The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix: resolve workflow form step auto-open race condition (#21053)
Thomas Trompettebc1b7f6fdfa6
diff --git a/packages/twenty-front/src/modules/sse-db-event/hooks/useChangeQueryListenState.ts b/packages/twenty-front/src/modules/sse-db-event/hooks/useChangeQueryListenState.tsnew file mode 100644index 00000000000..38b22005f3b--- /dev/null+++ b/packages/twenty-front/src/modules/sse-db-event/hooks/useChangeQueryListenState.ts@@ -0,0 +1,53 @@+import { requiredQueryListenersState } from '@/sse-db-event/states/requiredQueryListenersState';+import { useCallback } from 'react';+import {+ type MetadataGqlOperationSignature,+ type RecordGqlOperationSignature,+} from 'twenty-shared/types';+import { useStore } from 'jotai';++export const useChangeQueryListenState = () => {+ const store = useStore();++ const changeQueryIdListenState = useCallback(+ (+ shouldListen: boolean,+ targetQueryId: string,+ targetOperationSignature:+ | RecordGqlOperationSignature+ | MetadataGqlOperationSignature,+ ) => {+ const currentRequiredQueryListeners = store.get(+ requiredQueryListenersState.atom,+ );++ const listeningForThisQueryIsActive = currentRequiredQueryListeners.some(+ (listener) => listener.queryId === targetQueryId,+ );++ if (shouldListen === listeningForThisQueryIsActive) {+ return;+ }++ if (shouldListen) {+ store.set(requiredQueryListenersState.atom, [+ ...currentRequiredQueryListeners,+ {+ queryId: targetQueryId,+ operationSignature: targetOperationSignature,+ },+ ]);+ } else {+ store.set(+ requiredQueryListenersState.atom,+ currentRequiredQueryListeners.filter(+ (listener) => listener.queryId !== targetQueryId,+ ),+ );+ }+ },+ [store],+ );++ return { changeQueryIdListenState };+};diff --git a/packages/twenty-front/src/modules/sse-db-event/hooks/useListenToEventsForQuery.ts b/packages/twenty-front/src/modules/sse-db-event/hooks/useListenToEventsForQuery.tsindex 5e0e5af52dd..24a5ac9fbf3 100644--- a/packages/twenty-front/src/modules/sse-db-event/hooks/useListenToEventsForQuery.ts+++ b/packages/twenty-front/src/modules/sse-db-event/hooks/useListenToEventsForQuery.ts@@ -1,10 +1,9 @@-import { requiredQueryListenersState } from '@/sse-db-event/states/requiredQueryListenersState';-import { useCallback, useEffect } from 'react';+import { useChangeQueryListenState } from '@/sse-db-event/hooks/useChangeQueryListenState';+import { useEffect } from 'react';import {type MetadataGqlOperationSignature,type RecordGqlOperationSignature,} from 'twenty-shared/types';-import { useStore } from 'jotai';export const useListenToEventsForQuery = ({queryId,@@ -15,46 +14,7 @@ export const useListenToEventsForQuery = ({| RecordGqlOperationSignature| MetadataGqlOperationSignature;}) => {- const store = useStore();- const changeQueryIdListenState = useCallback(- (- shouldListen: boolean,- targetQueryId: string,- targetOperationSignature:- | RecordGqlOperationSignature- | MetadataGqlOperationSignature,- ) => {- const currentRequiredQueryListeners = store.get(- requiredQueryListenersState.atom,- );-- const listeningForThisQueryIsActive = currentRequiredQueryListeners.some(- (listener) => listener.queryId === targetQueryId,- );-- if (shouldListen === listeningForThisQueryIsActive) {- return;- }-- if (shouldListen) {- store.set(requiredQueryListenersState.atom, [- ...currentRequiredQueryListeners,- {- queryId: targetQueryId,- operationSignature: targetOperationSignature,- },- ]);- } else {- store.set(- requiredQueryListenersState.atom,- currentRequiredQueryListeners.filter(- (listener) => listener.queryId !== targetQueryId,- ),- );- }- },- [store],- );+ const { changeQueryIdListenState } = useChangeQueryListenState();useEffect(() => {changeQueryIdListenState(true, queryId, operationSignature);diff --git a/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseUpdateEvents.ts b/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseUpdateEvents.tsindex 3117ccf8496..5b0408b8459 100644--- a/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseUpdateEvents.ts+++ b/packages/twenty-front/src/modules/sse-db-event/hooks/useTriggerOptimisticEffectFromSseUpdateEvents.ts@@ -45,8 +45,6 @@ export const useTriggerOptimisticEffectFromSseUpdateEvents = () => {continue;}- upsertRecordsInStore({ partialRecords: [updatedRecord] });-const computedOptimisticRecord = {...computeOptimisticRecordFromInput({cache: apolloCoreClient.cache,@@ -76,6 +74,15 @@ export const useTriggerOptimisticEffectFromSseUpdateEvents = () => {objectPermissionsByObjectMetadataId,});+ if (+ isDefined(cachedRecord?.updatedAt) &&+ isDefined(updatedRecord.updatedAt) &&+ new Date(updatedRecord.updatedAt as string).getTime() <+ new Date(cachedRecord!.updatedAt as string).getTime()+ ) {+ continue;+ }+const cachedRecordWithConnection = getRecordNodeFromRecord({record: cachedRecord,objectMetadataItem,@@ -91,6 +98,8 @@ export const useTriggerOptimisticEffectFromSseUpdateEvents = () => {continue;}+ upsertRecordsInStore({ partialRecords: [updatedRecord] });+updateRecordFromCache({objectMetadataItems,objectMetadataItem,diff --git a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsx b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsxindex bde8bbd2743..4dabf1a4bb1 100644--- a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsx+++ b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsx@@ -15,7 +15,9 @@ import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUimport { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { computeOptimisticCreateRecordBaseRecordInput } from '@/object-record/utils/computeOptimisticCreateRecordBaseRecordInput';import { computeOptimisticRecordFromInput } from '@/object-record/utils/computeOptimisticRecordFromInput';+import { useChangeQueryListenState } from '@/sse-db-event/hooks/useChangeQueryListenState';import { RUN_WORKFLOW_VERSION } from '@/workflow/graphql/mutations/runWorkflowVersion';+import { getWorkflowRunSseQueryId } from '@/workflow/utils/getWorkflowRunSseQueryId';import { type WorkflowRun } from '@/workflow/types/Workflow';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useCallback } from 'react';@@ -63,6 +65,7 @@ export const useRunWorkflowVersion = () => {});const { openRecordInSidePanel } = useOpenRecordInSidePanel();+ const { changeQueryIdListenState } = useChangeQueryListenState();const setRecordInStore = useCallback((workflowRun: WorkflowRun) => {@@ -137,9 +140,24 @@ export const useRunWorkflowVersion = () => {setRecordInStore(recordCreatedInCache);- await mutate({- variables: { input: { workflowVersionId, workflowRunId, payload } },- });+ const sseQueryId = getWorkflowRunSseQueryId(workflowRunId);+ const sseOperationSignature = {+ objectNameSingular: CoreObjectNameSingular.WorkflowRun,+ variables: {+ filter: { id: { eq: workflowRunId } },+ },+ };++ changeQueryIdListenState(true, sseQueryId, sseOperationSignature);++ try {+ await mutate({+ variables: { input: { workflowVersionId, workflowRunId, payload } },+ });+ } catch (error) {+ changeQueryIdListenState(false, sseQueryId, sseOperationSignature);+ throw error;+ }openRecordInSidePanel({objectNameSingular: CoreObjectNameSingular.WorkflowRun,diff --git a/packages/twenty-front/src/modules/workflow/utils/getWorkflowRunSseQueryId.ts b/packages/twenty-front/src/modules/workflow/utils/getWorkflowRunSseQueryId.tsnew file mode 100644index 00000000000..881e768d7e4--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/utils/getWorkflowRunSseQueryId.ts@@ -0,0 +1,2 @@+export const getWorkflowRunSseQueryId = (workflowRunId: string) =>+ `workflow-run-${workflowRunId}`;diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunSSESubscribeEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunSSESubscribeEffect.tsxindex e3a88fa7b49..59f67a783cb 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunSSESubscribeEffect.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunSSESubscribeEffect.tsx@@ -1,12 +1,13 @@import { CoreObjectNameSingular } from 'twenty-shared/types';import { useListenToEventsForQuery } from '@/sse-db-event/hooks/useListenToEventsForQuery';+import { getWorkflowRunSseQueryId } from '@/workflow/utils/getWorkflowRunSseQueryId';export const WorkflowRunSSESubscribeEffect = ({workflowRunId,}: {workflowRunId: string;}) => {- const queryId = `workflow-run-${workflowRunId}`;+ const queryId = getWorkflowRunSseQueryId(workflowRunId);useListenToEventsForQuery({queryId,diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsxindex 04269748340..992a942849d 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowRunVisualizerEffect.tsx@@ -20,6 +20,7 @@ import { useStepsOutputSchema } from '@/workflow/workflow-variables/hooks/useSteimport { useStore } from 'jotai';import { useCallback, useContext, useEffect } from 'react';import { isDefined } from 'twenty-shared/utils';+import { useIcons } from 'twenty-ui/display';export const WorkflowRunVisualizerEffect = ({diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowRunDiagram.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowRunDiagram.tsindex 0bb7cea90da..861cfc9f5b2 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowRunDiagram.ts+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowRunDiagram.ts@@ -25,10 +25,16 @@ const shouldOpenStep = ({}) => {const step = steps.find((step) => step.id === nodeId);const stepInfo = stepInfos?.[nodeId];- const isStepPending = isDefined(stepInfo) && stepInfo.status === 'PENDING';const isStepOpenable = isDefined(step) && ['FORM'].includes(step.type);- return isStepPending && isStepOpenable;+ if (!isStepOpenable || !isDefined(stepInfo)) {+ return false;+ }++ return (+ stepInfo.status === StepStatus.PENDING ||+ stepInfo.status === StepStatus.RUNNING+ );};export const generateWorkflowRunDiagram = ({diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepNodeDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepNodeDetail.tsxindex 3a0cf652f8d..fee1fe3085e 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepNodeDetail.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowRunStepNodeDetail.tsx@@ -205,7 +205,9 @@ export const WorkflowRunStepNodeDetail = ({key={stepId}action={stepDefinition.definition}actionOptions={{- readonly: stepExecutionStatus !== 'PENDING',+ readonly:+ stepExecutionStatus !== 'PENDING' &&+ stepExecutionStatus !== 'RUNNING',}}/>);