From 07dec369766fc2110fc31fee50ba89797a3a1298 Mon Sep 17 00:00:00 2001 From: Thomas Trompette Date: Fri, 24 Jan 2025 18:25:01 +0100 Subject: [PATCH] Tt fast follows 24/01 (#9843) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add icons on steps - Add search input on object selection - Improve event label Capture d’écran 2025-01-24 à 17 59 34 Capture d’écran 2025-01-24 à 17 59 54 Capture d’écran 2025-01-24 à 18 00 08 --- .../WorkflowEditActionFormCreateRecord.tsx | 1 + .../WorkflowEditActionFormDeleteRecord.tsx | 1 + .../WorkflowEditActionFormUpdateRecord.tsx | 1 + .../WorkflowEditTriggerDatabaseEventForm.tsx | 1 + .../useAvailableVariablesInWorkflowStep.ts | 18 +++++++++++++++++- .../utils/generate-fake-object-record-event.ts | 16 +++++++++++----- 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx index d9d9e8d0f..d4c074da6 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx @@ -196,6 +196,7 @@ export const WorkflowEditActionFormCreateRecord = ({ saveAction(newFormData); }} + withSearchInput /> diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormDeleteRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormDeleteRecord.tsx index 6b7cb4067..e8fb0462c 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormDeleteRecord.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormDeleteRecord.tsx @@ -145,6 +145,7 @@ export const WorkflowEditActionFormDeleteRecord = ({ saveAction(newFormData); }} + withSearchInput /> diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx index 3a8ff7a4d..7a4b0c6da 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx @@ -194,6 +194,7 @@ export const WorkflowEditActionFormUpdateRecord = ({ saveAction(newFormData); }} + withSearchInput /> diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx index b1b82bdd4..c0016dada 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx +++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx @@ -97,6 +97,7 @@ export const WorkflowEditTriggerDatabaseEventForm = ({ }, }); }} + withSearchInput /> diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useAvailableVariablesInWorkflowStep.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useAvailableVariablesInWorkflowStep.ts index 3707ea72d..bdd870f7a 100644 --- a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useAvailableVariablesInWorkflowStep.ts +++ b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useAvailableVariablesInWorkflowStep.ts @@ -1,7 +1,10 @@ import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import { workflowIdState } from '@/workflow/states/workflowIdState'; import { getStepDefinitionOrThrow } from '@/workflow/utils/getStepDefinitionOrThrow'; +import { splitWorkflowTriggerEventName } from '@/workflow/utils/splitWorkflowTriggerEventName'; import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState'; +import { getActionIcon } from '@/workflow/workflow-steps/workflow-actions/utils/getActionIcon'; +import { getTriggerIcon } from '@/workflow/workflow-trigger/utils/getTriggerIcon'; import { OutputSchema, StepOutputSchema, @@ -62,11 +65,24 @@ export const useAvailableVariablesInWorkflowStep = ({ isDefined(filteredTriggerOutputSchema) && !isEmptyObject(filteredTriggerOutputSchema) ) { + const triggerIconKey = + workflow.currentVersion.trigger.type === 'DATABASE_EVENT' + ? getTriggerIcon({ + type: workflow.currentVersion.trigger.type, + eventName: splitWorkflowTriggerEventName( + workflow.currentVersion.trigger.settings?.eventName, + ).event, + }) + : getTriggerIcon({ + type: workflow.currentVersion.trigger.type, + }); + result.push({ id: 'trigger', name: isDefined(workflow.currentVersion.trigger.name) ? workflow.currentVersion.trigger.name : getTriggerStepName(workflow.currentVersion.trigger), + icon: triggerIconKey, outputSchema: filteredTriggerOutputSchema, }); } @@ -81,8 +97,8 @@ export const useAvailableVariablesInWorkflowStep = ({ result.push({ id: previousStep.id, name: previousStep.name, + icon: getActionIcon(previousStep.type), outputSchema: filteredOutputSchema, - ...(previousStep.type === 'CODE' ? { icon: 'IconCode' } : {}), }); } }); diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event.ts index 0db159a10..be7a3f86e 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event.ts @@ -48,7 +48,9 @@ export const generateFakeObjectRecordEvent = ( ...baseResult, properties: { isLeaf: false, - value: { after: { isLeaf: false, value: after, label: 'After' } }, + value: { + after: { isLeaf: false, value: after, label: 'After Creation' }, + }, label: 'Record Fields', }, }; @@ -62,8 +64,8 @@ export const generateFakeObjectRecordEvent = ( properties: { isLeaf: false, value: { - before: { isLeaf: false, value: before, label: 'Before' }, - after: { isLeaf: false, value: after, label: 'After' }, + before: { isLeaf: false, value: before, label: 'Before Update' }, + after: { isLeaf: false, value: after, label: 'After Update' }, }, label: 'Record Fields', }, @@ -76,7 +78,7 @@ export const generateFakeObjectRecordEvent = ( properties: { isLeaf: false, value: { - before: { isLeaf: false, value: before, label: 'Before' }, + before: { isLeaf: false, value: before, label: 'Before Deletion' }, }, label: 'Record Fields', }, @@ -89,7 +91,11 @@ export const generateFakeObjectRecordEvent = ( properties: { isLeaf: false, value: { - before: { isLeaf: false, value: before, label: 'Before' }, + before: { + isLeaf: false, + value: before, + label: 'Before Permanent Deletion', + }, }, label: 'Record Fields', },