Merge branch 'dev' into bal-3144

ballerine-io · Dec 15, 2024 · 6217446 · 6217446
2 parents fe6fbd7 + 35e675e
commit 6217446
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 4 deletions.
diff --git a/.github/workflows/db-ops.yaml b/.github/workflows/db-ops.yaml
@@ -165,6 +165,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [update-helm-chart,build-and-push-ee-image]
     if: ${{ needs.update-helm-chart.result == 'success' }}
+    environment: ${{ github.event.client_payload.environment }}
     permissions:
       contents: read
       packages: write

diff --git a/.github/workflows/deploy-wf-service.yml b/.github/workflows/deploy-wf-service.yml
@@ -256,6 +256,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [update-helm-chart,build-and-push-ee-image]
     if: ${{ needs.update-helm-chart.result == 'success' }}
+    environment: ${{ inputs.environment }}
     permissions:
       contents: read
       packages: write

diff --git a/.github/workflows/hotfix-wf-service.yml b/.github/workflows/hotfix-wf-service.yml
@@ -329,6 +329,7 @@ jobs:
   send-to-slack:
     runs-on: ubuntu-latest
     needs: [update-helm-chart,build-and-push-ee-image,build-and-push-image]
+    environment: ${{ inputs.environment }}
     if: ${{ needs.update-helm-chart.result == 'success' }}
     permissions:
       contents: read

diff --git a/apps/backoffice-v2/src/common/components/organisms/EditableDetailsV2/EditableDetailsV2.tsx b/apps/backoffice-v2/src/common/components/organisms/EditableDetailsV2/EditableDetailsV2.tsx
@@ -65,6 +65,11 @@ export const EditableDetailsV2: FunctionComponent<IEditableDetailsV2Props> = ({
                       <EditableDetailV2
                         name={field.name}
                         type={props.type}
+                        inputType={
+                          config.inputTypes?.[
+                            path.split('.').at(-1) as keyof typeof config.inputTypes
+                          ]
+                        }
                         format={props.format}
                         minimum={props.minimum}
                         maximum={props.maximum}

diff --git a/...n/components/organisms/EditableDetailsV2/components/EditableDetailV2/EditableDetailV2.tsx b/...n/components/organisms/EditableDetailsV2/components/EditableDetailV2/EditableDetailV2.tsx
@@ -33,6 +33,7 @@ export const EditableDetailV2 = ({
   minimum,
   maximum,
   pattern,
+  inputType,
   parse,
 }: {
   isEditable: boolean;
@@ -52,6 +53,7 @@ export const EditableDetailV2 = ({
   minimum?: number;
   maximum?: number;
   pattern?: string;
+  inputType?: string;
   parse?: {
     date?: boolean;
     isoDate?: boolean;
@@ -131,7 +133,10 @@ export const EditableDetailV2 = ({
     );
   }
 
-  if (parse?.boolean && (typeof value === 'boolean' || type === 'boolean')) {
+  if (
+    parse?.boolean &&
+    (typeof value === 'boolean' || type === 'boolean' || inputType === 'checkbox')
+  ) {
     return (
       <FormControl>
         <Checkbox_
@@ -145,16 +150,16 @@ export const EditableDetailV2 = ({
   }
 
   if (isEditable) {
-    const inputType = getInputType({ format, type, value });
+    const computedInputType = inputType ?? getInputType({ format, type, value });
 
     return (
       <FormControl>
         <Input
           {...(typeof minimum === 'number' && { min: minimum })}
           {...(typeof maximum === 'number' && { max: maximum })}
           {...(pattern && { pattern })}
-          {...(inputType === 'datetime-local' && { step: '1' })}
-          type={inputType}
+          {...(computedInputType === 'datetime-local' && { step: '1' })}
+          type={computedInputType}
           value={displayValue}
           onChange={handleInputChange}
           autoComplete={'off'}

diff --git a/apps/backoffice-v2/src/common/components/organisms/EditableDetailsV2/types.ts b/apps/backoffice-v2/src/common/components/organisms/EditableDetailsV2/types.ts
@@ -30,6 +30,7 @@ export interface IBaseEditableDetailsV2Config {
       disabled: boolean;
     };
   };
+  inputTypes?: Record<string, HTMLInputElement['type']>;
 }
 
 export interface IEditableDetailsV2ConfigWithBlacklist extends IBaseEditableDetailsV2Config {

diff --git a/apps/backoffice-v2/src/lib/blocks/components/KycBlock/hooks/useKycBlock/useKycBlock.tsx b/apps/backoffice-v2/src/lib/blocks/components/KycBlock/hooks/useKycBlock/useKycBlock.tsx
@@ -414,6 +414,9 @@ export const useKycBlock = ({
                   disabled: !caseState.writeEnabled,
                 },
               },
+              inputTypes: {
+                dateOfBirth: 'date',
+              },
             },
           },
         })
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ export interface IBaseEditableDetailsV2Config { @@
           disabled: boolean;
         };
       };
+      inputTypes?: Record<string, HTMLInputElement['type']>;
     }
     export interface IEditableDetailsV2ConfigWithBlacklist extends IBaseEditableDetailsV2Config {
@@ Expand Down @@