The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(front): reset confirmation modal input when reopened (#25674)
Mydd2d576ecef7a0
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsxindex 1835a0e2cf0..a41c03867d1 100644--- a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx@@ -1,6 +1,6 @@import { styled } from '@linaria/react';+import { isNonEmptyString } from '@sniptt/guards';import { type ReactNode, useState } from 'react';-import { useDebouncedCallback } from 'use-debounce';import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';@@ -98,29 +98,25 @@ export const ConfirmationModal = ({confirmButtonText ?? i18n._(defaultConfirmButtonText);const [inputConfirmationValue, setInputConfirmationValue] =useState<string>('');- const [isValidValue, setIsValidValue] = useState(!confirmationValue);- const handleInputConfimrationValueChange = (value: string) => {- setInputConfirmationValue(value);- isValueMatchingInput(confirmationValue, value);- };-- const isValueMatchingInput = useDebouncedCallback(- (value?: string, inputValue?: string) => {- setIsValidValue(Boolean(value && inputValue && value === inputValue));- },- 250,- );+ const isValidValue =+ !isNonEmptyString(confirmationValue) ||+ inputConfirmationValue === confirmationValue;const { closeModal } = useModal();- const handleConfirmClick = () => {+ const handleClose = () => {+ setInputConfirmationValue('');closeModal(modalInstanceId);+ };++ const handleConfirmClick = () => {+ handleClose();onConfirmClick();};const handleCancelClick = () => {- closeModal(modalInstanceId);+ handleClose();onClose?.();};@@ -134,6 +130,7 @@ export const ConfirmationModal = ({<ModalStatefulWrappermodalInstanceId={modalInstanceId}onClose={() => {+ setInputConfirmationValue('');onClose?.();}}onEnter={handleEnter}@@ -163,7 +160,7 @@ export const ConfirmationModal = ({instanceId="confirmation-modal-input"dataTestId="confirmation-modal-input"value={inputConfirmationValue}- onChange={handleInputConfimrationValueChange}+ onChange={setInputConfirmationValue}placeholder={confirmationPlaceholder}fullWidthdisableHotkeysdiff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmationModal.stories.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmationModal.stories.tsxindex 693c0050126..dd60b8eaf21 100644--- a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmationModal.stories.tsx+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmationModal.stories.tsx@@ -188,3 +188,56 @@ export const ConfirmButtonClick: Story = {});},};++export const ResetsInputWhenReopened: Story = {+ args: {+ modalInstanceId: 'confirmation-modal',+ title: 'Reopen Reset Test',+ subtitle: 'Reopening the modal should clear the confirmation input.',+ confirmButtonText: 'Confirm',+ confirmationValue: '[email protected]',+ confirmationPlaceholder: '[email protected]',+ onConfirmClick: fn(),+ onClose: fn(),+ },+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);++ await body.findByText('Reopen Reset Test');++ await userEvent.type(+ await body.findByTestId('confirmation-modal-input'),+ '[email protected]',+ );++ await waitFor(() => {+ expect(+ body.getByTestId('confirmation-modal-confirm-button'),+ ).toBeEnabled();+ });++ await userEvent.click(body.getByTestId('confirmation-modal-cancel-button'));++ await waitFor(() => {+ expect(+ body.queryByTestId('confirmation-modal-input'),+ ).not.toBeInTheDocument();+ });++ jotaiStore.set(+ isModalOpenedComponentState.atomFamily({+ instanceId: 'confirmation-modal',+ }),+ true,+ );++ await body.findByTestId('confirmation-modal-input');++ await waitFor(() => {+ expect(body.getByTestId('confirmation-modal-input')).toHaveValue('');+ expect(+ body.getByTestId('confirmation-modal-confirm-button'),+ ).toBeDisabled();+ });+ },+};