The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Make LIST a widget layout instead of a table in disguise (#23940)
Félix Malfait0fa9bdb324df
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex f3a4027206c..f8b1ed68fb0 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -841,6 +841,7 @@ enum ViewType {FIELDS_WIDGETTABLE_WIDGETKANBAN_WIDGET+ LIST_WIDGETCALENDAR_WIDGET}@@ -3890,7 +3891,7 @@ input UpsertViewWidgetInput {input UpsertViewWidgetViewSettingsInput {"""- The layout type of the widget view. Only widget view types (TABLE_WIDGET, KANBAN_WIDGET, CALENDAR_WIDGET) are allowed.+ The layout type of the widget view. Only widget view types (TABLE_WIDGET, KANBAN_WIDGET, LIST_WIDGET, CALENDAR_WIDGET) are allowed."""type: ViewTypemainGroupByFieldMetadataId: UUIDdiff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 6c9e1a97cb9..40fd330506e 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -585,7 +585,7 @@ export interface View {__typename: 'View'}-export type ViewType = 'TABLE' | 'KANBAN' | 'CALENDAR' | 'LIST' | 'FIELDS_WIDGET' | 'TABLE_WIDGET' | 'KANBAN_WIDGET' | 'CALENDAR_WIDGET'+export type ViewType = 'TABLE' | 'KANBAN' | 'CALENDAR' | 'LIST' | 'FIELDS_WIDGET' | 'TABLE_WIDGET' | 'KANBAN_WIDGET' | 'LIST_WIDGET' | 'CALENDAR_WIDGET'export type ViewKey = 'INDEX'@@ -6660,7 +6660,7 @@ viewFilterGroups?: (UpsertViewWidgetViewFilterGroupInput[] | null),viewSorts?: (UpsertViewWidgetViewSortInput[] | null)}export interface UpsertViewWidgetViewSettingsInput {-/** The layout type of the widget view. Only widget view types (TABLE_WIDGET, KANBAN_WIDGET, CALENDAR_WIDGET) are allowed. */+/** The layout type of the widget view. Only widget view types (TABLE_WIDGET, KANBAN_WIDGET, LIST_WIDGET, CALENDAR_WIDGET) are allowed. */type?: (ViewType | null),mainGroupByFieldMetadataId?: (Scalars['UUID'] | null),shouldHideEmptyGroups?: (Scalars['Boolean'] | null),/** Deprecated: Superseded by objectMetadata.openRecordIn and the workspace member preference; kept one release for API compatibility, no longer read by the frontend. */openRecordIn?: (ViewOpenRecordIn | null),kanbanAggregateOperation?: (AggregateOperations | null),kanbanAggregateOperationFieldMetadataId?: (Scalars['UUID'] | null),kanbanColumnWidth?: (Scalars['Int'] | null),calendarLayout?: (ViewCalendarLayout | null),calendarFieldMetadataId?: (Scalars['UUID'] | null),calendarEndFieldMetadataId?: (Scalars['UUID'] | null)}@@ -9446,6 +9446,7 @@ export const enumViewType = {FIELDS_WIDGET: 'FIELDS_WIDGET' as const,TABLE_WIDGET: 'TABLE_WIDGET' as const,KANBAN_WIDGET: 'KANBAN_WIDGET' as const,+ LIST_WIDGET: 'LIST_WIDGET' as const,CALENDAR_WIDGET: 'CALENDAR_WIDGET' as const}diff --git a/packages/twenty-docs/developers/extend/apps/layout/views.mdx b/packages/twenty-docs/developers/extend/apps/layout/views.mdxindex 5f034c3f2fa..07c1001873e 100644--- a/packages/twenty-docs/developers/extend/apps/layout/views.mdx+++ b/packages/twenty-docs/developers/extend/apps/layout/views.mdx@@ -43,7 +43,7 @@ export default defineView({| Property | Values | Description ||----------|--------|-------------|-| `type` | `ViewType.TABLE` (default), `ViewType.LIST`, `ViewType.KANBAN`, `ViewType.CALENDAR` | How records are laid out. (`FIELDS_WIDGET`, `TABLE_WIDGET`, `KANBAN_WIDGET`, and `CALENDAR_WIDGET` also exist but are used internally by page-layout widgets.) |+| `type` | `ViewType.TABLE` (default), `ViewType.LIST`, `ViewType.KANBAN`, `ViewType.CALENDAR` | How records are laid out. (`FIELDS_WIDGET`, `TABLE_WIDGET`, `KANBAN_WIDGET`, `LIST_WIDGET`, and `CALENDAR_WIDGET` also exist but are used internally by page-layout widgets.) || `visibility` | `ViewVisibility.WORKSPACE` (default), `ViewVisibility.UNLISTED` | Whether the view is listed for the whole workspace or hidden from pickers. || `openRecordIn` | deprecated | No longer read: where records open is now a property of the [object](/developers/extend/apps/data/objects) (`openRecordIn` on `defineObject()`), falling back to each member's own preference. || `sorts` | `{ fieldMetadataUniversalIdentifier, direction: ViewSortDirection.ASC \| DESC }[]` | Default sort order. |diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 3e611b1d246..17ba0bf4110 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -6150,7 +6150,7 @@ export type UpsertViewWidgetViewSettingsInput = {/** Deprecated: Superseded by objectMetadata.openRecordIn and the workspace member preference; kept one release for API compatibility, no longer read by the frontend. */openRecordIn?: InputMaybe<ViewOpenRecordIn>;shouldHideEmptyGroups?: InputMaybe<Scalars['Boolean']['input']>;- /** The layout type of the widget view. Only widget view types (TABLE_WIDGET, KANBAN_WIDGET, CALENDAR_WIDGET) are allowed. */+ /** The layout type of the widget view. Only widget view types (TABLE_WIDGET, KANBAN_WIDGET, LIST_WIDGET, CALENDAR_WIDGET) are allowed. */type?: InputMaybe<ViewType>;};@@ -6490,6 +6490,7 @@ export enum ViewType {KANBAN = 'KANBAN',KANBAN_WIDGET = 'KANBAN_WIDGET',LIST = 'LIST',+ LIST_WIDGET = 'LIST_WIDGET',TABLE = 'TABLE',TABLE_WIDGET = 'TABLE_WIDGET'}diff --git a/packages/twenty-front/src/modules/context-store/utils/getContextStoreViewType.ts b/packages/twenty-front/src/modules/context-store/utils/getContextStoreViewType.tsindex 4aa240e1fcd..ce6a38c7b1c 100644--- a/packages/twenty-front/src/modules/context-store/utils/getContextStoreViewType.ts+++ b/packages/twenty-front/src/modules/context-store/utils/getContextStoreViewType.ts@@ -13,6 +13,7 @@ const VIEW_TYPE_TO_CONTEXT_STORE_VIEW_TYPE: Record<[ViewType.FIELDS_WIDGET]: ContextStoreViewType.Table,[ViewType.KANBAN]: ContextStoreViewType.Kanban,[ViewType.KANBAN_WIDGET]: ContextStoreViewType.Kanban,+ [ViewType.LIST_WIDGET]: ContextStoreViewType.Table,[ViewType.CALENDAR]: ContextStoreViewType.Calendar,[ViewType.CALENDAR_WIDGET]: ContextStoreViewType.Calendar,};diff --git a/packages/twenty-front/src/modules/metadata-store/hooks/useLoadStaleMetadataEntities.ts b/packages/twenty-front/src/modules/metadata-store/hooks/useLoadStaleMetadataEntities.tsindex 0dbbe8fe32b..1311cea102f 100644--- a/packages/twenty-front/src/modules/metadata-store/hooks/useLoadStaleMetadataEntities.ts+++ b/packages/twenty-front/src/modules/metadata-store/hooks/useLoadStaleMetadataEntities.ts@@ -53,6 +53,7 @@ const FIELDS_WIDGET_VIEW_TYPES = [ViewType.FIELDS_WIDGET];const WIDGET_VIEW_TYPES = [ViewType.TABLE_WIDGET,ViewType.KANBAN_WIDGET,+ ViewType.LIST_WIDGET,ViewType.CALENDAR_WIDGET,];diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSetViewTypeFromLayoutOptionsMenu.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSetViewTypeFromLayoutOptionsMenu.tsindex 9ed7397b52d..776ab3f324e 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSetViewTypeFromLayoutOptionsMenu.ts+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSetViewTypeFromLayoutOptionsMenu.ts@@ -117,6 +117,7 @@ export const useSetViewTypeFromLayoutOptionsMenu = () => {}case ViewType.TABLE_WIDGET:case ViewType.KANBAN_WIDGET:+ case ViewType.LIST_WIDGET:case ViewType.CALENDAR_WIDGET:case ViewType.FIELDS_WIDGET: {return;diff --git a/packages/twenty-front/src/modules/object-record/record-list-widget/components/RecordListWidget.tsx b/packages/twenty-front/src/modules/object-record/record-list-widget/components/RecordListWidget.tsxnew file mode 100644index 00000000000..39e558e7a94--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-list-widget/components/RecordListWidget.tsx@@ -0,0 +1,44 @@+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';+import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { RecordList } from '@/object-record/record-list/components/RecordList';+import { RecordListSSESubscribeEffect } from '@/object-record/record-list/components/RecordListSSESubscribeEffect';+import { RecordListContextProvider } from '@/object-record/record-list/contexts/RecordListContext';+import { styled } from '@linaria/react';++const StyledListContainer = styled.div`+ display: flex;+ flex: 1;+ flex-direction: column;+ min-height: 0;+ overflow: hidden;+`;++export const RecordListWidget = () => {+ const { objectNameSingular, viewBarInstanceId } =+ useRecordIndexContextOrThrow();++ const { objectMetadataItem } = useObjectMetadataItem({+ objectNameSingular,+ });++ const objectPermissions = useObjectPermissionsForObject(+ objectMetadataItem.id,+ );++ return (+ <StyledListContainer>+ <RecordListContextProvider+ value={{+ viewBarInstanceId,+ objectNameSingular,+ objectMetadataItem,+ objectPermissions,+ }}+ >+ <RecordList />+ <RecordListSSESubscribeEffect />+ </RecordListContextProvider>+ </StyledListContainer>+ );+};diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsxindex 4ca8a14e215..22937cd7667 100644--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsx+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordList.tsx@@ -8,7 +8,7 @@ import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { styled } from '@linaria/react';-import { useRef } from 'react';+import { useState } from 'react';import { themeCssVariables } from 'twenty-ui/theme-constants';const StyledContainer = styled.div`@@ -29,11 +29,14 @@ export const RecordList = () => {hasRecordGroupsComponentSelector,);- const containerRef = useRef<HTMLDivElement>(null);+ const [containerElement, setContainerElement] =+ useState<HTMLDivElement | null>(null);return (- <StyledContainer ref={containerRef}>- <RecordListResponsiveFieldCountEffect containerRef={containerRef} />+ <StyledContainer ref={setContainerElement}>+ <RecordListResponsiveFieldCountEffect+ containerElement={containerElement}+ /><ScrollWrappercomponentInstanceId={`scroll-wrapper-record-list-${recordListId}`}defaultEnableXScroll={false}diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldCountEffect.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldCountEffect.tsxindex 04794365f9c..de9db602c13 100644--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldCountEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldCountEffect.tsx@@ -1,23 +1,26 @@import { recordListDisplayedFieldCountComponentState } from '@/object-record/record-list/states/recordListDisplayedFieldCountComponentState';import { computeRecordListDisplayedFieldCount } from '@/object-record/record-list/utils/computeRecordListDisplayedFieldCount';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';-import { type RefObject, useLayoutEffect } from 'react';+import { useLayoutEffect } from 'react';import { isDefined } from 'twenty-shared/utils';type RecordListResponsiveFieldCountEffectProps = {- containerRef: RefObject<HTMLElement | null>;+ containerElement: HTMLElement | null;};+// Takes the element rather than a ref object. React attaches a host element's+// ref only after the layout effects of its children have run, so reading the+// parent's ref here on mount finds null and nothing re-runs the effect once it+// is filled — the list would keep its default field count. A callback ref+// stored in state re-renders instead, and the effect measures the real element.export const RecordListResponsiveFieldCountEffect = ({- containerRef,+ containerElement,}: RecordListResponsiveFieldCountEffectProps) => {const setRecordListDisplayedFieldCount = useSetAtomComponentState(recordListDisplayedFieldCountComponentState,);useLayoutEffect(() => {- const containerElement = containerRef.current;-if (!isDefined(containerElement)) {return;}@@ -35,7 +38,7 @@ export const RecordListResponsiveFieldCountEffect = ({resizeObserver.observe(containerElement);return () => resizeObserver.disconnect();- }, [containerRef, setRecordListDisplayedFieldCount]);+ }, [containerElement, setRecordListDisplayedFieldCount]);return null;};diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getWidgetConfigurationViewId.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getWidgetConfigurationViewId.test.tsindex b41cbb77028..c67b94c7ec5 100644--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getWidgetConfigurationViewId.test.ts+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getWidgetConfigurationViewId.test.ts@@ -41,4 +41,14 @@ describe('getWidgetConfigurationViewId', () => {expect(getWidgetConfigurationViewId(configuration)).toBeNull();});++ it('should return null when viewId is an empty string', () => {+ const configuration = {+ __typename: 'RecordTableConfiguration',+ configurationType: 'RECORD_TABLE',+ viewId: '',+ } as unknown as PageLayoutWidget['configuration'];++ expect(getWidgetConfigurationViewId(configuration)).toBeNull();+ });});diff --git a/packages/twenty-front/src/modules/page-layout/utils/getWidgetConfigurationViewId.ts b/packages/twenty-front/src/modules/page-layout/utils/getWidgetConfigurationViewId.tsindex b0bf2201de5..07618f9f2dd 100644--- a/packages/twenty-front/src/modules/page-layout/utils/getWidgetConfigurationViewId.ts+++ b/packages/twenty-front/src/modules/page-layout/utils/getWidgetConfigurationViewId.ts@@ -1,9 +1,13 @@import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';+import { isNonEmptyString } from '@sniptt/guards';+// The single answer to "does this widget have a view to render?", so callers+// cannot disagree over an empty id — which is no more a view than a missing+// one, and would otherwise be committed to as if it were.export const getWidgetConfigurationViewId = (configuration: PageLayoutWidget['configuration'],): string | null => {- if ('viewId' in configuration && typeof configuration.viewId === 'string') {+ if ('viewId' in configuration && isNonEmptyString(configuration.viewId)) {return configuration.viewId;}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsxindex 7eea3d9a6d7..f3a5c52bf29 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx@@ -19,6 +19,7 @@ import { FieldWidgetRelationCard } from '@/page-layout/widgets/field/components/import { FieldWidgetRelationField } from '@/page-layout/widgets/field/components/FieldWidgetRelationField';import { FieldWidgetRelationTable } from '@/page-layout/widgets/field/components/FieldWidgetRelationTable';import { assertFieldWidgetOrThrow } from '@/page-layout/widgets/field/utils/assertFieldWidgetOrThrow';+import { getFieldWidgetEffectiveDisplayMode } from '@/page-layout/widgets/field/utils/getFieldWidgetEffectiveDisplayMode';import { FieldWidgetTextEditor } from '@/page-layout/widgets/field/components/FieldWidgetTextEditor';import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';@@ -97,7 +98,9 @@ export const FieldWidget = ({ widget }: FieldWidgetProps) => {labelWidth: 90,});- const fieldDisplayMode = widget.configuration.fieldDisplayMode;+ const fieldDisplayMode = getFieldWidgetEffectiveDisplayMode(+ widget.configuration,+ );if (isFieldMorphRelation(fieldDefinition)) {if (fieldDisplayMode === FieldDisplayMode.CARD) {diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/utils/__tests__/getFieldWidgetEffectiveDisplayMode.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/__tests__/getFieldWidgetEffectiveDisplayMode.test.tsnew file mode 100644index 00000000000..729be3a5896--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/__tests__/getFieldWidgetEffectiveDisplayMode.test.ts@@ -0,0 +1,57 @@+import { type FieldConfiguration } from '@/page-layout/types/FieldConfiguration';+import { getFieldWidgetEffectiveDisplayMode } from '@/page-layout/widgets/field/utils/getFieldWidgetEffectiveDisplayMode';+import {+ FieldDisplayMode,+ WidgetConfigurationType,+} from '~/generated-metadata/graphql';++const buildConfiguration = (+ configuration: Partial<FieldConfiguration>,+): FieldConfiguration => ({+ __typename: 'FieldConfiguration',+ configurationType: WidgetConfigurationType.FIELD,+ fieldMetadataId: 'field-metadata-id',+ fieldDisplayMode: FieldDisplayMode.FIELD,+ ...configuration,+});++describe('getFieldWidgetEffectiveDisplayMode', () => {+ it('should keep the table display mode when the widget has a view', () => {+ expect(+ getFieldWidgetEffectiveDisplayMode(+ buildConfiguration({+ fieldDisplayMode: FieldDisplayMode.TABLE,+ viewId: 'view-id',+ }),+ ),+ ).toBe(FieldDisplayMode.TABLE);+ });++ // An embedded view is the only thing the table display mode can render, so+ // without one the widget must fall back rather than render nothing.+ it.each([undefined, ''])(+ 'should fall back to the field display mode when the view id is %p',+ (viewId) => {+ expect(+ getFieldWidgetEffectiveDisplayMode(+ buildConfiguration({+ fieldDisplayMode: FieldDisplayMode.TABLE,+ viewId,+ }),+ ),+ ).toBe(FieldDisplayMode.FIELD);+ },+ );++ it.each([+ FieldDisplayMode.FIELD,+ FieldDisplayMode.CARD,+ FieldDisplayMode.EDITOR,+ ])('should leave the %s display mode untouched', (fieldDisplayMode) => {+ expect(+ getFieldWidgetEffectiveDisplayMode(+ buildConfiguration({ fieldDisplayMode }),+ ),+ ).toBe(fieldDisplayMode);+ });+});diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/utils/getFieldWidgetEffectiveDisplayMode.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/getFieldWidgetEffectiveDisplayMode.tsnew file mode 100644index 00000000000..0e1872e3d2e--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/getFieldWidgetEffectiveDisplayMode.ts@@ -0,0 +1,16 @@+import { type FieldConfiguration } from '@/page-layout/types/FieldConfiguration';+import { getWidgetConfigurationViewId } from '@/page-layout/utils/getWidgetConfigurationViewId';+import { isDefined } from 'twenty-shared/utils';+import { FieldDisplayMode } from '~/generated-metadata/graphql';++// The table display mode renders an embedded view, so it only means anything+// once the widget has one. A widget stranded in that mode without a view — its+// view deleted, or a layout picked before one could be created — renders its+// inline relation instead of an empty card.+export const getFieldWidgetEffectiveDisplayMode = (+ configuration: FieldConfiguration,+): FieldDisplayMode =>+ configuration.fieldDisplayMode === FieldDisplayMode.TABLE &&+ !isDefined(getWidgetConfigurationViewId(configuration))+ ? FieldDisplayMode.FIELD+ : configuration.fieldDisplayMode;diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsx b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsxindex b4240734dc0..6ece3ab6b5b 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsx@@ -2,16 +2,22 @@ import { getContextStoreViewType } from '@/context-store/utils/getContextStoreViimport { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';import { RecordBoardWidget } from '@/object-record/record-board-widget/components/RecordBoardWidget';import { RecordCalendarWidget } from '@/object-record/record-calendar-widget/components/RecordCalendarWidget';+import { RecordListWidget } from '@/object-record/record-list-widget/components/RecordListWidget';import { RecordTableWidget } from '@/object-record/record-table-widget/components/RecordTableWidget';import { RecordTableWidgetProvider } from '@/object-record/record-table-widget/components/RecordTableWidgetProvider';import { type RecordTableWidgetNestedRelationCreateThrough } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';import { recordTableWidgetViewDraftByWidgetIdComponentFamilySelector } from '@/page-layout/states/selectors/recordTableWidgetViewDraftByWidgetIdComponentFamilySelector';+import {+ getRecordTableWidgetLayout,+ type RecordTableWidgetLayout,+} from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';import { constructViewFromRecordTableWidgetViewSnapshot } from '@/page-layout/widgets/record-table/utils/constructViewFromRecordTableWidgetViewSnapshot';import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';import { useViewById } from '@/views/hooks/useViewById';import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';-import { getViewLayoutFromViewType, isDefined } from 'twenty-shared/utils';+import { type ReactNode } from 'react';+import { isDefined } from 'twenty-shared/utils';import {FeatureFlagKey,ViewCalendarLayout,@@ -57,11 +63,8 @@ export const RecordTableWidgetRendererContent = ({? constructViewFromRecordTableWidgetViewSnapshot(draftSnapshot): persistedView;- const widgetViewLayout = getViewLayoutFromViewType(- widgetView?.type ?? ViewType.TABLE_WIDGET,- );+ const widgetViewLayout = getRecordTableWidgetLayout(widgetView?.type);- const isKanbanLayout = widgetViewLayout === ViewType.KANBAN;const isCalendarLayout = widgetViewLayout === ViewType.CALENDAR;const isCalendarWeekViewEnabled = useIsFeatureEnabled(@@ -84,6 +87,22 @@ export const RecordTableWidgetRendererContent = ({// widget calendars editable. Object permissions still gate the drag.const calendarIsReadOnly = !canEditCalendar;+ // Keyed rather than chained so a layout added to RECORD_TABLE_WIDGET_LAYOUTS+ // fails to compile here instead of silently rendering as a table.+ const renderWidgetForLayout = {+ [ViewType.TABLE]: () => (+ <RecordTableWidget+ isReadOnly={isReadOnly}+ isEmptyStateHidden={isEmptyStateHidden}+ />+ ),+ [ViewType.KANBAN]: () => <RecordBoardWidget isReadOnly={isReadOnly} />,+ [ViewType.LIST]: () => <RecordListWidget />,+ [ViewType.CALENDAR]: () => (+ <RecordCalendarWidget isReadOnly={calendarIsReadOnly} />+ ),+ } satisfies Record<RecordTableWidgetLayout, () => ReactNode>;+return (<RecordTableWidgetProviderobjectNameSingular={objectMetadataItem.nameSingular}@@ -94,16 +113,7 @@ export const RecordTableWidgetRendererContent = ({nestedRelationCreateThrough={nestedRelationCreateThrough}contextStoreViewType={getContextStoreViewType(widgetViewLayout)}>- {isKanbanLayout ? (- <RecordBoardWidget isReadOnly={isReadOnly} />- ) : isCalendarLayout ? (- <RecordCalendarWidget isReadOnly={calendarIsReadOnly} />- ) : (- <RecordTableWidget- isReadOnly={isReadOnly}- isEmptyStateHidden={isEmptyStateHidden}- />- )}+ {renderWidgetForLayout[widgetViewLayout]()}</RecordTableWidgetProvider>);};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/__tests__/RecordTableWidgetRendererContent.test.tsx b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/__tests__/RecordTableWidgetRendererContent.test.tsxnew file mode 100644index 00000000000..65ce507852d--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/__tests__/RecordTableWidgetRendererContent.test.tsx@@ -0,0 +1,95 @@+import { render, screen } from '@testing-library/react';++import { RecordTableWidgetRendererContent } from '@/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent';+import { ViewType } from '~/generated-metadata/graphql';++const mockUseViewById = jest.fn();++jest.mock('@/object-metadata/hooks/useObjectMetadataItemById', () => ({+ useObjectMetadataItemById: jest.fn(() => ({+ objectMetadataItem: { nameSingular: 'company' },+ })),+}));+jest.mock('@/page-layout/hooks/useIsPageLayoutInEditMode', () => ({+ useIsPageLayoutInEditMode: jest.fn(() => false),+}));+jest.mock(+ '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue',+ () => ({ useAtomComponentFamilySelectorValue: jest.fn(() => undefined) }),+);+jest.mock('@/views/hooks/useViewById', () => ({+ useViewById: () => mockUseViewById(),+}));+jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({+ useIsFeatureEnabled: jest.fn(() => false),+}));+jest.mock(+ '@/object-record/record-table-widget/components/RecordTableWidgetProvider',+ () => ({+ RecordTableWidgetProvider: ({ children }: { children: React.ReactNode }) =>+ children,+ }),+);+jest.mock(+ '@/object-record/record-table-widget/components/RecordTableWidget',+ () => ({ RecordTableWidget: () => <div>record table widget</div> }),+);+jest.mock(+ '@/object-record/record-board-widget/components/RecordBoardWidget',+ () => ({ RecordBoardWidget: () => <div>record board widget</div> }),+);+jest.mock(+ '@/object-record/record-list-widget/components/RecordListWidget',+ () => ({+ RecordListWidget: () => <div>record list widget</div>,+ }),+);+jest.mock(+ '@/object-record/record-calendar-widget/components/RecordCalendarWidget',+ () => ({ RecordCalendarWidget: () => <div>record calendar widget</div> }),+);++const renderWidgetForViewType = (viewType: ViewType | undefined) => {+ mockUseViewById.mockReturnValue({+ view:+ viewType === undefined ? undefined : { id: 'view-id', type: viewType },+ });++ render(+ <RecordTableWidgetRendererContent+ objectMetadataId="object-metadata-id"+ viewId="view-id"+ widgetId="widget-id"+ />,+ );+};++describe('RecordTableWidgetRendererContent', () => {+ beforeEach(() => jest.clearAllMocks());++ // A layout that fell through to the table renderer was the bug this widget+ // type set out to fix, so every layout has to claim its own renderer.+ it.each([+ [ViewType.TABLE_WIDGET, 'record table widget'],+ [ViewType.KANBAN_WIDGET, 'record board widget'],+ [ViewType.LIST_WIDGET, 'record list widget'],+ [ViewType.CALENDAR_WIDGET, 'record calendar widget'],+ ])('should render %s with its own widget', (viewType, expectedWidget) => {+ renderWidgetForViewType(viewType);++ expect(screen.getByText(expectedWidget)).toBeVisible();+ });++ // A widget can be backed by a plain view, which keeps that view's layout.+ it('should render a non-widget list view as a list', () => {+ renderWidgetForViewType(ViewType.LIST);++ expect(screen.getByText('record list widget')).toBeVisible();+ });++ it('should render a widget with no view as a table', () => {+ renderWidgetForViewType(undefined);++ expect(screen.getByText('record table widget')).toBeVisible();+ });+});diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks.ts b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks.tsindex 969dd13f056..84866b17ce0 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks.ts@@ -1,6 +1,7 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { getSupportedRecordCalendarLayout } from '@/object-record/record-calendar/utils/getSupportedRecordCalendarLayout';import { recordTableWidgetViewDraftComponentState } from '@/page-layout/states/recordTableWidgetViewDraftComponentState';+import { type RecordTableWidgetLayoutViewType } from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';import { type RecordTableWidgetViewSnapshot } from '@/page-layout/widgets/record-table/types/RecordTableWidgetViewSnapshot';import { buildDraftViewGroupsForFieldMetadataItem } from '@/page-layout/widgets/record-table/utils/buildDraftViewGroupsForFieldMetadataItem';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';@@ -13,11 +14,6 @@ import {ViewType,} from '~/generated-metadata/graphql';-export type RecordTableWidgetLayoutViewType =- | ViewType.TABLE_WIDGET- | ViewType.KANBAN_WIDGET- | ViewType.CALENDAR_WIDGET;-type UseRecordTableWidgetLayoutCallbacksParams = {pageLayoutId: string;widgetId: string;diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutPickerOptions.ts b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutPickerOptions.tsnew file mode 100644index 00000000000..7024c119dd3--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutPickerOptions.ts@@ -0,0 +1,39 @@+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { isFieldMetadataItemAvailableAsCalendarField } from '@/object-record/record-calendar/utils/isFieldMetadataItemAvailableAsCalendarField';+import { getRecordTableWidgetLayoutPickerOptions } from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';+import { isFieldMetadataItemAvailableAsWidgetGroupByField } from '@/page-layout/widgets/record-table/utils/isFieldMetadataItemAvailableAsWidgetGroupByField';+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';+import { isDefined } from 'twenty-shared/utils';+import { FeatureFlagKey } from '~/generated-metadata/graphql';++// Which layouts a record table widget over this object can offer, plus the+// fields a layout switch needs to seed. Both layout pickers ask this so they+// cannot disagree about what is on offer.+export const useRecordTableWidgetLayoutPickerOptions = (+ objectMetadataItem: EnrichedObjectMetadataItem | undefined,+) => {+ const isListViewEnabled = useIsFeatureEnabled(+ FeatureFlagKey.IS_LIST_VIEW_ENABLED,+ );++ const readableFields = objectMetadataItem?.readableFields ?? [];++ const defaultGroupByFieldMetadataItem =+ readableFields.find(isFieldMetadataItemAvailableAsWidgetGroupByField) ??+ null;++ const defaultCalendarFieldMetadataItem =+ readableFields.find(isFieldMetadataItemAvailableAsCalendarField) ?? null;++ const layoutOptions = getRecordTableWidgetLayoutPickerOptions({+ isKanbanAvailable: isDefined(defaultGroupByFieldMetadataItem),+ isCalendarAvailable: isDefined(defaultCalendarFieldMetadataItem),+ isListViewEnabled,+ });++ return {+ layoutOptions,+ defaultGroupByFieldMetadataItem,+ defaultCalendarFieldMetadataItem,+ };+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType.ts b/packages/twenty-front/src/modules/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType.tsnew file mode 100644index 00000000000..1fc93e9526b--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType.ts@@ -0,0 +1,62 @@+import { type MessageDescriptor } from '@lingui/core';+import { msg } from '@lingui/core/macro';+import { getViewLayoutFromViewType, isDefined } from 'twenty-shared/utils';+import {+ IconCalendar,+ type IconComponent,+ IconLayoutKanban,+ IconList,+ IconTable,+} from 'twenty-ui/icon';+import { ViewType } from '~/generated-metadata/graphql';++// Declaration order is the order layouts are offered in the pickers.+export const RECORD_TABLE_WIDGET_LAYOUT_VIEW_TYPES = [+ ViewType.TABLE_WIDGET,+ ViewType.KANBAN_WIDGET,+ ViewType.LIST_WIDGET,+ ViewType.CALENDAR_WIDGET,+] as const;++export type RecordTableWidgetLayoutViewType =+ (typeof RECORD_TABLE_WIDGET_LAYOUT_VIEW_TYPES)[number];++export const RECORD_TABLE_WIDGET_LAYOUT_OPTIONS = {+ [ViewType.TABLE_WIDGET]: { Icon: IconTable, label: msg`Table` },+ [ViewType.KANBAN_WIDGET]: { Icon: IconLayoutKanban, label: msg`Kanban` },+ [ViewType.LIST_WIDGET]: { Icon: IconList, label: msg`List` },+ [ViewType.CALENDAR_WIDGET]: { Icon: IconCalendar, label: msg`Calendar` },+} satisfies Record<+ RecordTableWidgetLayoutViewType,+ { Icon: IconComponent; label: MessageDescriptor }+>;++// A widget view backed by a record table renders as a table unless its type+// names another layout, so anything else — including a missing view — reads as+// TABLE_WIDGET.+export const getRecordTableWidgetLayoutViewType = (+ viewType: ViewType | null | undefined,+): RecordTableWidgetLayoutViewType =>+ RECORD_TABLE_WIDGET_LAYOUT_VIEW_TYPES.find(+ (layoutViewType) => layoutViewType === viewType,+ ) ?? ViewType.TABLE_WIDGET;++// The layouts a record table widget can render, as opposed to the widget view+// types above: a widget backed by a plain LIST view still renders as a list.+export const RECORD_TABLE_WIDGET_LAYOUTS = [+ ViewType.TABLE,+ ViewType.KANBAN,+ ViewType.LIST,+ ViewType.CALENDAR,+] as const;++export type RecordTableWidgetLayout =+ (typeof RECORD_TABLE_WIDGET_LAYOUTS)[number];++export const getRecordTableWidgetLayout = (+ viewType: ViewType | null | undefined,+): RecordTableWidgetLayout =>+ RECORD_TABLE_WIDGET_LAYOUTS.find(+ (layout) =>+ isDefined(viewType) && layout === getViewLayoutFromViewType(viewType),+ ) ?? ViewType.TABLE;diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/types/__tests__/RecordTableWidgetLayoutViewType.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/record-table/types/__tests__/RecordTableWidgetLayoutViewType.test.tsnew file mode 100644index 00000000000..28d6ff42f21--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/types/__tests__/RecordTableWidgetLayoutViewType.test.ts@@ -0,0 +1,56 @@+import {+ getRecordTableWidgetLayout,+ getRecordTableWidgetLayoutViewType,+} from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';+import { ViewType } from '~/generated-metadata/graphql';++describe('getRecordTableWidgetLayoutViewType', () => {+ it.each([+ ViewType.TABLE_WIDGET,+ ViewType.KANBAN_WIDGET,+ ViewType.LIST_WIDGET,+ ViewType.CALENDAR_WIDGET,+ ])('should keep %s as its own layout', (viewType) => {+ expect(getRecordTableWidgetLayoutViewType(viewType)).toBe(viewType);+ });++ it.each([+ ViewType.TABLE,+ ViewType.KANBAN,+ ViewType.LIST,+ ViewType.CALENDAR,+ ViewType.FIELDS_WIDGET,+ undefined,+ null,+ ])('should fall back to the table layout for %s', (viewType) => {+ expect(getRecordTableWidgetLayoutViewType(viewType)).toBe(+ ViewType.TABLE_WIDGET,+ );+ });+});++describe('getRecordTableWidgetLayout', () => {+ it.each([+ [ViewType.TABLE_WIDGET, ViewType.TABLE],+ [ViewType.KANBAN_WIDGET, ViewType.KANBAN],+ [ViewType.LIST_WIDGET, ViewType.LIST],+ [ViewType.CALENDAR_WIDGET, ViewType.CALENDAR],+ ])('should reduce %s to the %s layout', (viewType, expectedLayout) => {+ expect(getRecordTableWidgetLayout(viewType)).toBe(expectedLayout);+ });++ // A widget backed by a plain view keeps that view's layout.+ it.each([+ [ViewType.LIST, ViewType.LIST],+ [ViewType.KANBAN, ViewType.KANBAN],+ ])('should keep the %s layout of a non-widget view', (viewType, expected) => {+ expect(getRecordTableWidgetLayout(viewType)).toBe(expected);+ });++ it.each([ViewType.FIELDS_WIDGET, undefined, null])(+ 'should fall back to the table layout for %s',+ (viewType) => {+ expect(getRecordTableWidgetLayout(viewType)).toBe(ViewType.TABLE);+ },+ );+});diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/utils/__tests__/getRecordTableWidgetLayoutPickerOptions.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/record-table/utils/__tests__/getRecordTableWidgetLayoutPickerOptions.test.tsnew file mode 100644index 00000000000..84c4cdd9c8a--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/utils/__tests__/getRecordTableWidgetLayoutPickerOptions.test.ts@@ -0,0 +1,86 @@+import {+ getRecordTableWidgetLayoutPickerOptions,+ isSelectableLayout,+} from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';+import { isDefined } from 'twenty-shared/utils';+import { ViewType } from '~/generated-metadata/graphql';++const ALL_AVAILABLE = {+ isKanbanAvailable: true,+ isCalendarAvailable: true,+ isListViewEnabled: true,+};++describe('getRecordTableWidgetLayoutPickerOptions', () => {+ it('should offer every layout in picker order', () => {+ expect(+ getRecordTableWidgetLayoutPickerOptions(ALL_AVAILABLE).map(+ (option) => option.viewType,+ ),+ ).toEqual([+ ViewType.TABLE_WIDGET,+ ViewType.KANBAN_WIDGET,+ ViewType.LIST_WIDGET,+ ViewType.CALENDAR_WIDGET,+ ]);+ });++ it('should hide the list layout while the feature flag is off', () => {+ expect(+ getRecordTableWidgetLayoutPickerOptions({+ ...ALL_AVAILABLE,+ isListViewEnabled: false,+ }).map((option) => option.viewType),+ ).not.toContain(ViewType.LIST_WIDGET);+ });++ it('should enable every offered layout when the object supports them all', () => {+ expect(+ getRecordTableWidgetLayoutPickerOptions(ALL_AVAILABLE).every(+ (option) => !option.isDisabled && !isDefined(option.unavailableReason),+ ),+ ).toBe(true);+ });++ it.each([+ [ViewType.KANBAN_WIDGET, { isKanbanAvailable: false }],+ [ViewType.CALENDAR_WIDGET, { isCalendarAvailable: false }],+ ])(+ 'should keep %s visible but disabled with a reason when the object cannot back it',+ (viewType, unavailable) => {+ const option = getRecordTableWidgetLayoutPickerOptions({+ ...ALL_AVAILABLE,+ ...unavailable,+ }).find((optionToFind) => optionToFind.viewType === viewType);++ expect(option?.isDisabled).toBe(true);+ expect(isDefined(option?.unavailableReason)).toBe(true);+ },+ );++ it('should refuse a layout the picker disabled or never offered', () => {+ const options = getRecordTableWidgetLayoutPickerOptions({+ isKanbanAvailable: false,+ isCalendarAvailable: true,+ isListViewEnabled: false,+ });++ expect(isSelectableLayout(options, ViewType.TABLE_WIDGET)).toBe(true);+ expect(isSelectableLayout(options, ViewType.CALENDAR_WIDGET)).toBe(true);+ expect(isSelectableLayout(options, ViewType.KANBAN_WIDGET)).toBe(false);+ expect(isSelectableLayout(options, ViewType.LIST_WIDGET)).toBe(false);+ });++ it('should never disable the table or list layouts', () => {+ const options = getRecordTableWidgetLayoutPickerOptions({+ isKanbanAvailable: false,+ isCalendarAvailable: false,+ isListViewEnabled: true,+ });+ const isDisabled = (viewType: ViewType) =>+ options.find((option) => option.viewType === viewType)?.isDisabled;++ expect(isDisabled(ViewType.TABLE_WIDGET)).toBe(false);+ expect(isDisabled(ViewType.LIST_WIDGET)).toBe(false);+ });+});diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions.ts b/packages/twenty-front/src/modules/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions.tsnew file mode 100644index 00000000000..ae91a07e41b--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions.ts@@ -0,0 +1,71 @@+import {+ RECORD_TABLE_WIDGET_LAYOUT_OPTIONS,+ RECORD_TABLE_WIDGET_LAYOUT_VIEW_TYPES,+ type RecordTableWidgetLayoutViewType,+} from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';+import { type MessageDescriptor } from '@lingui/core';+import { msg } from '@lingui/core/macro';+import { isDefined } from 'twenty-shared/utils';+import { type IconComponent } from 'twenty-ui/icon';+import { ViewType } from '~/generated-metadata/graphql';++export type RecordTableWidgetLayoutPickerOption = {+ viewType: RecordTableWidgetLayoutViewType;+ Icon: IconComponent;+ label: MessageDescriptor;+ isDisabled: boolean;+ unavailableReason?: MessageDescriptor;+};++type GetRecordTableWidgetLayoutPickerOptionsParams = {+ isKanbanAvailable: boolean;+ isCalendarAvailable: boolean;+ isListViewEnabled: boolean;+};++// Kanban and calendar stay visible but disabled when the object has no field+// to drive them, so the layout exists in the picker with the reason why it+// can't be picked; list is hidden outright until the feature flag is on.+export const getRecordTableWidgetLayoutPickerOptions = ({+ isKanbanAvailable,+ isCalendarAvailable,+ isListViewEnabled,+}: GetRecordTableWidgetLayoutPickerOptionsParams): RecordTableWidgetLayoutPickerOption[] => {+ const unavailableReasonByViewType: Partial<+ Record<RecordTableWidgetLayoutViewType, MessageDescriptor>+ > = {+ ...(isKanbanAvailable+ ? {}+ : { [ViewType.KANBAN_WIDGET]: msg`Needs a Select field` }),+ ...(isCalendarAvailable+ ? {}+ : { [ViewType.CALENDAR_WIDGET]: msg`Needs a Date field` }),+ };++ return RECORD_TABLE_WIDGET_LAYOUT_VIEW_TYPES.filter(+ (viewType) => viewType !== ViewType.LIST_WIDGET || isListViewEnabled,+ ).map((viewType) => {+ const unavailableReason = unavailableReasonByViewType[viewType];++ return {+ viewType,+ ...RECORD_TABLE_WIDGET_LAYOUT_OPTIONS[viewType],+ isDisabled: isDefined(unavailableReason),+ unavailableReason,+ };+ });+};++export const getSelectableLayoutViewTypes = (+ layoutOptions: RecordTableWidgetLayoutPickerOption[],+): RecordTableWidgetLayoutViewType[] =>+ layoutOptions+ .filter((layoutOption) => !layoutOption.isDisabled)+ .map((layoutOption) => layoutOption.viewType);++// A layout that is hidden or disabled must not be applied even if its row is+// reached by keyboard, so selection asks the same options the picker renders.+export const isSelectableLayout = (+ layoutOptions: RecordTableWidgetLayoutPickerOption[],+ viewType: RecordTableWidgetLayoutViewType,+): boolean => getSelectableLayoutViewTypes(layoutOptions).includes(viewType);diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenRecordsInSidePanel.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenRecordsInSidePanel.test.tsxindex 4a1fb78540a..f21d2e35990 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenRecordsInSidePanel.test.tsx+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenRecordsInSidePanel.test.tsx@@ -31,6 +31,7 @@ const companyObjectMetadataItem = getMockObjectMetadataItemOrThrow('company');const INDEX_VIEW_ID = '11111111-1111-4111-8111-111111111111';const KANBAN_VIEW_ID = '22222222-2222-4222-8222-222222222222';const WIDGET_VIEW_ID = '33333333-3333-4333-8333-333333333333';+const LIST_VIEW_ID = '44444444-4444-4444-8444-444444444444';const buildCompanyView = (view: Partial<ViewWithRelations>) =>({@@ -58,13 +59,23 @@ const kanbanView = buildCompanyView({position: 2,});-const widgetView = buildCompanyView({- id: WIDGET_VIEW_ID,- name: 'Dashboard widget view',- type: ViewType.KANBAN_WIDGET,- position: 0,+const listView = buildCompanyView({+ id: LIST_VIEW_ID,+ name: 'Companies list',+ type: ViewType.LIST,+ position: 3,});+const buildWidgetView = (type: ViewType) =>+ buildCompanyView({+ id: WIDGET_VIEW_ID,+ name: 'Dashboard widget view',+ type,+ position: 0,+ });++const widgetView = buildWidgetView(ViewType.KANBAN_WIDGET);+const renderOpenRecordsInSidePanel = (views: ViewWithRelations[]) => {let store: ReturnType<typeof createStore> | undefined;@@ -188,16 +199,41 @@ describe('useOpenRecordsInSidePanel', () => {).toBe(INDEX_VIEW_ID);});- it('should fall back to the index view when the view id points at a widget-backing view', () => {+ it.each([ViewType.KANBAN_WIDGET, ViewType.LIST_WIDGET])(+ 'should fall back to the index view when the view id points at a %s view',+ (widgetViewType) => {+ const { result, store } = renderOpenRecordsInSidePanel([+ buildWidgetView(widgetViewType),+ indexView,+ ]);++ act(() => {+ result.current.openRecordsInSidePanel({+ objectNameSingular: companyObjectMetadataItem.nameSingular,+ viewId: WIDGET_VIEW_ID,+ });+ });++ expect(+ store.get(+ viewableRecordsViewIdComponentState.atomFamily({+ instanceId: getNavigatedPageId(),+ }),+ ),+ ).toBe(INDEX_VIEW_ID);+ },+ );++ it('should open a list view without falling back to the index view', () => {const { result, store } = renderOpenRecordsInSidePanel([- widgetView,+ listView,indexView,]);act(() => {result.current.openRecordsInSidePanel({objectNameSingular: companyObjectMetadataItem.nameSingular,- viewId: WIDGET_VIEW_ID,+ viewId: LIST_VIEW_ID,});});@@ -207,7 +243,7 @@ describe('useOpenRecordsInSidePanel', () => {instanceId: getNavigatedPageId(),}),),- ).toBe(INDEX_VIEW_ID);+ ).toBe(LIST_VIEW_ID);});it('should throw when the object has no user-facing view', () => {diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsxindex 2abd2d9be78..beecce8456a 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx@@ -6,6 +6,10 @@ import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadatimport { useRecordTableWidgetFieldCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetFieldCallbacks';import { useRecordTableWidgetLayoutCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks';import { useRecordTableWidgetViewForDisplay } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewForDisplay';+import {+ getRecordTableWidgetLayoutViewType,+ RECORD_TABLE_WIDGET_LAYOUT_OPTIONS,+} from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';@@ -26,7 +30,7 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContentimport { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { styled } from '@linaria/react';-import { t } from '@lingui/core/macro';+import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import {IconArrowBarToDownDashed,@@ -36,10 +40,8 @@ import {IconCalendarEvent,IconEyeOff,IconFilter,- IconLayoutKanban,IconLayoutList,IconListDetails,- IconTable,} from 'twenty-ui/icon';import {FeatureFlagKey,@@ -62,6 +64,8 @@ const StyledSettingsContainer = styled.div``;export const SidePanelDashboardRecordTableSettings = () => {+ const { t } = useLingui();+const { pageLayoutId } = usePageLayoutIdFromContextStore();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();@@ -131,13 +135,14 @@ export const SidePanelDashboardRecordTableSettings = () => {widgetView?.mainGroupByFieldMetadataId ?? null;const shouldHideEmptyGroups = widgetView?.shouldHideEmptyGroups ?? false;- const isKanbanLayout = widgetView?.type === ViewType.KANBAN_WIDGET;- const isCalendarLayout = widgetView?.type === ViewType.CALENDAR_WIDGET;- const currentLayoutViewType = isKanbanLayout- ? ViewType.KANBAN_WIDGET- : isCalendarLayout- ? ViewType.CALENDAR_WIDGET- : ViewType.TABLE_WIDGET;+ const currentLayoutViewType = getRecordTableWidgetLayoutViewType(+ widgetView?.type,+ );+ const isKanbanLayout = currentLayoutViewType === ViewType.KANBAN_WIDGET;+ const isCalendarLayout = currentLayoutViewType === ViewType.CALENDAR_WIDGET;++ const { Icon: CurrentLayoutIcon, label: currentLayoutLabel } =+ RECORD_TABLE_WIDGET_LAYOUT_OPTIONS[currentLayoutViewType];const calendarFieldMetadataId = widgetView?.calendarFieldMetadataId ?? null;@@ -239,13 +244,7 @@ export const SidePanelDashboardRecordTableSettings = () => {</SelectableListItem><SelectableListItem itemId="object-view-layout"><CommandMenuItemDropdown- Icon={- isKanbanLayout- ? IconLayoutKanban- : isCalendarLayout- ? IconCalendar- : IconTable- }+ Icon={CurrentLayoutIcon}label={t`Layout`}id="object-view-layout"dropdownId="object-view-layout"@@ -265,13 +264,7 @@ export const SidePanelDashboardRecordTableSettings = () => {}dropdownPlacement="bottom-end"hasSubMenu={hasViewId}- description={- isKanbanLayout- ? t`Kanban`- : isCalendarLayout- ? t`Calendar`- : t`Table`- }+ description={t(currentLayoutLabel)}disabled={!hasViewId}contextualTextPosition="right"/>diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsxindex 49459a80792..d42cc791b68 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx@@ -1,17 +1,24 @@import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { isFieldMetadataItemAvailableAsCalendarField } from '@/object-record/record-calendar/utils/isFieldMetadataItemAvailableAsCalendarField';import { type FieldConfiguration } from '@/page-layout/types/FieldConfiguration';+import { getWidgetConfigurationViewId } from '@/page-layout/utils/getWidgetConfigurationViewId';import { getFieldWidgetAvailableDisplayModes } from '@/page-layout/widgets/field/utils/getFieldWidgetDisplayModeConfig';+import { getFieldWidgetEffectiveDisplayMode } from '@/page-layout/widgets/field/utils/getFieldWidgetEffectiveDisplayMode';import { getFieldWidgetRelationTraversal } from '@/page-layout/widgets/field/utils/getFieldWidgetRelationTraversal';import { resolveFieldWidgetNestedRelation } from '@/page-layout/widgets/field/utils/resolveFieldWidgetNestedRelation';import { useAddDraftViewForFieldRelationTableWidget } from '@/page-layout/widgets/record-table/hooks/useAddDraftViewForFieldRelationTableWidget';+import { useRecordTableWidgetLayoutCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks';+import { useRecordTableWidgetLayoutPickerOptions } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutPickerOptions';+import { useRecordTableWidgetViewForDisplay } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewForDisplay';import {+ getRecordTableWidgetLayoutViewType,type RecordTableWidgetLayoutViewType,- useRecordTableWidgetLayoutCallbacks,-} from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks';-import { useRecordTableWidgetViewForDisplay } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewForDisplay';-import { isFieldMetadataItemAvailableAsWidgetGroupByField } from '@/page-layout/widgets/record-table/utils/isFieldMetadataItemAvailableAsWidgetGroupByField';+} from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';+import {+ getSelectableLayoutViewTypes,+ isSelectableLayout,+} from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';+import { RecordTableWidgetLayoutMenuItems } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems';import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';@@ -27,15 +34,13 @@ import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import {type IconComponent,- IconCalendar,IconFileText,IconId,- IconLayoutKanban,IconListDetails,IconTable,} from 'twenty-ui/icon';import { MenuItemSelect } from 'twenty-ui/navigation';-import { FieldDisplayMode, ViewType } from '~/generated-metadata/graphql';+import { FieldDisplayMode } from '~/generated-metadata/graphql';const DISPLAY_MODE_ICONS: Record<FieldDisplayMode, IconComponent> = {[FieldDisplayMode.FIELD]: IconListDetails,@@ -45,10 +50,9 @@ const DISPLAY_MODE_ICONS: Record<FieldDisplayMode, IconComponent> = {[FieldDisplayMode.TABLE]: IconTable,};-// One flat picker: inline display modes (Field / Card / Editor) followed by the-// embedded-view layouts (Table / Kanban / Calendar). Picking a layout selects-// the TABLE display mode under the hood — users choose "Kanban" directly-// instead of "Table" first and a layout second.+// One flat picker: inline display modes followed by the embedded-view layouts.+// Picking a layout selects the TABLE display mode under the hood — users choose+// "Kanban" directly instead of "Table" first and a layout second.export const FieldWidgetLayoutDropdownContent = () => {const { t } = useLingui();@@ -60,11 +64,15 @@ export const FieldWidgetLayoutDropdownContent = () => {| FieldConfiguration| undefined;- const currentDisplayMode = fieldConfiguration?.fieldDisplayMode;+ const currentDisplayMode = isDefined(fieldConfiguration)+ ? getFieldWidgetEffectiveDisplayMode(fieldConfiguration)+ : undefined;const currentFieldMetadataId = fieldConfiguration?.fieldMetadataId;const currentNestedRelationFieldMetadataId =fieldConfiguration?.nestedRelationFieldMetadataId;- const currentViewId = fieldConfiguration?.viewId ?? null;+ const currentViewId = isDefined(fieldConfiguration)+ ? getWidgetConfigurationViewId(fieldConfiguration)+ : null;const { fieldMetadataItem } = useFieldMetadataItemById(currentFieldMetadataId ?? '',@@ -100,9 +108,6 @@ export const FieldWidgetLayoutDropdownContent = () => {: availableDisplayModes.filter((displayMode) => displayMode !== FieldDisplayMode.TABLE,);- const hasEmbeddedViewLayouts = availableDisplayModes.includes(- FieldDisplayMode.TABLE,- );// A configured but unresolvable second hop yields no traversal at all, so a// stale nested widget cannot fall back to scoping by its first hop.@@ -120,6 +125,14 @@ export const FieldWidgetLayoutDropdownContent = () => {const relationTargetFieldMetadataId =relationTraversal?.relationTargetFieldMetadataId ?? null;+ // Every embedded layout renders a view scoped by the relation's inverse+ // field, so a relation the traversal cannot resolve offers none of them+ // rather than entries that would leave the widget with nothing to render.+ const hasEmbeddedViewLayouts =+ availableDisplayModes.includes(FieldDisplayMode.TABLE) &&+ isDefined(targetObjectMetadataId) &&+ isDefined(inverseFieldMetadataId);+const targetObjectMetadataItem = isNestedRelationWidget? resolvedNestedRelation?.nestedRelationTargetObjectMetadataItem: objectMetadataItems.find(@@ -127,18 +140,11 @@ export const FieldWidgetLayoutDropdownContent = () => {objectMetadataItemToFind.id === targetObjectMetadataId,);- const defaultGroupByFieldMetadataItem =- (targetObjectMetadataItem?.readableFields ?? []).find(- isFieldMetadataItemAvailableAsWidgetGroupByField,- ) ?? null;-- const defaultCalendarFieldMetadataItem =- (targetObjectMetadataItem?.readableFields ?? []).find(- isFieldMetadataItemAvailableAsCalendarField,- ) ?? null;-- const isKanbanAvailable = isDefined(defaultGroupByFieldMetadataItem);- const isCalendarAvailable = isDefined(defaultCalendarFieldMetadataItem);+ const {+ layoutOptions,+ defaultGroupByFieldMetadataItem,+ defaultCalendarFieldMetadataItem,+ } = useRecordTableWidgetLayoutPickerOptions(targetObjectMetadataItem);const { view: embeddedWidgetView } = useRecordTableWidgetViewForDisplay({viewId: currentViewId ?? '',@@ -148,12 +154,9 @@ export const FieldWidgetLayoutDropdownContent = () => {const isTableDisplayMode = currentDisplayMode === FieldDisplayMode.TABLE;- const currentEmbeddedViewType: RecordTableWidgetLayoutViewType =- embeddedWidgetView?.type === ViewType.KANBAN_WIDGET- ? ViewType.KANBAN_WIDGET- : embeddedWidgetView?.type === ViewType.CALENDAR_WIDGET- ? ViewType.CALENDAR_WIDGET- : ViewType.TABLE_WIDGET;+ const currentEmbeddedViewType = getRecordTableWidgetLayoutViewType(+ embeddedWidgetView?.type,+ );const dropdownId = useAvailableComponentInstanceIdOrThrow(DropdownComponentInstanceContext,@@ -192,38 +195,35 @@ export const FieldWidgetLayoutDropdownContent = () => {if (!isDefined(widgetInEditMode)) {return;}- if (targetViewType === ViewType.KANBAN_WIDGET && !isKanbanAvailable) {+ if (!isSelectableLayout(layoutOptions, targetViewType)) {return;}- if (targetViewType === ViewType.CALENDAR_WIDGET && !isCalendarAvailable) {++ const viewId =+ currentViewId ??+ (isDefined(targetObjectMetadataId) && isDefined(inverseFieldMetadataId)+ ? addDraftViewForFieldRelationTableWidget({+ widgetId: widgetInEditMode.id,+ targetObjectMetadataId,+ inverseFieldMetadataId,+ relationTargetFieldMetadataId,+ })+ : undefined);++ // Creating the draft view still fails if the target object is not loaded,+ // and switching to the table display mode without one would leave the+ // widget with nothing to render, so it keeps the display mode it has.+ if (!isDefined(viewId)) {+ closeDropdown();return;}- if (- !isDefined(currentViewId) &&- isDefined(targetObjectMetadataId) &&- isDefined(inverseFieldMetadataId)- ) {- const viewId = addDraftViewForFieldRelationTableWidget({- widgetId: widgetInEditMode.id,- targetObjectMetadataId,- inverseFieldMetadataId,- relationTargetFieldMetadataId,- });-- updateCurrentWidgetConfig({- configToUpdate: {- fieldDisplayMode: FieldDisplayMode.TABLE,- viewId,- },- });- } else {- updateCurrentWidgetConfig({- configToUpdate: {- fieldDisplayMode: FieldDisplayMode.TABLE,- },- });- }+ updateCurrentWidgetConfig({+ configToUpdate: {+ fieldDisplayMode: FieldDisplayMode.TABLE,+ viewId,+ },+ });handleLayoutChange({targetViewType,@@ -247,11 +247,7 @@ export const FieldWidgetLayoutDropdownContent = () => {selectableItemIdArray={[...inlineDisplayModes,...(hasEmbeddedViewLayouts- ? [- ViewType.TABLE_WIDGET,- ...(isKanbanAvailable ? [ViewType.KANBAN_WIDGET] : []),- ...(isCalendarAvailable ? [ViewType.CALENDAR_WIDGET] : []),- ]+ ? getSelectableLayoutViewTypes(layoutOptions): []),]}>@@ -275,63 +271,14 @@ export const FieldWidgetLayoutDropdownContent = () => {</SelectableListItem>))}{hasEmbeddedViewLayouts && (- <>- <SelectableListItem- itemId={ViewType.TABLE_WIDGET}- onEnter={() => handleSelectViewLayout(ViewType.TABLE_WIDGET)}- >- <MenuItemSelect- text={t`Table`}- LeftIcon={IconTable}- selected={- isTableDisplayMode &&- currentEmbeddedViewType === ViewType.TABLE_WIDGET- }- focused={selectedItemId === ViewType.TABLE_WIDGET}- onClick={() => handleSelectViewLayout(ViewType.TABLE_WIDGET)}- />- </SelectableListItem>- <SelectableListItem- itemId={ViewType.KANBAN_WIDGET}- onEnter={() => handleSelectViewLayout(ViewType.KANBAN_WIDGET)}- >- <MenuItemSelect- text={t`Kanban`}- LeftIcon={IconLayoutKanban}- disabled={!isKanbanAvailable}- contextualText={- !isKanbanAvailable ? t`Needs a Select field` : undefined- }- contextualTextPosition="right"- selected={- isTableDisplayMode &&- currentEmbeddedViewType === ViewType.KANBAN_WIDGET- }- focused={selectedItemId === ViewType.KANBAN_WIDGET}- onClick={() => handleSelectViewLayout(ViewType.KANBAN_WIDGET)}- />- </SelectableListItem>- <SelectableListItem- itemId={ViewType.CALENDAR_WIDGET}- onEnter={() => handleSelectViewLayout(ViewType.CALENDAR_WIDGET)}- >- <MenuItemSelect- text={t`Calendar`}- LeftIcon={IconCalendar}- disabled={!isCalendarAvailable}- contextualText={- !isCalendarAvailable ? t`Needs a Date field` : undefined- }- contextualTextPosition="right"- selected={- isTableDisplayMode &&- currentEmbeddedViewType === ViewType.CALENDAR_WIDGET- }- focused={selectedItemId === ViewType.CALENDAR_WIDGET}- onClick={() => handleSelectViewLayout(ViewType.CALENDAR_WIDGET)}- />- </SelectableListItem>- </>+ <RecordTableWidgetLayoutMenuItems+ layoutOptions={layoutOptions}+ selectedViewType={+ isTableDisplayMode ? currentEmbeddedViewType : undefined+ }+ focusedItemId={selectedItemId}+ onSelect={handleSelectViewLayout}+ />)}</SelectableList></DropdownMenuItemsContainer>diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsxindex 3afad1366c8..9f2d2dfdbeb 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx@@ -4,9 +4,14 @@ import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadaimport { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { type FieldConfiguration } from '@/page-layout/types/FieldConfiguration';import { getWidgetConfigurationViewId } from '@/page-layout/utils/getWidgetConfigurationViewId';+import { getFieldWidgetEffectiveDisplayMode } from '@/page-layout/widgets/field/utils/getFieldWidgetEffectiveDisplayMode';import { resolveFieldWidgetNestedRelation } from '@/page-layout/widgets/field/utils/resolveFieldWidgetNestedRelation';import { useRecordTableWidgetViewFieldItems } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewFieldItems';import { useRecordTableWidgetViewForDisplay } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewForDisplay';+import {+ getRecordTableWidgetLayoutViewType,+ RECORD_TABLE_WIDGET_LAYOUT_OPTIONS,+} from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';@@ -28,12 +33,9 @@ import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import {- IconCalendar,- IconLayoutKanban,IconLayoutSidebarRight,IconList,IconListDetails,- IconTable,} from 'twenty-ui/icon';import {FeatureFlagKey,@@ -72,7 +74,9 @@ export const SidePanelRecordPageFieldSettings = () => {const currentFieldMetadataId = fieldConfiguration?.fieldMetadataId;const currentNestedRelationFieldMetadataId =fieldConfiguration?.nestedRelationFieldMetadataId;- const currentDisplayMode = fieldConfiguration?.fieldDisplayMode;+ const currentDisplayMode = isDefined(fieldConfiguration)+ ? getFieldWidgetEffectiveDisplayMode(fieldConfiguration)+ : undefined;const currentViewId = isDefined(widgetInEditMode)? getWidgetConfigurationViewId(widgetInEditMode.configuration): null;@@ -127,10 +131,11 @@ export const SidePanelRecordPageFieldSettings = () => {isDefined(targetObjectMetadataId) &&isDefined(currentViewId);- const isEmbeddedViewKanbanLayout =- embeddedWidgetView?.type === ViewType.KANBAN_WIDGET;+ const embeddedViewLayoutViewType = getRecordTableWidgetLayoutViewType(+ embeddedWidgetView?.type,+ );const isEmbeddedViewCalendarLayout =- embeddedWidgetView?.type === ViewType.CALENDAR_WIDGET;+ embeddedViewLayoutViewType === ViewType.CALENDAR_WIDGET;const embeddedViewHasGroupBy = isDefined(embeddedWidgetView?.mainGroupByFieldMetadataId,);@@ -157,22 +162,17 @@ export const SidePanelRecordPageFieldSettings = () => {[FieldDisplayMode.TABLE]: t`Table`,};+ const embeddedViewLayoutOption =+ RECORD_TABLE_WIDGET_LAYOUT_OPTIONS[embeddedViewLayoutViewType];+const layoutLabel = isTableDisplayMode- ? isEmbeddedViewKanbanLayout- ? t`Kanban`- : isEmbeddedViewCalendarLayout- ? t`Calendar`- : t`Table`+ ? t(embeddedViewLayoutOption.label): isDefined(currentDisplayMode)? (displayModeLabels[currentDisplayMode] ?? ''): '';const layoutRowIcon = isTableDisplayMode- ? isEmbeddedViewKanbanLayout- ? IconLayoutKanban- : isEmbeddedViewCalendarLayout- ? IconCalendar- : IconTable+ ? embeddedViewLayoutOption.Icon: IconLayoutSidebarRight;const selectableItemIds = [diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsxindex 1ca533c3e45..5b6c47a3303 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsx@@ -1,23 +1,19 @@import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { isFieldMetadataItemAvailableAsCalendarField } from '@/object-record/record-calendar/utils/isFieldMetadataItemAvailableAsCalendarField';+import { useRecordTableWidgetLayoutCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks';+import { useRecordTableWidgetLayoutPickerOptions } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutPickerOptions';+import { type RecordTableWidgetLayoutViewType } from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';import {- type RecordTableWidgetLayoutViewType,- useRecordTableWidgetLayoutCallbacks,-} from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks';-import { isFieldMetadataItemAvailableAsWidgetGroupByField } from '@/page-layout/widgets/record-table/utils/isFieldMetadataItemAvailableAsWidgetGroupByField';+ getSelectableLayoutViewTypes,+ isSelectableLayout,+} from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';+import { RecordTableWidgetLayoutMenuItems } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { t } from '@lingui/core/macro';-import { isDefined } from 'twenty-shared/utils';-import { IconCalendar, IconLayoutKanban, IconTable } from 'twenty-ui/icon';-import { MenuItemSelect } from 'twenty-ui/navigation';-import { ViewType } from '~/generated-metadata/graphql';type RecordTableLayoutDropdownContentProps = {pageLayoutId: string;@@ -54,26 +50,16 @@ export const RecordTableLayoutDropdownContent = ({widgetId,});- const defaultGroupByFieldMetadataItem =- (objectMetadataItem?.readableFields ?? []).find(- isFieldMetadataItemAvailableAsWidgetGroupByField,- ) ?? null;-- const defaultCalendarFieldMetadataItem =- (objectMetadataItem?.readableFields ?? []).find(- isFieldMetadataItemAvailableAsCalendarField,- ) ?? null;-- const isKanbanAvailable = isDefined(defaultGroupByFieldMetadataItem);- const isCalendarAvailable = isDefined(defaultCalendarFieldMetadataItem);+ const {+ layoutOptions,+ defaultGroupByFieldMetadataItem,+ defaultCalendarFieldMetadataItem,+ } = useRecordTableWidgetLayoutPickerOptions(objectMetadataItem);const handleSelectLayout = (targetViewType: RecordTableWidgetLayoutViewType,) => {- if (targetViewType === ViewType.KANBAN_WIDGET && !isKanbanAvailable) {- return;- }- if (targetViewType === ViewType.CALENDAR_WIDGET && !isCalendarAvailable) {+ if (!isSelectableLayout(layoutOptions, targetViewType)) {return;}handleLayoutChange({@@ -88,59 +74,15 @@ export const RecordTableLayoutDropdownContent = ({<DropdownMenuItemsContainer><SelectableListselectableListInstanceId={dropdownId}- selectableItemIdArray={[- ViewType.TABLE_WIDGET,- ...(isKanbanAvailable ? [ViewType.KANBAN_WIDGET] : []),- ...(isCalendarAvailable ? [ViewType.CALENDAR_WIDGET] : []),- ]}+ selectableItemIdArray={getSelectableLayoutViewTypes(layoutOptions)}focusId={dropdownId}>- <SelectableListItem- itemId={ViewType.TABLE_WIDGET}- onEnter={() => handleSelectLayout(ViewType.TABLE_WIDGET)}- >- <MenuItemSelect- text={t`Table`}- LeftIcon={IconTable}- selected={currentLayoutViewType === ViewType.TABLE_WIDGET}- focused={selectedItemId === ViewType.TABLE_WIDGET}- onClick={() => handleSelectLayout(ViewType.TABLE_WIDGET)}- />- </SelectableListItem>- <SelectableListItem- itemId={ViewType.KANBAN_WIDGET}- onEnter={() => handleSelectLayout(ViewType.KANBAN_WIDGET)}- >- <MenuItemSelect- text={t`Kanban`}- LeftIcon={IconLayoutKanban}- disabled={!isKanbanAvailable}- contextualText={- !isKanbanAvailable ? t`Needs a Select field` : undefined- }- contextualTextPosition="right"- selected={currentLayoutViewType === ViewType.KANBAN_WIDGET}- focused={selectedItemId === ViewType.KANBAN_WIDGET}- onClick={() => handleSelectLayout(ViewType.KANBAN_WIDGET)}- />- </SelectableListItem>- <SelectableListItem- itemId={ViewType.CALENDAR_WIDGET}- onEnter={() => handleSelectLayout(ViewType.CALENDAR_WIDGET)}- >- <MenuItemSelect- text={t`Calendar`}- LeftIcon={IconCalendar}- disabled={!isCalendarAvailable}- contextualText={- !isCalendarAvailable ? t`Needs a Date field` : undefined- }- contextualTextPosition="right"- selected={currentLayoutViewType === ViewType.CALENDAR_WIDGET}- focused={selectedItemId === ViewType.CALENDAR_WIDGET}- onClick={() => handleSelectLayout(ViewType.CALENDAR_WIDGET)}- />- </SelectableListItem>+ <RecordTableWidgetLayoutMenuItems+ layoutOptions={layoutOptions}+ selectedViewType={currentLayoutViewType}+ focusedItemId={selectedItemId}+ onSelect={handleSelectLayout}+ /></SelectableList></DropdownMenuItemsContainer>);diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems.tsxnew file mode 100644index 00000000000..129fe9a64a8--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems.tsx@@ -0,0 +1,51 @@+import { type RecordTableWidgetLayoutViewType } from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';+import { type RecordTableWidgetLayoutPickerOption } from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';+import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';+import { useLingui } from '@lingui/react/macro';+import { isDefined } from 'twenty-shared/utils';+import { MenuItemSelect } from 'twenty-ui/navigation';++type RecordTableWidgetLayoutMenuItemsProps = {+ layoutOptions: RecordTableWidgetLayoutPickerOption[];+ // Undefined when the host widget is not currently showing an embedded view,+ // so no layout reads as selected.+ selectedViewType: RecordTableWidgetLayoutViewType | undefined;+ focusedItemId: string | null;+ onSelect: (viewType: RecordTableWidgetLayoutViewType) => void;+};++export const RecordTableWidgetLayoutMenuItems = ({+ layoutOptions,+ selectedViewType,+ focusedItemId,+ onSelect,+}: RecordTableWidgetLayoutMenuItemsProps) => {+ const { t } = useLingui();++ return (+ <>+ {layoutOptions.map(+ ({ viewType, Icon, label, isDisabled, unavailableReason }) => (+ <SelectableListItem+ key={viewType}+ itemId={viewType}+ onEnter={() => onSelect(viewType)}+ >+ <MenuItemSelect+ text={t(label)}+ LeftIcon={Icon}+ disabled={isDisabled}+ contextualText={+ isDefined(unavailableReason) ? t(unavailableReason) : undefined+ }+ contextualTextPosition="right"+ selected={selectedViewType === viewType}+ focused={focusedItemId === viewType}+ onClick={() => onSelect(viewType)}+ />+ </SelectableListItem>+ ),+ )}+ </>+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsxindex 55854fc513f..df966243c1a 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx@@ -3,6 +3,10 @@ import { CommandMenuItemToggle } from '@/command-menu/components/CommandMenuItemimport { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { useRecordTableWidgetLayoutCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks';import { useRecordTableWidgetViewForDisplay } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewForDisplay';+import {+ getRecordTableWidgetLayoutViewType,+ RECORD_TABLE_WIDGET_LAYOUT_OPTIONS,+} from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';import { RecordTableCalendarFieldDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarFieldDropdownContent';import { RecordTableCalendarLayoutDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent';import { RecordTableGroupByDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent';@@ -10,15 +14,13 @@ import { RecordTableLayoutDropdownContent } from '@/side-panel/pages/page-layoutimport { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';-import { t } from '@lingui/core/macro';+import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import {IconCalendar,IconCalendarEvent,IconEyeOff,- IconLayoutKanban,IconLayoutList,- IconTable,} from 'twenty-ui/icon';import {FeatureFlagKey,@@ -48,6 +50,8 @@ export const WidgetViewLayoutSettingsRows = ({viewId,isLayoutRowHidden = false,}: WidgetViewLayoutSettingsRowsProps) => {+ const { t } = useLingui();+const isCalendarWeekViewEnabled = useIsFeatureEnabled(FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,);@@ -68,13 +72,14 @@ export const WidgetViewLayoutSettingsRows = ({widgetView?.mainGroupByFieldMetadataId ?? null;const shouldHideEmptyGroups = widgetView?.shouldHideEmptyGroups ?? false;- const isKanbanLayout = widgetView?.type === ViewType.KANBAN_WIDGET;- const isCalendarLayout = widgetView?.type === ViewType.CALENDAR_WIDGET;- const currentLayoutViewType = isKanbanLayout- ? ViewType.KANBAN_WIDGET- : isCalendarLayout- ? ViewType.CALENDAR_WIDGET- : ViewType.TABLE_WIDGET;+ const currentLayoutViewType = getRecordTableWidgetLayoutViewType(+ widgetView?.type,+ );+ const isKanbanLayout = currentLayoutViewType === ViewType.KANBAN_WIDGET;+ const isCalendarLayout = currentLayoutViewType === ViewType.CALENDAR_WIDGET;++ const { Icon: CurrentLayoutIcon, label: currentLayoutLabel } =+ RECORD_TABLE_WIDGET_LAYOUT_OPTIONS[currentLayoutViewType];const calendarFieldMetadataId = widgetView?.calendarFieldMetadataId ?? null;@@ -114,13 +119,7 @@ export const WidgetViewLayoutSettingsRows = ({{!isLayoutRowHidden && (<SelectableListItem itemId="object-view-layout"><CommandMenuItemDropdown- Icon={- isKanbanLayout- ? IconLayoutKanban- : isCalendarLayout- ? IconCalendar- : IconTable- }+ Icon={CurrentLayoutIcon}label={t`Layout`}id="object-view-layout"dropdownId="object-view-layout"@@ -136,13 +135,7 @@ export const WidgetViewLayoutSettingsRows = ({}dropdownPlacement="bottom-end"hasSubMenu- description={- isKanbanLayout- ? t`Kanban`- : isCalendarLayout- ? t`Calendar`- : t`Table`- }+ description={t(currentLayoutLabel)}contextualTextPosition="right"/></SelectableListItem>diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/RecordTableLayoutDropdownContent.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/RecordTableLayoutDropdownContent.test.tsxnew file mode 100644index 00000000000..6c1c16372c5--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/RecordTableLayoutDropdownContent.test.tsx@@ -0,0 +1,178 @@+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { fireEvent, render, screen } from '@testing-library/react';++import { type RecordTableWidgetLayoutViewType } from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';+import { RecordTableLayoutDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent';+import { ViewType } from '~/generated-metadata/graphql';++const OBJECT_METADATA_ID = '11111111-1111-4111-8111-111111111111';++const mockHandleLayoutChange = jest.fn();+const mockCloseDropdown = jest.fn();+const mockUseIsFeatureEnabled = jest.fn();+const mockIsAvailableAsGroupByField = jest.fn();+const mockIsAvailableAsCalendarField = jest.fn();++jest.mock('@/object-metadata/hooks/useObjectMetadataItems', () => ({+ useObjectMetadataItems: jest.fn(() => ({+ objectMetadataItems: [+ { id: OBJECT_METADATA_ID, readableFields: [{ id: 'field-id' }] },+ ],+ })),+}));+jest.mock(+ '@/object-record/record-calendar/utils/isFieldMetadataItemAvailableAsCalendarField',+ () => ({+ isFieldMetadataItemAvailableAsCalendarField: (...args: unknown[]) =>+ mockIsAvailableAsCalendarField(...args),+ }),+);+jest.mock(+ '@/page-layout/widgets/record-table/utils/isFieldMetadataItemAvailableAsWidgetGroupByField',+ () => ({+ isFieldMetadataItemAvailableAsWidgetGroupByField: (...args: unknown[]) =>+ mockIsAvailableAsGroupByField(...args),+ }),+);+jest.mock(+ '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks',+ () => ({+ useRecordTableWidgetLayoutCallbacks: jest.fn(() => ({+ handleLayoutChange: mockHandleLayoutChange,+ })),+ }),+);+jest.mock('@/ui/layout/dropdown/components/DropdownMenuItemsContainer', () => ({+ DropdownMenuItemsContainer: ({ children }: { children: React.ReactNode }) =>+ children,+}));+jest.mock('@/ui/layout/dropdown/hooks/useCloseDropdown', () => ({+ useCloseDropdown: jest.fn(() => ({ closeDropdown: mockCloseDropdown })),+}));+jest.mock('@/ui/layout/selectable-list/components/SelectableList', () => ({+ SelectableList: ({ children }: { children: React.ReactNode }) => children,+}));+jest.mock('@/ui/layout/selectable-list/components/SelectableListItem', () => ({+ SelectableListItem: ({ children }: { children: React.ReactNode }) => children,+}));+jest.mock(+ '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow',+ () => ({+ useAvailableComponentInstanceIdOrThrow: jest.fn(() => 'dropdown-id'),+ }),+);+jest.mock(+ '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue',+ () => ({+ useAtomComponentStateValue: jest.fn(() => null),+ }),+);+jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({+ useIsFeatureEnabled: (...args: unknown[]) => mockUseIsFeatureEnabled(...args),+}));+jest.mock('twenty-ui/navigation', () => ({+ MenuItemSelect: ({+ contextualText,+ disabled,+ onClick,+ selected,+ text,+ }: {+ contextualText?: React.ReactNode;+ disabled?: boolean;+ onClick?: () => void;+ selected: boolean;+ text: string;+ }) => (+ <button data-selected={selected} disabled={disabled} onClick={onClick}>+ <span>{text}</span>+ {contextualText}+ </button>+ ),+}));++const renderDropdown = (+ currentLayoutViewType: RecordTableWidgetLayoutViewType = ViewType.TABLE_WIDGET,+) =>+ render(+ <I18nProvider i18n={i18n}>+ <RecordTableLayoutDropdownContent+ pageLayoutId="page-layout-id"+ widgetId="widget-id"+ objectMetadataId={OBJECT_METADATA_ID}+ currentLayoutViewType={currentLayoutViewType}+ />+ </I18nProvider>,+ );++const layoutLabels = () =>+ screen+ .getAllByRole('button')+ .map((button) => button.querySelector('span')?.textContent);++describe('RecordTableLayoutDropdownContent', () => {+ beforeEach(() => {+ jest.clearAllMocks();+ mockUseIsFeatureEnabled.mockReturnValue(true);+ mockIsAvailableAsGroupByField.mockReturnValue(true);+ mockIsAvailableAsCalendarField.mockReturnValue(true);+ });++ it('should offer every layout in picker order', () => {+ renderDropdown();++ expect(layoutLabels()).toEqual(['Table', 'Kanban', 'List', 'Calendar']);+ });++ it('should hide the list layout while the feature flag is off', () => {+ mockUseIsFeatureEnabled.mockReturnValue(false);++ renderDropdown();++ expect(layoutLabels()).toEqual(['Table', 'Kanban', 'Calendar']);+ });++ it('should mark the current layout as selected', () => {+ renderDropdown(ViewType.LIST_WIDGET);++ expect(screen.getByText('List').closest('button')?.dataset.selected).toBe(+ 'true',+ );+ expect(screen.getByText('Table').closest('button')?.dataset.selected).toBe(+ 'false',+ );+ });++ it('should switch the widget to the picked layout and close the dropdown', () => {+ renderDropdown();++ fireEvent.click(screen.getByText('List').closest('button') as HTMLElement);++ expect(mockHandleLayoutChange).toHaveBeenCalledWith(+ expect.objectContaining({ targetViewType: ViewType.LIST_WIDGET }),+ );+ expect(mockCloseDropdown).toHaveBeenCalled();+ });++ it.each([+ ['Kanban', 'Needs a Select field', mockIsAvailableAsGroupByField],+ ['Calendar', 'Needs a Date field', mockIsAvailableAsCalendarField],+ ])(+ 'should keep %s visible but disabled with its reason when unavailable',+ (label, reason, availability) => {+ availability.mockReturnValue(false);++ renderDropdown();++ const button = screen.getByText(label).closest('button');++ expect(button).toBeDisabled();+ expect(button?.textContent).toContain(reason);++ fireEvent.click(button as HTMLElement);++ expect(mockHandleLayoutChange).not.toHaveBeenCalled();+ },+ );+});diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsxnew file mode 100644index 00000000000..ac5afe1064e--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsx@@ -0,0 +1,113 @@+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { render, screen } from '@testing-library/react';++import { WidgetViewLayoutSettingsRows } from '@/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows';+import { ViewType } from '~/generated-metadata/graphql';++const mockUseRecordTableWidgetViewForDisplay = jest.fn();++jest.mock('@/object-metadata/hooks/useObjectMetadataItems', () => ({+ useObjectMetadataItems: jest.fn(() => ({ objectMetadataItems: [] })),+}));+jest.mock(+ '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks',+ () => ({+ useRecordTableWidgetLayoutCallbacks: jest.fn(() => ({+ handleShouldHideEmptyGroupsChange: jest.fn(),+ })),+ }),+);+jest.mock(+ '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewForDisplay',+ () => ({+ useRecordTableWidgetViewForDisplay: () =>+ mockUseRecordTableWidgetViewForDisplay(),+ }),+);+jest.mock(+ '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarFieldDropdownContent',+ () => ({ RecordTableCalendarFieldDropdownContent: () => null }),+);+jest.mock(+ '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent',+ () => ({ RecordTableCalendarLayoutDropdownContent: () => null }),+);+jest.mock(+ '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent',+ () => ({ RecordTableGroupByDropdownContent: () => null }),+);+jest.mock(+ '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent',+ () => ({ RecordTableLayoutDropdownContent: () => null }),+);+jest.mock('@/ui/layout/dropdown/components/DropdownContent', () => ({+ DropdownContent: ({ children }: { children: React.ReactNode }) => children,+}));+jest.mock('@/ui/layout/selectable-list/components/SelectableListItem', () => ({+ SelectableListItem: ({ children }: { children: React.ReactNode }) => children,+}));+jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({+ useIsFeatureEnabled: jest.fn(() => false),+}));+jest.mock('@/command-menu/components/CommandMenuItemToggle', () => ({+ CommandMenuItemToggle: () => null,+}));+jest.mock('@/command-menu/components/CommandMenuItemDropdown', () => ({+ CommandMenuItemDropdown: ({+ Icon,+ label,+ description,+ }: {+ Icon?: { displayName?: string; name?: string };+ label: string;+ description?: React.ReactNode;+ }) => (+ <div data-testid={`row-${label}`}>+ <span data-icon={Icon?.displayName ?? Icon?.name ?? 'unknown'} />+ <span>{description}</span>+ </div>+ ),+}));++const renderLayoutRows = (widgetViewType: ViewType) => {+ mockUseRecordTableWidgetViewForDisplay.mockReturnValue({+ view: { id: 'view-id', type: widgetViewType },+ });++ render(+ <I18nProvider i18n={i18n}>+ <WidgetViewLayoutSettingsRows+ pageLayoutId="page-layout-id"+ widgetId="widget-id"+ objectMetadataId="object-metadata-id"+ viewId="view-id"+ />+ </I18nProvider>,+ );++ return screen.getByTestId('row-Layout');+};++describe('WidgetViewLayoutSettingsRows', () => {+ beforeEach(() => jest.clearAllMocks());++ // The layout row used to fall through to Table for anything that was not+ // kanban or calendar, so a list widget described itself as a table.+ it.each([+ [ViewType.TABLE_WIDGET, 'Table', 'Table'],+ [ViewType.KANBAN_WIDGET, 'Kanban', 'LayoutKanban'],+ [ViewType.LIST_WIDGET, 'List', 'List'],+ [ViewType.CALENDAR_WIDGET, 'Calendar', 'Calendar'],+ ])(+ 'should describe a %s widget with its own label and icon',+ (widgetViewType, expectedLabel, expectedIcon) => {+ const layoutRow = renderLayoutRows(widgetViewType);++ expect(layoutRow).toHaveTextContent(expectedLabel);+ expect(+ layoutRow.querySelector('[data-icon]')?.getAttribute('data-icon'),+ ).toBe(expectedIcon);+ },+ );+});diff --git a/packages/twenty-front/src/modules/views/types/ViewType.ts b/packages/twenty-front/src/modules/views/types/ViewType.tsindex d59a868d02e..735472b9dca 100644--- a/packages/twenty-front/src/modules/views/types/ViewType.ts+++ b/packages/twenty-front/src/modules/views/types/ViewType.ts@@ -21,6 +21,7 @@ export const VIEW_TYPE_LABELS = {[ViewType.FIELDS_WIDGET]: msg`Fields widget`,[ViewType.TABLE_WIDGET]: msg`Table widget`,[ViewType.KANBAN_WIDGET]: msg`Kanban widget`,+ [ViewType.LIST_WIDGET]: msg`List widget`,[ViewType.CALENDAR_WIDGET]: msg`Calendar widget`,} satisfies Record<ViewTypeLabelKey, MessageDescriptor>;diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-30/2-30-instance-command-fast-1786227282471-add-list-widget-view-type.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-30/2-30-instance-command-fast-1786227282471-add-list-widget-view-type.tsnew file mode 100644index 00000000000..0c0f9ee0f2b--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-30/2-30-instance-command-fast-1786227282471-add-list-widget-view-type.ts@@ -0,0 +1,37 @@+import { type QueryRunner } from 'typeorm';++import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';+import { type FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';++@RegisteredInstanceCommand('2.30.0', 1786227282471)+export class AddListWidgetViewTypeFastInstanceCommand+ implements FastInstanceCommand+{+ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ `ALTER TYPE "core"."view_type_enum" ADD VALUE IF NOT EXISTS 'LIST_WIDGET' AFTER 'KANBAN_WIDGET'`,+ );+ }++ public async down(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ `UPDATE "core"."view" SET "type" = 'TABLE_WIDGET' WHERE "type" = 'LIST_WIDGET'`,+ );+ await queryRunner.query(+ "CREATE TYPE \"core\".\"view_type_enum_old\" AS ENUM('TABLE', 'KANBAN', 'CALENDAR', 'LIST', 'FIELDS_WIDGET', 'TABLE_WIDGET', 'KANBAN_WIDGET', 'CALENDAR_WIDGET')",+ );+ await queryRunner.query(+ 'ALTER TABLE "core"."view" ALTER COLUMN "type" DROP DEFAULT',+ );+ await queryRunner.query(+ 'ALTER TABLE "core"."view" ALTER COLUMN "type" TYPE "core"."view_type_enum_old" USING "type"::"text"::"core"."view_type_enum_old"',+ );+ await queryRunner.query(+ 'ALTER TABLE "core"."view" ALTER COLUMN "type" SET DEFAULT \'TABLE\'',+ );+ await queryRunner.query('DROP TYPE "core"."view_type_enum"');+ await queryRunner.query(+ 'ALTER TYPE "core"."view_type_enum_old" RENAME TO "view_type_enum"',+ );+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.tsindex 768ac3cbb64..d9d59f073c6 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts@@ -136,6 +136,7 @@ import { AddOpenRecordInToObjectMetadataFastInstanceCommand } from 'src/databaseimport { CreateUserSessionCoreTableFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-27/2-27-instance-command-fast-1785518325511-create-user-session-core-table';import { CreateApplicationAuthorizationCoreTableFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-27/2-27-instance-command-fast-1785681272278-create-application-authorization-core-table';import { AddListViewTypeFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-30/2-30-instance-command-fast-1785929606728-add-list-view-type';+import { AddListWidgetViewTypeFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-30/2-30-instance-command-fast-1786227282471-add-list-widget-view-type';import { AddCallRecordingWidgetTypesFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-29/2-29-instance-command-fast-1786009374684-add-call-recording-widget-types';export const INSTANCE_COMMANDS = [@@ -276,4 +277,5 @@ export const INSTANCE_COMMANDS = [CreateApplicationAuthorizationCoreTableFastInstanceCommand,AddListViewTypeFastInstanceCommand,AddCallRecordingWidgetTypesFastInstanceCommand,+ AddListWidgetViewTypeFastInstanceCommand,];diff --git a/packages/twenty-server/src/engine/metadata-modules/view/dtos/inputs/upsert-view-widget-view-settings.input.ts b/packages/twenty-server/src/engine/metadata-modules/view/dtos/inputs/upsert-view-widget-view-settings.input.tsindex e82d2698da3..5d72d3ffab5 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/dtos/inputs/upsert-view-widget-view-settings.input.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/dtos/inputs/upsert-view-widget-view-settings.input.ts@@ -28,7 +28,7 @@ export class UpsertViewWidgetViewSettingsInput {@Field(() => ViewType, {nullable: true,description:- 'The layout type of the widget view. Only widget view types (TABLE_WIDGET, KANBAN_WIDGET, CALENDAR_WIDGET) are allowed.',+ 'The layout type of the widget view. Only widget view types (TABLE_WIDGET, KANBAN_WIDGET, LIST_WIDGET, CALENDAR_WIDGET) are allowed.',})type?: ViewType;diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.tsindex 6f2c5f2eca9..70e454bd0cb 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view-widget-upsert.service.ts@@ -75,6 +75,7 @@ const EMPTY_SORT_OPS = {const ALLOWED_WIDGET_VIEW_TYPES: ViewType[] = [ViewType.TABLE_WIDGET,ViewType.KANBAN_WIDGET,+ ViewType.LIST_WIDGET,ViewType.CALENDAR_WIDGET,];diff --git a/packages/twenty-server/src/engine/metadata-modules/view/tools/view-tools.factory.ts b/packages/twenty-server/src/engine/metadata-modules/view/tools/view-tools.factory.tsindex 86352b1d9b3..3ddfced2cde 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/tools/view-tools.factory.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/tools/view-tools.factory.ts@@ -35,6 +35,7 @@ const CREATABLE_VIEW_TYPES = [ViewType.CALENDAR,ViewType.TABLE_WIDGET,ViewType.KANBAN_WIDGET,+ ViewType.LIST_WIDGET,ViewType.CALENDAR_WIDGET,] as const;@@ -78,7 +79,7 @@ const CreateViewInputSchema = z.object({.optional().default(ViewType.TABLE).describe(- 'View type. Use the *_WIDGET variants (TABLE_WIDGET, KANBAN_WIDGET, CALENDAR_WIDGET) for views backing a dashboard widget so they stay out of record index view pickers.',+ 'View type. Use the *_WIDGET variants (TABLE_WIDGET, KANBAN_WIDGET, LIST_WIDGET, CALENDAR_WIDGET) for views backing a dashboard widget so they stay out of record index view pickers.',),visibility: z.enum([ViewVisibility.WORKSPACE, ViewVisibility.UNLISTED])diff --git a/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.ts b/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.tsindex 094db5ef5f8..235fdb04140 100644--- a/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.ts+++ b/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.ts@@ -102,8 +102,8 @@ CHART FILTERS (AGGREGATE_CHART, BAR_CHART, LINE_CHART, PIE_CHART):- Requires: objectMetadataId (top-level, UUID of the object to display) AND configuration.viewId (UUID of the dedicated view you just created)- configuration.configurationType must be "RECORD_TABLE"- Recommended size: rowSpan 8-10, columnSpan 12 (full width)- - Workflow: (1) call create_view with the appropriate *_WIDGET type (TABLE_WIDGET for a table, KANBAN_WIDGET for a board, CALENDAR_WIDGET for a calendar — kanban requires mainGroupByFieldName, calendar requires calendarFieldName) → get the viewId, (2) call create_many_view_fields to add visible columns to that view, (3) create the widget with that viewId- - The widget renders according to its view type: TABLE_WIDGET renders a table, KANBAN_WIDGET a board (requires mainGroupByFieldName pointing at a SELECT or many-to-one relation field), CALENDAR_WIDGET a calendar (requires a date calendar field)+ - Workflow: (1) call create_view with the appropriate *_WIDGET type (TABLE_WIDGET for a table, KANBAN_WIDGET for a board, LIST_WIDGET for a list, CALENDAR_WIDGET for a calendar — kanban requires mainGroupByFieldName, calendar requires calendarFieldName) → get the viewId, (2) call create_many_view_fields to add visible columns to that view, (3) create the widget with that viewId+ - The widget renders according to its view type: TABLE_WIDGET renders a table, KANBAN_WIDGET a board (requires mainGroupByFieldName pointing at a SELECT or many-to-one relation field), LIST_WIDGET a list, CALENDAR_WIDGET a calendar (requires a date calendar field)- Example: { type: "RECORD_TABLE", objectMetadataId: "<object-uuid>", configuration: { configurationType: "RECORD_TABLE", viewId: "<dedicated-view-uuid>" } }AGGREGATION OPERATIONS: COUNT, SUM, AVG, MIN, MAX, COUNT_EMPTY, COUNT_NOT_EMPTY`,diff --git a/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget-view-settings.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget-view-settings.integration-spec.tsindex ed86b80c561..65db509cb83 100644--- a/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget-view-settings.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget-view-settings.integration-spec.ts@@ -196,6 +196,21 @@ describe('upsertViewWidget view settings', () => {);});+ it('should switch the widget view to LIST_WIDGET', async () => {+ const { data } = await upsertViewWidget({+ expectToFail: false,+ input: {+ widgetId,+ view: {+ type: ViewType.LIST_WIDGET,+ },+ },+ gqlFields: VIEW_SETTINGS_GQL_FIELDS,+ });++ expect(data.upsertViewWidget.type).toBe(ViewType.LIST_WIDGET);+ });+it('should reject switching to KANBAN_WIDGET without a main group by field', async () => {const { errors } = await upsertViewWidget({expectToFail: true,diff --git a/packages/twenty-shared/src/types/ViewType.ts b/packages/twenty-shared/src/types/ViewType.tsindex c36ce999b04..7cc8b172d1c 100644--- a/packages/twenty-shared/src/types/ViewType.ts+++ b/packages/twenty-shared/src/types/ViewType.ts@@ -6,5 +6,6 @@ export enum ViewType {FIELDS_WIDGET = 'FIELDS_WIDGET',TABLE_WIDGET = 'TABLE_WIDGET',KANBAN_WIDGET = 'KANBAN_WIDGET',+ LIST_WIDGET = 'LIST_WIDGET',CALENDAR_WIDGET = 'CALENDAR_WIDGET',}diff --git a/packages/twenty-shared/src/utils/views/__tests__/getViewLayoutFromViewType.test.ts b/packages/twenty-shared/src/utils/views/__tests__/getViewLayoutFromViewType.test.tsnew file mode 100644index 00000000000..9baae2c1427--- /dev/null+++ b/packages/twenty-shared/src/utils/views/__tests__/getViewLayoutFromViewType.test.ts@@ -0,0 +1,20 @@+import { ViewType } from '@/types';+import { getViewLayoutFromViewType } from '@/utils/views/getViewLayoutFromViewType';++describe('getViewLayoutFromViewType', () => {+ it.each([+ [ViewType.TABLE_WIDGET, ViewType.TABLE],+ [ViewType.KANBAN_WIDGET, ViewType.KANBAN],+ [ViewType.LIST_WIDGET, ViewType.LIST],+ [ViewType.CALENDAR_WIDGET, ViewType.CALENDAR],+ ])('should reduce %s to its %s layout', (viewType, expectedLayout) => {+ expect(getViewLayoutFromViewType(viewType)).toBe(expectedLayout);+ });++ it.each([ViewType.TABLE, ViewType.KANBAN, ViewType.LIST, ViewType.CALENDAR])(+ 'should leave the %s layout unchanged',+ (viewType) => {+ expect(getViewLayoutFromViewType(viewType)).toBe(viewType);+ },+ );+});diff --git a/packages/twenty-shared/src/utils/views/__tests__/isWidgetViewType.test.ts b/packages/twenty-shared/src/utils/views/__tests__/isWidgetViewType.test.tsnew file mode 100644index 00000000000..a2969eb307e--- /dev/null+++ b/packages/twenty-shared/src/utils/views/__tests__/isWidgetViewType.test.ts@@ -0,0 +1,21 @@+import { ViewType } from '@/types';+import { isWidgetViewType } from '@/utils/views/isWidgetViewType';++describe('isWidgetViewType', () => {+ it.each([+ ViewType.FIELDS_WIDGET,+ ViewType.TABLE_WIDGET,+ ViewType.KANBAN_WIDGET,+ ViewType.LIST_WIDGET,+ ViewType.CALENDAR_WIDGET,+ ])('should treat %s as a widget view type', (viewType) => {+ expect(isWidgetViewType(viewType)).toBe(true);+ });++ it.each([ViewType.TABLE, ViewType.KANBAN, ViewType.LIST, ViewType.CALENDAR])(+ 'should keep %s out of view pickers as a record index type',+ (viewType) => {+ expect(isWidgetViewType(viewType)).toBe(false);+ },+ );+});diff --git a/packages/twenty-shared/src/utils/views/getViewLayoutFromViewType.ts b/packages/twenty-shared/src/utils/views/getViewLayoutFromViewType.tsindex 7cd7de15798..31faf74af56 100644--- a/packages/twenty-shared/src/utils/views/getViewLayoutFromViewType.ts+++ b/packages/twenty-shared/src/utils/views/getViewLayoutFromViewType.ts@@ -10,6 +10,7 @@ const VIEW_TYPE_TO_LAYOUT_MAPPING: Record<ViewTypeValue, ViewTypeValue> = {[ViewType.FIELDS_WIDGET]: ViewType.FIELDS_WIDGET,[ViewType.TABLE_WIDGET]: ViewType.TABLE,[ViewType.KANBAN_WIDGET]: ViewType.KANBAN,+ [ViewType.LIST_WIDGET]: ViewType.LIST,[ViewType.CALENDAR_WIDGET]: ViewType.CALENDAR,};diff --git a/packages/twenty-shared/src/utils/views/isWidgetViewType.ts b/packages/twenty-shared/src/utils/views/isWidgetViewType.tsindex ce20fdeb8c2..6aee88682bc 100644--- a/packages/twenty-shared/src/utils/views/isWidgetViewType.ts+++ b/packages/twenty-shared/src/utils/views/isWidgetViewType.ts@@ -6,6 +6,7 @@ const WIDGET_VIEW_TYPES: ViewTypeValue[] = [ViewType.FIELDS_WIDGET,ViewType.TABLE_WIDGET,ViewType.KANBAN_WIDGET,+ ViewType.LIST_WIDGET,ViewType.CALENDAR_WIDGET,];