Hi, I’ve resolved the workflow form-level issue referenced in ID: #13108. If any changes are required, please let me know—I’ll be happy to work on them.  --------- Co-authored-by: readul-islam <developer.readul@gamil.com>
This commit is contained in:
@ -1,6 +1,7 @@
|
|||||||
import { FormNumberFieldInput } from '@/object-record/record-field/form-types/components/FormNumberFieldInput';
|
import { FormNumberFieldInput } from '@/object-record/record-field/form-types/components/FormNumberFieldInput';
|
||||||
import { FormTextFieldInput } from '@/object-record/record-field/form-types/components/FormTextFieldInput';
|
import { FormTextFieldInput } from '@/object-record/record-field/form-types/components/FormTextFieldInput';
|
||||||
import { Select } from '@/ui/input/components/Select';
|
import { Select } from '@/ui/input/components/Select';
|
||||||
|
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
|
||||||
import { WorkflowCronTrigger } from '@/workflow/types/Workflow';
|
import { WorkflowCronTrigger } from '@/workflow/types/Workflow';
|
||||||
import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody';
|
import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody';
|
||||||
import { WorkflowStepHeader } from '@/workflow/workflow-steps/components/WorkflowStepHeader';
|
import { WorkflowStepHeader } from '@/workflow/workflow-steps/components/WorkflowStepHeader';
|
||||||
@ -10,12 +11,12 @@ import { getTriggerHeaderType } from '@/workflow/workflow-trigger/utils/getTrigg
|
|||||||
import { getTriggerIcon } from '@/workflow/workflow-trigger/utils/getTriggerIcon';
|
import { getTriggerIcon } from '@/workflow/workflow-trigger/utils/getTriggerIcon';
|
||||||
import { getTriggerDefaultLabel } from '@/workflow/workflow-trigger/utils/getTriggerLabel';
|
import { getTriggerDefaultLabel } from '@/workflow/workflow-trigger/utils/getTriggerLabel';
|
||||||
import { useTheme } from '@emotion/react';
|
import { useTheme } from '@emotion/react';
|
||||||
|
import { t } from '@lingui/core/macro';
|
||||||
import { isNumber } from '@sniptt/guards';
|
import { isNumber } from '@sniptt/guards';
|
||||||
import cron from 'cron-validate';
|
import cron from 'cron-validate';
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
import { isDefined } from 'twenty-shared/utils';
|
import { isDefined } from 'twenty-shared/utils';
|
||||||
import { useIcons } from 'twenty-ui/display';
|
import { useIcons } from 'twenty-ui/display';
|
||||||
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
|
|
||||||
|
|
||||||
type WorkflowEditTriggerCronFormProps = {
|
type WorkflowEditTriggerCronFormProps = {
|
||||||
trigger: WorkflowCronTrigger;
|
trigger: WorkflowCronTrigger;
|
||||||
@ -82,7 +83,7 @@ export const WorkflowEditTriggerCronForm = ({
|
|||||||
<WorkflowStepBody>
|
<WorkflowStepBody>
|
||||||
<Select
|
<Select
|
||||||
dropdownId="workflow-edit-cron-trigger-interval"
|
dropdownId="workflow-edit-cron-trigger-interval"
|
||||||
label="Trigger interval"
|
label={t`Trigger interval`}
|
||||||
fullWidth
|
fullWidth
|
||||||
disabled={triggerOptions.readonly}
|
disabled={triggerOptions.readonly}
|
||||||
value={trigger.settings.type}
|
value={trigger.settings.type}
|
||||||
@ -107,7 +108,7 @@ export const WorkflowEditTriggerCronForm = ({
|
|||||||
/>
|
/>
|
||||||
{trigger.settings.type === 'CUSTOM' && (
|
{trigger.settings.type === 'CUSTOM' && (
|
||||||
<FormTextFieldInput
|
<FormTextFieldInput
|
||||||
label="Expression"
|
label={t`Expression`}
|
||||||
placeholder="0 */1 * * *"
|
placeholder="0 */1 * * *"
|
||||||
error={errorMessagesVisible ? errorMessages.CUSTOM : undefined}
|
error={errorMessagesVisible ? errorMessages.CUSTOM : undefined}
|
||||||
onBlur={onBlur}
|
onBlur={onBlur}
|
||||||
@ -149,7 +150,7 @@ export const WorkflowEditTriggerCronForm = ({
|
|||||||
{trigger.settings.type === 'DAYS' && (
|
{trigger.settings.type === 'DAYS' && (
|
||||||
<>
|
<>
|
||||||
<FormNumberFieldInput
|
<FormNumberFieldInput
|
||||||
label="Days Between Triggers"
|
label={t`Days between triggers`}
|
||||||
error={errorMessagesVisible ? errorMessages.DAYS_day : undefined}
|
error={errorMessagesVisible ? errorMessages.DAYS_day : undefined}
|
||||||
onBlur={onBlur}
|
onBlur={onBlur}
|
||||||
defaultValue={trigger.settings.schedule.day}
|
defaultValue={trigger.settings.schedule.day}
|
||||||
@ -198,7 +199,7 @@ export const WorkflowEditTriggerCronForm = ({
|
|||||||
readonly={triggerOptions.readonly}
|
readonly={triggerOptions.readonly}
|
||||||
/>
|
/>
|
||||||
<FormNumberFieldInput
|
<FormNumberFieldInput
|
||||||
label="Trigger at Hour"
|
label={t`Trigger at hour`}
|
||||||
error={errorMessagesVisible ? errorMessages.DAYS_hour : undefined}
|
error={errorMessagesVisible ? errorMessages.DAYS_hour : undefined}
|
||||||
onBlur={onBlur}
|
onBlur={onBlur}
|
||||||
defaultValue={trigger.settings.schedule.hour}
|
defaultValue={trigger.settings.schedule.hour}
|
||||||
@ -247,7 +248,7 @@ export const WorkflowEditTriggerCronForm = ({
|
|||||||
readonly={triggerOptions.readonly}
|
readonly={triggerOptions.readonly}
|
||||||
/>
|
/>
|
||||||
<FormNumberFieldInput
|
<FormNumberFieldInput
|
||||||
label="Trigger at Minute"
|
label={t`Trigger at minute`}
|
||||||
error={
|
error={
|
||||||
errorMessagesVisible ? errorMessages.DAYS_minute : undefined
|
errorMessagesVisible ? errorMessages.DAYS_minute : undefined
|
||||||
}
|
}
|
||||||
@ -302,7 +303,7 @@ export const WorkflowEditTriggerCronForm = ({
|
|||||||
{trigger.settings.type === 'HOURS' && (
|
{trigger.settings.type === 'HOURS' && (
|
||||||
<>
|
<>
|
||||||
<FormNumberFieldInput
|
<FormNumberFieldInput
|
||||||
label="Hours Between Triggers"
|
label={t`Hours between triggers`}
|
||||||
error={
|
error={
|
||||||
errorMessagesVisible ? errorMessages.HOURS_hour : undefined
|
errorMessagesVisible ? errorMessages.HOURS_hour : undefined
|
||||||
}
|
}
|
||||||
@ -349,7 +350,7 @@ export const WorkflowEditTriggerCronForm = ({
|
|||||||
readonly={triggerOptions.readonly}
|
readonly={triggerOptions.readonly}
|
||||||
/>
|
/>
|
||||||
<FormNumberFieldInput
|
<FormNumberFieldInput
|
||||||
label="Trigger at Minute"
|
label={t`Trigger at minute`}
|
||||||
error={
|
error={
|
||||||
errorMessagesVisible ? errorMessages.HOURS_minute : undefined
|
errorMessagesVisible ? errorMessages.HOURS_minute : undefined
|
||||||
}
|
}
|
||||||
@ -399,7 +400,7 @@ export const WorkflowEditTriggerCronForm = ({
|
|||||||
)}
|
)}
|
||||||
{trigger.settings.type === 'MINUTES' && (
|
{trigger.settings.type === 'MINUTES' && (
|
||||||
<FormNumberFieldInput
|
<FormNumberFieldInput
|
||||||
label="Minutes Between Triggers"
|
label={t`Minutes between triggers`}
|
||||||
error={errorMessagesVisible ? errorMessages.MINUTES : undefined}
|
error={errorMessagesVisible ? errorMessages.MINUTES : undefined}
|
||||||
onBlur={onBlur}
|
onBlur={onBlur}
|
||||||
defaultValue={trigger.settings.schedule.minute}
|
defaultValue={trigger.settings.schedule.minute}
|
||||||
|
|||||||
Reference in New Issue
Block a user