Skip to content

The open alternative to Salesforce, designed for AI.

feat(view): land on the initial object view and hide the index view behind the flag (#25682)

Thomas Trompettef77b37663e35
diff --git a/packages/twenty-front/src/modules/context-store/components/RouteContextStoreProvider.tsx b/packages/twenty-front/src/modules/context-store/components/RouteContextStoreProvider.tsx
index 07bc0754dee..98d0e8a97c7 100644
--- a/packages/twenty-front/src/modules/context-store/components/RouteContextStoreProvider.tsx
+++ b/packages/twenty-front/src/modules/context-store/components/RouteContextStoreProvider.tsx
@@ -7,18 +7,28 @@ import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMeta
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
+import { computeObjectViewTargetIds } from '@/views/utils/computeObjectViewTargetIds';
+import { isUsableLastVisitedView } from '@/views/utils/isUsableLastVisitedView';
import { matchRoutes, useLocation, useSearchParams } from 'react-router-dom';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { ViewKey, ViewType } from '~/generated-metadata/graphql';
+import { FeatureFlagKey, ViewType } from '~/generated-metadata/graphql';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { isMatchingLocation } from '~/utils/isMatchingLocation';
-const getViewId = (
- viewIdFromQueryParams: string | null,
- indexViewId?: string,
- lastVisitedViewId?: string,
- firstAvailableViewId?: string,
-) => {
+const getViewId = ({
+ viewIdFromQueryParams,
+ indexViewId,
+ lastVisitedViewId,
+ firstAvailableViewId,
+ firstSelectableViewId,
+}: {
+ viewIdFromQueryParams: string | null;
+ indexViewId?: string;
+ lastVisitedViewId?: string;
+ firstAvailableViewId?: string;
+ firstSelectableViewId?: string;
+}) => {
if (isDefined(viewIdFromQueryParams)) {
return viewIdFromQueryParams;
}
@@ -27,6 +37,10 @@ const getViewId = (
return lastVisitedViewId;
}
+ if (isDefined(firstSelectableViewId)) {
+ return firstSelectableViewId;
+ }
+
if (isDefined(indexViewId)) {
return indexViewId;
}
@@ -89,30 +103,31 @@ export const RouteContextStoreProvider = () => {
(view) => view.id === lastVisitedViewIdRaw,
);
- const lastVisitedViewId =
- isDefined(lastVisitedView) &&
- lastVisitedView.type !== ViewType.FIELDS_WIDGET
- ? lastVisitedViewIdRaw
- : undefined;
-
- const indexViewId = views.find(
- (view) =>
- view.objectMetadataId === objectMetadataItem?.id &&
- view.key === ViewKey.INDEX,
- )?.id;
-
- const firstAvailableViewId = views.find(
- (view) =>
- view.objectMetadataId === objectMetadataItem?.id &&
- view.type !== ViewType.FIELDS_WIDGET,
- )?.id;
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
- const viewId = getViewId(
- viewIdQueryParam,
+ const lastVisitedViewId = isUsableLastVisitedView({
+ lastVisitedView,
+ isInitialObjectViewEnabled,
+ })
+ ? lastVisitedViewIdRaw
+ : undefined;
+
+ const { firstSelectableViewId, indexViewId, firstAvailableViewId } =
+ computeObjectViewTargetIds({
+ views,
+ objectMetadataId: objectMetadataItem?.id,
+ isInitialObjectViewEnabled,
+ });
+
+ const viewId = getViewId({
+ viewIdFromQueryParams: viewIdQueryParam,
indexViewId,
lastVisitedViewId,
firstAvailableViewId,
- );
+ firstSelectableViewId,
+ });
const shouldComputeContextStore =
(isRecordIndexPage ||
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/constants/ObjectBackedNavigationMenuItemTypes.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/ObjectBackedNavigationMenuItemTypes.ts
new file mode 100644
index 00000000000..6a1b8c7f2fb
--- /dev/null
+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/ObjectBackedNavigationMenuItemTypes.ts
@@ -0,0 +1,7 @@
+import { NavigationMenuItemType } from 'twenty-shared/types';
+
+export const OBJECT_BACKED_NAVIGATION_MENU_ITEM_TYPES = [
+ NavigationMenuItemType.OBJECT,
+ NavigationMenuItemType.VIEW,
+ NavigationMenuItemType.RECORD,
+];
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx
index 455e2464df7..79c0fc95981 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx
@@ -9,7 +9,10 @@ import {
} from 'twenty-ui/primitives/data-display';
import { IconLink, IconPerspective, IconWorld, useIcons } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { type NavigationMenuItem } from '~/generated-metadata/graphql';
+import {
+ FeatureFlagKey,
+ type NavigationMenuItem,
+} from '~/generated-metadata/graphql';
import { getNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemColor';
import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier';
@@ -23,6 +26,7 @@ import { useGetStandardObjectIcon } from '@/object-metadata/hooks/useGetStandard
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
export const NavigationMenuItemIcon = ({
@@ -36,6 +40,9 @@ export const NavigationMenuItemIcon = ({
);
const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
const views = useAtomStateValue(viewsSelector);
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
const objectNameSingular =
getNavigationMenuItemObjectNameSingular(
@@ -112,6 +119,7 @@ export const NavigationMenuItemIcon = ({
item: navigationMenuItem,
objectMetadataItems,
views,
+ isInitialObjectViewEnabled,
});
return (
<LinkIconWithLinkOverlay
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx
index 8a32a7cdf48..e853d8adb52 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx
@@ -1,7 +1,10 @@
import { NavigationMenuItemType } from 'twenty-shared/types';
import { IconHeartOff } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/primitives/input';
-import { type NavigationMenuItem } from '~/generated-metadata/graphql';
+import {
+ FeatureFlagKey,
+ type NavigationMenuItem,
+} from '~/generated-metadata/graphql';
import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';
import { NavigationMenuItemBackButton } from '@/navigation-menu-item/edit/components/NavigationMenuItemBackButton';
@@ -17,6 +20,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
import { lastVisitedViewPerObjectMetadataItemState } from '@/navigation/states/lastVisitedViewPerObjectMetadataItemState';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
type NavigationMenuItemFolderContentProps = {
folderId: string;
@@ -34,6 +38,9 @@ export const NavigationMenuItemFolderContent = ({
const lastVisitedViewPerObjectMetadataItem = useAtomStateValue(
lastVisitedViewPerObjectMetadataItemState,
);
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
const { deleteManyNavigationMenuItems } = useDeleteManyNavigationMenuItems();
const folderDroppableId = `${NavigationMenuItemDroppableIds.FAVORITE_FOLDER_PREFIX}${folderId}`;
@@ -52,6 +59,7 @@ export const NavigationMenuItemFolderContent = ({
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
+ isInitialObjectViewEnabled,
});
const objectNameSingular = getNavigationMenuItemObjectNameSingular(
navigationMenuItem,
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx
index 0d33a0e54e1..92e8e82a971 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx
@@ -58,6 +58,9 @@ export const NavigationMenuItemFolderSubItem = ({
);
const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
const views = useAtomStateValue(viewsSelector);
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
const lastVisitedViewPerObjectMetadataItem = useAtomStateValue(
lastVisitedViewPerObjectMetadataItemState,
);
@@ -82,6 +85,7 @@ export const NavigationMenuItemFolderSubItem = ({
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
+ isInitialObjectViewEnabled,
});
const objectNameSingular = getNavigationMenuItemObjectNameSingular(
navigationMenuItem,
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemFolderOpenState.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemFolderOpenState.ts
index 3fe0b211d57..bd9e6d8a0f5 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemFolderOpenState.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemFolderOpenState.ts
@@ -4,7 +4,10 @@ import { useNavigate } from 'react-router-dom';
import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { useIsMobile } from 'twenty-ui/utilities';
-import { type NavigationMenuItem } from '~/generated-metadata/graphql';
+import {
+ FeatureFlagKey,
+ type NavigationMenuItem,
+} from '~/generated-metadata/graphql';
import { currentNavigationMenuItemFolderIdState } from '@/navigation-menu-item/common/states/currentNavigationMenuItemFolderIdState';
import { lastClickedNavigationMenuItemIdState } from '@/navigation-menu-item/common/states/lastClickedNavigationMenuItemIdState';
@@ -17,6 +20,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
import { lastVisitedViewPerObjectMetadataItemState } from '@/navigation/states/lastVisitedViewPerObjectMetadataItemState';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
type UseNavigationMenuItemFolderOpenStateParams = {
folderId: string;
@@ -34,6 +38,9 @@ export const useNavigationMenuItemFolderOpenState = ({
const lastVisitedViewPerObjectMetadataItem = useAtomStateValue(
lastVisitedViewPerObjectMetadataItemState,
);
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
const [openNavigationMenuItemFolderIds, setOpenNavigationMenuItemFolderIds] =
useAtomState(openNavigationMenuItemFolderIdsState);
@@ -83,6 +90,7 @@ export const useNavigationMenuItemFolderOpenState = ({
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
+ isInitialObjectViewEnabled,
});
return isNonEmptyString(computedLink);
},
@@ -93,6 +101,7 @@ export const useNavigationMenuItemFolderOpenState = ({
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
+ isInitialObjectViewEnabled,
});
if (isNonEmptyString(link)) {
setLastClickedNavigationMenuItemId(firstNonLinkItem.id);
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useIdentifyActiveNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useIdentifyActiveNavigationMenuItems.ts
index ff9400fe404..8e931c23384 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useIdentifyActiveNavigationMenuItems.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useIdentifyActiveNavigationMenuItems.ts
@@ -14,6 +14,8 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
import { lastVisitedViewPerObjectMetadataItemState } from '@/navigation/states/lastVisitedViewPerObjectMetadataItemState';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { FeatureFlagKey } from '~/generated-metadata/graphql';
export const useIdentifyActiveNavigationMenuItems = (): {
activeNavigationMenuItemIds: string[];
@@ -27,6 +29,9 @@ export const useIdentifyActiveNavigationMenuItems = (): {
const lastVisitedViewPerObjectMetadataItem = useAtomStateValue(
lastVisitedViewPerObjectMetadataItemState,
);
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
const { activeObjectMetadataItems, objectMetadataItems } =
useFilteredObjectMetadataItems();
@@ -73,6 +78,7 @@ export const useIdentifyActiveNavigationMenuItems = (): {
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
+ isInitialObjectViewEnabled,
});
const lastClickedObjectMetadataId =
getObjectMetadataForNavigationMenuItem(
@@ -110,6 +116,7 @@ export const useIdentifyActiveNavigationMenuItems = (): {
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
+ isInitialObjectViewEnabled,
});
return link === currentPath;
})
@@ -186,6 +193,7 @@ export const useIdentifyActiveNavigationMenuItems = (): {
currentObjectMetadataItem,
isOnRecordShowPage,
contextStoreCurrentViewId,
+ isInitialObjectViewEnabled,
]);
return { activeNavigationMenuItemIds, objectMetadataIdForOpenedSection };
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx
index 97034f2db18..c4a8f0615bb 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx
@@ -6,7 +6,7 @@ import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/st
import { lastClickedNavigationMenuItemIdState } from '@/navigation-menu-item/common/states/lastClickedNavigationMenuItemIdState';
import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier';
import { useIdentifyActiveNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useIdentifyActiveNavigationMenuItems';
-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';
+import { getObjectDrawerItemNavigationPath } from '@/navigation-menu-item/display/object/utils/getObjectDrawerItemNavigationPath';
import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';
import { isCoreWorkflowsObjectNavigationMenuItem } from '@/navigation-menu-item/display/utils/isCoreWorkflowsObjectNavigationMenuItem';
import { ObjectIconWithViewOverlay } from '@/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay';
@@ -24,12 +24,11 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
import { useNavigate } from 'react-router-dom';
import {
- AppPath,
CoreObjectNameSingular,
FeatureFlagKey,
NavigationMenuItemType,
} from 'twenty-shared/types';
-import { getAppPath, isDefined } from 'twenty-shared/utils';
+import { isDefined } from 'twenty-shared/utils';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { IconLock, useIcons } from 'twenty-ui/icon';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
@@ -65,15 +64,15 @@ export const NavigationDrawerItemForObjectMetadataItem = ({
);
const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
const views = useAtomStateValue(viewsSelector);
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
const canReadObjectRecords = getObjectPermissionsForObject(
objectPermissionsByObjectMetadataId,
objectMetadataItem.id,
).canReadObjectRecords;
- const lastVisitedViewId =
- lastVisitedViewPerObjectMetadataItem?.[objectMetadataItem.id];
-
const { getIcon } = useIcons();
const objectNavItemColor = getObjectColorWithFallback(objectMetadataItem);
const navigate = useNavigate();
@@ -89,18 +88,14 @@ export const NavigationDrawerItemForObjectMetadataItem = ({
const isObject = navigationMenuItem?.type === NavigationMenuItemType.OBJECT;
const hasNavigationMenuItem = isRecord || isView || isObject;
- const navigationPath = hasNavigationMenuItem
- ? getNavigationMenuItemComputedLink({
- item: navigationMenuItem!,
- objectMetadataItems,
- views,
- lastVisitedViewPerObjectMetadataItem,
- })
- : getAppPath(
- AppPath.RecordIndexPage,
- { objectNamePlural: objectMetadataItem.namePlural },
- lastVisitedViewId ? { viewId: lastVisitedViewId } : undefined,
- );
+ const navigationPath = getObjectDrawerItemNavigationPath({
+ navigationMenuItem: navigationMenuItem ?? undefined,
+ objectMetadataItem,
+ objectMetadataItems,
+ views,
+ lastVisitedViewPerObjectMetadataItem,
+ isInitialObjectViewEnabled,
+ });
const isActive = hasNavigationMenuItem
? activeNavigationMenuItemIds.includes(navigationMenuItem!.id)
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getObjectDrawerItemNavigationPath.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getObjectDrawerItemNavigationPath.test.ts
new file mode 100644
index 00000000000..382d9132f1f
--- /dev/null
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getObjectDrawerItemNavigationPath.test.ts
@@ -0,0 +1,102 @@
+import { getObjectDrawerItemNavigationPath } from '@/navigation-menu-item/display/object/utils/getObjectDrawerItemNavigationPath';
+import { NavigationMenuItemType } from 'twenty-shared/types';
+import {
+ type NavigationMenuItem,
+ ViewKey,
+ ViewType,
+} from '~/generated-metadata/graphql';
+
+const OBJECT_METADATA_ID = 'object-metadata-id';
+
+const objectMetadataItem = {
+ id: OBJECT_METADATA_ID,
+ namePlural: 'companies',
+};
+
+const objectMetadataItems = [objectMetadataItem] as unknown as Parameters<
+ typeof getObjectDrawerItemNavigationPath
+>[0]['objectMetadataItems'];
+
+const makeView = (id: string, key: ViewKey | null, position: number) => ({
+ id,
+ objectMetadataId: OBJECT_METADATA_ID,
+ key,
+ type: ViewType.TABLE,
+ position,
+});
+
+const indexView = makeView('index-view-id', ViewKey.INDEX, 0);
+const initialView = makeView('initial-view-id', null, 1);
+
+const objectNavigationMenuItem = {
+ id: 'navigation-menu-item-id',
+ type: NavigationMenuItemType.OBJECT,
+ targetObjectMetadataId: OBJECT_METADATA_ID,
+} as NavigationMenuItem;
+
+describe('getObjectDrawerItemNavigationPath', () => {
+ it('should target the index view without a navigation menu item when the flag is off', () => {
+ expect(
+ getObjectDrawerItemNavigationPath({
+ objectMetadataItem,
+ objectMetadataItems,
+ views: [indexView, initialView],
+ lastVisitedViewPerObjectMetadataItem: null,
+ isInitialObjectViewEnabled: false,
+ }),
+ ).toBe('/objects/companies?viewId=index-view-id');
+ });
+
+ it('should target the initial view without a navigation menu item when the flag is on', () => {
+ expect(
+ getObjectDrawerItemNavigationPath({
+ objectMetadataItem,
+ objectMetadataItems,
+ views: [indexView, initialView],
+ lastVisitedViewPerObjectMetadataItem: null,
+ isInitialObjectViewEnabled: true,
+ }),
+ ).toBe('/objects/companies?viewId=initial-view-id');
+ });
+
+ it('should ignore a stale index last visited view when the flag is on', () => {
+ expect(
+ getObjectDrawerItemNavigationPath({
+ objectMetadataItem,
+ objectMetadataItems,
+ views: [indexView, initialView],
+ lastVisitedViewPerObjectMetadataItem: {
+ [OBJECT_METADATA_ID]: 'index-view-id',
+ },
+ isInitialObjectViewEnabled: true,
+ }),
+ ).toBe('/objects/companies?viewId=initial-view-id');
+ });
+
+ it('should honor a last visited view that is not the index view', () => {
+ expect(
+ getObjectDrawerItemNavigationPath({
+ objectMetadataItem,
+ objectMetadataItems,
+ views: [indexView, initialView, makeView('user-view-id', null, 7)],
+ lastVisitedViewPerObjectMetadataItem: {
+ [OBJECT_METADATA_ID]: 'user-view-id',
+ },
+ isInitialObjectViewEnabled: true,
+ }),
+ ).toBe('/objects/companies?viewId=user-view-id');
+ });
+
+ it('should delegate to the navigation menu item link when there is one', () => {
+ expect(
+ getObjectDrawerItemNavigationPath({
+ navigationMenuItem: objectNavigationMenuItem,
+ objectMetadataItem,
+ objectMetadataItems,
+ views: [indexView, initialView],
+ lastVisitedViewPerObjectMetadataItem: null,
+ isInitialObjectViewEnabled: true,
+ }),
+ ).toBe('/objects/companies?viewId=initial-view-id');
+ });
+});
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getObjectNavigationMenuItemComputedLink.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getObjectNavigationMenuItemComputedLink.test.ts
index 0e2467380b7..8da39efbff7 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getObjectNavigationMenuItemComputedLink.test.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getObjectNavigationMenuItemComputedLink.test.ts
@@ -1,7 +1,7 @@
import { getObjectNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemComputedLink';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { type View } from '@/views/types/View';
-import { ViewKey } from '~/generated-metadata/graphql';
+import { ViewKey, ViewType } from '~/generated-metadata/graphql';
const mockObjectMetadataItems: Pick<
EnrichedObjectMetadataItem,
@@ -13,50 +13,182 @@ const mockObjectMetadataItems: Pick<
},
];
-const mockViews: Pick<View, 'id' | 'objectMetadataId' | 'key'>[] = [
- { id: 'view-index', objectMetadataId: 'metadata-1', key: ViewKey.INDEX },
+const mockViews: Pick<
+ View,
+ 'id' | 'objectMetadataId' | 'key' | 'type' | 'position'
+>[] = [
+ {
+ id: 'view-index',
+ objectMetadataId: 'metadata-1',
+ key: ViewKey.INDEX,
+ type: ViewType.TABLE,
+ position: 0,
+ },
+];
+
+const mockViewsWithInitialView: Pick<
+ View,
+ 'id' | 'objectMetadataId' | 'key' | 'type' | 'position'
+>[] = [
+ ...mockViews,
+ {
+ id: 'view-initial',
+ objectMetadataId: 'metadata-1',
+ key: null,
+ type: ViewType.TABLE,
+ position: 1,
+ },
];
describe('getObjectNavigationMenuItemComputedLink', () => {
it('should link to the index view when no last visited view is provided', () => {
- const result = getObjectNavigationMenuItemComputedLink(
- { targetObjectMetadataId: 'metadata-1' },
- mockObjectMetadataItems,
- mockViews,
- );
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'metadata-1' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: mockViews,
+ });
expect(result).toBe('/objects/people?viewId=view-index');
});
it('should link to the last visited view when provided, overriding the index view', () => {
- const result = getObjectNavigationMenuItemComputedLink(
- { targetObjectMetadataId: 'metadata-1' },
- mockObjectMetadataItems,
- mockViews,
- 'view-42',
- );
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'metadata-1' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: mockViews,
+ lastVisitedViewId: 'view-42',
+ });
expect(result).toBe('/objects/people?viewId=view-42');
});
it('should link to the bare object path when neither a last visited nor an index view exists', () => {
- const result = getObjectNavigationMenuItemComputedLink(
- { targetObjectMetadataId: 'metadata-1' },
- mockObjectMetadataItems,
- [],
- );
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'metadata-1' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: [],
+ });
expect(result).toBe('/objects/people');
});
it('should return an empty string when the target object metadata is not found', () => {
- const result = getObjectNavigationMenuItemComputedLink(
- { targetObjectMetadataId: 'non-existent-metadata' },
- mockObjectMetadataItems,
- mockViews,
- 'view-42',
- );
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'non-existent-metadata' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: mockViews,
+ lastVisitedViewId: 'view-42',
+ });
expect(result).toBe('');
});
+
+ it('should keep linking to the index view when the initial object view flag is off', () => {
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'metadata-1' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: mockViewsWithInitialView,
+ isInitialObjectViewEnabled: false,
+ });
+
+ expect(result).toBe('/objects/people?viewId=view-index');
+ });
+
+ it('should link to the initial view instead of the index view when the flag is on', () => {
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'metadata-1' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: mockViewsWithInitialView,
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result).toBe('/objects/people?viewId=view-initial');
+ });
+
+ it('should fall back to the index view when the flag is on and no initial view exists', () => {
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'metadata-1' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: mockViews,
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result).toBe('/objects/people?viewId=view-index');
+ });
+
+ it('should never target a fields widget view when the flag is on', () => {
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'metadata-1' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: [
+ ...mockViews,
+ {
+ id: 'view-widget',
+ objectMetadataId: 'metadata-1',
+ key: null,
+ type: ViewType.FIELDS_WIDGET,
+ position: 2,
+ },
+ ],
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result).toBe('/objects/people?viewId=view-index');
+ });
+
+ it('should ignore a last visited view pointing at the index view when the flag is on', () => {
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'metadata-1' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: mockViewsWithInitialView,
+ lastVisitedViewId: 'view-index',
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result).toBe('/objects/people?viewId=view-initial');
+ });
+
+ it('should still honour a last visited view that is not the index view when the flag is on', () => {
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'metadata-1' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: mockViewsWithInitialView,
+ lastVisitedViewId: 'view-42',
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result).toBe('/objects/people?viewId=view-42');
+ });
+
+ it('should still honour a last visited index view when the flag is off', () => {
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'metadata-1' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: mockViewsWithInitialView,
+ lastVisitedViewId: 'view-index',
+ isInitialObjectViewEnabled: false,
+ });
+
+ expect(result).toBe('/objects/people?viewId=view-index');
+ });
+
+ it('should target the lowest-positioned non-index view regardless of array order', () => {
+ const result = getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: 'metadata-1' },
+ objectMetadataItems: mockObjectMetadataItems,
+ views: [
+ {
+ id: 'view-user-created',
+ objectMetadataId: 'metadata-1',
+ key: null,
+ type: ViewType.TABLE,
+ position: 7,
+ },
+ ...mockViewsWithInitialView,
+ ],
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result).toBe('/objects/people?viewId=view-initial');
+ });
});
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectDrawerItemNavigationPath.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectDrawerItemNavigationPath.ts
new file mode 100644
index 00000000000..3b6bdbdf77a
--- /dev/null
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectDrawerItemNavigationPath.ts
@@ -0,0 +1,46 @@
+import { getObjectNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemComputedLink';
+import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';
+import { OBJECT_BACKED_NAVIGATION_MENU_ITEM_TYPES } from '@/navigation-menu-item/common/constants/ObjectBackedNavigationMenuItemTypes';
+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+import { type View } from '@/views/types/View';
+import { isDefined } from 'twenty-shared/utils';
+import { type NavigationMenuItem } from '~/generated-metadata/graphql';
+
+export const getObjectDrawerItemNavigationPath = ({
+ navigationMenuItem,
+ objectMetadataItem,
+ objectMetadataItems,
+ views,
+ lastVisitedViewPerObjectMetadataItem,
+ isInitialObjectViewEnabled = false,
+}: {
+ navigationMenuItem?: NavigationMenuItem;
+ objectMetadataItem: Pick<EnrichedObjectMetadataItem, 'id' | 'namePlural'>;
+ objectMetadataItems: EnrichedObjectMetadataItem[];
+ views: Pick<View, 'id' | 'objectMetadataId' | 'key' | 'type' | 'position'>[];
+ lastVisitedViewPerObjectMetadataItem: Record<string, string> | null;
+ isInitialObjectViewEnabled?: boolean;
+}): string => {
+ const hasNavigationMenuItem =
+ isDefined(navigationMenuItem) &&
+ OBJECT_BACKED_NAVIGATION_MENU_ITEM_TYPES.includes(navigationMenuItem.type);
+
+ if (hasNavigationMenuItem) {
+ return getNavigationMenuItemComputedLink({
+ item: navigationMenuItem,
+ objectMetadataItems,
+ views,
+ lastVisitedViewPerObjectMetadataItem,
+ isInitialObjectViewEnabled,
+ });
+ }
+
+ return getObjectNavigationMenuItemComputedLink({
+ item: { targetObjectMetadataId: objectMetadataItem.id },
+ objectMetadataItems,
+ views,
+ lastVisitedViewId:
+ lastVisitedViewPerObjectMetadataItem?.[objectMetadataItem.id],
+ isInitialObjectViewEnabled,
+ });
+};
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemComputedLink.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemComputedLink.ts
index fd037e92858..2c493755df0 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemComputedLink.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemComputedLink.ts
@@ -1,16 +1,23 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { type View } from '@/views/types/View';
-import { ViewKey } from '@/views/types/ViewKey';
+import { computeObjectViewTargetIds } from '@/views/utils/computeObjectViewTargetIds';
import { AppPath } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
-export const getObjectNavigationMenuItemComputedLink = (
- item: Pick<NavigationMenuItem, 'targetObjectMetadataId'>,
- objectMetadataItems: Pick<EnrichedObjectMetadataItem, 'id' | 'namePlural'>[],
- views: Pick<View, 'id' | 'objectMetadataId' | 'key'>[],
- lastVisitedViewId?: string,
-): string => {
+export const getObjectNavigationMenuItemComputedLink = ({
+ item,
+ objectMetadataItems,
+ views,
+ lastVisitedViewId,
+ isInitialObjectViewEnabled = false,
+}: {
+ item: Pick<NavigationMenuItem, 'targetObjectMetadataId'>;
+ objectMetadataItems: Pick<EnrichedObjectMetadataItem, 'id' | 'namePlural'>[];
+ views: Pick<View, 'id' | 'objectMetadataId' | 'key' | 'type' | 'position'>[];
+ lastVisitedViewId?: string;
+ isInitialObjectViewEnabled?: boolean;
+}): string => {
const objectMetadataItem = objectMetadataItems.find(
(meta) => meta.id === item.targetObjectMetadataId,
);
@@ -18,13 +25,19 @@ export const getObjectNavigationMenuItemComputedLink = (
return '';
}
- const indexViewId = views.find(
- (view) =>
- view.objectMetadataId === objectMetadataItem.id &&
- view.key === ViewKey.INDEX,
- )?.id;
+ const { firstSelectableViewId, indexViewId } = computeObjectViewTargetIds({
+ views,
+ objectMetadataId: objectMetadataItem.id,
+ isInitialObjectViewEnabled,
+ });
- const targetViewId = lastVisitedViewId ?? indexViewId;
+ const applicableLastVisitedViewId =
+ isInitialObjectViewEnabled && lastVisitedViewId === indexViewId
+ ? undefined
+ : lastVisitedViewId;
+
+ const targetViewId =
+ applicableLastVisitedViewId ?? firstSelectableViewId ?? indexViewId;
return getAppPath(
AppPath.RecordIndexPage,
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx
index 334bde56162..6faf5f76c54 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx
@@ -27,8 +27,12 @@ import { useNavigationSection } from '@/ui/navigation/navigation-drawer/hooks/us
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { PermissionFlagType } from '~/generated-metadata/graphql';
+import {
+ FeatureFlagKey,
+ PermissionFlagType,
+} from '~/generated-metadata/graphql';
const StyledRightIconsContainer = styled.div`
align-items: center;
@@ -45,6 +49,9 @@ export const WorkspaceSection = () => {
lastVisitedViewPerObjectMetadataItemState,
);
const { enterLayoutCustomizationMode } = useEnterLayoutCustomizationMode();
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
const hasLayoutsPermission = useHasPermissionFlag(PermissionFlagType.LAYOUTS);
const isLayoutCustomizationModeEnabled = useAtomStateValue(
isLayoutCustomizationModeEnabledState,
@@ -78,6 +85,7 @@ export const WorkspaceSection = () => {
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
+ isInitialObjectViewEnabled,
});
if (isNonEmptyString(link)) {
navigate(link);
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/utils/__tests__/getNavigationMenuItemComputedLink.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/__tests__/getNavigationMenuItemComputedLink.test.ts
index be76cdf3305..15db2088681 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/utils/__tests__/getNavigationMenuItemComputedLink.test.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/__tests__/getNavigationMenuItemComputedLink.test.ts
@@ -3,6 +3,7 @@ import { type View } from '@/views/types/View';
import {
NavigationMenuItemType,
ViewKey,
+ ViewType,
type NavigationMenuItem,
} from '~/generated-metadata/graphql';
@@ -13,8 +14,17 @@ const objectMetadataItems = [
{ id: 'obj-2', namePlural: 'companies' },
] as EnrichedObjectMetadataItem[];
-const views: Pick<View, 'id' | 'objectMetadataId' | 'key'>[] = [
- { id: 'view-index', objectMetadataId: 'obj-1', key: ViewKey.INDEX },
+const views: Pick<
+ View,
+ 'id' | 'objectMetadataId' | 'key' | 'type' | 'position'
+>[] = [
+ {
+ id: 'view-index',
+ objectMetadataId: 'obj-1',
+ key: ViewKey.INDEX,
+ type: ViewType.TABLE,
+ position: 0,
+ },
];
const objectItem: NavigationMenuItem = {
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink.ts
index 548aae32966..aad2b205f2a 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink.ts
@@ -14,11 +14,13 @@ export const getNavigationMenuItemComputedLink = ({
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
+ isInitialObjectViewEnabled = false,
}: {
item: NavigationMenuItem;
objectMetadataItems: EnrichedObjectMetadataItem[];
- views: Pick<View, 'id' | 'objectMetadataId' | 'key'>[];
+ views: Pick<View, 'id' | 'objectMetadataId' | 'key' | 'type' | 'position'>[];
lastVisitedViewPerObjectMetadataItem?: Record<string, string> | null;
+ isInitialObjectViewEnabled?: boolean;
}): string => {
switch (item.type) {
case NavigationMenuItemType.OBJECT: {
@@ -26,12 +28,13 @@ export const getNavigationMenuItemComputedLink = ({
? lastVisitedViewPerObjectMetadataItem?.[item.targetObjectMetadataId]
: undefined;
- return getObjectNavigationMenuItemComputedLink(
+ return getObjectNavigationMenuItemComputedLink({
item,
objectMetadataItems,
views,
lastVisitedViewId,
- );
+ isInitialObjectViewEnabled,
+ });
}
case NavigationMenuItemType.VIEW:
return getViewNavigationMenuItemComputedLink(
diff --git a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.ts b/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.ts
index 409b637fa06..89f6f48b06e 100644
--- a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.ts
+++ b/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.ts
@@ -10,10 +10,11 @@ import { renderHook, waitFor } from '@testing-library/react';
import { Provider as JotaiProvider } from 'jotai';
import { createElement, useEffect, type ReactNode } from 'react';
import { AppPath, SettingsPath } from 'twenty-shared/types';
-import { getSettingsPath } from 'twenty-shared/utils';
+import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import {
type NavigationMenuItem,
NavigationMenuItemType,
+ ViewKey,
ViewType,
ViewVisibility,
} from '~/generated-metadata/graphql';
@@ -24,11 +25,16 @@ import { setTestObjectMetadataItemsInMetadataStore } from '~/testing/utils/setTe
import { setTestViewsInMetadataStore } from '~/testing/utils/setTestViewsInMetadataStore';
let mockIsMobile = false;
+let mockIsInitialObjectViewEnabled = false;
jest.mock('@/ui/utilities/responsive/hooks/useIsMobile', () => ({
useIsMobile: () => mockIsMobile,
}));
+jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({
+ useIsFeatureEnabled: () => mockIsInitialObjectViewEnabled,
+}));
+
const Wrapper = ({ children }: { children: ReactNode }) =>
createElement(JotaiProvider, { store: jotaiStore }, children);
@@ -97,6 +103,33 @@ const buildViewNavigationMenuItem = (
updatedAt: '2024-01-01T00:00:00.000Z',
});
+const buildCompanyView = (
+ id: string,
+ key: ViewKey | null,
+ position: number,
+) => ({
+ id,
+ name: 'Company view',
+ objectMetadataId: getMockObjectMetadataItemOrThrow('company').id,
+ type: ViewType.TABLE,
+ key,
+ isCompact: false,
+ viewFields: [],
+ viewFieldGroups: [],
+ viewGroups: [],
+ viewSorts: [],
+ viewFilters: [],
+ viewFilterGroups: [],
+ kanbanAggregateOperation: AggregateOperations.COUNT,
+ icon: '',
+ kanbanAggregateOperationFieldMetadataId: '',
+ position,
+ visibility: ViewVisibility.WORKSPACE,
+ createdByUserWorkspaceId: null,
+ shouldHideEmptyGroups: false,
+ isActive: true,
+});
+
const renderHooks = ({
withCurrentUser,
withExistingView,
@@ -104,6 +137,7 @@ const renderHooks = ({
objectMetadataItems = getTestEnrichedObjectMetadataItemsMock(),
navigationMenuItems = [],
withNavigationMenuItemsLoaded = true,
+ views,
}: {
withCurrentUser: boolean;
withExistingView: boolean;
@@ -111,6 +145,7 @@ const renderHooks = ({
objectMetadataItems?: EnrichedObjectMetadataItem[];
navigationMenuItems?: NavigationMenuItem[];
withNavigationMenuItemsLoaded?: boolean;
+ views?: Parameters<typeof setTestViewsInMetadataStore>[1];
}) => {
if (withObjectMetadataLoaded) {
setTestObjectMetadataItemsInMetadataStore(jotaiStore, objectMetadataItems);
@@ -136,7 +171,9 @@ const renderHooks = ({
);
useEffect(() => {
- if (withExistingView) {
+ if (isDefined(views)) {
+ setTestViewsInMetadataStore(jotaiStore, views);
+ } else if (withExistingView) {
setTestViewsInMetadataStore(jotaiStore, [
{
id: 'viewId',
@@ -183,6 +220,7 @@ const renderHooks = ({
describe('useDefaultHomePagePath', () => {
afterEach(() => {
mockIsMobile = false;
+ mockIsInitialObjectViewEnabled = false;
});
it('should return proper path when no currentUser', async () => {
@@ -286,6 +324,44 @@ describe('useDefaultHomePagePath', () => {
expect(result.current.defaultHomePagePath).toEqual('/objects/companies');
});
});
+ it('should target the initial view rather than the index view when the menu has no object item and the flag is on', async () => {
+ mockIsInitialObjectViewEnabled = true;
+
+ const { result } = renderHooks({
+ withCurrentUser: true,
+ withExistingView: false,
+ navigationMenuItems: [],
+ views: [
+ buildCompanyView('index-view-id', ViewKey.INDEX, 0),
+ buildCompanyView('initial-view-id', null, 1),
+ ],
+ });
+
+ await waitFor(() => {
+ expect(result.current.defaultHomePagePath).toEqual(
+ '/objects/companies?viewId=initial-view-id',
+ );
+ });
+ });
+
+ it('should target the index view when the menu has no object item and the flag is off', async () => {
+ const { result } = renderHooks({
+ withCurrentUser: true,
+ withExistingView: false,
+ navigationMenuItems: [],
+ views: [
+ buildCompanyView('index-view-id', ViewKey.INDEX, 0),
+ buildCompanyView('initial-view-id', null, 1),
+ ],
+ });
+
+ await waitFor(() => {
+ expect(result.current.defaultHomePagePath).toEqual(
+ '/objects/companies?viewId=index-view-id',
+ );
+ });
+ });
+
it('should redirect to profile settings when there is no readable object', async () => {
const { result } = renderHooks({
withCurrentUser: true,
diff --git a/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts b/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts
index 1e0a8dbc7aa..a63045a095e 100644
--- a/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts
+++ b/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts
@@ -4,6 +4,7 @@ import { metadataStoreStatusFamilySelector } from '@/metadata-store/states/metad
import { useNavigationMenuItemSectionItems } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemSectionItems';
import { type ObjectPathInfo } from '@/navigation/types/ObjectPathInfo';
import { getFirstNavigationMenuItemLink } from '@/navigation/utils/getFirstNavigationMenuItemLink';
+import { computeObjectViewTargetIds } from '@/views/utils/computeObjectViewTargetIds';
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';
@@ -13,6 +14,8 @@ import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/use
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { FeatureFlagKey } from '~/generated-metadata/graphql';
import isEmpty from 'lodash.isempty';
import { useCallback, useMemo } from 'react';
import { AppPath, SettingsPath } from 'twenty-shared/types';
@@ -38,6 +41,9 @@ export const useDefaultHomePagePath = () => {
const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
const views = useAtomStateValue(viewsSelector);
const navigationMenuItemsInDisplayOrder = useNavigationMenuItemSectionItems();
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
const readableNonSystemObjectMetadataItems = useMemo(
() =>
@@ -50,13 +56,18 @@ export const useDefaultHomePagePath = () => {
[activeObjectMetadataItems, objectPermissionsByObjectMetadataId],
);
- const getFirstView = useCallback(
+ const getTargetViewId = useCallback(
(objectMetadataItemId: string | undefined | null) => {
- return views.find(
- (view) => view.objectMetadataId === objectMetadataItemId,
- );
+ const { firstSelectableViewId, indexViewId, firstAvailableViewId } =
+ computeObjectViewTargetIds({
+ views,
+ objectMetadataId: objectMetadataItemId ?? undefined,
+ isInitialObjectViewEnabled,
+ });
+
+ return firstSelectableViewId ?? indexViewId ?? firstAvailableViewId;
},
- [views],
+ [views, isInitialObjectViewEnabled],
);
const firstNavigationMenuItemLink = useMemo(
@@ -66,12 +77,14 @@ export const useDefaultHomePagePath = () => {
objectMetadataItems,
views,
objectPermissionsByObjectMetadataId,
+ isInitialObjectViewEnabled,
}),
[
objectMetadataItems,
objectPermissionsByObjectMetadataId,
views,
navigationMenuItemsInDisplayOrder,
+ isInitialObjectViewEnabled,
],
);
@@ -82,10 +95,10 @@ export const useDefaultHomePagePath = () => {
return null;
}
- const view = getFirstView(firstObjectMetadataItem.id);
+ const viewId = getTargetViewId(firstObjectMetadataItem.id);
- return { objectMetadataItem: firstObjectMetadataItem, view };
- }, [getFirstView, readableNonSystemObjectMetadataItems]);
+ return { objectMetadataItem: firstObjectMetadataItem, viewId };
+ }, [getTargetViewId, readableNonSystemObjectMetadataItems]);
const defaultHomePagePath = useMemo(() => {
if (!isDefined(currentUser)) {
@@ -118,8 +131,8 @@ export const useDefaultHomePagePath = () => {
return getAppPath(
AppPath.RecordIndexPage,
{ objectNamePlural: firstObjectPathInfo.objectMetadataItem?.namePlural },
- firstObjectPathInfo.view?.id
- ? { viewId: firstObjectPathInfo.view.id }
+ isDefined(firstObjectPathInfo.viewId)
+ ? { viewId: firstObjectPathInfo.viewId }
: undefined,
);
}, [
diff --git a/packages/twenty-front/src/modules/navigation/hooks/useSetLastVisitedViewForObjectMetadataNamePlural.ts b/packages/twenty-front/src/modules/navigation/hooks/useSetLastVisitedViewForObjectMetadataNamePlural.ts
index c65b73c600c..17084948ec9 100644
--- a/packages/twenty-front/src/modules/navigation/hooks/useSetLastVisitedViewForObjectMetadataNamePlural.ts
+++ b/packages/twenty-front/src/modules/navigation/hooks/useSetLastVisitedViewForObjectMetadataNamePlural.ts
@@ -1,13 +1,19 @@
import { lastVisitedViewPerObjectMetadataItemState } from '@/navigation/states/lastVisitedViewPerObjectMetadataItemState';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
+import { ViewKey } from '@/views/types/ViewKey';
import { type ViewWithRelations } from '@/views/types/ViewWithRelations';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { useStore } from 'jotai';
+import { FeatureFlagKey } from '~/generated-metadata/graphql';
export const useSetLastVisitedViewForObjectMetadataNamePlural = () => {
const store = useStore();
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
const setLastVisitedViewForObjectMetadataNamePlural = useCallback(
async ({
objectNamePlural,
@@ -34,6 +40,10 @@ export const useSetLastVisitedViewForObjectMetadataNamePlural = () => {
return;
}
+ if (isInitialObjectViewEnabled && view.key === ViewKey.INDEX) {
+ return;
+ }
+
const lastVisitedViewPerObjectMetadataItem = store.get(
lastVisitedViewPerObjectMetadataItemState.atom,
);
@@ -48,7 +58,7 @@ export const useSetLastVisitedViewForObjectMetadataNamePlural = () => {
});
}
},
- [store],
+ [store, isInitialObjectViewEnabled],
);
return {
diff --git a/packages/twenty-front/src/modules/navigation/types/ObjectPathInfo.ts b/packages/twenty-front/src/modules/navigation/types/ObjectPathInfo.ts
index 33fed86af7d..292f6d49032 100644
--- a/packages/twenty-front/src/modules/navigation/types/ObjectPathInfo.ts
+++ b/packages/twenty-front/src/modules/navigation/types/ObjectPathInfo.ts
@@ -1,7 +1,6 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { type View } from '@/views/types/View';
export type ObjectPathInfo = {
objectMetadataItem: EnrichedObjectMetadataItem;
- view: View | undefined;
+ viewId: string | undefined;
};
diff --git a/packages/twenty-front/src/modules/navigation/utils/getFirstNavigationMenuItemLink.ts b/packages/twenty-front/src/modules/navigation/utils/getFirstNavigationMenuItemLink.ts
index 58922851e09..78db7a55ffa 100644
--- a/packages/twenty-front/src/modules/navigation/utils/getFirstNavigationMenuItemLink.ts
+++ b/packages/twenty-front/src/modules/navigation/utils/getFirstNavigationMenuItemLink.ts
@@ -1,5 +1,6 @@
import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/display/object/utils/getObjectMetadataForNavigationMenuItem';
import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';
+import { OBJECT_BACKED_NAVIGATION_MENU_ITEM_TYPES } from '@/navigation-menu-item/common/constants/ObjectBackedNavigationMenuItemTypes';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { type View } from '@/views/types/View';
@@ -11,23 +12,19 @@ import { type NavigationMenuItem } from '~/generated-metadata/graphql';
type GetFirstNavigationMenuItemLinkArgs = {
navigationMenuItemsInDisplayOrder: NavigationMenuItem[];
objectMetadataItems: EnrichedObjectMetadataItem[];
- views: Pick<View, 'id' | 'objectMetadataId' | 'key'>[];
+ views: Pick<View, 'id' | 'objectMetadataId' | 'key' | 'type' | 'position'>[];
objectPermissionsByObjectMetadataId: Parameters<
typeof getObjectPermissionsForObject
>[0];
+ isInitialObjectViewEnabled?: boolean;
};
-const OBJECT_BACKED_NAVIGATION_MENU_ITEM_TYPES = [
- NavigationMenuItemType.OBJECT,
- NavigationMenuItemType.VIEW,
- NavigationMenuItemType.RECORD,
-];
-
export const getFirstNavigationMenuItemLink = ({
navigationMenuItemsInDisplayOrder,
objectMetadataItems,
views,
objectPermissionsByObjectMetadataId,
+ isInitialObjectViewEnabled = false,
}: GetFirstNavigationMenuItemLinkArgs): string | null => {
for (const item of navigationMenuItemsInDisplayOrder) {
if (
@@ -60,6 +57,7 @@ export const getFirstNavigationMenuItemLink = ({
item,
objectMetadataItems,
views,
+ isInitialObjectViewEnabled,
});
if (isNonEmptyString(link)) {
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/computeObjectViewTargetIds.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/computeObjectViewTargetIds.test.ts
new file mode 100644
index 00000000000..0f81d8fbf58
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/computeObjectViewTargetIds.test.ts
@@ -0,0 +1,83 @@
+import { computeObjectViewTargetIds } from '@/views/utils/computeObjectViewTargetIds';
+import { ViewKey, ViewType } from '~/generated-metadata/graphql';
+
+const makeView = (
+ id: string,
+ position: number,
+ key: ViewKey | null,
+ type: ViewType = ViewType.TABLE,
+) => ({
+ id,
+ objectMetadataId: 'metadata-1',
+ key,
+ type,
+ position,
+});
+
+const indexView = makeView('view-index', 0, ViewKey.INDEX);
+const firstSelectableView = makeView('view-first-selectable', 1, null);
+const userView = makeView('view-user', 7, null);
+const widgetView = makeView('view-widget', 2, null, ViewType.FIELDS_WIDGET);
+const tableWidgetView = makeView(
+ 'view-table-widget',
+ 0,
+ null,
+ ViewType.TABLE_WIDGET,
+);
+
+describe('computeObjectViewTargetIds', () => {
+ it('should not resolve a selectable view when the flag is off', () => {
+ const result = computeObjectViewTargetIds({
+ views: [indexView, firstSelectableView],
+ objectMetadataId: 'metadata-1',
+ isInitialObjectViewEnabled: false,
+ });
+
+ expect(result.firstSelectableViewId).toBeUndefined();
+ expect(result.indexViewId).toBe('view-index');
+ });
+
+ it('should resolve the lowest-positioned non-index view regardless of array order', () => {
+ const result = computeObjectViewTargetIds({
+ views: [userView, indexView, firstSelectableView],
+ objectMetadataId: 'metadata-1',
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result.firstSelectableViewId).toBe('view-first-selectable');
+ expect(result.indexViewId).toBe('view-index');
+ expect(result.firstAvailableViewId).toBe('view-index');
+ });
+
+ it('should ignore fields widget views', () => {
+ const result = computeObjectViewTargetIds({
+ views: [indexView, widgetView],
+ objectMetadataId: 'metadata-1',
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result.firstSelectableViewId).toBeUndefined();
+ });
+
+ it('should ignore views belonging to another object', () => {
+ const result = computeObjectViewTargetIds({
+ views: [indexView, firstSelectableView],
+ objectMetadataId: 'metadata-2',
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result.indexViewId).toBeUndefined();
+ expect(result.firstAvailableViewId).toBeUndefined();
+ });
+
+ it('should never resolve a widget view, whatever its type', () => {
+ const result = computeObjectViewTargetIds({
+ views: [tableWidgetView, widgetView, indexView, firstSelectableView],
+ objectMetadataId: 'metadata-1',
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result.firstSelectableViewId).toBe('view-first-selectable');
+ expect(result.firstAvailableViewId).toBe('view-index');
+ });
+});
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/isUsableLastVisitedView.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/isUsableLastVisitedView.test.ts
new file mode 100644
index 00000000000..5eae3532cab
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/isUsableLastVisitedView.test.ts
@@ -0,0 +1,49 @@
+import { isUsableLastVisitedView } from '@/views/utils/isUsableLastVisitedView';
+import { ViewKey, ViewType } from '~/generated-metadata/graphql';
+
+describe('isUsableLastVisitedView', () => {
+ it('should refuse a missing last visited view', () => {
+ expect(
+ isUsableLastVisitedView({
+ lastVisitedView: undefined,
+ isInitialObjectViewEnabled: true,
+ }),
+ ).toBe(false);
+ });
+
+ it('should refuse a widget view whatever the flag', () => {
+ expect(
+ isUsableLastVisitedView({
+ lastVisitedView: { key: null, type: ViewType.TABLE_WIDGET },
+ isInitialObjectViewEnabled: false,
+ }),
+ ).toBe(false);
+ });
+
+ it('should refuse the index view when the flag is on', () => {
+ expect(
+ isUsableLastVisitedView({
+ lastVisitedView: { key: ViewKey.INDEX, type: ViewType.TABLE },
+ isInitialObjectViewEnabled: true,
+ }),
+ ).toBe(false);
+ });
+
+ it('should accept the index view when the flag is off', () => {
+ expect(
+ isUsableLastVisitedView({
+ lastVisitedView: { key: ViewKey.INDEX, type: ViewType.TABLE },
+ isInitialObjectViewEnabled: false,
+ }),
+ ).toBe(true);
+ });
+
+ it('should accept a user owned view whatever the flag', () => {
+ expect(
+ isUsableLastVisitedView({
+ lastVisitedView: { key: null, type: ViewType.TABLE },
+ isInitialObjectViewEnabled: true,
+ }),
+ ).toBe(true);
+ });
+});
diff --git a/packages/twenty-front/src/modules/views/utils/computeObjectViewTargetIds.ts b/packages/twenty-front/src/modules/views/utils/computeObjectViewTargetIds.ts
new file mode 100644
index 00000000000..a61d9b111ba
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/utils/computeObjectViewTargetIds.ts
@@ -0,0 +1,40 @@
+import { type View } from '@/views/types/View';
+import { ViewKey } from '@/views/types/ViewKey';
+import { isWidgetViewType } from 'twenty-shared/utils';
+
+export const computeObjectViewTargetIds = <
+ TView extends Pick<
+ View,
+ 'id' | 'objectMetadataId' | 'key' | 'type' | 'position'
+ >,
+>({
+ views,
+ objectMetadataId,
+ isInitialObjectViewEnabled,
+}: {
+ views: TView[];
+ objectMetadataId?: string;
+ isInitialObjectViewEnabled: boolean;
+}): {
+ firstSelectableViewId?: string;
+ indexViewId?: string;
+ firstAvailableViewId?: string;
+} => {
+ const selectableViewsOnObject = views
+ .filter(
+ (view) =>
+ view.objectMetadataId === objectMetadataId &&
+ !isWidgetViewType(view.type),
+ )
+ .sort((a, b) => a.position - b.position || a.id.localeCompare(b.id));
+
+ return {
+ firstSelectableViewId: isInitialObjectViewEnabled
+ ? selectableViewsOnObject.find((view) => view.key !== ViewKey.INDEX)?.id
+ : undefined,
+ indexViewId: selectableViewsOnObject.find(
+ (view) => view.key === ViewKey.INDEX,
+ )?.id,
+ firstAvailableViewId: selectableViewsOnObject[0]?.id,
+ };
+};
diff --git a/packages/twenty-front/src/modules/views/utils/isUsableLastVisitedView.ts b/packages/twenty-front/src/modules/views/utils/isUsableLastVisitedView.ts
new file mode 100644
index 00000000000..7f690abad2d
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/utils/isUsableLastVisitedView.ts
@@ -0,0 +1,21 @@
+import { type View } from '@/views/types/View';
+import { ViewKey } from '@/views/types/ViewKey';
+import { isDefined, isWidgetViewType } from 'twenty-shared/utils';
+
+export const isUsableLastVisitedView = ({
+ lastVisitedView,
+ isInitialObjectViewEnabled,
+}: {
+ lastVisitedView: Pick<View, 'key' | 'type'> | undefined;
+ isInitialObjectViewEnabled: boolean;
+}): boolean => {
+ if (!isDefined(lastVisitedView)) {
+ return false;
+ }
+
+ if (isWidgetViewType(lastVisitedView.type)) {
+ return false;
+ }
+
+ return !isInitialObjectViewEnabled || lastVisitedView.key !== ViewKey.INDEX;
+};
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerEditButton.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerEditButton.tsx
index 831fc9b219e..cdc930f7703 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerEditButton.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerEditButton.tsx
@@ -3,6 +3,8 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { viewsFromObjectMetadataItemFamilySelector } from '@/views/states/selectors/viewsFromObjectMetadataItemFamilySelector';
import { ViewType } from '@/views/types/ViewType';
+import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
+import { computeViewPickerVisibleViews } from '@/views/view-picker/utils/computeViewPickerVisibleViews';
import { useCreateViewFromCurrentState } from '@/views/view-picker/hooks/useCreateViewFromCurrentState';
import { useDestroyViewFromCurrentState } from '@/views/view-picker/hooks/useDestroyViewFromCurrentState';
import { useGetAvailableFieldsToGroupRecordsBy } from '@/views/view-picker/hooks/useGetAvailableFieldsToGroupRecordsBy';
@@ -10,8 +12,10 @@ import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
import { viewPickerIsPersistingComponentState } from '@/views/view-picker/states/viewPickerIsPersistingComponentState';
import { viewPickerMainGroupByFieldMetadataIdComponentState } from '@/views/view-picker/states/viewPickerMainGroupByFieldMetadataIdComponentState';
import { viewPickerTypeComponentState } from '@/views/view-picker/states/viewPickerTypeComponentState';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { t } from '@lingui/core/macro';
import { Button } from 'twenty-ui/primitives/input';
+import { FeatureFlagKey } from '~/generated-metadata/graphql';
export const ViewPickerEditButton = () => {
const { availableFieldsForGrouping, navigateToSelectSettings } =
@@ -24,7 +28,19 @@ export const ViewPickerEditButton = () => {
{ objectMetadataItemId: objectMetadataItem.id },
);
- const isLastView = viewsOnCurrentObject.length <= 1;
+ const { currentView } = useGetCurrentViewOnly();
+
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
+
+ const visibleViews = computeViewPickerVisibleViews({
+ views: viewsOnCurrentObject,
+ currentViewId: currentView?.id,
+ isInitialObjectViewEnabled,
+ });
+
+ const isLastView = visibleViews.length <= 1;
const { viewPickerMode } = useViewPickerMode();
const viewPickerType = useAtomComponentStateValue(
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
index 544a962b2eb..369296a9b62 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
@@ -20,11 +20,13 @@ import { viewsFromObjectMetadataItemFamilySelector } from '@/views/states/select
import { ViewPickerOptionDropdown } from '@/views/view-picker/components/ViewPickerOptionDropdown';
import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';
+import { computeViewPickerVisibleViews } from '@/views/view-picker/utils/computeViewPickerVisibleViews';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { useLingui } from '@lingui/react/macro';
import { IconPlus } from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { ViewVisibility } from '~/generated-metadata/graphql';
+import { FeatureFlagKey, ViewVisibility } from '~/generated-metadata/graphql';
import { moveArrayItem } from '~/utils/array/moveArrayItem';
const StyledBoldDropdownMenuItemsContainerWrapper = styled.div`
@@ -41,21 +43,31 @@ export const ViewPickerListContent = () => {
{ objectMetadataItemId: objectMetadataItem.id },
);
- const workspaceViews = viewsOnCurrentObject.filter(
+ const { currentView } = useGetCurrentViewOnly();
+
+ const isInitialObjectViewEnabled = useIsFeatureEnabled(
+ FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
+ );
+
+ const visibleViews = computeViewPickerVisibleViews({
+ views: viewsOnCurrentObject,
+ currentViewId: currentView?.id,
+ isInitialObjectViewEnabled,
+ });
+
+ const workspaceViews = visibleViews.filter(
(view) => view.visibility === ViewVisibility.WORKSPACE,
);
- const unlistedViews = viewsOnCurrentObject.filter(
+ const unlistedViews = visibleViews.filter(
(view) => view.visibility === ViewVisibility.UNLISTED,
);
- const isLastView = viewsOnCurrentObject.length <= 1;
+ const isLastView = visibleViews.length <= 1;
const shouldShowSectionLabels =
workspaceViews.length > 0 && unlistedViews.length > 0;
- const { currentView } = useGetCurrentViewOnly();
-
const setViewPickerReferenceViewId = useSetAtomComponentState(
viewPickerReferenceViewIdComponentState,
);
diff --git a/packages/twenty-front/src/modules/views/view-picker/utils/__tests__/computeViewPickerVisibleViews.test.ts b/packages/twenty-front/src/modules/views/view-picker/utils/__tests__/computeViewPickerVisibleViews.test.ts
new file mode 100644
index 00000000000..0d2f659acb3
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/utils/__tests__/computeViewPickerVisibleViews.test.ts
@@ -0,0 +1,45 @@
+import { ViewKey } from '@/views/types/ViewKey';
+import { computeViewPickerVisibleViews } from '@/views/view-picker/utils/computeViewPickerVisibleViews';
+
+const INDEX_VIEW = { id: 'index-view-id', key: ViewKey.INDEX };
+const INITIAL_VIEW = { id: 'initial-view-id', key: null };
+const USER_VIEW = { id: 'user-view-id', key: null };
+
+describe('computeViewPickerVisibleViews', () => {
+ it('keeps every view while the flag is off', () => {
+ const result = computeViewPickerVisibleViews({
+ views: [INDEX_VIEW, USER_VIEW],
+ isInitialObjectViewEnabled: false,
+ });
+
+ expect(result).toEqual([INDEX_VIEW, USER_VIEW]);
+ });
+
+ it('hides the index view once the flag is on', () => {
+ const result = computeViewPickerVisibleViews({
+ views: [INDEX_VIEW, INITIAL_VIEW, USER_VIEW],
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result).toEqual([INITIAL_VIEW, USER_VIEW]);
+ });
+
+ it('keeps the index view visible while it is the one being displayed', () => {
+ const result = computeViewPickerVisibleViews({
+ views: [INDEX_VIEW, INITIAL_VIEW],
+ currentViewId: INDEX_VIEW.id,
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result).toEqual([INDEX_VIEW, INITIAL_VIEW]);
+ });
+
+ it('keeps the index view when hiding it would leave no view at all', () => {
+ const result = computeViewPickerVisibleViews({
+ views: [INDEX_VIEW],
+ isInitialObjectViewEnabled: true,
+ });
+
+ expect(result).toEqual([INDEX_VIEW]);
+ });
+});
diff --git a/packages/twenty-front/src/modules/views/view-picker/utils/computeViewPickerVisibleViews.ts b/packages/twenty-front/src/modules/views/view-picker/utils/computeViewPickerVisibleViews.ts
new file mode 100644
index 00000000000..a70aa0de490
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-picker/utils/computeViewPickerVisibleViews.ts
@@ -0,0 +1,33 @@
+import { type View } from '@/views/types/View';
+import { ViewKey } from '@/views/types/ViewKey';
+import { isDefined } from 'twenty-shared/utils';
+
+export const computeViewPickerVisibleViews = <
+ TView extends Pick<View, 'id' | 'key'>,
+>({
+ views,
+ currentViewId,
+ isInitialObjectViewEnabled,
+}: {
+ views: TView[];
+ currentViewId?: string;
+ isInitialObjectViewEnabled: boolean;
+}): TView[] => {
+ if (!isInitialObjectViewEnabled) {
+ return views;
+ }
+
+ const viewsWithoutIndexView = views.filter(
+ (view) => view.key !== ViewKey.INDEX,
+ );
+
+ if (viewsWithoutIndexView.length === 0) {
+ return views;
+ }
+
+ return views.filter(
+ (view) =>
+ view.key !== ViewKey.INDEX ||
+ (isDefined(currentViewId) && view.id === currentViewId),
+ );
+};