The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Record table widget - Follow up (#19479)
Etienne34972f616703
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidget.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidget.tsxindex 809695bd414..0705dbf5e81 100644--- a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidget.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidget.tsx@@ -1,6 +1,14 @@import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';import { RecordTableWidgetSetReadOnlyColumnHeadersEffect } from '@/object-record/record-table-widget/components/RecordTableWidgetSetReadOnlyColumnHeadersEffect';import { RecordTableWithWrappers } from '@/object-record/record-table/components/RecordTableWithWrappers';+import { styled } from '@linaria/react';+import { themeCssVariables } from 'twenty-ui/theme-constants';++const StyledTableContainer = styled.div`+ border: 1px solid ${themeCssVariables.border.color.light};+ border-radius: ${themeCssVariables.border.radius.sm};+ overflow: hidden;+`;export const RecordTableWidget = () => {const { objectNameSingular, recordIndexId, viewBarInstanceId } =@@ -11,11 +19,13 @@ export const RecordTableWidget = () => {<RecordTableWidgetSetReadOnlyColumnHeadersEffectrecordTableId={recordIndexId}/>- <RecordTableWithWrappers- recordTableId={recordIndexId}- objectNameSingular={objectNameSingular}- viewBarId={viewBarInstanceId}- />+ <StyledTableContainer>+ <RecordTableWithWrappers+ recordTableId={recordIndexId}+ objectNameSingular={objectNameSingular}+ viewBarId={viewBarInstanceId}+ />+ </StyledTableContainer></>);};diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutRecordTableWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutRecordTableWidget.tsindex 7bd75516b83..594186963ad 100644--- a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutRecordTableWidget.ts+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutRecordTableWidget.ts@@ -1,3 +1,4 @@+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { WIDGET_SIZES } from '@/page-layout/constants/WidgetSizes';import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';@@ -49,8 +50,10 @@ export const useCreatePageLayoutRecordTableWidget = (const store = useStore();- const createPageLayoutRecordTableWidget =- useCallback((): PageLayoutWidget => {+ const createPageLayoutRecordTableWidget = useCallback(+ (+ objectMetadata?: Pick<EnrichedObjectMetadataItem, 'id' | 'labelPlural'>,+ ): PageLayoutWidget => {const allTabLayouts = store.get(pageLayoutCurrentLayoutsState);const pageLayoutDraggedArea = store.get(pageLayoutDraggedAreaState);@@ -70,17 +73,18 @@ export const useCreatePageLayoutRecordTableWidget = (minimumSize,);- const newWidget = createDefaultRecordTableWidget(- widgetId,- activeTabId,- 'Record Table',- {+ const newWidget = createDefaultRecordTableWidget({+ id: widgetId,+ pageLayoutTabId: activeTabId,+ title: objectMetadata?.labelPlural ?? 'Record Table',+ gridPosition: {row: position.y,column: position.x,rowSpan: position.h,columnSpan: position.w,},- );+ objectMetadataId: objectMetadata?.id,+ });const newLayout = {i: widgetId,@@ -108,13 +112,15 @@ export const useCreatePageLayoutRecordTableWidget = (store.set(pageLayoutDraggedAreaState, null);return newWidget;- }, [+ },+ [activeTabId,pageLayoutCurrentLayoutsState,pageLayoutDraftState,pageLayoutDraggedAreaState,store,- ]);+ ],+ );return { createPageLayoutRecordTableWidget };};diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultRecordTableWidget.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultRecordTableWidget.test.tsindex 08983451cdf..caf3b6b34ab 100644--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultRecordTableWidget.test.ts+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultRecordTableWidget.test.ts@@ -1,9 +1,9 @@+import { createDefaultRecordTableWidget } from '@/page-layout/utils/createDefaultRecordTableWidget';import {PageLayoutTabLayoutMode,WidgetConfigurationType,WidgetType,} from '~/generated-metadata/graphql';-import { createDefaultRecordTableWidget } from '@/page-layout/utils/createDefaultRecordTableWidget';describe('createDefaultRecordTableWidget', () => {const widgetId = 'widget-id-1';@@ -11,12 +11,12 @@ describe('createDefaultRecordTableWidget', () => {const title = 'My Record Table';const gridPosition = { row: 1, column: 2, rowSpan: 3, columnSpan: 4 };- const widget = createDefaultRecordTableWidget(- widgetId,+ const widget = createDefaultRecordTableWidget({+ id: widgetId,pageLayoutTabId,title,gridPosition,- );+ });it('should return correct shape with all required fields', () => {expect(widget.__typename).toBe('PageLayoutWidget');diff --git a/packages/twenty-front/src/modules/page-layout/utils/createDefaultRecordTableWidget.ts b/packages/twenty-front/src/modules/page-layout/utils/createDefaultRecordTableWidget.tsindex 50d3edc9ff2..873632195b9 100644--- a/packages/twenty-front/src/modules/page-layout/utils/createDefaultRecordTableWidget.ts+++ b/packages/twenty-front/src/modules/page-layout/utils/createDefaultRecordTableWidget.ts@@ -6,12 +6,19 @@ import {WidgetType,} from '~/generated-metadata/graphql';-export const createDefaultRecordTableWidget = (- id: string,- pageLayoutTabId: string,- title: string,- gridPosition: GridPosition,-): PageLayoutWidget => {+export const createDefaultRecordTableWidget = ({+ id,+ pageLayoutTabId,+ title,+ gridPosition,+ objectMetadataId,+}: {+ id: string;+ pageLayoutTabId: string;+ title: string;+ gridPosition: GridPosition;+ objectMetadataId?: string;+}): PageLayoutWidget => {return {__typename: 'PageLayoutWidget',id,@@ -30,7 +37,8 @@ export const createDefaultRecordTableWidget = (rowSpan: gridPosition.rowSpan,columnSpan: gridPosition.columnSpan,},- objectMetadataId: null,+ objectMetadataId: objectMetadataId ?? null,+ isOverridden: false,createdAt: new Date().toISOString(),updatedAt: new Date().toISOString(),deletedAt: null,diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useCreateViewForRecordTableWidget.ts b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useCreateViewForRecordTableWidget.tsindex 28bbfc471b5..ea090a53b87 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useCreateViewForRecordTableWidget.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useCreateViewForRecordTableWidget.ts@@ -1,12 +1,15 @@import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { filterFieldsForRecordTableViewCreation } from '@/page-layout/widgets/record-table/utils/filterFieldsForRecordTableViewCreation';import { sortFieldsByRelevanceForRecordTableWidget } from '@/page-layout/widgets/record-table/utils/sortFieldsByRelevanceForRecordTableWidget';-import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';+import { useUpdatePageLayoutWidget } from '@/page-layout/hooks/useUpdatePageLayoutWidget';import { usePerformViewAPIPersist } from '@/views/hooks/internal/usePerformViewAPIPersist';import { usePerformViewFieldAPIPersist } from '@/views/hooks/internal/usePerformViewFieldAPIPersist';import { useCallback } from 'react';import { v4 } from 'uuid';-import { ViewType } from '~/generated-metadata/graphql';+import {+ WidgetConfigurationType,+ ViewType,+} from '~/generated-metadata/graphql';const DEFAULT_VIEW_FIELD_SIZE = 180;const INITIAL_VISIBLE_FIELDS_COUNT_IN_WIDGET = 6;@@ -14,11 +17,13 @@ const INITIAL_VISIBLE_FIELDS_COUNT_IN_WIDGET = 6;export const useCreateViewForRecordTableWidget = (pageLayoutId: string) => {const { performViewAPICreate } = usePerformViewAPIPersist();const { performViewFieldAPICreate } = usePerformViewFieldAPIPersist();- const { updateCurrentWidgetConfig } =- useUpdateCurrentWidgetConfig(pageLayoutId);+ const { updatePageLayoutWidget } = useUpdatePageLayoutWidget(pageLayoutId);const createViewForRecordTableWidget = useCallback(- async (objectMetadataItem: EnrichedObjectMetadataItem) => {+ async (+ widgetId: string,+ objectMetadataItem: EnrichedObjectMetadataItem,+ ) => {const newViewId = v4();const viewResult = await performViewAPICreate(@@ -60,8 +65,9 @@ export const useCreateViewForRecordTableWidget = (pageLayoutId: string) => {try {await performViewFieldAPICreate({ inputs: viewFieldInputs });- updateCurrentWidgetConfig({- configToUpdate: {+ updatePageLayoutWidget(widgetId, {+ configuration: {+ configurationType: WidgetConfigurationType.RECORD_TABLE,viewId: newViewId,},});@@ -72,11 +78,7 @@ export const useCreateViewForRecordTableWidget = (pageLayoutId: string) => {);}},- [- performViewAPICreate,- performViewFieldAPICreate,- updateCurrentWidgetConfig,- ],+ [performViewAPICreate, performViewFieldAPICreate, updatePageLayoutWidget],);return { createViewForRecordTableWidget };diff --git a/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.ts b/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.tsindex 71c65983d94..7596f5c5196 100644--- a/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.ts+++ b/packages/twenty-front/src/modules/side-panel/components/hooks/usePageLayoutHeaderInfo.ts@@ -227,7 +227,7 @@ export const usePageLayoutHeaderInfo = ({return {headerIcon: IconTable,headerIconColor: iconColor,- headerType: t`Record Table`,+ headerType: t`View`,title,isReadonly: false,tab: undefined,diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsxindex 118a63e1c5d..e5219c7bcef 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx@@ -1,5 +1,6 @@import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';import { FIND_MANY_FRONT_COMPONENTS } from '@/front-components/graphql/queries/findManyFrontComponents';+import { useReadableObjectMetadataItems } from '@/object-metadata/hooks/useReadableObjectMetadataItems';import { useCreatePageLayoutFrontComponentWidget } from '@/page-layout/hooks/useCreatePageLayoutFrontComponentWidget';import { useCreatePageLayoutGraphWidget } from '@/page-layout/hooks/useCreatePageLayoutGraphWidget';import { useCreatePageLayoutIframeWidget } from '@/page-layout/hooks/useCreatePageLayoutIframeWidget';@@ -10,6 +11,7 @@ import { useRemovePageLayoutWidgetAndPreservePosition } from '@/page-layout/hookimport { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';import { getTabListInstanceIdFromPageLayoutAndRecord } from '@/page-layout/utils/getTabListInstanceIdFromPageLayoutAndRecord';+import { useCreateViewForRecordTableWidget } from '@/page-layout/widgets/record-table/hooks/useCreateViewForRecordTableWidget';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';@@ -23,7 +25,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useQuery } from '@apollo/client/react';import { t } from '@lingui/core/macro';-import { SidePanelPages } from 'twenty-shared/types';+import { CoreObjectNameSingular, SidePanelPages } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import {IconAlignBoxLeftTop,@@ -86,6 +88,19 @@ export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {const { removePageLayoutWidgetAndPreservePosition } =useRemovePageLayoutWidgetAndPreservePosition(pageLayoutId);+ const { createViewForRecordTableWidget } =+ useCreateViewForRecordTableWidget(pageLayoutId);+ const { readableObjectMetadataItems } = useReadableObjectMetadataItems();++ const firstAvailableObjectMetadataItem =+ readableObjectMetadataItems.find(+ (objectMetadataItem) =>+ objectMetadataItem.nameSingular === CoreObjectNameSingular.Company,+ ) ||+ [...readableObjectMetadataItems].sort((first, second) =>+ first.labelPlural.localeCompare(second.labelPlural),+ )[0];+const isRecordTableWidgetEnabled = useIsFeatureEnabled(FeatureFlagKey.IS_RECORD_TABLE_WIDGET_ENABLED,);@@ -179,7 +194,7 @@ export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {closeSidePanelMenu();};- const handleNavigateToRecordTableSettings = () => {+ const handleNavigateToRecordTableSettings = async () => {if (isExistingWidgetMissingOrDifferentType(existingWidget?.type,@@ -190,9 +205,16 @@ export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {removePageLayoutWidgetAndPreservePosition(pageLayoutEditingWidgetId);}- const newRecordTableWidget = createPageLayoutRecordTableWidget();+ const newRecordTableWidget = createPageLayoutRecordTableWidget(+ firstAvailableObjectMetadataItem,+ );setPageLayoutEditingWidgetId(newRecordTableWidget.id);++ await createViewForRecordTableWidget(+ newRecordTableWidget.id,+ firstAvailableObjectMetadataItem,+ );}navigatePageLayoutSidePanel({@@ -251,7 +273,7 @@ export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {><CommandMenuItemIcon={IconTable}- label={t`Record Table`}+ label={t`View`}id="record-table"onClick={handleNavigateToRecordTableSettings}/>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 8ad8c80dc56..29c8fcaa205 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@@ -8,6 +8,7 @@ import { RecordTableDataSourceDropdownContent } from '@/side-panel/pages/page-laimport { RecordTableFieldsDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownContent';import { WidgetSettingsFooter } from '@/side-panel/pages/page-layout/components/WidgetSettingsFooter';import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';+import { useRecordTableSettingsDescriptions } from '@/side-panel/pages/page-layout/hooks/useRecordTableSettingsDescriptions';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';@@ -17,9 +18,10 @@ import { t } from '@lingui/core/macro';import { isDefined } from 'twenty-shared/utils';import {IconArrowsSort,- IconDatabase,- IconEye,+ IconBox,IconFilter,+ IconListDetails,+ IconTable,} from 'twenty-ui/display';import { WidgetConfigurationType } from '~/generated-metadata/graphql';@@ -41,21 +43,31 @@ export const SidePanelDashboardRecordTableSettings = () => {const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();- if (!isDefined(widgetInEditMode)) {- return null;- }-- const { configuration } = widgetInEditMode;-+ const configuration = widgetInEditMode?.configuration;const isRecordTableConfiguration =- configuration.configurationType === WidgetConfigurationType.RECORD_TABLE;+ configuration?.configurationType === WidgetConfigurationType.RECORD_TABLE;const viewId =isRecordTableConfiguration &&+ isDefined(configuration) &&'viewId' in configuration &&isDefined(configuration.viewId)? (configuration.viewId as string)- : undefined;+ : null;++ const {+ sourceDescription,+ fieldsDescription,+ filterDescription,+ sortDescription,+ } = useRecordTableSettingsDescriptions({+ objectMetadataId: widgetInEditMode?.objectMetadataId,+ viewId,+ });++ if (!isDefined(widgetInEditMode)) {+ return null;+ }const hasViewId = isDefined(viewId);@@ -84,10 +96,23 @@ export const SidePanelDashboardRecordTableSettings = () => {commandGroups={[]}selectableItemIds={selectableItemIds}>- <SidePanelGroup heading={t`Data`}>+ <SidePanelGroup heading={t`Settings`}>+ <SelectableListItem itemId="object-view-layout">+ <CommandMenuItemDropdown+ Icon={IconTable}+ label={t`Layout`}+ id="object-view-layout"+ dropdownId="object-view-layout"+ dropdownComponents={<></>}+ dropdownPlacement="bottom-end"+ description={t`Table`}+ disabled={true}+ contextualTextPosition="right"+ />+ </SelectableListItem><SelectableListItem itemId="record-table-source"><CommandMenuItemDropdown- Icon={IconDatabase}+ Icon={IconBox}label={t`Source`}id="record-table-source"dropdownId="record-table-source"@@ -98,6 +123,7 @@ export const SidePanelDashboardRecordTableSettings = () => {}dropdownPlacement="bottom-end"hasSubMenu+ description={sourceDescription}contextualTextPosition="right"/></SelectableListItem>@@ -105,7 +131,7 @@ export const SidePanelDashboardRecordTableSettings = () => {<><SelectableListItem itemId="record-table-fields"><CommandMenuItemDropdown- Icon={IconEye}+ Icon={IconListDetails}label={t`Fields`}id="record-table-fields"dropdownId="record-table-fields"@@ -117,6 +143,7 @@ export const SidePanelDashboardRecordTableSettings = () => {}dropdownPlacement="bottom-end"hasSubMenu+ description={fieldsDescription}contextualTextPosition="right"/></SelectableListItem>@@ -130,6 +157,7 @@ export const SidePanelDashboardRecordTableSettings = () => {Icon={IconFilter}hasSubMenuonClick={handleFilterClick}+ description={filterDescription}contextualTextPosition="right"/></SelectableListItem>@@ -143,6 +171,7 @@ export const SidePanelDashboardRecordTableSettings = () => {Icon={IconArrowsSort}hasSubMenuonClick={handleSortClick}+ description={sortDescription}contextualTextPosition="right"/></SelectableListItem>diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsxindex 137aac59d15..892fc21c640 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx@@ -105,14 +105,15 @@ export const RecordTableDataSourceDropdownContent = () => {(item) => item.id === newObjectMetadataItemId,);- if (isDefined(selectedObjectMetadataItem)) {- await createViewForRecordTableWidget(selectedObjectMetadataItem);-- if (isDefined(widgetInEditMode)) {- updatePageLayoutWidget(widgetInEditMode.id, {- title: selectedObjectMetadataItem.labelPlural,- });- }+ if (isDefined(selectedObjectMetadataItem) && isDefined(widgetInEditMode)) {+ await createViewForRecordTableWidget(+ widgetInEditMode.id,+ selectedObjectMetadataItem,+ );++ updatePageLayoutWidget(widgetInEditMode.id, {+ title: selectedObjectMetadataItem.labelPlural,+ });}closeDropdown();diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useRecordTableSettingsDescriptions.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useRecordTableSettingsDescriptions.tsnew file mode 100644index 00000000000..0bc6450c824--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useRecordTableSettingsDescriptions.ts@@ -0,0 +1,114 @@+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';+import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';+import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { useViewById } from '@/views/hooks/useViewById';+import { t } from '@lingui/core/macro';+import { isDefined } from 'twenty-shared/utils';++const PLACEHOLDER_INSTANCE_ID =+ 'record-table-settings-descriptions-placeholder';++type UseRecordTableSettingsDescriptionsParams = {+ objectMetadataId: string | null | undefined;+ viewId: string | null;+};++export const useRecordTableSettingsDescriptions = ({+ objectMetadataId,+ viewId,+}: UseRecordTableSettingsDescriptionsParams) => {+ const { objectMetadataItems } = useObjectMetadataItems();+ const { view } = useViewById(viewId);++ const sourceObjectMetadataItem = objectMetadataItems.find(+ (item) => item.id === objectMetadataId,+ );++ const recordIndexId =+ isDefined(viewId) && isDefined(sourceObjectMetadataItem)+ ? getRecordIndexIdFromObjectNamePluralAndViewId(+ sourceObjectMetadataItem.namePlural,+ viewId,+ )+ : PLACEHOLDER_INSTANCE_ID;++ const currentRecordFilters = useAtomComponentStateValue(+ currentRecordFiltersComponentState,+ recordIndexId,+ );++ const currentRecordSorts = useAtomComponentStateValue(+ currentRecordSortsComponentState,+ recordIndexId,+ );++ const currentRecordFields = useAtomComponentStateValue(+ currentRecordFieldsComponentState,+ recordIndexId,+ );++ const hasViewId = isDefined(viewId);++ const activeVisibleFieldLabels: Array<string | undefined> = hasViewId+ ? currentRecordFields+ .filter((field) => field.isVisible)+ .map(+ (field) =>+ sourceObjectMetadataItem?.fields.find(+ (metaField) => metaField.id === field.fieldMetadataItemId,+ )?.label,+ )+ : [];++ const activeFilterLabels: Array<string | undefined> =+ currentRecordFilters.length > 0+ ? currentRecordFilters.map((filter) => filter.label)+ : (view?.viewFilters ?? []).map(+ (filter) =>+ sourceObjectMetadataItem?.fields.find(+ (field) => field.id === filter.fieldMetadataId,+ )?.label,+ );++ const activeSortLabels: Array<string | undefined> = (+ currentRecordSorts.length > 0 ? currentRecordSorts : (view?.viewSorts ?? [])+ ).map(+ (sort) =>+ sourceObjectMetadataItem?.fields.find(+ (field) => field.id === sort.fieldMetadataId,+ )?.label,+ );++ const sourceDescription = sourceObjectMetadataItem?.labelPlural;++ const fieldsDescription =+ activeVisibleFieldLabels.length === 1+ ? activeVisibleFieldLabels[0]+ : activeVisibleFieldLabels.length > 1+ ? t`${activeVisibleFieldLabels.length} shown`+ : undefined;++ const filterDescription =+ activeFilterLabels.length === 1+ ? activeFilterLabels[0]+ : activeFilterLabels.length > 1+ ? t`${activeFilterLabels.length} shown`+ : undefined;++ const sortDescription =+ activeSortLabels.length === 1+ ? activeSortLabels[0]+ : activeSortLabels.length > 1+ ? t`${activeSortLabels.length} shown`+ : undefined;++ return {+ sourceDescription,+ fieldsDescription,+ filterDescription,+ sortDescription,+ };+};diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx b/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsxindex 5d62e31e141..e7530f46cea 100644--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx+++ b/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx@@ -135,12 +135,13 @@ export const MenuItem = ({<RightIcon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />)}{RightComponent}- {hasSubMenu && !disabled && (+ {hasSubMenu && (<StyledSubMenuIconanimate={{ rotate: isSubMenuOpened ? 90 : 0 }}transition={{duration: theme.animation.duration.normal,}}+ style={{ visibility: disabled ? 'hidden' : 'visible' }}><IconChevronRightsize={theme.icon.size.sm}