Skip to content

Commit e4170e4

Browse files
committed
refactor(*): changed handling of date inputs
1 parent fe55bfa commit e4170e4

File tree

15 files changed

+3115
-675
lines changed

15 files changed

+3115
-675
lines changed

apps/backoffice-v2/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
"tesseract.js": "^4.0.1",
146146
"ts-pattern": "^5.0.8",
147147
"vite-plugin-terminal": "^1.1.0",
148-
"zod": "^3.22.3"
148+
"zod": "^3.23.4"
149149
},
150150
"devDependencies": {
151151
"@ballerine/config": "^1.1.26",
@@ -162,8 +162,9 @@
162162
"@storybook/react-vite": "^7.0.0-rc.10",
163163
"@storybook/testing-library": "^0.0.14-next.1",
164164
"@tanstack/react-query-devtools": "4.22.0",
165-
"@testing-library/jest-dom": "^5.16.4",
166-
"@testing-library/react": "^13.3.0",
165+
"@testing-library/jest-dom": "^6.6.3",
166+
"@testing-library/react": "^16.1.0",
167+
"@testing-library/user-event": "^14.5.2",
167168
"@total-typescript/ts-reset": "^0.5.1",
168169
"@types/d3-hierarchy": "^3.1.7",
169170
"@types/dompurify": "^3.0.5",
@@ -173,7 +174,6 @@
173174
"@types/qs": "^6.9.7",
174175
"@types/react": "^18.0.14",
175176
"@types/react-dom": "^18.0.5",
176-
"@types/testing-library__jest-dom": "^5.14.5",
177177
"@typescript-eslint/eslint-plugin": "^5.30.0",
178178
"@typescript-eslint/parser": "^5.30.0",
179179
"@vitejs/plugin-react-swc": "^3.0.1",
@@ -199,7 +199,7 @@
199199
"vite-plugin-mkcert": "^1.16.0",
200200
"vite-plugin-top-level-await": "^1.4.4",
201201
"vite-tsconfig-paths": "^5.0.1",
202-
"vitest": "^0.29.8"
202+
"vitest": "^2.1.8"
203203
},
204204
"peerDependencies": {
205205
"react": "^17.0.0",

apps/backoffice-v2/src/common/components/organisms/EditableDetailsV2/EditableDetailsV2.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { FormLabel } from '../Form/Form.Label';
99
import { FormMessage } from '../Form/Form.Message';
1010
import { useNewEditableDetailsLogic } from './hooks/useEditableDetailsV2Logic/useEditableDetailsV2Logic';
1111
import { EditableDetailsV2Options } from './components/EditableDetailsV2Options';
12-
import { EditableDetailV2 } from './components/EditableDetailV2';
12+
import { EditableDetailV2 } from './components/EditableDetailV2/EditableDetailV2';
1313
import { IEditableDetailsV2Props } from './types';
1414

1515
export const EditableDetailsV2: FunctionComponent<IEditableDetailsV2Props> = ({
@@ -24,9 +24,10 @@ export const EditableDetailsV2: FunctionComponent<IEditableDetailsV2Props> = ({
2424
throw new Error('Cannot provide both blacklist and whitelist');
2525
}
2626

27-
const { form, handleSubmit, filteredFields } = useNewEditableDetailsLogic({
27+
const { form, handleSubmit, handleCancel, filteredFields } = useNewEditableDetailsLogic({
2828
fields,
2929
onSubmit,
30+
onCancel,
3031
config,
3132
});
3233

@@ -64,17 +65,19 @@ export const EditableDetailsV2: FunctionComponent<IEditableDetailsV2Props> = ({
6465
{titleCase(title ?? '')}
6566
</TextWithNAFallback>
6667
<EditableDetailV2
68+
name={field.name}
6769
type={props.type}
6870
format={props.format}
6971
minimum={props.minimum}
7072
maximum={props.maximum}
7173
pattern={props.pattern}
7274
options={props.options}
7375
isEditable={!config.actions.editing.disabled && props.isEditable}
76+
value={field.value}
7477
valueAlias={props.valueAlias}
7578
originalValue={originalValue}
76-
form={form}
77-
field={field}
79+
onInputChange={form.setValue}
80+
onOptionChange={field.onChange}
7881
parse={config.parse}
7982
/>
8083
<FormMessage />
@@ -91,7 +94,7 @@ export const EditableDetailsV2: FunctionComponent<IEditableDetailsV2Props> = ({
9194
type="button"
9295
className={`aria-disabled:pointer-events-none aria-disabled:opacity-50`}
9396
aria-disabled={config.actions.cancel.disabled}
94-
onClick={onCancel}
97+
onClick={handleCancel}
9598
>
9699
Cancel
97100
</Button>

apps/backoffice-v2/src/common/components/organisms/EditableDetailsV2/components/EditableDetailV2.tsx

Lines changed: 0 additions & 188 deletions
This file was deleted.

0 commit comments

Comments
 (0)