Skip to content

The open alternative to Salesforce, designed for AI.

feat(workflow): polish the core workflows index and gate workflow run workspace relations (#25356)

Thomas Trompette9d87519fc756
diff --git a/packages/twenty-front/src/modules/object-core/components/CoreObjectTableAddNewRow.tsx b/packages/twenty-front/src/modules/object-core/components/CoreObjectTableAddNewRow.tsx
new file mode 100644
index 00000000000..2eff2eafd9b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-core/components/CoreObjectTableAddNewRow.tsx
@@ -0,0 +1,44 @@
+import { styled } from '@linaria/react';
+import { IconPlus } from 'twenty-ui/icon';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+const StyledAddNewRow = styled.button`
+ align-items: center;
+ background: transparent;
+ border: none;
+ border-top: 1px solid ${themeCssVariables.border.color.light};
+ color: ${themeCssVariables.font.color.tertiary};
+ display: flex;
+ font-family: inherit;
+ font-size: ${themeCssVariables.font.size.md};
+ gap: ${themeCssVariables.spacing[1]};
+ height: ${themeCssVariables.spacing[8]};
+ padding: 0 ${themeCssVariables.spacing[2]};
+ width: 100%;
+
+ &:not(:disabled) {
+ cursor: pointer;
+ }
+
+ &:not(:disabled):hover {
+ background-color: ${themeCssVariables.background.transparent.light};
+ color: ${themeCssVariables.font.color.secondary};
+ }
+`;
+
+type CoreObjectTableAddNewRowProps = {
+ label: string;
+ onClick: () => void;
+ disabled?: boolean;
+};
+
+export const CoreObjectTableAddNewRow = ({
+ label,
+ onClick,
+ disabled = false,
+}: CoreObjectTableAddNewRowProps) => (
+ <StyledAddNewRow type="button" onClick={onClick} disabled={disabled}>
+ <IconPlus size={14} />
+ {label}
+ </StyledAddNewRow>
+);
diff --git a/packages/twenty-front/src/modules/object-core/components/CoreObjectTableRow.tsx b/packages/twenty-front/src/modules/object-core/components/CoreObjectTableRow.tsx
index f768171bfc5..5317e41d99d 100644
--- a/packages/twenty-front/src/modules/object-core/components/CoreObjectTableRow.tsx
+++ b/packages/twenty-front/src/modules/object-core/components/CoreObjectTableRow.tsx
@@ -6,6 +6,7 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
const StyledCoreObjectTableBody = styled(TableBody)`
gap: 0;
+ padding: 0;
`;
const StyledCoreObjectTableRow = styled(TableRow)`
diff --git a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowsFilterBar.tsx b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowsFilterBar.tsx
index 06bd6012253..106ef00dab0 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowsFilterBar.tsx
+++ b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowsFilterBar.tsx
@@ -62,7 +62,7 @@ export const CoreWorkflowsFilterBar = () => {
<IconButton
Icon={IconFilter}
variant="secondary"
- size="medium"
+ size="small"
ariaLabel={t`Filter`}
onClick={openCoreWorkflowFiltersSidePanel}
/>
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.ts
index 6ddff0379e2..7a3859dae25 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.ts
@@ -1,8 +1,11 @@
import { useState } from 'react';
+import { type ErrorLike } from '@apollo/client';
import { useQuery } from '@apollo/client/react';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { logError } from '~/utils/logError';
import { coreWorkflowsFilterSettingsState } from '@/object-core/workflows/states/coreWorkflowsFilterSettingsState';
import { buildCoreWorkflowFilterInput } from '@/object-core/workflows/utils/buildCoreWorkflowFilterInput';
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
@@ -81,6 +84,8 @@ export const useCoreWorkflows = ({
);
const connection = (data ?? previousData)?.coreWorkflows;
+ const { enqueueErrorSnackBar } = useSnackBar();
+
const fetchNextPage = async () => {
if (connection?.pageInfo.hasNextPage !== true || isFetchingMore) {
return;
@@ -88,21 +93,26 @@ export const useCoreWorkflows = ({
setIsFetchingMore(true);
- await fetchMore({
- variables: { after: connection.pageInfo.endCursor },
- updateQuery: (previousResult, { fetchMoreResult }) => ({
- ...fetchMoreResult,
- coreWorkflows: {
- ...fetchMoreResult.coreWorkflows,
- edges: [
- ...previousResult.coreWorkflows.edges,
- ...fetchMoreResult.coreWorkflows.edges,
- ],
- },
- }),
- }).finally(() => {
+ try {
+ await fetchMore({
+ variables: { after: connection.pageInfo.endCursor },
+ updateQuery: (previousResult, { fetchMoreResult }) => ({
+ ...fetchMoreResult,
+ coreWorkflows: {
+ ...fetchMoreResult.coreWorkflows,
+ edges: [
+ ...previousResult.coreWorkflows.edges,
+ ...fetchMoreResult.coreWorkflows.edges,
+ ],
+ },
+ }),
+ });
+ } catch (fetchMoreError) {
+ logError(`useCoreWorkflows fetchMore error : ${fetchMoreError}`);
+ enqueueErrorSnackBar({ apolloError: fetchMoreError as ErrorLike });
+ } finally {
setIsFetchingMore(false);
- });
+ }
};
return {
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCreateCoreWorkflow.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCreateCoreWorkflow.ts
new file mode 100644
index 00000000000..0dedbacc591
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCreateCoreWorkflow.ts
@@ -0,0 +1,80 @@
+import { t } from '@lingui/core/macro';
+import { useCallback, useState } from 'react';
+import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
+import { v4 } from 'uuid';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useBuildRecordInputFromRLSPredicates } from '@/object-record/hooks/useBuildRecordInputFromRLSPredicates';
+import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
+import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
+import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/canCreateRecordsForObjectMetadataItem';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
+import { logError } from '~/utils/logError';
+
+export const useCreateCoreWorkflow = () => {
+ const { objectMetadataItem } = useObjectMetadataItem({
+ objectNameSingular: CoreObjectNameSingular.Workflow,
+ });
+
+ const objectPermissions = useObjectPermissionsForObject(
+ objectMetadataItem.id,
+ );
+
+ const { createOneRecord } = useCreateOneRecord({
+ objectNameSingular: CoreObjectNameSingular.Workflow,
+ });
+
+ const { buildRecordInputFromRLSPredicates } =
+ useBuildRecordInputFromRLSPredicates({
+ objectMetadataItem,
+ });
+
+ const [isCreatingCoreWorkflow, setIsCreatingCoreWorkflow] = useState(false);
+
+ const navigate = useNavigateApp();
+
+ const { enqueueErrorSnackBar } = useSnackBar();
+
+ const canCreateCoreWorkflow = canCreateRecordsForObjectMetadataItem({
+ objectPermissions,
+ objectMetadataItem,
+ });
+
+ const createCoreWorkflow = useCallback(async () => {
+ if (isCreatingCoreWorkflow) {
+ return;
+ }
+
+ setIsCreatingCoreWorkflow(true);
+
+ const workflowId = v4();
+
+ try {
+ await createOneRecord({
+ id: workflowId,
+ ...buildRecordInputFromRLSPredicates(),
+ });
+ } catch (error) {
+ logError(error);
+ enqueueErrorSnackBar({ message: t`Failed to create workflow` });
+
+ return;
+ } finally {
+ setIsCreatingCoreWorkflow(false);
+ }
+
+ navigate(AppPath.RecordShowPage, {
+ objectNameSingular: CoreObjectNameSingular.Workflow,
+ objectRecordId: workflowId,
+ });
+ }, [
+ buildRecordInputFromRLSPredicates,
+ createOneRecord,
+ navigate,
+ enqueueErrorSnackBar,
+ isCreatingCoreWorkflow,
+ ]);
+
+ return { createCoreWorkflow, canCreateCoreWorkflow, isCreatingCoreWorkflow };
+};
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useHiddenWorkspaceWorkflowRunRelationFields.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useHiddenWorkspaceWorkflowRunRelationFields.ts
new file mode 100644
index 00000000000..24eca6bab59
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useHiddenWorkspaceWorkflowRunRelationFields.ts
@@ -0,0 +1,37 @@
+import { useMemo } from 'react';
+import { FeatureFlagKey } from 'twenty-shared/types';
+
+import { isHiddenWorkspaceWorkflowRunRelationField } from '@/object-core/workflows/utils/isHiddenWorkspaceWorkflowRunRelationField';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+
+// Remove with the workspace workflow and workflowVersion objects, once the
+// core migration owns them.
+export const useHiddenWorkspaceWorkflowRunRelationFields = (
+ objectNameSingular: string | undefined,
+) => {
+ const { objectMetadataItems } = useObjectMetadataItems();
+
+ const isWorkflowCoreIndexPageEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
+ );
+
+ return useMemo(
+ () =>
+ (
+ objectMetadataItems.find(
+ (objectMetadataItem) =>
+ objectMetadataItem.nameSingular === objectNameSingular,
+ )?.fields ?? []
+ )
+ .filter((field) =>
+ isHiddenWorkspaceWorkflowRunRelationField({
+ objectNameSingular,
+ fieldName: field.name,
+ isWorkflowCoreIndexPageEnabled,
+ }),
+ )
+ .flatMap((field) => [field.id, field.name]),
+ [objectMetadataItems, objectNameSingular, isWorkflowCoreIndexPageEnabled],
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-core/workflows/utils/__tests__/isHiddenWorkspaceWorkflowRunRelationField.test.ts b/packages/twenty-front/src/modules/object-core/workflows/utils/__tests__/isHiddenWorkspaceWorkflowRunRelationField.test.ts
new file mode 100644
index 00000000000..b30afe6bad2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-core/workflows/utils/__tests__/isHiddenWorkspaceWorkflowRunRelationField.test.ts
@@ -0,0 +1,58 @@
+import { CoreObjectNameSingular } from 'twenty-shared/types';
+
+import { isHiddenWorkspaceWorkflowRunRelationField } from '@/object-core/workflows/utils/isHiddenWorkspaceWorkflowRunRelationField';
+
+describe('isHiddenWorkspaceWorkflowRunRelationField', () => {
+ it.each(['workflow', 'workflowVersion'])(
+ 'should hide the %s relation field on a workflow run when the flag is on',
+ (fieldName) => {
+ expect(
+ isHiddenWorkspaceWorkflowRunRelationField({
+ objectNameSingular: CoreObjectNameSingular.WorkflowRun,
+ fieldName,
+ isWorkflowCoreIndexPageEnabled: true,
+ }),
+ ).toBe(true);
+ },
+ );
+
+ it('should keep the workspace relation fields when the flag is off', () => {
+ expect(
+ isHiddenWorkspaceWorkflowRunRelationField({
+ objectNameSingular: CoreObjectNameSingular.WorkflowRun,
+ fieldName: 'workflow',
+ isWorkflowCoreIndexPageEnabled: false,
+ }),
+ ).toBe(false);
+ });
+
+ it('should keep the other workflow run fields when the flag is on', () => {
+ expect(
+ isHiddenWorkspaceWorkflowRunRelationField({
+ objectNameSingular: CoreObjectNameSingular.WorkflowRun,
+ fieldName: 'status',
+ isWorkflowCoreIndexPageEnabled: true,
+ }),
+ ).toBe(false);
+ });
+
+ it('should keep the workflow relation of other objects when the flag is on', () => {
+ expect(
+ isHiddenWorkspaceWorkflowRunRelationField({
+ objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
+ fieldName: 'workflow',
+ isWorkflowCoreIndexPageEnabled: true,
+ }),
+ ).toBe(false);
+ });
+
+ it('should keep the fields of a route without an object', () => {
+ expect(
+ isHiddenWorkspaceWorkflowRunRelationField({
+ objectNameSingular: undefined,
+ fieldName: 'workflow',
+ isWorkflowCoreIndexPageEnabled: true,
+ }),
+ ).toBe(false);
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-core/workflows/utils/isHiddenWorkspaceWorkflowRunRelationField.ts b/packages/twenty-front/src/modules/object-core/workflows/utils/isHiddenWorkspaceWorkflowRunRelationField.ts
new file mode 100644
index 00000000000..443e9d99ff8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-core/workflows/utils/isHiddenWorkspaceWorkflowRunRelationField.ts
@@ -0,0 +1,21 @@
+import { CoreObjectNameSingular } from 'twenty-shared/types';
+
+// Remove with the workspace workflow and workflowVersion objects, once the
+// core migration owns them.
+const HIDDEN_WORKSPACE_WORKFLOW_RUN_RELATION_FIELD_NAMES = [
+ 'workflow',
+ 'workflowVersion',
+];
+
+export const isHiddenWorkspaceWorkflowRunRelationField = ({
+ objectNameSingular,
+ fieldName,
+ isWorkflowCoreIndexPageEnabled,
+}: {
+ objectNameSingular?: string | null;
+ fieldName: string;
+ isWorkflowCoreIndexPageEnabled: boolean;
+}) =>
+ isWorkflowCoreIndexPageEnabled &&
+ objectNameSingular === CoreObjectNameSingular.WorkflowRun &&
+ HIDDEN_WORKSPACE_WORKFLOW_RUN_RELATION_FIELD_NAMES.includes(fieldName);
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useWidgetVisibilityContext.ts b/packages/twenty-front/src/modules/page-layout/hooks/useWidgetVisibilityContext.ts
index b7797bfe555..6eeb57b8120 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useWidgetVisibilityContext.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useWidgetVisibilityContext.ts
@@ -1,3 +1,4 @@
+import { useHiddenWorkspaceWorkflowRunRelationFields } from '@/object-core/workflows/hooks/useHiddenWorkspaceWorkflowRunRelationFields';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
import { type WidgetVisibilityContext } from '@/page-layout/types/WidgetVisibilityContext';
import { buildWidgetVisibilityContext } from '@/page-layout/utils/buildWidgetVisibilityContext';
@@ -22,13 +23,22 @@ export const useWidgetVisibilityContext = (): WidgetVisibilityContext => {
targetRecordIdentifier?.id ?? '',
);
+ // Remove with the workspace workflow and workflowVersion objects, once the
+ // core migration owns them.
+ const hiddenFieldMetadataIdsOrNames =
+ useHiddenWorkspaceWorkflowRunRelationFields(
+ targetRecordIdentifier?.targetObjectNameSingular,
+ );
+
return useMemo(
- () =>
- buildWidgetVisibilityContext({
+ () => ({
+ ...buildWidgetVisibilityContext({
isMobile,
isInSidePanel,
targetRecord: isDefined(recordStore) ? recordStore : undefined,
}),
- [isMobile, isInSidePanel, recordStore],
+ hiddenFieldMetadataIdsOrNames,
+ }),
+ [isMobile, isInSidePanel, recordStore, hiddenFieldMetadataIdsOrNames],
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/types/WidgetVisibilityContext.ts b/packages/twenty-front/src/modules/page-layout/types/WidgetVisibilityContext.ts
index 072d36088d0..d2751f0aafa 100644
--- a/packages/twenty-front/src/modules/page-layout/types/WidgetVisibilityContext.ts
+++ b/packages/twenty-front/src/modules/page-layout/types/WidgetVisibilityContext.ts
@@ -1,4 +1,7 @@
export type WidgetVisibilityContext = {
device: 'MOBILE' | 'DESKTOP';
selectedRecords: Record<string, unknown>[];
+ // Remove with the workspace workflow and workflowVersion objects, once the
+ // core migration owns them.
+ hiddenFieldMetadataIdsOrNames?: string[];
};
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterVisibleWidgets.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterVisibleWidgets.test.ts
index 5a8b9669937..6354a14dbc9 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterVisibleWidgets.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterVisibleWidgets.test.ts
@@ -1,6 +1,7 @@
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
import { filterVisibleWidgets } from '@/page-layout/utils/filterVisibleWidgets';
import {
+ FieldDisplayMode,
PageLayoutTabLayoutMode,
WidgetConfigurationType,
WidgetType,
@@ -122,4 +123,75 @@ describe('filterVisibleWidgets', () => {
expect(widgets).toHaveLength(originalLength);
});
+
+ describe('hiddenFieldMetadataIdsOrNames', () => {
+ const createMockFieldWidget = (
+ id: string,
+ fieldMetadataId: string,
+ ): PageLayoutTab['widgets'][0] => ({
+ ...createMockWidget(id),
+ type: WidgetType.FIELD,
+ configuration: {
+ __typename: 'FieldConfiguration',
+ configurationType: WidgetConfigurationType.FIELD,
+ fieldMetadataId,
+ fieldDisplayMode: FieldDisplayMode.CARD,
+ },
+ });
+
+ it('should filter out a field widget referencing a hidden field by id', () => {
+ const result = filterVisibleWidgets({
+ widgets: [
+ createMockFieldWidget('widget-1', 'field-id-1'),
+ createMockFieldWidget('widget-2', 'field-id-2'),
+ ],
+ context: {
+ device: 'DESKTOP',
+ selectedRecords: [],
+ hiddenFieldMetadataIdsOrNames: ['field-id-1'],
+ },
+ });
+
+ expect(result).toHaveLength(1);
+ expect(result[0].id).toBe('widget-2');
+ });
+
+ it('should filter out a field widget referencing a hidden field by name', () => {
+ const result = filterVisibleWidgets({
+ widgets: [createMockFieldWidget('widget-1', 'workflow')],
+ context: {
+ device: 'DESKTOP',
+ selectedRecords: [],
+ hiddenFieldMetadataIdsOrNames: ['field-id-1', 'workflow'],
+ },
+ });
+
+ expect(result).toHaveLength(0);
+ });
+
+ it('should keep non-field widgets referencing a hidden name', () => {
+ const result = filterVisibleWidgets({
+ widgets: [createMockWidget('widget-1')],
+ context: {
+ device: 'DESKTOP',
+ selectedRecords: [],
+ hiddenFieldMetadataIdsOrNames: ['workflow'],
+ },
+ });
+
+ expect(result).toHaveLength(1);
+ });
+
+ it('should keep every field widget when nothing is hidden', () => {
+ const result = filterVisibleWidgets({
+ widgets: [
+ createMockFieldWidget('widget-1', 'field-id-1'),
+ createMockFieldWidget('widget-2', 'field-id-2'),
+ ],
+ context: { device: 'DESKTOP', selectedRecords: [] },
+ });
+
+ expect(result).toHaveLength(2);
+ });
+ });
});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/filterVisibleWidgets.ts b/packages/twenty-front/src/modules/page-layout/utils/filterVisibleWidgets.ts
index b6353c19d89..8710221050a 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/filterVisibleWidgets.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/filterVisibleWidgets.ts
@@ -1,6 +1,7 @@
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
import { type WidgetVisibilityContext } from '@/page-layout/types/WidgetVisibilityContext';
import { evaluateWidgetVisibility } from '@/page-layout/utils/evaluateWidgetVisibility';
+import { isFieldWidget } from '@/page-layout/widgets/field/utils/isFieldWidget';
type FilterVisibleWidgetsParams = {
widgets: PageLayoutTab['widgets'];
@@ -11,7 +12,21 @@ export const filterVisibleWidgets = ({
widgets,
context,
}: FilterVisibleWidgetsParams): PageLayoutTab['widgets'] => {
+ // Remove with the workspace workflow and workflowVersion objects, once the
+ // core migration owns them.
+ const hiddenFieldMetadataIdsOrNames =
+ context.hiddenFieldMetadataIdsOrNames ?? [];
+
return widgets.filter((widget) => {
+ if (
+ isFieldWidget(widget) &&
+ hiddenFieldMetadataIdsOrNames.includes(
+ widget.configuration.fieldMetadataId,
+ )
+ ) {
+ return false;
+ }
+
return evaluateWidgetVisibility({
conditionalAvailabilityExpression:
widget.conditionalAvailabilityExpression,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetFields.ts b/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetFields.ts
new file mode 100644
index 00000000000..d99e9312111
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetFields.ts
@@ -0,0 +1,26 @@
+import { useHiddenWorkspaceWorkflowRunRelationFields } from '@/object-core/workflows/hooks/useHiddenWorkspaceWorkflowRunRelationFields';
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+import { useMemo } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+
+// Remove with the workspace workflow and workflowVersion objects, once the
+// core migration owns them.
+export const useFieldsWidgetFields = (
+ objectMetadataItem: EnrichedObjectMetadataItem | undefined,
+): FieldMetadataItem[] => {
+ const hiddenFieldMetadataIdsOrNames =
+ useHiddenWorkspaceWorkflowRunRelationFields(
+ objectMetadataItem?.nameSingular,
+ );
+
+ return useMemo(
+ () =>
+ isDefined(objectMetadataItem)
+ ? objectMetadataItem.fields.filter(
+ (field) => !hiddenFieldMetadataIdsOrNames.includes(field.name),
+ )
+ : [],
+ [objectMetadataItem, hiddenFieldMetadataIdsOrNames],
+ );
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroups.ts b/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroups.ts
index 971fbec554a..3d9e311eb96 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroups.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetGroups.ts
@@ -7,6 +7,7 @@ import {
type FieldsWidgetGroup,
type FieldsWidgetGroupField,
} from '@/page-layout/widgets/fields/types/FieldsWidgetGroup';
+import { useFieldsWidgetFields } from '@/page-layout/widgets/fields/hooks/useFieldsWidgetFields';
import { buildDefaultFieldsWidgetGroups } from '@/page-layout/widgets/fields/utils/buildDefaultFieldsWidgetGroups';
import { filterDraftGroupsForDisplay } from '@/page-layout/widgets/fields/utils/filterDraftGroupsForDisplay';
import { useViewById } from '@/views/hooks/useViewById';
@@ -35,6 +36,8 @@ export const useFieldsWidgetGroups = ({
const workspaceCustomApplicationId =
currentWorkspace?.workspaceCustomApplication?.id;
+ const visibleFields = useFieldsWidgetFields(objectMetadataItem);
+
const { groups, displayMode } = useMemo<{
groups: FieldsWidgetGroup[];
displayMode: FieldsWidgetDisplayMode;
@@ -43,9 +46,7 @@ export const useFieldsWidgetGroups = ({
return { groups: [], displayMode: 'grouped' };
}
- const activeFields = objectMetadataItem.fields.filter(
- (field) => field.isActive,
- );
+ const activeFields = visibleFields.filter((field) => field.isActive);
if (isDefined(view) && isNonEmptyArray(view.viewFieldGroups)) {
const sortedGroups = view.viewFieldGroups.toSorted(
@@ -140,7 +141,7 @@ export const useFieldsWidgetGroups = ({
return {
groups: filterDraftGroupsForDisplay(
buildDefaultFieldsWidgetGroups({
- fields: objectMetadataItem.fields,
+ fields: visibleFields,
labelIdentifierFieldMetadataItemId:
labelIdentifierFieldMetadataItem?.id,
workspaceCustomApplicationId,
@@ -150,6 +151,7 @@ export const useFieldsWidgetGroups = ({
};
}, [
objectMetadataItem,
+ visibleFields,
labelIdentifierFieldMetadataItem,
view,
viewId,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetHiddenFields.ts b/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetHiddenFields.ts
index 8c4ffe1e913..848638e7d37 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetHiddenFields.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/hooks/useFieldsWidgetHiddenFields.ts
@@ -3,6 +3,7 @@ import {
type FieldsWidgetGroup,
type FieldsWidgetGroupField,
} from '@/page-layout/widgets/fields/types/FieldsWidgetGroup';
+import { useFieldsWidgetFields } from '@/page-layout/widgets/fields/hooks/useFieldsWidgetFields';
import { getHiddenFieldsFromGroups } from '@/page-layout/widgets/fields/utils/getHiddenFieldsFromGroups';
import { useViewById } from '@/views/hooks/useViewById';
import { useMemo } from 'react';
@@ -22,14 +23,14 @@ export const useFieldsWidgetHiddenFields = ({
objectNameSingular,
});
+ const visibleFields = useFieldsWidgetFields(objectMetadataItem);
+
const hiddenFields = useMemo<FieldsWidgetGroupField[]>(() => {
if (!isDefined(objectMetadataItem)) {
return [];
}
- const activeFields = objectMetadataItem.fields.filter(
- (field) => field.isActive,
- );
+ const activeFields = visibleFields.filter((field) => field.isActive);
if (isDefined(view) && isNonEmptyArray(view.viewFieldGroups)) {
const groups: FieldsWidgetGroup[] = view.viewFieldGroups.map((group) => {
@@ -90,7 +91,7 @@ export const useFieldsWidgetHiddenFields = ({
}
return [];
- }, [objectMetadataItem, view]);
+ }, [objectMetadataItem, view, visibleFields]);
return { hiddenFields };
};
diff --git a/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx b/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx
index 757cfd1a3a6..f5ac02bd0b7 100644
--- a/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx
+++ b/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx
@@ -1,15 +1,28 @@
import { useEffect } from 'react';
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { useInView } from 'react-intersection-observer';
import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
+import { IconPlus } from 'twenty-ui/icon';
+import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';
+import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';
+import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';
+import { PinnedCommandMenuItemButtons } from '@/command-menu-item/display/components/PinnedCommandMenuItemButtons';
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { CoreObjectTable } from '@/object-core/components/CoreObjectTable';
+import { useListenToObjectRecordOperationBrowserEvent } from '@/browser-event/hooks/useListenToObjectRecordOperationBrowserEvent';
+import { CoreObjectTableAddNewRow } from '@/object-core/components/CoreObjectTableAddNewRow';
+import { getDeletedRecordIdsFromOperation } from '@/object-core/utils/getDeletedRecordIdsFromOperation';
import { CoreWorkflowsSelectionToContextStoreEffect } from '@/object-core/workflows/components/CoreWorkflowsSelectionToContextStoreEffect';
import { useCoreWorkflowsSelection } from '@/object-core/workflows/hooks/useCoreWorkflowsSelection';
+import { useCreateCoreWorkflow } from '@/object-core/workflows/hooks/useCreateCoreWorkflow';
import { useHydrateSelectedWorkflowRecords } from '@/object-core/workflows/hooks/useHydrateSelectedWorkflowRecords';
-import { getDeletedRecordIdsFromOperation } from '@/object-core/utils/getDeletedRecordIdsFromOperation';
-import { useListenToObjectRecordOperationBrowserEvent } from '@/browser-event/hooks/useListenToObjectRecordOperationBrowserEvent';
+import { coreWorkflowsFilterSettingsState } from '@/object-core/workflows/states/coreWorkflowsFilterSettingsState';
+import { isUsableCoreWorkflowFilterRule } from '@/object-core/workflows/utils/isUsableCoreWorkflowFilterRule';
+import { RecordIndexEmptyStateDisplay } from '@/object-record/record-index/components/RecordIndexEmptyStateDisplay';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { CoreWorkflowsFilterBar } from '@/object-core/workflows/components/CoreWorkflowsFilterBar';
import { WORKFLOW_CORE_TABLE_COLUMNS } from '@/object-core/workflows/constants/WorkflowCoreTableColumns';
import {
@@ -53,11 +66,14 @@ export const WorkflowCoreIndexPage = () => {
objectNameSingular: CoreObjectNameSingular.Workflow,
});
- const { coreWorkflows, hasNextPage, loading, fetchNextPage } =
+ const { coreWorkflows, hasNextPage, loading, error, fetchNextPage } =
useCoreWorkflows({ tableId });
const { ref: fetchMoreRef, inView } = useInView();
+ const { createCoreWorkflow, canCreateCoreWorkflow, isCreatingCoreWorkflow } =
+ useCreateCoreWorkflow();
+
const {
displayedCoreWorkflows,
selectedRowIds,
@@ -78,6 +94,22 @@ export const WorkflowCoreIndexPage = () => {
),
});
+ const coreWorkflowsFilterSettings = useAtomStateValue(
+ coreWorkflowsFilterSettingsState,
+ );
+
+ const hasAppliedFilters = (
+ coreWorkflowsFilterSettings.stepFilters ?? []
+ ).some(isUsableCoreWorkflowFilterRule);
+
+ const hasError = isDefined(error);
+
+ const isEmpty =
+ !loading &&
+ !hasError &&
+ !hasNextPage &&
+ displayedCoreWorkflows.length === 0;
+
useEffect(() => {
if (inView && hasNextPage && !loading) {
void fetchNextPage();
@@ -96,6 +128,18 @@ export const WorkflowCoreIndexPage = () => {
title={objectMetadataItem.labelPlural}
actionButton={
<>
+ <CommandMenuComponentInstanceContext.Provider
+ value={{
+ instanceId: getCommandMenuIdFromRecordIndexId(tableId),
+ }}
+ >
+ <CommandMenuContextProvider
+ displayType="button"
+ containerType={CommandMenuItemContainerType.IndexPageHeader}
+ >
+ <PinnedCommandMenuItemButtons />
+ </CommandMenuContextProvider>
+ </CommandMenuComponentInstanceContext.Provider>
<CoreWorkflowsFilterBar />
<SidePanelToggleButton />
</>
@@ -104,22 +148,62 @@ export const WorkflowCoreIndexPage = () => {
}
>
<StyledTableContainer>
- <CoreObjectTable
- tableId={tableId}
- columns={WORKFLOW_CORE_TABLE_COLUMNS}
- items={displayedCoreWorkflows}
- getItemKey={(workflow) => workflow.id}
- getItemLink={getCoreWorkflowLink}
- initialSort={CORE_WORKFLOWS_INITIAL_SORT}
- selection={{
- selectedRowIds,
- onToggleRow: toggleRow,
- onToggleAllRows: selectRows,
- isItemSelectable: (coreWorkflow) =>
- isDefined(coreWorkflow.workspaceWorkflowId),
- }}
- />
- {hasNextPage && <StyledFetchMoreSentinel ref={fetchMoreRef} />}
+ {hasError && (
+ <RecordIndexEmptyStateDisplay
+ animatedPlaceholderType="errorIndex"
+ title={t`Something went wrong`}
+ subTitle={t`We could not load your ${objectMetadataItem.labelPlural}. Please try again later.`}
+ />
+ )}
+ {isEmpty && (
+ <RecordIndexEmptyStateDisplay
+ animatedPlaceholderType={
+ hasAppliedFilters ? 'noMatchRecord' : 'noRecord'
+ }
+ title={
+ hasAppliedFilters
+ ? t`No ${objectMetadataItem.labelPlural} found`
+ : t`Add your first ${objectMetadataItem.labelSingular}`
+ }
+ subTitle={
+ hasAppliedFilters
+ ? t`No ${objectMetadataItem.labelPlural} match your filters. Try removing some of them.`
+ : t`Create a ${objectMetadataItem.labelSingular} to automate your work.`
+ }
+ ButtonIcon={IconPlus}
+ buttonTitle={t`Add a ${objectMetadataItem.labelSingular}`}
+ onButtonClick={
+ canCreateCoreWorkflow ? createCoreWorkflow : undefined
+ }
+ />
+ )}
+ {!hasError && !isEmpty && (
+ <>
+ <CoreObjectTable
+ tableId={tableId}
+ columns={WORKFLOW_CORE_TABLE_COLUMNS}
+ items={displayedCoreWorkflows}
+ getItemKey={(workflow) => workflow.id}
+ getItemLink={getCoreWorkflowLink}
+ initialSort={CORE_WORKFLOWS_INITIAL_SORT}
+ selection={{
+ selectedRowIds,
+ onToggleRow: toggleRow,
+ onToggleAllRows: selectRows,
+ isItemSelectable: (coreWorkflow) =>
+ isDefined(coreWorkflow.workspaceWorkflowId),
+ }}
+ />
+ {canCreateCoreWorkflow && (
+ <CoreObjectTableAddNewRow
+ label={t`New ${objectMetadataItem.labelSingular}`}
+ onClick={createCoreWorkflow}
+ disabled={isCreatingCoreWorkflow}
+ />
+ )}
+ {hasNextPage && <StyledFetchMoreSentinel ref={fetchMoreRef} />}
+ </>
+ )}
<CoreWorkflowsSelectionToContextStoreEffect
selectedWorkspaceWorkflowIds={selectedWorkspaceWorkflowIds}
/>
diff --git a/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx b/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx
index ee97abd5ad9..dc66e8d84f9 100644
--- a/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx
+++ b/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx
@@ -68,13 +68,22 @@ jest.mock('@/object-core/workflows/hooks/useCoreWorkflows', () => ({
CORE_WORKFLOWS_INITIAL_SORT: [],
CORE_WORKFLOWS_TABLE_ID: 'workflow-table',
useCoreWorkflows: () => ({
- coreWorkflows: [],
+ coreWorkflows: [{ id: 'workflow-1' }],
hasNextPage: false,
loading: false,
+ error: undefined,
fetchNextPage: jest.fn(),
}),
}));
+jest.mock('@/object-core/workflows/hooks/useCreateCoreWorkflow', () => ({
+ useCreateCoreWorkflow: () => ({
+ createCoreWorkflow: jest.fn(),
+ canCreateCoreWorkflow: false,
+ isCreatingCoreWorkflow: false,
+ }),
+}));
+
jest.mock('react-intersection-observer', () => ({
useInView: () => ({ ref: jest.fn(), inView: false }),
}));