From e957b9b019ca4631822c173bdfb88c7f3f8fd4a2 Mon Sep 17 00:00:00 2001 From: Illia Rudniev Date: Wed, 29 Jan 2025 13:59:44 +0200 Subject: [PATCH 1/3] fix: adjusted delays & fixed date picker events --- .../molecules/inputs/DatePickerInput/DatePickerInput.tsx | 2 ++ .../create-or-update-fileid-or-file-in-documents.ts | 1 + .../Form/DynamicForm/hooks/external/useField/useField.ts | 5 ++--- .../hooks/external/useField/useField.unit.test.ts | 5 ++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/ui/src/components/molecules/inputs/DatePickerInput/DatePickerInput.tsx b/packages/ui/src/components/molecules/inputs/DatePickerInput/DatePickerInput.tsx index e6d7bc9f13..dab028f36b 100644 --- a/packages/ui/src/components/molecules/inputs/DatePickerInput/DatePickerInput.tsx +++ b/packages/ui/src/components/molecules/inputs/DatePickerInput/DatePickerInput.tsx @@ -168,6 +168,8 @@ export const DatePickerInput = ({ ), inputProps: { 'data-test-id': testId, + onBlur: onBlur, + onFocus: onFocus, }, InputProps: { className: 'focus:outline-none', diff --git a/packages/ui/src/components/organisms/Form/DynamicForm/fields/DocumentField/hooks/useDocumentUpload/helpers/create-or-update-fileid-or-file-in-documents/create-or-update-fileid-or-file-in-documents.ts b/packages/ui/src/components/organisms/Form/DynamicForm/fields/DocumentField/hooks/useDocumentUpload/helpers/create-or-update-fileid-or-file-in-documents/create-or-update-fileid-or-file-in-documents.ts index 8e88507482..e206732558 100644 --- a/packages/ui/src/components/organisms/Form/DynamicForm/fields/DocumentField/hooks/useDocumentUpload/helpers/create-or-update-fileid-or-file-in-documents/create-or-update-fileid-or-file-in-documents.ts +++ b/packages/ui/src/components/organisms/Form/DynamicForm/fields/DocumentField/hooks/useDocumentUpload/helpers/create-or-update-fileid-or-file-in-documents/create-or-update-fileid-or-file-in-documents.ts @@ -28,6 +28,7 @@ export const createOrUpdateFileIdOrFileInDocuments = ( return documents; } else { const existingDocumentIndex = documents.findIndex(document => document.id === template?.id); + documents[existingDocumentIndex] = structuredClone(template); const pathToFileId = composePathToFileId(existingDocumentIndex, pageProperty, pageIndex); set(documents, pathToFileId, fileIdOrFile); diff --git a/packages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useField/useField.ts b/packages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useField/useField.ts index 7b40ac8af4..7ee55f0487 100644 --- a/packages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useField/useField.ts +++ b/packages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useField/useField.ts @@ -26,7 +26,7 @@ export const useField = (element: IFormElement, stack?: TDeept const disabledRulesResult = useRuleEngine(valuesAndMetadata, { rules: useRules(element.disable, stack), runOnInitialize: true, - executionDelay: 500, + executionDelay: 100, }); const isDisabled = useMemo(() => { @@ -38,13 +38,12 @@ export const useField = (element: IFormElement, stack?: TDeept const onChange = useCallback( (value: TValue, ignoreEvent = false) => { setValue(fieldId, valueDestination, value); - setTouched(fieldId, true); if (!ignoreEvent) { sendEventAsync('onChange'); } }, - [fieldId, valueDestination, setValue, setTouched, sendEventAsync], + [fieldId, valueDestination, setValue, sendEventAsync], ); const onBlur = useCallback(() => { diff --git a/packages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useField/useField.unit.test.ts b/packages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useField/useField.unit.test.ts index e1c9f8b053..b9a6433022 100644 --- a/packages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useField/useField.unit.test.ts +++ b/packages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useField/useField.unit.test.ts @@ -155,7 +155,6 @@ describe('useField', () => { result.current.onChange('new-value'); expect(mockSetValue).toHaveBeenCalledWith('test-field-1-2', 'test.path[1][2]', 'new-value'); - expect(mockSetTouched).toHaveBeenCalledWith('test-field-1-2', true); expect(mockSendEventAsync).toHaveBeenCalledWith('onChange'); }); @@ -274,7 +273,7 @@ describe('useField', () => { { rules: mockElement.disable, runOnInitialize: true, - executionDelay: 500, + executionDelay: 100, }, ); }); @@ -296,7 +295,7 @@ describe('useField', () => { { rules: mockElement.disable, runOnInitialize: true, - executionDelay: 500, + executionDelay: 100, }, ); }); From 21a2d17f7a06048f4b8a4435ec398f6d6b36a7f8 Mon Sep 17 00:00:00 2001 From: Illia Rudniev Date: Wed, 29 Jan 2025 14:02:48 +0200 Subject: [PATCH 2/3] fix: adjusted validator params & fixed revision --- .../organisms/CollectionFlowUI/CollectionFlowUI.tsx | 6 +++--- .../usePriorityFields/utils/generate-priority-fields.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/CollectionFlowUI.tsx b/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/CollectionFlowUI.tsx index 75bf2e9faf..48b29d91b7 100644 --- a/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/CollectionFlowUI.tsx +++ b/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/CollectionFlowUI.tsx @@ -21,9 +21,9 @@ interface ICollectionFlowUIProps { } const validationParams = { - validateOnBlur: true, - abortEarly: true, - validationDelay: 200, + validateOnBlur: false, + abortEarly: false, + validationDelay: 500, }; export const CollectionFlowUI: FunctionComponent = ({ diff --git a/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/hooks/usePriorityFields/utils/generate-priority-fields.ts b/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/hooks/usePriorityFields/utils/generate-priority-fields.ts index d54c3a9f6c..af486f078b 100644 --- a/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/hooks/usePriorityFields/utils/generate-priority-fields.ts +++ b/apps/kyb-app/src/pages/CollectionFlow/versions/v2/components/organisms/CollectionFlowUI/hooks/usePriorityFields/utils/generate-priority-fields.ts @@ -24,7 +24,7 @@ export const generatePriorityFields = ( // Extracting revision reason fro documents isnt common so we handling it explicitly if (isDocumentFieldDefinition(element)) { const documents = get(context, formatValueDestination(element.valueDestination, stack)); - const document = documents.find( + const document = documents?.find( (doc: TDocument) => doc.id === element.params?.template?.id, ); From 862ecdda24137df2c0b5b305c9b0b269fbf629f8 Mon Sep 17 00:00:00 2001 From: Illia Rudniev Date: Wed, 29 Jan 2025 14:04:32 +0200 Subject: [PATCH 3/3] feat: bumped ui & lock fix --- apps/kyb-app/CHANGELOG.md | 7 ++ apps/kyb-app/package.json | 4 +- packages/react-pdf-toolkit/CHANGELOG.md | 7 ++ packages/react-pdf-toolkit/package.json | 4 +- packages/ui/CHANGELOG.md | 6 ++ packages/ui/package.json | 2 +- pnpm-lock.yaml | 84 +++---------------- .../workflows-service/prisma/data-migrations | 2 +- 8 files changed, 36 insertions(+), 80 deletions(-) diff --git a/apps/kyb-app/CHANGELOG.md b/apps/kyb-app/CHANGELOG.md index aa6f18a879..8d3490155e 100644 --- a/apps/kyb-app/CHANGELOG.md +++ b/apps/kyb-app/CHANGELOG.md @@ -1,5 +1,12 @@ # kyb-app +## 0.3.119 + +### Patch Changes + +- Updated dependencies + - @ballerine/ui@0.5.70 + ## 0.3.118 ### Patch Changes diff --git a/apps/kyb-app/package.json b/apps/kyb-app/package.json index 07a3c9277b..f4246e5161 100644 --- a/apps/kyb-app/package.json +++ b/apps/kyb-app/package.json @@ -1,7 +1,7 @@ { "name": "@ballerine/kyb-app", "private": true, - "version": "0.3.118", + "version": "0.3.119", "type": "module", "scripts": { "dev": "vite", @@ -19,7 +19,7 @@ "@ballerine/blocks": "0.2.34", "@ballerine/common": "^0.9.70", "@ballerine/workflow-browser-sdk": "0.6.89", - "@ballerine/ui": "0.5.69", + "@ballerine/ui": "0.5.70", "@lukemorales/query-key-factory": "^1.0.3", "@radix-ui/react-icons": "^1.3.0", "@rjsf/core": "^5.9.0", diff --git a/packages/react-pdf-toolkit/CHANGELOG.md b/packages/react-pdf-toolkit/CHANGELOG.md index 42000bd3bb..bcf3e018d1 100644 --- a/packages/react-pdf-toolkit/CHANGELOG.md +++ b/packages/react-pdf-toolkit/CHANGELOG.md @@ -1,5 +1,12 @@ # @ballerine/react-pdf-toolkit +## 1.2.70 + +### Patch Changes + +- Updated dependencies + - @ballerine/ui@0.5.70 + ## 1.2.69 ### Patch Changes diff --git a/packages/react-pdf-toolkit/package.json b/packages/react-pdf-toolkit/package.json index d02dded313..fd091e36e9 100644 --- a/packages/react-pdf-toolkit/package.json +++ b/packages/react-pdf-toolkit/package.json @@ -1,7 +1,7 @@ { "name": "@ballerine/react-pdf-toolkit", "private": false, - "version": "1.2.69", + "version": "1.2.70", "types": "./dist/build.d.ts", "main": "./dist/react-pdf-toolkit.js", "module": "./dist/react-pdf-toolkit.mjs", @@ -27,7 +27,7 @@ }, "dependencies": { "@ballerine/config": "^1.1.32", - "@ballerine/ui": "0.5.69", + "@ballerine/ui": "0.5.70", "@react-pdf/renderer": "^3.1.14", "@sinclair/typebox": "^0.31.7", "ajv": "^8.12.0", diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md index 443d442202..e6020ac259 100644 --- a/packages/ui/CHANGELOG.md +++ b/packages/ui/CHANGELOG.md @@ -1,5 +1,11 @@ # @ballerine/ui +## 0.5.70 + +### Patch Changes + +- Param adjustmetns & bugfixes + ## 0.5.69 ### Patch Changes diff --git a/packages/ui/package.json b/packages/ui/package.json index c239c101bf..110506875d 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,7 +1,7 @@ { "name": "@ballerine/ui", "private": false, - "version": "0.5.69", + "version": "0.5.70", "type": "module", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 73b0e751de..f8c92b8c04 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -536,7 +536,7 @@ importers: specifier: ^0.9.70 version: link:../../packages/common '@ballerine/ui': - specifier: 0.5.69 + specifier: 0.5.70 version: link:../../packages/ui '@ballerine/workflow-browser-sdk': specifier: 0.6.89 @@ -1253,7 +1253,7 @@ importers: version: 3.7.2(eslint@8.54.0)(typescript@5.1.6) eslint-plugin-import: specifier: ^2.22.0 - version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0) + version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) eslint-plugin-storybook: specifier: ^0.6.13 version: 0.6.15(eslint@8.54.0)(typescript@5.1.6) @@ -1431,7 +1431,7 @@ importers: version: 3.7.2(eslint@8.54.0)(typescript@4.9.5) eslint-plugin-import: specifier: ^2.22.0 - version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0) + version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) eslint-plugin-unused-imports: specifier: ^2.0.0 version: 2.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.54.0) @@ -1519,7 +1519,7 @@ importers: specifier: ^1.1.32 version: link:../config '@ballerine/ui': - specifier: 0.5.69 + specifier: 0.5.70 version: link:../ui '@react-pdf/renderer': specifier: ^3.1.14 @@ -1699,7 +1699,7 @@ importers: version: 3.7.2(eslint@8.54.0)(typescript@4.9.5) eslint-plugin-import: specifier: ^2.22.0 - version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0) + version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) eslint-plugin-unused-imports: specifier: ^2.0.0 version: 2.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.54.0) @@ -2157,7 +2157,7 @@ importers: version: 3.7.2(eslint@8.54.0)(typescript@5.1.6) eslint-plugin-import: specifier: ^2.22.0 - version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0) + version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) eslint-plugin-unused-imports: specifier: ^2.0.0 version: 2.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.54.0) @@ -2432,7 +2432,7 @@ importers: version: 3.7.2(eslint@8.54.0)(typescript@4.9.5) eslint-plugin-import: specifier: ^2.22.0 - version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0) + version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) eslint-plugin-unused-imports: specifier: ^2.0.0 version: 2.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.54.0) @@ -2568,7 +2568,7 @@ importers: version: 3.7.2(eslint@8.54.0)(typescript@5.1.6) eslint-plugin-import: specifier: ^2.22.0 - version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0) + version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) eslint-plugin-unused-imports: specifier: ^2.0.0 version: 2.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.54.0) @@ -25590,35 +25590,6 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.54.0): - resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} - engines: {node: '>=4'} - peerDependencies: - '@typescript-eslint/parser': '*' - eslint: '*' - eslint-import-resolver-node: '*' - eslint-import-resolver-typescript: '*' - eslint-import-resolver-webpack: '*' - peerDependenciesMeta: - '@typescript-eslint/parser': - optional: true - eslint: - optional: true - eslint-import-resolver-node: - optional: true - eslint-import-resolver-typescript: - optional: true - eslint-import-resolver-webpack: - optional: true - dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@5.1.6) - debug: 3.2.7 - eslint: 8.54.0 - eslint-import-resolver-node: 0.3.9 - transitivePeerDependencies: - - supports-color - dev: true - /eslint-plugin-astro@0.28.0(eslint@8.54.0): resolution: {integrity: sha512-fZ3B93nXLSXMmEYSAnHkDRBKDbUFuIkWj5CoKE4fxjPnE/EZEHu6zxtX2UJZeclJKu33Uf2mWdeCJKFufyracg==} engines: {node: ^14.18.0 || >=16.0.0} @@ -25777,41 +25748,6 @@ packages: - supports-color dev: true - /eslint-plugin-import@2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0): - resolution: {integrity: sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==} - engines: {node: '>=4'} - peerDependencies: - '@typescript-eslint/parser': '*' - eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - peerDependenciesMeta: - '@typescript-eslint/parser': - optional: true - dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@5.1.6) - array-includes: 3.1.7 - array.prototype.findlastindex: 1.2.3 - array.prototype.flat: 1.3.2 - array.prototype.flatmap: 1.3.2 - debug: 3.2.7 - doctrine: 2.1.0 - eslint: 8.54.0 - eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.54.0) - hasown: 2.0.0 - is-core-module: 2.13.1 - is-glob: 4.0.3 - minimatch: 3.1.2 - object.fromentries: 2.0.7 - object.groupby: 1.0.1 - object.values: 1.1.7 - semver: 6.3.1 - tsconfig-paths: 3.14.2 - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - dev: true - /eslint-plugin-import@2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.54.0): resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==} engines: {node: '>=4'} @@ -25831,7 +25767,7 @@ packages: doctrine: 2.1.0 eslint: 8.54.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.54.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) hasown: 2.0.0 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -26104,7 +26040,7 @@ packages: '@typescript-eslint/eslint-plugin': optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0)(typescript@5.1.6) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0)(typescript@4.9.5) eslint: 8.54.0 eslint-rule-composer: 0.3.0 dev: true diff --git a/services/workflows-service/prisma/data-migrations b/services/workflows-service/prisma/data-migrations index 4d14afe763..be37b412e0 160000 --- a/services/workflows-service/prisma/data-migrations +++ b/services/workflows-service/prisma/data-migrations @@ -1 +1 @@ -Subproject commit 4d14afe76300c59a1f91e0a732acf2bbf5c9ca3b +Subproject commit be37b412e02776cf35e64f65db3bda1386f61485