From d16b94bde64132b6d06815288d8cb1512944ce9e Mon Sep 17 00:00:00 2001 From: BugIsGod <87571967+bugisthegod@users.noreply.github.com> Date: Sun, 22 Mar 2026 21:11:02 +0000 Subject: [PATCH] fix: reset form defaultValues after save to fix dirty detection (#18835) fixes #18833 I have put some log video and explained the details in pr #18630. image --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Charles Bochet --- .../components/__stories__/CommandMenu.stories.tsx | 4 +++- .../components/SettingsUpdateDataModelObjectAboutForm.tsx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx index 27453c80a5..893a2a2e36 100644 --- a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx +++ b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx @@ -269,7 +269,9 @@ export const SubPageNavigation: Story = { const backButton = await canvas.findByRole('button', { name: 'Go back' }); await userEvent.click(backButton); - expect(await canvas.findByText('Object')).toBeVisible(); + await waitFor(() => { + expect(canvas.getByText('Object')).toBeVisible(); + }); }, decorators: [ (Story) => { diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx index 3dcc7a0a54..26f3031d0b 100644 --- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx @@ -96,7 +96,7 @@ export const SettingsUpdateDataModelObjectAboutForm = ({ nameSingular: updatedObject?.data?.updateOneObject.nameSingular, }); } else { - formConfig.reset(undefined, { keepValues: true }); + formConfig.reset(formValues); } navigate(SettingsPath.ObjectDetail, {