Skip to content

Commit 259e58b

Browse files
✅ - test: attempt to fix the tests
1 parent 0fd45e6 commit 259e58b

File tree

3 files changed

+24
-8
lines changed

3 files changed

+24
-8
lines changed

backend/src/openarchiefbeheer/destruction/tests/e2e/features/test_feature_list_process_review.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ async def test_scenario_record_manager_process_review(self):
6868

6969
# Fill archive date
7070
await self.when.user_clicks_radio(page, "Verlengen bewaartermijn")
71-
await self.when.user_fills_form_field(page, "Archief datum", "09/15/2023")
71+
await self.when.user_fills_form_field(page, "Dag van de maand", "09/15/2023")
7272
await page.keyboard.press("Enter")
7373

7474
await self.when.user_fills_form_field(page, "Reden", "Andere datum")

frontend/src/pages/destructionlist/detail/hooks/useFormDialog.tsx

+9-4
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,27 @@ export const useFormDialog = () => {
4848
{typeof message === "string" ? <P>{message}</P> : message}
4949
<Form
5050
fields={fields}
51+
justify="stretch"
5152
labelSubmit={labelConfirm}
5253
secondaryActions={[
5354
{
5455
children: labelCancel,
5556
type: "button",
5657
variant: "secondary",
57-
onClick: () => {
58-
setModalProps({ open: false });
58+
onClick: (e: React.MouseEvent<HTMLButtonElement>) => {
59+
e.preventDefault();
60+
e.stopPropagation();
5961
onCancel?.();
62+
setModalProps({ open: false });
6063
},
6164
},
6265
]}
6366
validateOnChange={true}
64-
onSubmit={(_, data) => {
65-
setModalProps({ open: false });
67+
onSubmit={(e, data) => {
68+
e.preventDefault();
69+
e.stopPropagation();
6670
onConfirm(data);
71+
setModalProps({ open: false });
6772
}}
6873
{...formProps}
6974
/>

frontend/src/pages/destructionlist/hooks/useFields.ts

+14-3
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,22 @@ export function useFields(
7272
{
7373
name: "startdatum",
7474
type: "daterange",
75-
filterValue: `${searchParams.get("startdatum__gte")}/${searchParams.get("startdatum__lte")}`,
75+
filterValue:
76+
searchParams.get("startdatum__gte") &&
77+
searchParams.get("startdatum__lte")
78+
? `${searchParams.get("startdatum__gte")}/${searchParams.get("startdatum__lte")}`
79+
: undefined,
7680
valueTransform: (rowData) =>
7781
rowData.startdatum ? formatDate(rowData.startdatum as string) : "",
7882
width: "150px",
7983
},
8084
{
8185
name: "einddatum",
8286
type: "daterange",
83-
filterValue: `${searchParams.get("einddatum__gte")}/${searchParams.get("einddatum__lte")}`,
87+
filterValue:
88+
searchParams.get("einddatum__gte") && searchParams.get("einddatum__lte")
89+
? `${searchParams.get("einddatum__gte")}/${searchParams.get("einddatum__lte")}`
90+
: undefined,
8491
valueTransform: (rowData) =>
8592
rowData.einddatum ? formatDate(rowData.einddatum as string) : "",
8693
width: "150px",
@@ -137,7 +144,11 @@ export function useFields(
137144
name: "archiefactiedatum",
138145
type: "daterange",
139146
width: "130px",
140-
filterValue: `${searchParams.get("archiefactiedatum__gte")}/${searchParams.get("archiefactiedatum__lte")}`,
147+
filterValue:
148+
searchParams.get("archiefactiedatum__gte") &&
149+
searchParams.get("archiefactiedatum__lte")
150+
? `${searchParams.get("archiefactiedatum__gte")}/${searchParams.get("archiefactiedatum__lte")}`
151+
: undefined,
141152
valueTransform: (rowData) =>
142153
rowData.archiefactiedatum
143154
? formatDate(rowData.archiefactiedatum as string)

0 commit comments

Comments
 (0)