The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Show app name on workflow logic function nodes (#21675)
Raphaël Bosi5b1cfa4cc0d7
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsxindex 8c1a063fcf2..2c651cae1c8 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsx@@ -17,13 +17,14 @@ import { WorkflowNodeRightPart } from '@/workflow/workflow-diagram/workflow-nodeimport { WorkflowNodeTitle } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeTitle';import { WORKFLOW_DIAGRAM_NODE_DEFAULT_SOURCE_HANDLE_ID } from '@/workflow/workflow-diagram/workflow-nodes/constants/WorkflowDiagramNodeDefaultSourceHandleId';import { useConnectionState } from '@/workflow/workflow-diagram/workflow-nodes/hooks/useConnectionState';+import { useWorkflowNodeLabel } from '@/workflow/workflow-diagram/workflow-nodes/hooks/useWorkflowNodeLabel';import { isNodeTitleHighlighted } from '@/workflow/workflow-diagram/workflow-nodes/utils/isNodeTitleHighlighted';import { workflowInsertStepIdsComponentState } from '@/workflow/workflow-steps/states/workflowInsertStepIdsComponentState';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { Position } from '@xyflow/react';import { useState } from 'react';-import { capitalize, isDefined } from 'twenty-shared/utils';+import { isDefined } from 'twenty-shared/utils';const StyledAddStepButtonContainer = styled.div<{shouldDisplay: boolean;@@ -75,6 +76,8 @@ export const WorkflowDiagramStepNodeEditableContent = ({const isNodeConnectable = isConnectable({ nodeId: id });+ const nodeLabel = useWorkflowNodeLabel(data);+const handleAddStepButtonContainerClick = (event: React.MouseEvent<HTMLDivElement>,) => {@@ -110,7 +113,7 @@ export const WorkflowDiagramStepNodeEditableContent = ({<WorkflowNodeRightPart><WorkflowNodeLabelWithCounterPart><WorkflowNodeLabel selected={selected}>- {capitalize(data.nodeType)}+ {nodeLabel}</WorkflowNodeLabel></WorkflowNodeLabelWithCounterPart>diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeReadonly.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeReadonly.tsxindex fe50895f7ff..8e4b6ff67ea 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeReadonly.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeReadonly.tsx@@ -20,10 +20,11 @@ import { WorkflowNodeLabelWithCounterPart } from '@/workflow/workflow-diagram/woimport { WorkflowNodeRightPart } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeRightPart';import { WorkflowNodeTitle } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeTitle';import { WORKFLOW_DIAGRAM_NODE_DEFAULT_SOURCE_HANDLE_ID } from '@/workflow/workflow-diagram/workflow-nodes/constants/WorkflowDiagramNodeDefaultSourceHandleId';+import { useWorkflowNodeLabel } from '@/workflow/workflow-diagram/workflow-nodes/hooks/useWorkflowNodeLabel';import { isNodeTitleHighlighted } from '@/workflow/workflow-diagram/workflow-nodes/utils/isNodeTitleHighlighted';import { Position } from '@xyflow/react';import { useContext } from 'react';-import { capitalize, isDefined } from 'twenty-shared/utils';+import { isDefined } from 'twenty-shared/utils';import { useIcons } from 'twenty-ui-deprecated/display';export const WorkflowDiagramStepNodeReadonly = ({@@ -85,6 +86,8 @@ export const WorkflowDiagramStepNodeReadonly = ({actionType: data.nodeType === 'action' ? data.actionType : undefined,});+ const nodeLabel = useWorkflowNodeLabel(data);+return (<><WorkflowNodeContainer@@ -100,7 +103,7 @@ export const WorkflowDiagramStepNodeReadonly = ({<WorkflowNodeRightPart><WorkflowNodeLabelWithCounterPart><WorkflowNodeLabel selected={selected}>- {capitalize(data.nodeType)}+ {nodeLabel}</WorkflowNodeLabel></WorkflowNodeLabelWithCounterPart>diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsxindex 318683a3ecd..5e3d31594c2 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowRunDiagramStepNode.tsx@@ -22,11 +22,12 @@ import { WorkflowNodeLabel } from '@/workflow/workflow-diagram/workflow-nodes/coimport { WorkflowNodeRightPart } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeRightPart';import { WorkflowNodeTitle } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeTitle';import { WORKFLOW_DIAGRAM_NODE_DEFAULT_SOURCE_HANDLE_ID } from '@/workflow/workflow-diagram/workflow-nodes/constants/WorkflowDiagramNodeDefaultSourceHandleId';+import { useWorkflowNodeLabel } from '@/workflow/workflow-diagram/workflow-nodes/hooks/useWorkflowNodeLabel';import { getNodeIterationCount } from '@/workflow/workflow-diagram/workflow-nodes/utils/getNodeIterationCount';import { styled } from '@linaria/react';import { Position } from '@xyflow/react';import { useContext } from 'react';-import { capitalize, isDefined } from 'twenty-shared/utils';+import { isDefined } from 'twenty-shared/utils';import { StepStatus } from 'twenty-shared/workflow';import { IconCheck, IconX, useIcons } from 'twenty-ui-deprecated/display';import { Loader } from 'twenty-ui-deprecated/feedback';@@ -116,6 +117,8 @@ export const WorkflowRunDiagramStepNode = ({? getNodeIterationCount({ stepInfo }): 0;+ const nodeLabel = useWorkflowNodeLabel(data);+const handleClick = () => {if (!isDefined(workflowVisualizerWorkflowId)) {throw new Error('Workflow ID must be defined');@@ -153,7 +156,7 @@ export const WorkflowRunDiagramStepNode = ({<WorkflowNodeRightPart><StyledNodeLabelWithCounterPart><WorkflowNodeLabel runStatus={data.runStatus} selected={selected}>- {capitalize(data.nodeType)}+ {nodeLabel}</WorkflowNodeLabel><StyledRightPartContainer>diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/hooks/useWorkflowNodeLabel.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/hooks/useWorkflowNodeLabel.tsnew file mode 100644index 00000000000..1070ee18809--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/hooks/useWorkflowNodeLabel.ts@@ -0,0 +1,31 @@+import { useApplicationChipData } from '@/applications/hooks/useApplicationChipData';+import { useIsThirdPartyApplication } from '@/applications/hooks/useIsThirdPartyApplication';+import { logicFunctionsSelector } from '@/logic-functions/states/logicFunctionsSelector';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { type WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/types/WorkflowDiagram';+import { capitalize, isDefined } from 'twenty-shared/utils';++export const useWorkflowNodeLabel = (+ data: WorkflowDiagramStepNodeData,+): string => {+ const logicFunctions = useAtomStateValue(logicFunctionsSelector);++ const logicFunctionId =+ data.nodeType === 'action' ? data.logicFunctionId : undefined;++ const applicationId = isDefined(logicFunctionId)+ ? logicFunctions.find(+ (logicFunction) => logicFunction.id === logicFunctionId,+ )?.applicationId+ : undefined;++ const isThirdPartyApplication = useIsThirdPartyApplication(applicationId);++ const { applicationChipData } = useApplicationChipData({ applicationId });++ if (isThirdPartyApplication) {+ return applicationChipData.name;+ }++ return capitalize(data.nodeType);+};