Skip to content

The open alternative to Salesforce, designed for AI.

Render core workflow versions as command menu items (#27062)

Thomas Trompettedaf0b2a67a00
diff --git a/packages/twenty-front/src/modules/object-core/workflows/versions/components/CoreWorkflowVersionsListItem.tsx b/packages/twenty-front/src/modules/object-core/workflows/versions/components/CoreWorkflowVersionsListItem.tsx
index df9ff8a6b36..bd5efae908e 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/versions/components/CoreWorkflowVersionsListItem.tsx
+++ b/packages/twenty-front/src/modules/object-core/workflows/versions/components/CoreWorkflowVersionsListItem.tsx
@@ -1,47 +1,16 @@
-import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { themeCssVariables } from 'twenty-ui/theme';
-import { Tag } from 'twenty-ui/primitives/data-display';
+import { IconVersions } from 'twenty-ui/icon';
-import { CORE_WORKFLOW_VERSION_STATUS_TAG_PROPS } from '@/object-core/workflows/versions/constants/CoreWorkflowVersionStatusTagProps';
+import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
+import { CORE_WORKFLOW_VERSION_STATUS_LABELS } from '@/object-core/workflows/versions/constants/CoreWorkflowVersionStatusLabels';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { type CoreWorkflowVersionStatus } from '~/generated/graphql';
-const StyledRow = styled.div<{ isSelectable: boolean }>`
- align-items: center;
- border-radius: ${themeCssVariables.border.radius.sm};
- cursor: ${({ isSelectable }) => (isSelectable ? 'pointer' : 'default')};
- display: flex;
- gap: ${themeCssVariables.spacing[2]};
- justify-content: space-between;
- opacity: ${({ isSelectable }) => (isSelectable ? 1 : 0.5)};
- padding: ${themeCssVariables.spacing[1]} ${themeCssVariables.spacing[2]};
-
- &:hover {
- background-color: ${({ isSelectable }) =>
- isSelectable
- ? themeCssVariables.background.transparent.light
- : 'transparent'};
- }
-`;
-
-const StyledLabel = styled.span`
- color: ${themeCssVariables.font.color.primary};
- font-size: ${themeCssVariables.font.size.md};
-`;
-
-const StyledDate = styled.span`
- color: ${themeCssVariables.font.color.tertiary};
- font-size: ${themeCssVariables.font.size.md};
- margin-right: auto;
-`;
-
type CoreWorkflowVersionsListItemProps = {
id: string;
label: string;
createdAt: string;
status: CoreWorkflowVersionStatus;
- isSelectable: boolean;
onSelect: () => void;
};
@@ -50,28 +19,24 @@ export const CoreWorkflowVersionsListItem = ({
label,
createdAt,
status,
- isSelectable,
onSelect,
}: CoreWorkflowVersionsListItemProps) => {
- const { t } = useLingui();
- const tagProps = CORE_WORKFLOW_VERSION_STATUS_TAG_PROPS[status];
+ const { t, i18n } = useLingui();
+ const statusLabel = t(CORE_WORKFLOW_VERSION_STATUS_LABELS[status]);
return (
<SelectableListItem itemId={id} onEnter={onSelect}>
- <StyledRow
- isSelectable={isSelectable}
- onClick={isSelectable ? onSelect : undefined}
- >
- <StyledLabel>{label}</StyledLabel>
- <StyledDate>
- {new Date(createdAt).toLocaleDateString(undefined, {
- year: 'numeric',
- month: 'long',
- day: 'numeric',
- })}
- </StyledDate>
- <Tag color={tagProps.color}>{t(tagProps.label)}</Tag>
- </StyledRow>
+ <CommandMenuItem
+ id={id}
+ Icon={IconVersions}
+ label={i18n.date(createdAt, {
+ year: 'numeric',
+ month: 'long',
+ day: 'numeric',
+ })}
+ description={t`${label}, ${statusLabel}`}
+ onClick={onSelect}
+ />
</SelectableListItem>
);
};
diff --git a/packages/twenty-front/src/modules/object-core/workflows/versions/components/SidePanelCoreWorkflowVersionsPage.tsx b/packages/twenty-front/src/modules/object-core/workflows/versions/components/SidePanelCoreWorkflowVersionsPage.tsx
index 7caada595f8..5c56ab5cd57 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/versions/components/SidePanelCoreWorkflowVersionsPage.tsx
+++ b/packages/twenty-front/src/modules/object-core/workflows/versions/components/SidePanelCoreWorkflowVersionsPage.tsx
@@ -47,7 +47,6 @@ export const SidePanelCoreWorkflowVersionsPage = () => {
label={coreWorkflowVersion.label}
createdAt={coreWorkflowVersion.createdAt}
status={coreWorkflowVersion.status}
- isSelectable
onSelect={() => {
openCoreWorkflowVersionSidePanel({
coreWorkflowVersionId: coreWorkflowVersion.id,
diff --git a/packages/twenty-front/src/modules/object-core/workflows/versions/constants/CoreWorkflowVersionStatusLabels.ts b/packages/twenty-front/src/modules/object-core/workflows/versions/constants/CoreWorkflowVersionStatusLabels.ts
new file mode 100644
index 00000000000..b3ca1b4c84b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-core/workflows/versions/constants/CoreWorkflowVersionStatusLabels.ts
@@ -0,0 +1,14 @@
+import { type MessageDescriptor } from '@lingui/core';
+import { msg } from '@lingui/core/macro';
+
+import { CoreWorkflowVersionStatus } from '~/generated/graphql';
+
+export const CORE_WORKFLOW_VERSION_STATUS_LABELS: Record<
+ CoreWorkflowVersionStatus,
+ MessageDescriptor
+> = {
+ [CoreWorkflowVersionStatus.DRAFT]: msg`Draft`,
+ [CoreWorkflowVersionStatus.ACTIVE]: msg`Active`,
+ [CoreWorkflowVersionStatus.DEACTIVATED]: msg`Deactivated`,
+ [CoreWorkflowVersionStatus.ARCHIVED]: msg`Archived`,
+};
diff --git a/packages/twenty-front/src/modules/object-core/workflows/versions/constants/CoreWorkflowVersionStatusTagProps.ts b/packages/twenty-front/src/modules/object-core/workflows/versions/constants/CoreWorkflowVersionStatusTagProps.ts
deleted file mode 100644
index 88f66c1582f..00000000000
--- a/packages/twenty-front/src/modules/object-core/workflows/versions/constants/CoreWorkflowVersionStatusTagProps.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { type MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
-import { type ThemeColor } from 'twenty-ui/theme';
-
-import { CoreWorkflowVersionStatus } from '~/generated/graphql';
-
-export const CORE_WORKFLOW_VERSION_STATUS_TAG_PROPS: Record<
- CoreWorkflowVersionStatus,
- { label: MessageDescriptor; color: ThemeColor }
-> = {
- [CoreWorkflowVersionStatus.DRAFT]: { label: msg`Draft`, color: 'yellow' },
- [CoreWorkflowVersionStatus.ACTIVE]: { label: msg`Active`, color: 'green' },
- [CoreWorkflowVersionStatus.DEACTIVATED]: {
- label: msg`Deactivated`,
- color: 'gray',
- },
- [CoreWorkflowVersionStatus.ARCHIVED]: { label: msg`Archived`, color: 'gray' },
-};