Skip to content

The open alternative to Salesforce, designed for AI.

Make the list view GA and fix what QA found on it (#25072)

Félix Malfaitb582eb597824
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 56afbd88d6b..dab4ac12c6b 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -1834,7 +1834,6 @@ enum FeatureFlagKey {
IS_JSON_FILTER_ENABLED
IS_EMAIL_GROUP_ENABLED
IS_JUNCTION_RELATIONS_ENABLED
- IS_LIST_VIEW_ENABLED
IS_REST_METADATA_API_NEW_FORMAT_DIRECT
IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED
IS_WORKFLOW_VERSION_IN_CORE_ENABLED
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index dc5cc76ab4b..eebc8d75ef8 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -1475,7 +1475,7 @@ export interface FeatureFlag {
__typename: 'FeatureFlag'
}
-export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_EMAIL_GROUP_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_LIST_VIEW_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED' | 'IS_API_RATE_LIMIT_V2_ENABLED' | 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED'
+export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_EMAIL_GROUP_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED' | 'IS_API_RATE_LIMIT_V2_ENABLED' | 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED'
export interface WorkspaceUrls {
customUrl?: Scalars['String']
@@ -10090,7 +10090,6 @@ export const enumFeatureFlagKey = {
IS_JSON_FILTER_ENABLED: 'IS_JSON_FILTER_ENABLED' as const,
IS_EMAIL_GROUP_ENABLED: 'IS_EMAIL_GROUP_ENABLED' as const,
IS_JUNCTION_RELATIONS_ENABLED: 'IS_JUNCTION_RELATIONS_ENABLED' as const,
- IS_LIST_VIEW_ENABLED: 'IS_LIST_VIEW_ENABLED' as const,
IS_REST_METADATA_API_NEW_FORMAT_DIRECT: 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' as const,
IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED: 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' as const,
IS_WORKFLOW_VERSION_IN_CORE_ENABLED: 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED' as const,
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.ts
index cdcd3c57d33..87777def51f 100644
--- a/packages/twenty-front/src/generated-admin/graphql.ts
+++ b/packages/twenty-front/src/generated-admin/graphql.ts
@@ -404,7 +404,6 @@ export enum FeatureFlagKey {
IS_EMAIL_GROUP_ENABLED = 'IS_EMAIL_GROUP_ENABLED',
IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',
IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',
- IS_LIST_VIEW_ENABLED = 'IS_LIST_VIEW_ENABLED',
IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',
IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED = 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 9c9da8527a4..2bc8f0b4476 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -1864,7 +1864,6 @@ export enum FeatureFlagKey {
IS_EMAIL_GROUP_ENABLED = 'IS_EMAIL_GROUP_ENABLED',
IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',
IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',
- IS_LIST_VIEW_ENABLED = 'IS_LIST_VIEW_ENABLED',
IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',
IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED = 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
index 867720e8e45..27248082003 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx
@@ -23,7 +23,6 @@ import {
} from '@/views/types/ViewType';
import { useGetAvailableFieldsForCalendar } from '@/views/view-picker/hooks/useGetAvailableFieldsForCalendar';
import { useGetAvailableFieldsToGroupRecordsBy } from '@/views/view-picker/hooks/useGetAvailableFieldsToGroupRecordsBy';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { useLingui } from '@lingui/react/macro';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
@@ -37,10 +36,7 @@ import {
} from 'twenty-ui/icon';
import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
import { MenuItem, MenuItemSelect, MenuItemToggle } from 'twenty-ui/navigation';
-import {
- FeatureFlagKey,
- ViewCalendarLayout,
-} from '~/generated-metadata/graphql';
+import { ViewCalendarLayout } from '~/generated-metadata/graphql';
export const ObjectOptionsDropdownLayoutContent = () => {
const { t } = useLingui();
@@ -66,9 +62,6 @@ export const ObjectOptionsDropdownLayoutContent = () => {
const recordIndexCalendarLayout = useAtomComponentStateValue(
recordIndexCalendarLayoutComponentState,
);
- const isListViewEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_LIST_VIEW_ENABLED,
- );
const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(
recordIndexGroupFieldMetadataItemComponentState,
);
@@ -119,7 +112,7 @@ export const ObjectOptionsDropdownLayoutContent = () => {
const selectableItemIdArray = [
ViewType.TABLE,
- ...(isListViewEnabled ? [ViewType.LIST] : []),
+ ViewType.LIST,
...(!isDefaultView ? [ViewType.CALENDAR] : []),
...(isDefaultView ? [] : [ViewType.KANBAN]),
...(currentView?.type === ViewType.KANBAN ? ['Group'] : []),
@@ -175,26 +168,24 @@ export const ObjectOptionsDropdownLayoutContent = () => {
}}
/>
</SelectableListItem>
- {isListViewEnabled && (
- <SelectableListItem
- itemId={ViewType.LIST}
- onEnter={() => {
- setAndPersistViewType(ViewType.LIST);
+ <SelectableListItem
+ itemId={ViewType.LIST}
+ onEnter={() => {
+ setAndPersistViewType(ViewType.LIST);
+ }}
+ >
+ <MenuItemSelect
+ LeftIcon={viewTypeIconMapping(ViewType.LIST)}
+ text={t(getViewTypeLabel(ViewType.LIST))}
+ selected={currentView?.type === ViewType.LIST}
+ focused={selectedItemId === ViewType.LIST}
+ onClick={async () => {
+ if (currentView?.type !== ViewType.LIST) {
+ await setAndPersistViewType(ViewType.LIST);
+ }
}}
- >
- <MenuItemSelect
- LeftIcon={viewTypeIconMapping(ViewType.LIST)}
- text={t(getViewTypeLabel(ViewType.LIST))}
- selected={currentView?.type === ViewType.LIST}
- focused={selectedItemId === ViewType.LIST}
- onClick={async () => {
- if (currentView?.type !== ViewType.LIST) {
- await setAndPersistViewType(ViewType.LIST);
- }
- }}
- />
- </SelectableListItem>
- )}
+ />
+ </SelectableListItem>
<SelectableListItem
itemId={ViewType.CALENDAR}
onEnter={() => {
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
index 587bc7f38e8..159066cd2c5 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
@@ -6,6 +6,7 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIte
import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';
import { useSearchRecordGroupField } from '@/object-record/object-options-dropdown/hooks/useSearchRecordGroupField';
import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector';
+import { isRecordGroupingOptionalForViewType } from '@/object-record/record-group/utils/isRecordGroupingOptionalForViewType';
import { useHandleRecordGroupField } from '@/object-record/record-index/hooks/useHandleRecordGroupField';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
@@ -18,7 +19,6 @@ import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMe
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
-import { ViewType } from '@/views/types/ViewType';
import { useLingui } from '@lingui/react/macro';
import { useLocation } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
@@ -127,7 +127,7 @@ export const ObjectOptionsDropdownRecordGroupFieldsContent = () => {
/>
<DropdownMenuSeparator />
<DropdownMenuItemsContainer>
- {viewType === ViewType.TABLE && (
+ {isRecordGroupingOptionalForViewType(viewType) && (
<MenuItemSelect
text={t`None`}
selected={!isDefined(recordIndexGroupFieldMetadataItem)}
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
index 42ba567c903..213ea0dfee5 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
@@ -6,6 +6,7 @@ import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdow
import { RecordGroupsVisibilityDropdownSection } from '@/object-record/record-group/components/RecordGroupsVisibilityDropdownSection';
import { useRecordGroupVisibility } from '@/object-record/record-group/hooks/useRecordGroupVisibility';
import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector';
+import { isRecordGroupingOptionalForViewType } from '@/object-record/record-group/utils/isRecordGroupingOptionalForViewType';
import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState';
@@ -22,7 +23,6 @@ import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
-import { ViewType } from '@/views/types/ViewType';
import { useGetAvailableFieldsToGroupRecordsBy } from '@/views/view-picker/hooks/useGetAvailableFieldsToGroupRecordsBy';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
@@ -87,7 +87,8 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {
useGetAvailableFieldsToGroupRecordsBy();
const isGroupByFieldPickerDisabled =
- availableFieldsForGrouping.length <= 1 && viewType !== ViewType.TABLE;
+ availableFieldsForGrouping.length <= 1 &&
+ !isRecordGroupingOptionalForViewType(viewType);
const isRelationGroupBy =
isDefined(recordIndexGroupFieldMetadataItem) &&
diff --git a/packages/twenty-front/src/modules/object-record/record-group/utils/__tests__/isRecordGroupingOptionalForViewType.test.ts b/packages/twenty-front/src/modules/object-record/record-group/utils/__tests__/isRecordGroupingOptionalForViewType.test.ts
new file mode 100644
index 00000000000..0e9772640f2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-group/utils/__tests__/isRecordGroupingOptionalForViewType.test.ts
@@ -0,0 +1,18 @@
+import { isRecordGroupingOptionalForViewType } from '@/object-record/record-group/utils/isRecordGroupingOptionalForViewType';
+import { ViewType } from '@/views/types/ViewType';
+
+describe('isRecordGroupingOptionalForViewType', () => {
+ it.each([ViewType.TABLE, ViewType.LIST])(
+ 'lets a %s view drop its grouping',
+ (viewType) => {
+ expect(isRecordGroupingOptionalForViewType(viewType)).toBe(true);
+ },
+ );
+
+ it.each([ViewType.KANBAN, ViewType.CALENDAR])(
+ 'keeps grouping mandatory for a %s view',
+ (viewType) => {
+ expect(isRecordGroupingOptionalForViewType(viewType)).toBe(false);
+ },
+ );
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-group/utils/isRecordGroupingOptionalForViewType.ts b/packages/twenty-front/src/modules/object-record/record-group/utils/isRecordGroupingOptionalForViewType.ts
new file mode 100644
index 00000000000..59a55c7dc54
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-group/utils/isRecordGroupingOptionalForViewType.ts
@@ -0,0 +1,12 @@
+import { ViewType } from '@/views/types/ViewType';
+
+// A kanban board is its groups and a calendar is its dates, so those layouts
+// cannot drop their grouping; the layouts that render a flat run of records can,
+// and must keep offering the way back to none.
+const VIEW_TYPES_WITH_OPTIONAL_RECORD_GROUPING: ViewType[] = [
+ ViewType.TABLE,
+ ViewType.LIST,
+];
+
+export const isRecordGroupingOptionalForViewType = (viewType: ViewType) =>
+ VIEW_TYPES_WITH_OPTIONAL_RECORD_GROUPING.includes(viewType);
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.tsx
index 22937cd7667..9b15cd5c6ee 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
@@ -2,7 +2,7 @@ import { hasRecordGroupsComponentSelector } from '@/object-record/record-group/s
import { RecordListBody } from '@/object-record/record-list/components/RecordListBody';
import { RecordListFieldTooltip } from '@/object-record/record-list/components/RecordListFieldTooltip';
import { RecordListRecordGroupsBody } from '@/object-record/record-list/components/RecordListRecordGroupsBody';
-import { RecordListResponsiveFieldCountEffect } from '@/object-record/record-list/components/RecordListResponsiveFieldCountEffect';
+import { RecordListResponsiveFieldsEffect } from '@/object-record/record-list/components/RecordListResponsiveFieldsEffect';
import { RecordListComponentInstanceContext } from '@/object-record/record-list/states/contexts/RecordListComponentInstanceContext';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
@@ -34,9 +34,7 @@ export const RecordList = () => {
return (
<StyledContainer ref={setContainerElement}>
- <RecordListResponsiveFieldCountEffect
- containerElement={containerElement}
- />
+ <RecordListResponsiveFieldsEffect containerElement={containerElement} />
<ScrollWrapper
componentInstanceId={`scroll-wrapper-record-list-${recordListId}`}
defaultEnableXScroll={false}
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsx
index 9a09cfc2fb6..59ca7cef337 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListBody.tsx
@@ -1,7 +1,9 @@
import { useRecordIndexTableQuery } from '@/object-record/record-index/hooks/useRecordIndexTableQuery';
+import { RecordListEmptyState } from '@/object-record/record-list/components/RecordListEmptyState';
import { RecordListRecords } from '@/object-record/record-list/components/RecordListRecords';
import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';
import { styled } from '@linaria/react';
+import { isDefined } from 'twenty-shared/utils';
const StyledBody = styled.div`
display: flex;
@@ -14,6 +16,12 @@ export const RecordListBody = () => {
const { records, loading, error, hasNextPage, fetchMoreRecords } =
useRecordIndexTableQuery(objectNameSingular);
+ const isEmpty = !loading && !isDefined(error) && records.length === 0;
+
+ if (isEmpty) {
+ return <RecordListEmptyState />;
+ }
+
return (
<StyledBody>
<RecordListRecords
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyState.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyState.tsx
new file mode 100644
index 00000000000..646226a4066
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyState.tsx
@@ -0,0 +1,148 @@
+/* oxlint-disable twenty/no-navigate-prefer-link */
+import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
+import { useObjectLabel } from '@/object-metadata/hooks/useObjectLabel';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { useCheckIsSoftDeleteFilter } from '@/object-record/record-filter/hooks/useCheckIsSoftDeleteFilter';
+import { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRemoveRecordFilter';
+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { hasAnySoftDeleteFilterOnViewComponentSelector } from '@/object-record/record-filter/states/hasAnySoftDeleteFilterOnView';
+import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter';
+import { RecordListEmptyStateDisplay } from '@/object-record/record-list/components/RecordListEmptyStateDisplay';
+import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';
+import { getEmptyStateSubTitle } from '@/object-record/record-table/empty-state/utils/getEmptyStateSubTitle';
+import { getEmptyStateTitle } from '@/object-record/record-table/empty-state/utils/getEmptyStateTitle';
+import { useCreateNewIndexRecord } from '@/object-record/record-table/hooks/useCreateNewIndexRecord';
+import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/canCreateRecordsForObjectMetadataItem';
+import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { useLingui } from '@lingui/react/macro';
+import { SettingsPath } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+import { IconFilterOff, IconPlus, IconSettings } from 'twenty-ui/icon';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+
+export const RecordListEmptyState = () => {
+ const { t } = useLingui();
+
+ const {
+ objectMetadataItem,
+ objectNameSingular,
+ objectPermissions,
+ viewBarInstanceId,
+ } = useRecordListContextOrThrow();
+
+ const objectLabelSingular = useObjectLabel(objectMetadataItem);
+
+ const navigate = useNavigateSettings();
+
+ const { createNewIndexRecord } = useCreateNewIndexRecord({
+ objectMetadataItem,
+ });
+
+ const { totalCount } = useFindManyRecords({ objectNameSingular, limit: 1 });
+
+ const hasAnySoftDeleteFilterOnView = useAtomComponentSelectorValue(
+ hasAnySoftDeleteFilterOnViewComponentSelector,
+ );
+
+ const currentRecordFilters = useAtomComponentStateValue(
+ currentRecordFiltersComponentState,
+ );
+
+ const { isRecordFilterAboutSoftDelete } = useCheckIsSoftDeleteFilter();
+ const { removeRecordFilter } = useRemoveRecordFilter();
+ const { toggleSoftDeleteFilterState } = useHandleToggleTrashColumnFilter({
+ objectNameSingular,
+ viewBarId: viewBarInstanceId,
+ });
+
+ const isLayoutCustomizationModeEnabled = useAtomStateValue(
+ isLayoutCustomizationModeEnabledState,
+ );
+
+ const canCreateRecords =
+ !isLayoutCustomizationModeEnabled &&
+ canCreateRecordsForObjectMetadataItem({
+ objectPermissions,
+ objectMetadataItem,
+ });
+
+ if (!objectPermissions.canUpdateObjectRecords) {
+ return (
+ <RecordListEmptyStateDisplay
+ animatedPlaceholderType="noRecord"
+ title={t`No records found`}
+ subTitle={t`You are not allowed to create records for this object`}
+ />
+ );
+ }
+
+ if (objectMetadataItem.isRemote) {
+ return (
+ <RecordListEmptyStateDisplay
+ animatedPlaceholderType="noRecord"
+ title={t`No Data Available for Remote Table`}
+ subTitle={t`If this is unexpected, please verify your settings.`}
+ ButtonIcon={IconSettings}
+ buttonTitle={t`Go to Settings`}
+ onButtonClick={() => navigate(SettingsPath.Integrations)}
+ />
+ );
+ }
+
+ if (hasAnySoftDeleteFilterOnView) {
+ const handleRemoveDeletedFilterClick = () => {
+ const deletedFilter = currentRecordFilters.find(
+ isRecordFilterAboutSoftDelete,
+ );
+
+ if (!isDefined(deletedFilter)) {
+ return;
+ }
+
+ removeRecordFilter({ recordFilterId: deletedFilter.id });
+ toggleSoftDeleteFilterState(false);
+ };
+
+ return (
+ <RecordListEmptyStateDisplay
+ animatedPlaceholderType="noDeletedRecord"
+ title={t`No Deleted ${objectLabelSingular} found`}
+ subTitle={t`No deleted records matching the filter criteria were found.`}
+ ButtonIcon={IconFilterOff}
+ buttonTitle={t`Remove Deleted filter`}
+ onButtonClick={handleRemoveDeletedFilterClick}
+ />
+ );
+ }
+
+ const hasNoRecordAtAll = totalCount === 0;
+
+ return (
+ <RecordListEmptyStateDisplay
+ animatedPlaceholderType={hasNoRecordAtAll ? 'noRecord' : 'noMatchRecord'}
+ title={
+ hasNoRecordAtAll
+ ? getEmptyStateTitle(
+ objectMetadataItem.nameSingular,
+ objectLabelSingular,
+ )
+ : t`No ${objectLabelSingular} found`
+ }
+ subTitle={
+ hasNoRecordAtAll
+ ? getEmptyStateSubTitle(
+ objectMetadataItem.nameSingular,
+ objectLabelSingular,
+ )
+ : t`No records matching the filter criteria were found.`
+ }
+ ButtonIcon={IconPlus}
+ buttonTitle={
+ canCreateRecords ? t`Add a ${objectLabelSingular}` : undefined
+ }
+ onButtonClick={() => createNewIndexRecord()}
+ />
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyStateDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyStateDisplay.tsx
new file mode 100644
index 00000000000..23488d2c703
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListEmptyStateDisplay.tsx
@@ -0,0 +1,58 @@
+import { styled } from '@linaria/react';
+import { isDefined } from 'twenty-shared/utils';
+import {
+ AnimatedPlaceholder,
+ AnimatedPlaceholderEmptyContainer,
+ AnimatedPlaceholderEmptySubTitle,
+ AnimatedPlaceholderEmptyTextContainer,
+ AnimatedPlaceholderEmptyTitle,
+ type AnimatedPlaceholderType,
+} from 'twenty-ui/feedback';
+import { type IconComponent } from 'twenty-ui/icon';
+import { Button } from 'twenty-ui/input';
+
+const StyledEmptyStateContainer = styled.div`
+ height: 100%;
+ width: 100%;
+`;
+
+type RecordListEmptyStateDisplayProps = {
+ animatedPlaceholderType: AnimatedPlaceholderType;
+ title: string;
+ subTitle: string;
+ ButtonIcon?: IconComponent;
+ buttonTitle?: string;
+ buttonIsDisabled?: boolean;
+ onButtonClick?: () => void;
+};
+
+export const RecordListEmptyStateDisplay = ({
+ animatedPlaceholderType,
+ title,
+ subTitle,
+ ButtonIcon,
+ buttonTitle,
+ buttonIsDisabled = false,
+ onButtonClick,
+}: RecordListEmptyStateDisplayProps) => (
+ <StyledEmptyStateContainer>
+ <AnimatedPlaceholderEmptyContainer>
+ <AnimatedPlaceholder type={animatedPlaceholderType} />
+ <AnimatedPlaceholderEmptyTextContainer>
+ <AnimatedPlaceholderEmptyTitle>{title}</AnimatedPlaceholderEmptyTitle>
+ <AnimatedPlaceholderEmptySubTitle>
+ {subTitle}
+ </AnimatedPlaceholderEmptySubTitle>
+ </AnimatedPlaceholderEmptyTextContainer>
+ {isDefined(buttonTitle) && (
+ <Button
+ Icon={ButtonIcon}
+ title={buttonTitle}
+ variant="secondary"
+ onClick={onButtonClick}
+ disabled={buttonIsDisabled}
+ />
+ )}
+ </AnimatedPlaceholderEmptyContainer>
+ </StyledEmptyStateContainer>
+);
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.tsx
deleted file mode 100644
index de9db602c13..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldCountEffect.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-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 { useLayoutEffect } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-
-type RecordListResponsiveFieldCountEffectProps = {
- 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 = ({
- containerElement,
-}: RecordListResponsiveFieldCountEffectProps) => {
- const setRecordListDisplayedFieldCount = useSetAtomComponentState(
- recordListDisplayedFieldCountComponentState,
- );
-
- useLayoutEffect(() => {
- if (!isDefined(containerElement)) {
- return;
- }
-
- const updateDisplayedFieldCount = () => {
- setRecordListDisplayedFieldCount(
- computeRecordListDisplayedFieldCount(containerElement.clientWidth),
- );
- };
-
- updateDisplayedFieldCount();
-
- const resizeObserver = new ResizeObserver(updateDisplayedFieldCount);
-
- resizeObserver.observe(containerElement);
-
- return () => resizeObserver.disconnect();
- }, [containerElement, setRecordListDisplayedFieldCount]);
-
- return null;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldsEffect.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldsEffect.tsx
new file mode 100644
index 00000000000..072394d73ef
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldsEffect.tsx
@@ -0,0 +1,53 @@
+import { recordListDisplayedFieldsComponentState } from '@/object-record/record-list/states/recordListDisplayedFieldsComponentState';
+import { computeRecordListDisplayedFields } from '@/object-record/record-list/utils/computeRecordListDisplayedFields';
+import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
+import { useLayoutEffect } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+
+type RecordListResponsiveFieldsEffectProps = {
+ 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 RecordListResponsiveFieldsEffect = ({
+ containerElement,
+}: RecordListResponsiveFieldsEffectProps) => {
+ const setRecordListDisplayedFields = useSetAtomComponentState(
+ recordListDisplayedFieldsComponentState,
+ );
+
+ useLayoutEffect(() => {
+ if (!isDefined(containerElement)) {
+ return;
+ }
+
+ // clientWidth counts the container's own padding, which the rows never get
+ // to use. Measuring the content box keeps the field widths handed to the
+ // rows equal to the space they actually render in.
+ const updateDisplayedFields = () => {
+ const { paddingLeft, paddingRight } = getComputedStyle(containerElement);
+
+ setRecordListDisplayedFields(
+ computeRecordListDisplayedFields(
+ containerElement.clientWidth -
+ parseFloat(paddingLeft) -
+ parseFloat(paddingRight),
+ ),
+ );
+ };
+
+ updateDisplayedFields();
+
+ const resizeObserver = new ResizeObserver(updateDisplayedFields);
+
+ resizeObserver.observe(containerElement);
+
+ return () => resizeObserver.disconnect();
+ }, [containerElement, setRecordListDisplayedFields]);
+
+ return null;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx
index 679bdacff2e..6fb0ece8b72 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx
@@ -7,7 +7,7 @@ import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/u
import { RecordListRowField } from '@/object-record/record-list/components/RecordListRowField';
import { RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH } from '@/object-record/record-list/constants/RecordListRowLabelIdentifierWidth';
import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';
-import { recordListDisplayedFieldCountComponentState } from '@/object-record/record-list/states/recordListDisplayedFieldCountComponentState';
+import { recordListDisplayedFieldsComponentState } from '@/object-record/record-list/states/recordListDisplayedFieldsComponentState';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -91,9 +91,8 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {
visibleRecordFieldsComponentSelector,
);
- const recordListDisplayedFieldCount = useAtomComponentStateValue(
- recordListDisplayedFieldCountComponentState,
- );
+ const { displayedFieldCount, displayedFieldMaxWidth } =
+ useAtomComponentStateValue(recordListDisplayedFieldsComponentState);
const { openRecordFromIndexView } = useOpenRecordFromIndexView();
@@ -127,7 +126,7 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {
const displayedRecordFields = nonEmptyRecordFields.slice(
0,
- recordListDisplayedFieldCount,
+ displayedFieldCount,
);
const hiddenFieldCount =
@@ -171,6 +170,7 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {
recordId={recordId}
recordField={recordField}
fieldDefinition={fieldDefinition}
+ maxWidth={displayedFieldMaxWidth}
/>
))}
{hiddenFieldCount > 0 && (
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRowField.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRowField.tsx
index bdeda95fcf1..ee36c207708 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRowField.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRowField.tsx
@@ -4,7 +4,6 @@ import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldCont
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
import { RECORD_LIST_ROW_FIELD_ANCHOR_CLASS_NAME } from '@/object-record/record-list/constants/RecordListRowFieldAnchorClassName';
-import { RECORD_LIST_ROW_FIELD_MAX_WIDTH } from '@/object-record/record-list/constants/RecordListRowFieldMaxWidth';
import { RECORD_LIST_ROW_INPUT_ID_PREFIX } from '@/object-record/record-list/constants/RecordListRowInputIdPrefix';
import { recordListHoveredFieldMetadataItemIdComponentState } from '@/object-record/record-list/states/recordListHoveredFieldMetadataItemIdComponentState';
import { type ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
@@ -12,11 +11,13 @@ import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFi
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { styled } from '@linaria/react';
+// Shrinkable rather than fixed: a long record label can eat into the fields'
+// share of the row, and a field that refuses to give any of it back is clipped
+// off the left edge of the right-aligned group instead of narrowing.
const StyledFieldContainer = styled.div`
align-items: center;
display: flex;
- flex-shrink: 0;
- max-width: ${RECORD_LIST_ROW_FIELD_MAX_WIDTH}px;
+ min-width: 0;
overflow: hidden;
& > * {
@@ -28,12 +29,14 @@ type RecordListRowFieldProps = {
recordId: string;
recordField: RecordField;
fieldDefinition: ColumnDefinition<FieldMetadata>;
+ maxWidth: number;
};
export const RecordListRowField = ({
recordId,
recordField,
fieldDefinition,
+ maxWidth,
}: RecordListRowFieldProps) => {
const setRecordListHoveredFieldMetadataItemId = useSetAtomComponentState(
recordListHoveredFieldMetadataItemIdComponentState,
@@ -42,6 +45,7 @@ export const RecordListRowField = ({
return (
<StyledFieldContainer
className={RECORD_LIST_ROW_FIELD_ANCHOR_CLASS_NAME}
+ style={{ maxWidth }}
onMouseEnter={() =>
setRecordListHoveredFieldMetadataItemId(recordField.fieldMetadataItemId)
}
@@ -49,7 +53,7 @@ export const RecordListRowField = ({
<FieldContext.Provider
value={{
recordId,
- maxWidth: RECORD_LIST_ROW_FIELD_MAX_WIDTH,
+ maxWidth,
isLabelIdentifier: false,
isRecordFieldReadOnly: true,
fieldDefinition,
diff --git a/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowFieldMinWidth.ts b/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowFieldMinWidth.ts
new file mode 100644
index 00000000000..ad17590a66f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowFieldMinWidth.ts
@@ -0,0 +1 @@
+export const RECORD_LIST_ROW_FIELD_MIN_WIDTH = 80;
diff --git a/packages/twenty-front/src/modules/object-record/record-list/states/recordListDisplayedFieldCountComponentState.ts b/packages/twenty-front/src/modules/object-record/record-list/states/recordListDisplayedFieldCountComponentState.ts
deleted file mode 100644
index 27b5b329e05..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-list/states/recordListDisplayedFieldCountComponentState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT } from '@/object-record/record-list/constants/RecordListRowVisibleFieldLimit';
-import { RecordListComponentInstanceContext } from '@/object-record/record-list/states/contexts/RecordListComponentInstanceContext';
-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
-
-export const recordListDisplayedFieldCountComponentState =
- createAtomComponentState<number>({
- key: 'recordListDisplayedFieldCountComponentState',
- defaultValue: RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT,
- componentInstanceContext: RecordListComponentInstanceContext,
- });
diff --git a/packages/twenty-front/src/modules/object-record/record-list/states/recordListDisplayedFieldsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-list/states/recordListDisplayedFieldsComponentState.ts
new file mode 100644
index 00000000000..312669e190e
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/states/recordListDisplayedFieldsComponentState.ts
@@ -0,0 +1,17 @@
+import { RECORD_LIST_ROW_FIELD_MAX_WIDTH } from '@/object-record/record-list/constants/RecordListRowFieldMaxWidth';
+import { RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT } from '@/object-record/record-list/constants/RecordListRowVisibleFieldLimit';
+import { RecordListComponentInstanceContext } from '@/object-record/record-list/states/contexts/RecordListComponentInstanceContext';
+import { type RecordListDisplayedFields } from '@/object-record/record-list/types/RecordListDisplayedFields';
+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
+
+const DEFAULT_RECORD_LIST_DISPLAYED_FIELDS: RecordListDisplayedFields = {
+ displayedFieldCount: RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT,
+ displayedFieldMaxWidth: RECORD_LIST_ROW_FIELD_MAX_WIDTH,
+};
+
+export const recordListDisplayedFieldsComponentState =
+ createAtomComponentState<RecordListDisplayedFields>({
+ key: 'recordListDisplayedFieldsComponentState',
+ defaultValue: DEFAULT_RECORD_LIST_DISPLAYED_FIELDS,
+ componentInstanceContext: RecordListComponentInstanceContext,
+ });
diff --git a/packages/twenty-front/src/modules/object-record/record-list/types/RecordListDisplayedFields.ts b/packages/twenty-front/src/modules/object-record/record-list/types/RecordListDisplayedFields.ts
new file mode 100644
index 00000000000..d2fc2ca01da
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/types/RecordListDisplayedFields.ts
@@ -0,0 +1,4 @@
+export type RecordListDisplayedFields = {
+ displayedFieldCount: number;
+ displayedFieldMaxWidth: number;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/utils/__tests__/computeRecordListDisplayedFieldCount.test.ts b/packages/twenty-front/src/modules/object-record/record-list/utils/__tests__/computeRecordListDisplayedFieldCount.test.ts
deleted file mode 100644
index fb5a60de514..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-list/utils/__tests__/computeRecordListDisplayedFieldCount.test.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { computeRecordListDisplayedFieldCount } from '@/object-record/record-list/utils/computeRecordListDisplayedFieldCount';
-
-describe('computeRecordListDisplayedFieldCount', () => {
- it('returns zero when only the record label and hidden count fit', () => {
- expect(computeRecordListDisplayedFieldCount(407)).toBe(0);
- });
-
- it('accounts for row padding when calculating field breakpoints', () => {
- expect(computeRecordListDisplayedFieldCount(408)).toBe(1);
- expect(computeRecordListDisplayedFieldCount(576)).toBe(2);
- });
-
- it('caps the displayed field count at the visible field limit', () => {
- expect(computeRecordListDisplayedFieldCount(10_000)).toBe(6);
- });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-list/utils/__tests__/computeRecordListDisplayedFields.test.ts b/packages/twenty-front/src/modules/object-record/record-list/utils/__tests__/computeRecordListDisplayedFields.test.ts
new file mode 100644
index 00000000000..f33bc520b21
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/utils/__tests__/computeRecordListDisplayedFields.test.ts
@@ -0,0 +1,59 @@
+import { computeRecordListDisplayedFields } from '@/object-record/record-list/utils/computeRecordListDisplayedFields';
+
+describe('computeRecordListDisplayedFields', () => {
+ it('accounts for row padding when calculating field breakpoints', () => {
+ expect(computeRecordListDisplayedFields(408).displayedFieldCount).toBe(1);
+ expect(computeRecordListDisplayedFields(576).displayedFieldCount).toBe(2);
+ });
+
+ it('keeps one narrowed field on rows too tight for a full-width one', () => {
+ expect(computeRecordListDisplayedFields(407).displayedFieldCount).toBe(1);
+ expect(computeRecordListDisplayedFields(332).displayedFieldCount).toBe(1);
+ });
+
+ it('returns no field when not even a narrowed one fits', () => {
+ expect(computeRecordListDisplayedFields(331).displayedFieldCount).toBe(0);
+ expect(computeRecordListDisplayedFields(0).displayedFieldCount).toBe(0);
+ });
+
+ it('caps the displayed field count at the visible field limit', () => {
+ expect(computeRecordListDisplayedFields(10_000).displayedFieldCount).toBe(
+ 6,
+ );
+ });
+
+ it('gives fields their full width as soon as the row can afford it', () => {
+ expect(computeRecordListDisplayedFields(408).displayedFieldMaxWidth).toBe(
+ 156,
+ );
+ expect(
+ computeRecordListDisplayedFields(10_000).displayedFieldMaxWidth,
+ ).toBe(156);
+ });
+
+ it('narrows the field to its slot on rows below the full-width breakpoint', () => {
+ // A 390px viewport leaves a 342px row, so the single field gets 90px.
+ expect(computeRecordListDisplayedFields(342).displayedFieldMaxWidth).toBe(
+ 90,
+ );
+ });
+
+ // Row padding 12 + label 176 + gap 12 + hidden-count chip 40.
+ const WIDTH_RESERVED_AROUND_FIELDS = 240;
+ const GAP_BEFORE_EACH_FIELD = 12;
+
+ it.each([332, 342, 380, 407, 408, 500, 576, 900, 1200])(
+ 'never promises a %ipx row more field width than it has',
+ (rowWidth) => {
+ const { displayedFieldCount, displayedFieldMaxWidth } =
+ computeRecordListDisplayedFields(rowWidth);
+
+ const widthTakenByFields =
+ displayedFieldCount * (displayedFieldMaxWidth + GAP_BEFORE_EACH_FIELD);
+
+ expect(widthTakenByFields).toBeLessThanOrEqual(
+ rowWidth - WIDTH_RESERVED_AROUND_FIELDS,
+ );
+ },
+ );
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-list/utils/computeRecordListDisplayedFieldCount.ts b/packages/twenty-front/src/modules/object-record/record-list/utils/computeRecordListDisplayedFieldCount.ts
deleted file mode 100644
index 68b30d464ac..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-list/utils/computeRecordListDisplayedFieldCount.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { RECORD_LIST_ROW_FIELD_MAX_WIDTH } from '@/object-record/record-list/constants/RecordListRowFieldMaxWidth';
-import { RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH } from '@/object-record/record-list/constants/RecordListRowLabelIdentifierWidth';
-import { RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT } from '@/object-record/record-list/constants/RecordListRowVisibleFieldLimit';
-
-const ROW_HORIZONTAL_PADDING_WIDTH = 12;
-const ROW_ITEM_GAP_WIDTH = 12;
-const HIDDEN_FIELD_COUNT_CHIP_WIDTH = 40;
-
-export const computeRecordListDisplayedFieldCount = (
- containerWidth: number,
-) => {
- const reservedWidth =
- ROW_HORIZONTAL_PADDING_WIDTH +
- RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH +
- ROW_ITEM_GAP_WIDTH +
- HIDDEN_FIELD_COUNT_CHIP_WIDTH;
-
- const fieldWidthWithGap =
- RECORD_LIST_ROW_FIELD_MAX_WIDTH + ROW_ITEM_GAP_WIDTH;
-
- const fittingFieldCount = Math.floor(
- (containerWidth - reservedWidth) / fieldWidthWithGap,
- );
-
- return Math.min(
- RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT,
- Math.max(0, fittingFieldCount),
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-list/utils/computeRecordListDisplayedFields.ts b/packages/twenty-front/src/modules/object-record/record-list/utils/computeRecordListDisplayedFields.ts
new file mode 100644
index 00000000000..d7cd1399571
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/utils/computeRecordListDisplayedFields.ts
@@ -0,0 +1,62 @@
+import { RECORD_LIST_ROW_FIELD_MAX_WIDTH } from '@/object-record/record-list/constants/RecordListRowFieldMaxWidth';
+import { RECORD_LIST_ROW_FIELD_MIN_WIDTH } from '@/object-record/record-list/constants/RecordListRowFieldMinWidth';
+import { RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH } from '@/object-record/record-list/constants/RecordListRowLabelIdentifierWidth';
+import { RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT } from '@/object-record/record-list/constants/RecordListRowVisibleFieldLimit';
+import { type RecordListDisplayedFields } from '@/object-record/record-list/types/RecordListDisplayedFields';
+
+const ROW_HORIZONTAL_PADDING_WIDTH = 12;
+const ROW_ITEM_GAP_WIDTH = 12;
+const HIDDEN_FIELD_COUNT_CHIP_WIDTH = 40;
+
+const computeDisplayedFieldCount = (widthLeftForFields: number) => {
+ const fullWidthFieldCount = Math.floor(
+ widthLeftForFields / (RECORD_LIST_ROW_FIELD_MAX_WIDTH + ROW_ITEM_GAP_WIDTH),
+ );
+
+ if (fullWidthFieldCount >= 1) {
+ return Math.min(RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT, fullWidthFieldCount);
+ }
+
+ // No phone is wide enough for a full-width field once the record label and
+ // the hidden-count chip are paid for, and a row that shows only "+5" says
+ // nothing about the record. Below that breakpoint, keep a single field and
+ // narrow it into whatever is left.
+ return widthLeftForFields >=
+ RECORD_LIST_ROW_FIELD_MIN_WIDTH + ROW_ITEM_GAP_WIDTH
+ ? 1
+ : 0;
+};
+
+// Takes the width a row actually renders in, not the list container's own
+// width: a field told it may be wider than its slot is cut rather than
+// ellipsised.
+export const computeRecordListDisplayedFields = (
+ rowWidth: number,
+): RecordListDisplayedFields => {
+ const reservedWidth =
+ ROW_HORIZONTAL_PADDING_WIDTH +
+ RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH +
+ ROW_ITEM_GAP_WIDTH +
+ HIDDEN_FIELD_COUNT_CHIP_WIDTH;
+
+ const widthLeftForFields = rowWidth - reservedWidth;
+
+ const displayedFieldCount = computeDisplayedFieldCount(widthLeftForFields);
+
+ if (displayedFieldCount === 0) {
+ return {
+ displayedFieldCount,
+ displayedFieldMaxWidth: RECORD_LIST_ROW_FIELD_MAX_WIDTH,
+ };
+ }
+
+ // Fields truncate at the width they are given rather than at the width they
+ // were promised: one told it may take 156px inside a 131px slot renders past
+ // its box and is cut mid-word instead of ellipsised.
+ const displayedFieldMaxWidth = Math.min(
+ RECORD_LIST_ROW_FIELD_MAX_WIDTH,
+ Math.floor(widthLeftForFields / displayedFieldCount) - ROW_ITEM_GAP_WIDTH,
+ );
+
+ return { displayedFieldCount, displayedFieldMaxWidth };
+};
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.ts
index 7024c119dd3..e2100b83dca 100644
--- 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.ts
@@ -2,9 +2,7 @@ import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/Enriche
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
@@ -12,10 +10,6 @@ import { FeatureFlagKey } from '~/generated-metadata/graphql';
export const useRecordTableWidgetLayoutPickerOptions = (
objectMetadataItem: EnrichedObjectMetadataItem | undefined,
) => {
- const isListViewEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_LIST_VIEW_ENABLED,
- );
-
const readableFields = objectMetadataItem?.readableFields ?? [];
const defaultGroupByFieldMetadataItem =
@@ -28,7 +22,6 @@ export const useRecordTableWidgetLayoutPickerOptions = (
const layoutOptions = getRecordTableWidgetLayoutPickerOptions({
isKanbanAvailable: isDefined(defaultGroupByFieldMetadataItem),
isCalendarAvailable: isDefined(defaultCalendarFieldMetadataItem),
- isListViewEnabled,
});
return {
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.ts
index 84c4cdd9c8a..f282e1ea722 100644
--- 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.ts
@@ -8,7 +8,6 @@ import { ViewType } from '~/generated-metadata/graphql';
const ALL_AVAILABLE = {
isKanbanAvailable: true,
isCalendarAvailable: true,
- isListViewEnabled: true,
};
describe('getRecordTableWidgetLayoutPickerOptions', () => {
@@ -25,15 +24,6 @@ describe('getRecordTableWidgetLayoutPickerOptions', () => {
]);
});
- 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(
@@ -58,24 +48,22 @@ describe('getRecordTableWidgetLayoutPickerOptions', () => {
},
);
- it('should refuse a layout the picker disabled or never offered', () => {
+ it('should refuse a layout the picker disabled', () => {
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.LIST_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;
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.ts
index ae91a07e41b..1ed550f567d 100644
--- 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.ts
@@ -20,16 +20,14 @@ export type RecordTableWidgetLayoutPickerOption = {
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.
+// can't be picked.
export const getRecordTableWidgetLayoutPickerOptions = ({
isKanbanAvailable,
isCalendarAvailable,
- isListViewEnabled,
}: GetRecordTableWidgetLayoutPickerOptionsParams): RecordTableWidgetLayoutPickerOption[] => {
const unavailableReasonByViewType: Partial<
Record<RecordTableWidgetLayoutViewType, MessageDescriptor>
@@ -42,9 +40,7 @@ export const getRecordTableWidgetLayoutPickerOptions = ({
: { [ViewType.CALENDAR_WIDGET]: msg`Needs a Date field` }),
};
- return RECORD_TABLE_WIDGET_LAYOUT_VIEW_TYPES.filter(
- (viewType) => viewType !== ViewType.LIST_WIDGET || isListViewEnabled,
- ).map((viewType) => {
+ return RECORD_TABLE_WIDGET_LAYOUT_VIEW_TYPES.map((viewType) => {
const unavailableReason = unavailableReasonByViewType[viewType];
return {
@@ -63,8 +59,8 @@ export const getSelectableLayoutViewTypes = (
.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.
+// A layout that is 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,
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.tsx
index 6c1c16372c5..71204986215 100644
--- 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.tsx
@@ -10,7 +10,6 @@ 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();
@@ -68,9 +67,6 @@ jest.mock(
useAtomComponentStateValue: jest.fn(() => null),
}),
);
-jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({
- useIsFeatureEnabled: (...args: unknown[]) => mockUseIsFeatureEnabled(...args),
-}));
jest.mock('twenty-ui/navigation', () => ({
MenuItemSelect: ({
contextualText,
@@ -114,7 +110,6 @@ const layoutLabels = () =>
describe('RecordTableLayoutDropdownContent', () => {
beforeEach(() => {
jest.clearAllMocks();
- mockUseIsFeatureEnabled.mockReturnValue(true);
mockIsAvailableAsGroupByField.mockReturnValue(true);
mockIsAvailableAsCalendarField.mockReturnValue(true);
});
@@ -125,14 +120,6 @@ describe('RecordTableLayoutDropdownContent', () => {
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);
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx
index 64af7ba4982..8183484ab86 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx
@@ -36,12 +36,10 @@ import { viewPickerIsPersistingComponentState } from '@/views/view-picker/states
import { viewPickerMainGroupByFieldMetadataIdComponentState } from '@/views/view-picker/states/viewPickerMainGroupByFieldMetadataIdComponentState';
import { viewPickerSelectedIconComponentState } from '@/views/view-picker/states/viewPickerSelectedIconComponentState';
import { viewPickerTypeComponentState } from '@/views/view-picker/states/viewPickerTypeComponentState';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { Trans, useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
import { IconX } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { FeatureFlagKey } from '~/generated-metadata/graphql';
const StyledFieldAvailableContainer = styled.div`
color: ${themeCssVariables.font.color.light};
@@ -55,9 +53,6 @@ export const ViewPickerContentCreateMode = () => {
const { t } = useLingui();
const { viewPickerMode, setViewPickerMode } = useViewPickerMode();
const [hasManuallySelectedIcon, setHasManuallySelectedIcon] = useState(false);
- const isListViewEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_LIST_VIEW_ENABLED,
- );
const viewObjectMetadataId = useAtomComponentStateValue(
viewObjectMetadataIdComponentState,
@@ -192,9 +187,7 @@ export const ViewPickerContentCreateMode = () => {
setViewPickerSelectedIcon(viewTypeIconKeyMapping(value));
}
}}
- options={VIEW_PICKER_TYPE_SELECT_OPTIONS.filter(
- (option) => option.value !== ViewType.LIST || isListViewEnabled,
- ).map((option) => ({
+ options={VIEW_PICKER_TYPE_SELECT_OPTIONS.map((option) => ({
...option,
label: t(option.label),
}))}
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts
index 08c93ec7f33..313fdbc3aa8 100644
--- a/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts
@@ -22,15 +22,6 @@ export const PUBLIC_FEATURE_FLAGS: PublicFeatureFlag[] = [
icon: 'IconRelationManyToMany',
},
},
- {
- key: FeatureFlagKey.IS_LIST_VIEW_ENABLED,
- metadata: {
- label: 'List View',
- description:
- 'Display records in a list layout with collapsible groups and inline fields',
- icon: 'IconList',
- },
- },
...(process.env.CLOUDFLARE_API_KEY
? [
// {
diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.ts
index caeb7903fa7..c801e8c618b 100644
--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts
+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts
@@ -4,7 +4,6 @@ export enum FeatureFlagKey {
IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',
IS_EMAIL_GROUP_ENABLED = 'IS_EMAIL_GROUP_ENABLED',
IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',
- IS_LIST_VIEW_ENABLED = 'IS_LIST_VIEW_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED = 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED',
IS_WORKFLOW_VERSION_IN_CORE_ENABLED = 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED',