Skip to content

The open alternative to Salesforce, designed for AI.

Give the core workflow pages their own labels, icon and status options (#27543)

Thomas Trompette0bb9cb37c710
diff --git a/packages/twenty-front/src/modules/object-core/commands/hooks/__tests__/useCoreObjectsCommands.test.tsx b/packages/twenty-front/src/modules/object-core/commands/hooks/__tests__/useCoreObjectsCommands.test.tsx
index f3dedbd405f..8bd5365c0cb 100644
--- a/packages/twenty-front/src/modules/object-core/commands/hooks/__tests__/useCoreObjectsCommands.test.tsx
+++ b/packages/twenty-front/src/modules/object-core/commands/hooks/__tests__/useCoreObjectsCommands.test.tsx
@@ -32,8 +32,6 @@ jest.mock('@/object-metadata/hooks/useObjectMetadataItem', () => ({
useObjectMetadataItem: () => ({
objectMetadataItem: {
id: '20202020-9e2b-4f2b-8f47-61b41565859a',
- labelSingular: 'Workflow',
- labelPlural: 'Workflows',
},
}),
}));
diff --git a/packages/twenty-front/src/modules/object-core/commands/hooks/useCoreObjectsCommands.ts b/packages/twenty-front/src/modules/object-core/commands/hooks/useCoreObjectsCommands.ts
index 8e47ff5dfac..cf46b02f305 100644
--- a/packages/twenty-front/src/modules/object-core/commands/hooks/useCoreObjectsCommands.ts
+++ b/packages/twenty-front/src/modules/object-core/commands/hooks/useCoreObjectsCommands.ts
@@ -95,7 +95,10 @@ export const useCoreObjectsCommands = () => {
isOnCoreWorkflowsIndex && isNonEmptyArray(selectedCoreWorkflowIds)
? {
label: getSelectedRecordsCountLabel({
- objectMetadataItem: workflowObjectMetadataItem,
+ objectMetadataItem: {
+ labelSingular: t`Workflow`,
+ labelPlural: t`Workflows`,
+ },
numberOfSelectedRecords: selectedCoreWorkflowIds.length,
}),
}
diff --git a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowNameCell.tsx b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowNameCell.tsx
index 387f0b0329e..8c308f50ee4 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowNameCell.tsx
+++ b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowNameCell.tsx
@@ -1,8 +1,4 @@
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-
import { CoreObjectNameCell } from '@/object-core/components/cells/CoreObjectNameCell';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { getAvatarShape } from '@/object-metadata/utils/getAvatarShape';
type CoreWorkflowNameCellProps = {
name: string | null | undefined;
@@ -13,15 +9,11 @@ export const CoreWorkflowNameCell = ({
name,
workflowId,
}: CoreWorkflowNameCellProps) => {
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- });
-
return (
<CoreObjectNameCell
name={name}
avatarColorSeed={workflowId}
- avatarShape={getAvatarShape(objectMetadataItem)}
+ avatarShape="circle"
/>
);
};
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowStatusOptions.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowStatusOptions.ts
index 7e5cd403e53..8b9644b6c4f 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowStatusOptions.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflowStatusOptions.ts
@@ -1,15 +1,12 @@
-import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { useLingui } from '@lingui/react/macro';
import { type SelectOption } from 'twenty-ui/primitives/input';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { CORE_WORKFLOW_STATUS_FILTER_OPTIONS } from '@/object-core/workflows/constants/CoreWorkflowStatusFilterOptions';
export const useCoreWorkflowStatusOptions = (): SelectOption[] => {
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- });
+ const { t } = useLingui();
- return (
- objectMetadataItem.fields.find((field) => field.name === 'statuses')
- ?.options ?? []
- );
+ return CORE_WORKFLOW_STATUS_FILTER_OPTIONS.map(({ value, label, color }) => {
+ return { value, label: t(label), color };
+ });
};
diff --git a/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx b/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx
index e5ab1b711af..8ea39a42e2d 100644
--- a/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx
+++ b/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx
@@ -1,6 +1,7 @@
import { t } from '@lingui/core/macro';
-import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
+import { AppPath } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
+import { IconSettingsAutomation } from 'twenty-ui/icon';
import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';
import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';
@@ -24,9 +25,8 @@ import {
useCoreWorkflows,
} from '@/object-core/workflows/hooks/useCoreWorkflows';
import { type CoreWorkflow } from '@/object-core/workflows/types/CoreWorkflow';
-import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { SidePanelToggleButton } from '@/side-panel/components/SidePanelToggleButton';
+import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';
import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
const getCoreWorkflowLink = (workflow: CoreWorkflow) =>
@@ -37,10 +37,6 @@ export const WorkflowCoreIndexPage = () => {
CORE_WORKFLOWS_TABLE_ID,
);
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- });
-
const {
coreWorkflows,
hasNextPage,
@@ -82,8 +78,8 @@ export const WorkflowCoreIndexPage = () => {
return (
<CoreObjectIndexPageLayout
- labelPlural={objectMetadataItem.labelPlural}
- icon={<ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />}
+ labelPlural={t`Workflows`}
+ icon={<ColoredIcon Icon={IconSettingsAutomation} color="gray" />}
numberOfSelectedRecords={selectedRowCount}
actionButton={
<>
@@ -109,12 +105,12 @@ export const WorkflowCoreIndexPage = () => {
emptyState={{
hasAppliedFilters,
title: hasAppliedFilters
- ? t`No ${objectMetadataItem.labelPlural} found`
- : t`Add your first ${objectMetadataItem.labelSingular}`,
+ ? t`No Workflows found`
+ : t`Add your first Workflow`,
subTitle: hasAppliedFilters
- ? t`No ${objectMetadataItem.labelPlural} match your filters. Try removing some of them.`
- : t`Create a ${objectMetadataItem.labelSingular} to automate your work.`,
- buttonTitle: t`Add a ${objectMetadataItem.labelSingular}`,
+ ? t`No Workflows match your filters. Try removing some of them.`
+ : t`Create a Workflow to automate your work.`,
+ buttonTitle: t`Add a Workflow`,
onButtonClick: canCreateCoreWorkflow ? createCoreWorkflow : undefined,
}}
hasNextPage={hasNextPage}
@@ -136,7 +132,7 @@ export const WorkflowCoreIndexPage = () => {
/>
{canCreateCoreWorkflow && (
<CoreObjectTableAddNewRow
- label={t`New ${objectMetadataItem.labelSingular}`}
+ label={t`New Workflow`}
onClick={createCoreWorkflow}
disabled={isCreatingCoreWorkflow}
/>