The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fix workflow date fields (#19210)
Thomas Trompette19dd4d6c1b08
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsxindex 87b5e773ff5..0e64e4d676b 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx@@ -1,76 +1,52 @@-import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';import { FormFieldInputContainer } from '@/object-record/record-field/ui/form-types/components/FormFieldInputContainer';import { FormFieldInputInnerContainer } from '@/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer';import { FormFieldInputRowContainer } from '@/object-record/record-field/ui/form-types/components/FormFieldInputRowContainer';import { VariableChipStandalone } from '@/object-record/record-field/ui/form-types/components/VariableChipStandalone';import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';import { InputLabel } from '@/ui/input/components/InputLabel';-import { DatePicker } from '@/ui/input/components/internal/date/components/DatePicker';import {+ DatePicker,MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,-} from '@/ui/input/components/internal/date/components/DateTimePicker';-import { useParseDateInputStringToPlainDate } from '@/ui/input/components/internal/date/hooks/useParseDateInputStringToPlainDate';-import { useParsePlainDateToDateInputString } from '@/ui/input/components/internal/date/hooks/useParsePlainDateToDateInputString';+} from '@/ui/input/components/internal/date/components/DatePicker';+import { DatePickerInput } from '@/ui/input/components/internal/date/components/DatePickerInput';+import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';+import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariableString';import { styled } from '@linaria/react';import { isNonEmptyString } from '@sniptt/guards';-import {- useId,- useRef,- useState,- type ChangeEvent,- type KeyboardEvent,-} from 'react';+import { useId, useRef, useState } from 'react';+import { Temporal } from 'temporal-polyfill';import { Key } from 'ts-key-enum';import { isDefined } from 'twenty-shared/utils';import { themeCssVariables } from 'twenty-ui/theme-constants';import { type Nullable } from 'twenty-ui/utilities';-import { getDateFormatStringForDatePickerInputMask } from '~/utils/date-utils';--const StyledInputContainerWrapper = styled.div`- display: grid;- grid-template-columns: 1fr;- grid-template-rows: 1fr 0;- overflow: visible;- position: relative;-`;const StyledDateInputAbsoluteContainer = styled.div`position: absolute;top: ${themeCssVariables.spacing[1]};`;-const StyledDateInput = styled.input<{ hasError?: boolean }>`- background-color: transparent;- border: none;- color: ${({ hasError }) =>- hasError- ? themeCssVariables.color.red- : themeCssVariables.font.color.primary};- color: ${themeCssVariables.font.color.primary};- font-family: ${themeCssVariables.font.family};- font-size: inherit;- font-weight: inherit;- outline: none;-- &::placeholder,- &::-webkit-input-placeholder {- color: ${themeCssVariables.font.color.light};- font-family: ${themeCssVariables.font.family};- font-weight: ${themeCssVariables.font.weight.medium};- }-- &:disabled {- color: ${themeCssVariables.font.color.tertiary};+const StyledDateInputTextContainer = styled.div<{ isReadonly?: boolean }>`+ align-items: center;+ display: flex;+ flex: 1;+ min-width: 0;+ pointer-events: ${({ isReadonly }) => (isReadonly ? 'none' : 'auto')};+ user-select: ${({ isReadonly }) => (isReadonly ? 'none' : 'auto')};+ width: 100%;++ & input {+ color: ${({ isReadonly }) =>+ isReadonly+ ? themeCssVariables.font.color.light+ : themeCssVariables.font.color.primary};}-- padding: ${themeCssVariables.spacing[0]} ${themeCssVariables.spacing[2]};`;const StyledDateInputContainer = styled.div`@@ -104,15 +80,8 @@ export const FormDateFieldInput = ({onChange,VariablePicker,readonly,- placeholder,}: FormDateFieldInputProps) => {const instanceId = useId();- const { dateFormat } = useDateTimeFormat();-- const { parsePlainDateToDateInputString } =- useParsePlainDateToDateInputString();- const { parseDateInputStringToPlainDate } =- useParseDateInputStringToPlainDate();const [draftValue, setDraftValue] = useState<DraftValue>(isStandaloneVariableString(defaultValue)@@ -127,24 +96,8 @@ export const FormDateFieldInput = ({},);- const draftValueAsDate =- isDefined(draftValue.value) &&- isNonEmptyString(draftValue.value) &&- draftValue.type === 'static'- ? draftValue.value- : null;-- const [pickerDate, setPickerDate] =- useState<Nullable<string>>(draftValueAsDate);-const datePickerWrapperRef = useRef<HTMLDivElement>(null);- const [inputDate, setInputDate] = useState(- isDefined(draftValueAsDate) && !isStandaloneVariableString(defaultValue)- ? parsePlainDateToDateInputString(draftValueAsDate)- : '',- );-const persistDate = (newDate: Nullable<string>) => {if (!isDefined(newDate)) {onChange(null);@@ -159,14 +112,9 @@ export const FormDateFieldInput = ({const displayDatePicker =draftValue.type === 'static' && draftValue.mode === 'edit';- const defaultPlaceHolder =- getDateFormatStringForDatePickerInputMask(dateFormat);-- const placeholderToDisplay = placeholder ?? defaultPlaceHolder;-useListenClickOutside({refs: [datePickerWrapperRef],- listenerId: 'FormDateTimeFieldInputBase',+ listenerId: 'FormDateFieldInputBase',callback: (event) => {event.stopImmediatePropagation();@@ -188,12 +136,6 @@ export const FormDateFieldInput = ({value: newDate ?? null,});- setInputDate(- isDefined(newDate) ? parsePlainDateToDateInputString(newDate) : '',- );-- setPickerDate(newDate);-persistDate(newDate);};@@ -222,10 +164,6 @@ export const FormDateFieldInput = ({mode: 'view',});- setPickerDate(null);-- setInputDate('');-persistDate(null);};@@ -236,58 +174,21 @@ export const FormDateFieldInput = ({mode: 'view',});- setPickerDate(newDate);-- setInputDate(- isDefined(newDate) ? parsePlainDateToDateInputString(newDate) : '',- );-persistDate(newDate);};- const handleInputFocus = () => {- setDraftValue({- type: 'static',- mode: 'edit',- value: draftValue.value,- });- };-- const handleInputChange = (event: ChangeEvent<HTMLInputElement>) => {- setInputDate(event.target.value);- };-- const handleInputKeydown = (event: KeyboardEvent<HTMLInputElement>) => {- if (event.key !== 'Enter') {- return;- }-- const inputDateTime = inputDate.trim();-- if (inputDateTime === '') {- handlePickerClear();- return;- }-- const parsedInputPlainDate = parseDateInputStringToPlainDate(inputDateTime);-- if (!isDefined(parsedInputPlainDate)) {+ const handleInputChange = (newDate: string | null) => {+ if (!isDefined(newDate)) {return;}- let validatedDate = parsedInputPlainDate;-setDraftValue({type: 'static',- value: validatedDate,mode: 'edit',+ value: newDate,});- setPickerDate(validatedDate);-- setInputDate(parsePlainDateToDateInputString(validatedDate));-- persistDate(validatedDate);+ persistDate(newDate);};const handleVariableTagInsert = (variableName: string) => {@@ -296,8 +197,6 @@ export const FormDateFieldInput = ({value: variableName,});- setInputDate('');-onChange(variableName);};@@ -308,8 +207,6 @@ export const FormDateFieldInput = ({mode: 'view',});- setPickerDate(null);-onChange(null);};@@ -320,56 +217,87 @@ export const FormDateFieldInput = ({dependencies: [handlePickerEscape],});+ const { userTimezone } = useUserTimezone();++ const isVariable = Boolean(isStandaloneVariableString(defaultValue));++ const plainDateValueFromProps =+ isVariable ||+ !isDefined(defaultValue) ||+ defaultValue === '' ||+ defaultValue === 'null'+ ? null+ : defaultValue.includes('T')+ ? Temporal.Instant.from(defaultValue)+ .toZonedDateTimeISO(userTimezone)+ .toPlainDate()+ .toString()+ : Temporal.PlainDate.from(defaultValue).toString();++ const plainDateValue =+ draftValue.type === 'static' && isNonEmptyString(draftValue.value)+ ? draftValue.value+ : plainDateValueFromProps;++ const handleMaskedDatePointerDownCapture = () => {+ if (readonly) {+ return;+ }++ setDraftValue((previous) =>+ previous.type === 'static' && previous.mode === 'view'+ ? { ...previous, mode: 'edit' }+ : previous,+ );+ };+return (<FormFieldInputContainer>{label ? <InputLabel>{label}</InputLabel> : null}<FormFieldInputRowContainer>- <StyledInputContainerWrapper ref={datePickerWrapperRef}>- <FormFieldInputInnerContainer- formFieldInputInstanceId={instanceId}- hasRightElement={isDefined(VariablePicker) && !readonly}- >- {draftValue.type === 'static' ? (- <>- <StyledDateInput- type="text"- placeholder={placeholderToDisplay}- value={inputDate}- onFocus={handleInputFocus}+ <FormFieldInputInnerContainer+ ref={datePickerWrapperRef}+ formFieldInputInstanceId={instanceId}+ hasRightElement={isDefined(VariablePicker) && !readonly}+ >+ {draftValue.type === 'static' ? (+ <>+ <StyledDateInputTextContainer+ isReadonly={readonly === true}+ onPointerDownCapture={handleMaskedDatePointerDownCapture}+ >+ <DatePickerInput+ date={plainDateValue}onChange={handleInputChange}- onKeyDown={handleInputKeydown}- disabled={readonly}/>-- {draftValue.mode === 'edit' ? (- <StyledDateInputContainer>- <StyledDateInputAbsoluteContainer>- <OverlayContainer>- <DatePicker- instanceId={instanceId}- plainDateString={pickerDate}- onChange={handlePickerChange}- onClose={handlePickerMouseSelect}- onEnter={handlePickerEnter}- onEscape={handlePickerEscape}- onClear={handlePickerClear}- hideHeaderInput- />- </OverlayContainer>- </StyledDateInputAbsoluteContainer>- </StyledDateInputContainer>- ) : null}- </>- ) : (- <VariableChipStandalone- rawVariableName={draftValue.value}- onRemove={readonly ? undefined : handleUnlinkVariable}- />- )}- </FormFieldInputInnerContainer>- </StyledInputContainerWrapper>-+ </StyledDateInputTextContainer>+ {draftValue.mode === 'edit' && !readonly ? (+ <StyledDateInputContainer>+ <StyledDateInputAbsoluteContainer>+ <OverlayContainer>+ <DatePicker+ instanceId={instanceId}+ plainDateString={plainDateValue}+ onChange={handlePickerChange}+ onClose={handlePickerMouseSelect}+ onEnter={handlePickerEnter}+ onEscape={handlePickerEscape}+ onClear={handlePickerClear}+ hideHeaderInput+ />+ </OverlayContainer>+ </StyledDateInputAbsoluteContainer>+ </StyledDateInputContainer>+ ) : null}+ </>+ ) : (+ <VariableChipStandalone+ rawVariableName={draftValue.value}+ onRemove={readonly ? undefined : handleUnlinkVariable}+ />+ )}+ </FormFieldInputInnerContainer>{VariablePicker && !readonly ? (<VariablePickerinstanceId={instanceId}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsxindex 71c6589646a..f45e69a4bb7 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx@@ -26,14 +26,6 @@ import { isDefined } from 'twenty-shared/utils';import { themeCssVariables } from 'twenty-ui/theme-constants';import { type Nullable } from 'twenty-ui/utilities';-const StyledInputContainerWrapper = styled.div`- display: grid;- grid-template-columns: 1fr;- grid-template-rows: 1fr 0;- overflow: visible;- position: relative;-`;-const StyledDateInputAbsoluteContainer = styled.div`position: absolute;top: ${themeCssVariables.spacing[1]};@@ -249,50 +241,49 @@ export const FormDateTimeFieldInput = ({{label ? <InputLabel>{label}</InputLabel> : null}<FormFieldInputRowContainer>- <StyledInputContainerWrapper ref={datePickerWrapperRef}>- <FormFieldInputInnerContainer- formFieldInputInstanceId={instanceId}- hasRightElement={isDefined(VariablePicker) && !readonly}- >- {draftValue.type === 'static' ? (- <>- <StyledDateInputTextContainer>- <DateTimePickerInput- date={dateValue}- onChange={handleInputChange}- onFocus={handleInputFocus}- readonly={readonly}- timeZone={timeZone}- />- </StyledDateInputTextContainer>- {draftValue.mode === 'edit' ? (- <StyledDateInputContainer>- <StyledDateInputAbsoluteContainer>- <OverlayContainer>- <DateTimePicker- instanceId={instanceId}- date={dateValue}- onChange={handlePickerChange}- onClose={handlePickerMouseSelect}- onEnter={handlePickerEnter}- onEscape={handlePickerEscape}- onClear={handlePickerClear}- hideHeaderInput- timeZone={timeZone}- />- </OverlayContainer>- </StyledDateInputAbsoluteContainer>- </StyledDateInputContainer>- ) : null}- </>- ) : (- <VariableChipStandalone- rawVariableName={draftValue.value}- onRemove={readonly ? undefined : handleUnlinkVariable}- />- )}- </FormFieldInputInnerContainer>- </StyledInputContainerWrapper>+ <FormFieldInputInnerContainer+ ref={datePickerWrapperRef}+ formFieldInputInstanceId={instanceId}+ hasRightElement={isDefined(VariablePicker) && !readonly}+ >+ {draftValue.type === 'static' ? (+ <>+ <StyledDateInputTextContainer>+ <DateTimePickerInput+ date={dateValue}+ onChange={handleInputChange}+ onFocus={handleInputFocus}+ readonly={readonly}+ timeZone={timeZone}+ />+ </StyledDateInputTextContainer>+ {draftValue.mode === 'edit' ? (+ <StyledDateInputContainer>+ <StyledDateInputAbsoluteContainer>+ <OverlayContainer>+ <DateTimePicker+ instanceId={instanceId}+ date={dateValue}+ onChange={handlePickerChange}+ onClose={handlePickerMouseSelect}+ onEnter={handlePickerEnter}+ onEscape={handlePickerEscape}+ onClear={handlePickerClear}+ hideHeaderInput+ timeZone={timeZone}+ />+ </OverlayContainer>+ </StyledDateInputAbsoluteContainer>+ </StyledDateInputContainer>+ ) : null}+ </>+ ) : (+ <VariableChipStandalone+ rawVariableName={draftValue.value}+ onRemove={readonly ? undefined : handleUnlinkVariable}+ />+ )}+ </FormFieldInputInnerContainer>{VariablePicker && !readonly ? (<VariablePickerinstanceId={instanceId}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsxindex 860cf46f2bb..7fac5d6254d 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx@@ -24,7 +24,9 @@ const StyledFormFieldInputInnerContainer = styled.div<border-bottom-right-radius: ${({ multiline, hasRightElement }) =>multiline || !hasRightElement ? themeCssVariables.border.radius.sm : '0'};border-right: ${({ multiline, hasRightElement }) =>- multiline || !hasRightElement ? 'auto' : 'none'};+ multiline || !hasRightElement+ ? `1px solid ${themeCssVariables.border.color.medium}`+ : 'none'};border-top-left-radius: ${themeCssVariables.border.radius.sm};border-top-right-radius: ${({ multiline, hasRightElement }) =>multiline || !hasRightElement ? themeCssVariables.border.radius.sm : '0'};diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsxindex 07ab9d57463..ec806995dd8 100644--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsx@@ -17,8 +17,8 @@ import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUsimport { useEffect, useState } from 'react';import { Temporal } from 'temporal-polyfill';import { isDefined } from 'twenty-shared/utils';-import { isDifferentZonedDateTime } from '~/utils/dates/isDifferentZonedDateTime';import { themeCssVariables } from 'twenty-ui/theme-constants';+import { isDifferentZonedDateTime } from '~/utils/dates/isDifferentZonedDateTime';const StyledInputContainer = styled.div`align-items: center;diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsxindex 0429bbc584e..c5cb34ee679 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormBuilder.tsx@@ -14,8 +14,8 @@ import { WorkflowStepFooter } from '@/workflow/workflow-steps/components/Workfloimport { WorkflowEditActionFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormFieldSettings';import { type WorkflowFormActionField } from '@/workflow/workflow-steps/workflow-actions/form-action/types/WorkflowFormActionField';import { getDefaultFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/utils/getDefaultFormFieldSettings';-import { styled } from '@linaria/react';import { type OnDragEndResponder } from '@hello-pangea/dnd';+import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';import { useContext, useEffect, useState } from 'react';@@ -30,9 +30,9 @@ import {IconTrash,} from 'twenty-ui/display';import { LightIconButton } from 'twenty-ui/input';+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';import { useDebouncedCallback } from 'use-debounce';import { v4 } from 'uuid';-import { themeCssVariables, ThemeContext } from 'twenty-ui/theme-constants';export type WorkflowEditActionFormBuilderProps = {triggerType: WorkflowTriggerType | undefined;@@ -98,9 +98,10 @@ const StyledFieldContainer = styled.div<{cursor: ${({ readonly }) => (readonly ? 'default' : 'pointer')};display: flex;font-family: inherit;+ height: 100%;padding-left: ${themeCssVariables.spacing[2]};- padding-right: ${themeCssVariables.spacing[2]};+ padding-right: ${themeCssVariables.spacing[2]};width: 100%;&:hover,diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFiller.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFiller.stories.tsxindex 12d2d383303..08ff7c59cd5 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFiller.stories.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFiller.stories.tsx@@ -81,43 +81,6 @@ const mockAction: WorkflowFormAction = {},};-// TEMP_DISABLED_TEST: Commented out unused mock data-// const mockActionWithDuplicatedRecordFields: WorkflowFormAction = {-// id: 'form-action-1',-// type: 'FORM',-// name: 'Test Form',-// valid: true,-// settings: {-// input: [-// {-// id: 'field-1',-// name: 'record',-// label: 'Record',-// type: 'RECORD',-// placeholder: 'Select a record',-// settings: {-// objectName: 'company',-// },-// },-// {-// id: 'field-2',-// name: 'record',-// label: 'Record',-// type: 'RECORD',-// placeholder: 'Select a record',-// settings: {-// objectName: 'company',-// },-// },-// ],-// outputSchema: {},-// errorHandlingOptions: {-// retryOnFailure: { value: false },-// continueOnFailure: { value: false },-// },-// },-// };-export const Default: Story = {args: {action: mockAction,@@ -158,45 +121,7 @@ export const ReadonlyMode: Story = {const numberInput = await canvas.findByPlaceholderText('Enter number');expect(numberInput).toBeDisabled();- const dateInput = await canvas.findByPlaceholderText('mm/dd/yyyy');- expect(dateInput).toBeDisabled();-const submitButton = canvas.queryByText('Submit');expect(submitButton).not.toBeInTheDocument();},};--// TEMP_DISABLED_TEST: Temporarily commented out due to test failure-// export const CanHaveManyRecordFieldsForTheSameRecordType: Story = {-// args: {-// action: mockActionWithDuplicatedRecordFields,-// actionOptions: {-// readonly: false,-// },-// },-// play: async ({ canvasElement }) => {-// const canvas = within(canvasElement);--// const recordSelects = await waitFor(() => {-// const elements = canvas.getAllByText('Select a company');--// expect(elements.length).toBe(2);--// return elements;-// });--// for (const recordSelect of recordSelects) {-// expect(recordSelect).toBeVisible();--// await userEvent.click(recordSelect);--// await waitFor(() => {-// expect(-// within(document.body).getByText('Louis Duss'),-// ).toBeVisible();-// });--// await userEvent.click(canvasElement);-// }-// },-// };