admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix workflow with manual triggers and no selection not appearing in the command menu (#11544)

Browse Source 
Fix workflow with manual triggers and no selection not appearing in the
command menu

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Raphaël Bosi
2025-04-14 11:03:29 +02:00
committed by GitHub
parent b5a1d1a895
commit ace515eea7
13 changed files with 86 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-front/src/modules/action-menu/actions/components/Action.tsx
View File

@ -23,5 +23,5 @@ export const Action = ({
onClick();
};
return <ActionDisplay action={actionConfig} onClick={handleClick} />;
return <ActionDisplay onClick={handleClick} />;
};

16
packages/twenty-front/src/modules/action-menu/actions/components/ActionLink.tsx
View File

@ -1,8 +1,6 @@
import { ActionDisplay } from '@/action-menu/actions/display/components/ActionDisplay';
import { ActionConfigContext } from '@/action-menu/contexts/ActionConfigContext';
import { useCloseActionMenu } from '@/action-menu/hooks/useCloseActionMenu';
import { AppPath } from '@/types/AppPath';
import { useContext } from 'react';
import { PathParam } from 'react-router-dom';
import { getAppPath } from '~/utils/navigation/getAppPath';
@ -15,21 +13,9 @@ export const ActionLink = <T extends AppPath>({
params?: { [key in PathParam<T>]: string | null };
queryParams?: Record<string, any>;
}) => {
const actionConfig = useContext(ActionConfigContext);
const { closeActionMenu } = useCloseActionMenu();
if (!actionConfig) {
return null;
}
const path = getAppPath(to, params, queryParams);
return (
<ActionDisplay
action={{ ...actionConfig }}
onClick={closeActionMenu}
to={path}
/>
);
return <ActionDisplay onClick={closeActionMenu} to={path} />;
};

2
packages/twenty-front/src/modules/action-menu/actions/components/ActionModal.tsx
View File

@ -46,7 +46,7 @@ export const ActionModal = ({
return (
<>
<ActionDisplay action={actionConfig} onClick={handleOpen} />
<ActionDisplay onClick={handleOpen} />
{isOpen &&
createPortal(
<ConfirmationModal

2
packages/twenty-front/src/modules/action-menu/actions/components/ActionOpenSidePanelPage.tsx
View File

@ -44,5 +44,5 @@ export const ActionOpenSidePanelPage = ({
}
};
return <ActionDisplay action={actionConfig} onClick={handleClick} />;
return <ActionDisplay onClick={handleClick} />;
};

4
packages/twenty-front/src/modules/action-menu/actions/display/components/ActionDisplay.tsx
View File

@ -1,6 +1,7 @@
import { ActionButton } from '@/action-menu/actions/display/components/ActionButton';
import { ActionDropdownItem } from '@/action-menu/actions/display/components/ActionDropdownItem';
import { ActionListItem } from '@/action-menu/actions/display/components/ActionListItem';
import { ActionConfigContext } from '@/action-menu/contexts/ActionConfigContext';
import { ActionMenuContext } from '@/action-menu/contexts/ActionMenuContext';
import { MessageDescriptor } from '@lingui/core';
import { useContext } from 'react';
@ -19,14 +20,13 @@ export type ActionDisplayProps = {
};
export const ActionDisplay = ({
action,
onClick,
to,
}: {
action: ActionDisplayProps;
onClick?: (event?: React.MouseEvent<HTMLElement>) => void;
to?: string;
}) => {
const action = useContext(ActionConfigContext);
const { displayType } = useContext(ActionMenuContext);
if (!action) {

11
packages/twenty-front/src/modules/action-menu/actions/record-actions/workflow-run-record-actions/hooks/useWorkflowRunRecordActions.tsx → packages/twenty-front/src/modules/action-menu/actions/record-actions/run-workflow-actions/hooks/useRunWorkflowRecordActions.tsx
View File

@ -13,10 +13,12 @@ import { useRecoilValue } from 'recoil';
import { capitalize, isDefined } from 'twenty-shared/utils';
import { IconSettingsAutomation } from 'twenty-ui/display';
export const useWorkflowRunRecordActions = ({
export const useRunWorkflowRecordActions = ({
objectMetadataItem,
skip,
}: {
objectMetadataItem: ObjectMetadataItem;
skip?: boolean;
}) => {
const contextStoreTargetedRecordsRule = useRecoilComponentValueV2(
contextStoreTargetedRecordsRuleComponentState,
@ -27,17 +29,14 @@ export const useWorkflowRunRecordActions = ({
? contextStoreTargetedRecordsRule.selectedRecordIds[0]
: undefined;
if (!isDefined(selectedRecordId)) {
throw new Error('Selected record ID is required');
}
const selectedRecord = useRecoilValue(
recordStoreFamilyState(selectedRecordId),
recordStoreFamilyState(selectedRecordId ?? ''),
);
const { records: activeWorkflowVersions } =
useActiveWorkflowVersionsWithManualTrigger({
objectMetadataItem,
skip,
});
const { runWorkflowVersion } = useRunWorkflowVersion();

9
packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/components/SeeActiveVersionWorkflowSingleRecordAction.tsx
View File

@ -1,4 +1,5 @@
import { ActionLink } from '@/action-menu/actions/components/ActionLink';
import { ActionDisplay } from '@/action-menu/actions/display/components/ActionDisplay';
import { useSelectedRecordIdOrThrow } from '@/action-menu/actions/record-actions/single-record/hooks/useSelectedRecordIdOrThrow';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
import { AppPath } from '@/types/AppPath';
@ -7,14 +8,18 @@ import { useActiveWorkflowVersion } from '@/workflow/hooks/useActiveWorkflowVers
export const SeeActiveVersionWorkflowSingleRecordAction = () => {
const recordId = useSelectedRecordIdOrThrow();
const workflowActiveVersion = useActiveWorkflowVersion(recordId);
const { workflowVersion, loading } = useActiveWorkflowVersion(recordId);
if (loading) {
return <ActionDisplay />;
}
return (
<ActionLink
to={AppPath.RecordShowPage}
params={{
objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
objectRecordId: workflowActiveVersion.id,
objectRecordId: workflowVersion.id,
}}
/>
);

33
packages/twenty-front/src/modules/action-menu/actions/record-agnostic-actions/run-workflow-actions/hooks/useRunWorkflowActions.tsx → packages/twenty-front/src/modules/action-menu/actions/record-agnostic-actions/run-workflow-actions/hooks/useRunWorkflowRecordAgnosticActions.tsx
View File

@ -1,28 +1,37 @@
import { Action } from '@/action-menu/actions/components/Action';
import { ActionScope } from '@/action-menu/actions/types/ActionScope';
import { ActionType } from '@/action-menu/actions/types/ActionType';
import { ActionMenuContext } from '@/action-menu/contexts/ActionMenuContext';
import { useActiveWorkflowVersionsWithManualTrigger } from '@/workflow/hooks/useActiveWorkflowVersionsWithManualTrigger';
import { useRunWorkflowVersion } from '@/workflow/hooks/useRunWorkflowVersion';
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { msg } from '@lingui/core/macro';
import { useContext } from 'react';
import { capitalize, isDefined } from 'twenty-shared/utils';
import { IconSettingsAutomation } from 'twenty-ui/display';
import { FeatureFlagKey } from '~/generated/graphql';
export const useRunWorkflowActions = () => {
export const useRunWorkflowRecordAgnosticActions = () => {
const isWorkflowEnabled = useIsFeatureEnabled(
FeatureFlagKey.IsWorkflowEnabled,
);
const { actionMenuType } = useContext(ActionMenuContext);
const { records: activeWorkflowVersions } =
useActiveWorkflowVersionsWithManualTrigger({});
useActiveWorkflowVersionsWithManualTrigger({
skip:
actionMenuType !== 'command-menu' &&
actionMenuType !== 'command-menu-show-page-action-menu-dropdown',
});
const { runWorkflowVersion } = useRunWorkflowVersion();
if (!isWorkflowEnabled) {
return { runWorkflowActions: [] };
return [];
}
const runWorkflowActions = activeWorkflowVersions
return activeWorkflowVersions
.map((activeWorkflowVersion, index) => {
if (!isDefined(activeWorkflowVersion.workflow)) {
return undefined;
@ -38,18 +47,16 @@ export const useRunWorkflowActions = () => {
position: index,
Icon: IconSettingsAutomation,
shouldBeRegistered: () => true,
useAction: () => {
return {
onClick: async () => {
await runWorkflowVersion({
component: (
<Action
onClick={() => {
runWorkflowVersion({
workflowVersionId: activeWorkflowVersion.id,
});
},
};
},
}}
/>
),
};
})
.filter(isDefined);
return { runWorkflowActions };
};