Skip to content

The open alternative to Salesforce, designed for AI.

Remove the IS_INITIAL_OBJECT_VIEW_ENABLED feature flag (#28009)

Thomas Trompette6549077ad6c4
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 1afe79d2c04..a143e7a001a 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -2088,7 +2088,6 @@ enum FeatureFlagKey {
IS_CALENDAR_SYNC_SKIP_UNCHANGED_RECORDS_ENABLED
IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED
IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED
- IS_INITIAL_OBJECT_VIEW_ENABLED
IS_JSON_FILTER_ENABLED
IS_LOGS_SETTINGS_SECTION_ENABLED
IS_MESSAGE_CAMPAIGN_ENABLED
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index 74f895eb9bf..1bfd821f446 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -1337,7 +1337,7 @@ export interface FeatureFlag {
__typename: 'FeatureFlag'
}
-export type FeatureFlagKey = 'IS_AI_CHAT_INBOX_ENABLED' | 'IS_APPLICATION_WORKFLOWS_ENABLED' | 'IS_APP_PREFERENCES_ENABLED' | 'IS_ASYNC_CSV_EXPORT_ENABLED' | 'IS_CALENDAR_SYNC_SKIP_UNCHANGED_RECORDS_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED' | 'IS_INITIAL_OBJECT_VIEW_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_LOGS_SETTINGS_SECTION_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_RECORD_CREATION_FORM_ENABLED' | 'IS_RECORD_LEVEL_SHARING_ENABLED' | 'IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT'
+export type FeatureFlagKey = 'IS_AI_CHAT_INBOX_ENABLED' | 'IS_APPLICATION_WORKFLOWS_ENABLED' | 'IS_APP_PREFERENCES_ENABLED' | 'IS_ASYNC_CSV_EXPORT_ENABLED' | 'IS_CALENDAR_SYNC_SKIP_UNCHANGED_RECORDS_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_LOGS_SETTINGS_SECTION_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_RECORD_CREATION_FORM_ENABLED' | 'IS_RECORD_LEVEL_SHARING_ENABLED' | 'IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT'
export interface Field {
applicationId: Scalars['UUID']
@@ -11537,7 +11537,6 @@ export const enumFeatureFlagKey = {
IS_CALENDAR_SYNC_SKIP_UNCHANGED_RECORDS_ENABLED: 'IS_CALENDAR_SYNC_SKIP_UNCHANGED_RECORDS_ENABLED' as const,
IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED: 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' as const,
IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED: 'IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED' as const,
- IS_INITIAL_OBJECT_VIEW_ENABLED: 'IS_INITIAL_OBJECT_VIEW_ENABLED' as const,
IS_JSON_FILTER_ENABLED: 'IS_JSON_FILTER_ENABLED' as const,
IS_LOGS_SETTINGS_SECTION_ENABLED: 'IS_LOGS_SETTINGS_SECTION_ENABLED' as const,
IS_MESSAGE_CAMPAIGN_ENABLED: 'IS_MESSAGE_CAMPAIGN_ENABLED' as const,
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.ts
index e7b156b9641..05993cbe041 100644
--- a/packages/twenty-front/src/generated-admin/graphql.ts
+++ b/packages/twenty-front/src/generated-admin/graphql.ts
@@ -452,7 +452,6 @@ export enum FeatureFlagKey {
IS_CALENDAR_SYNC_SKIP_UNCHANGED_RECORDS_ENABLED = 'IS_CALENDAR_SYNC_SKIP_UNCHANGED_RECORDS_ENABLED',
IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',
IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED = 'IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED',
- IS_INITIAL_OBJECT_VIEW_ENABLED = 'IS_INITIAL_OBJECT_VIEW_ENABLED',
IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',
IS_LOGS_SETTINGS_SECTION_ENABLED = 'IS_LOGS_SETTINGS_SECTION_ENABLED',
IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index a333200821d..5094fed1e97 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -2206,7 +2206,6 @@ export enum FeatureFlagKey {
IS_CALENDAR_SYNC_SKIP_UNCHANGED_RECORDS_ENABLED = 'IS_CALENDAR_SYNC_SKIP_UNCHANGED_RECORDS_ENABLED',
IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',
IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED = 'IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED',
- IS_INITIAL_OBJECT_VIEW_ENABLED = 'IS_INITIAL_OBJECT_VIEW_ENABLED',
IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',
IS_LOGS_SETTINGS_SECTION_ENABLED = 'IS_LOGS_SETTINGS_SECTION_ENABLED',
IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',
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 ec989692473..94c2a5c6466 100644
--- a/packages/twenty-front/src/modules/context-store/components/RouteContextStoreProvider.tsx
+++ b/packages/twenty-front/src/modules/context-store/components/RouteContextStoreProvider.tsx
@@ -12,21 +12,18 @@ import { isUsableLastVisitedView } from '@/views/utils/isUsableLastVisitedView';
import { matchRoutes, useLocation, useSearchParams } from 'react-router-dom';
import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { FeatureFlagKey, ViewType } from '~/generated-metadata/graphql';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { ViewType } from '~/generated-metadata/graphql';
import { isMatchingLocation } from '~/utils/isMatchingLocation';
const getViewId = ({
viewIdFromQueryParams,
indexViewId,
lastVisitedViewId,
- firstAvailableViewId,
firstSelectableViewId,
}: {
viewIdFromQueryParams: string | null;
indexViewId?: string;
lastVisitedViewId?: string;
- firstAvailableViewId?: string;
firstSelectableViewId?: string;
}) => {
if (isDefined(viewIdFromQueryParams)) {
@@ -45,10 +42,6 @@ const getViewId = ({
return indexViewId;
}
- if (isDefined(firstAvailableViewId)) {
- return firstAvailableViewId;
- }
-
return undefined;
};
@@ -118,29 +111,21 @@ export const RouteContextStoreProvider = () => {
(view) => view.id === lastVisitedViewIdRaw,
);
- const isInitialObjectViewEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
- );
-
const lastVisitedViewId = isUsableLastVisitedView({
lastVisitedView,
- isInitialObjectViewEnabled,
})
? lastVisitedViewIdRaw
: undefined;
- const { firstSelectableViewId, indexViewId, firstAvailableViewId } =
- computeObjectViewTargetIds({
- views,
- objectMetadataId: objectMetadataItem?.id,
- isInitialObjectViewEnabled,
- });
+ const { firstSelectableViewId, indexViewId } = computeObjectViewTargetIds({
+ views,
+ objectMetadataId: objectMetadataItem?.id,
+ });
const viewId = getViewId({
viewIdFromQueryParams: viewIdQueryParam,
indexViewId,
lastVisitedViewId,
- firstAvailableViewId,
firstSelectableViewId,
});
diff --git a/packages/twenty-front/src/modules/context-store/components/__tests__/RouteContextStoreProvider.test.tsx b/packages/twenty-front/src/modules/context-store/components/__tests__/RouteContextStoreProvider.test.tsx
index 3f8e2b930e5..02320836aa2 100644
--- a/packages/twenty-front/src/modules/context-store/components/__tests__/RouteContextStoreProvider.test.tsx
+++ b/packages/twenty-front/src/modules/context-store/components/__tests__/RouteContextStoreProvider.test.tsx
@@ -186,7 +186,7 @@ describe('RouteContextStoreProvider', () => {
expect(screen.getByTestId('route-context-store')).toHaveAttribute(
'data-view-id',
- 'company-index-view',
+ 'company-view',
);
});
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 31fe4bf9429..165214e1cb8 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
@@ -7,10 +7,7 @@ import { getIconTileColorShades } from 'twenty-ui/components/data-display';
import { IconLink, IconPerspective, IconWorld, useIcons } from 'twenty-ui/icon';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { themeCssVariables } from 'twenty-ui/theme';
-import {
- FeatureFlagKey,
- type NavigationMenuItem,
-} from '~/generated-metadata/graphql';
+import { type NavigationMenuItem } from '~/generated-metadata/graphql';
import { getNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemColor';
import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier';
@@ -24,7 +21,6 @@ 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 = ({
@@ -38,9 +34,6 @@ export const NavigationMenuItemIcon = ({
);
const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
const views = useAtomStateValue(viewsSelector);
- const isInitialObjectViewEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
- );
const objectNameSingular =
getNavigationMenuItemObjectNameSingular(
@@ -117,7 +110,6 @@ export const NavigationMenuItemIcon = ({
item: navigationMenuItem,
objectMetadataItems,
views,
- isInitialObjectViewEnabled,
});
if (isSafeInternalPath(computedLink)) {
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 30e5bcb9e35..b9d170d3180 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
@@ -2,10 +2,7 @@ import { t } from '@lingui/core/macro';
import { NavigationMenuItemType } from 'twenty-shared/types';
import { LightIconButton } from 'twenty-ui/components/input';
import { IconHeartOff } from 'twenty-ui/icon';
-import {
- FeatureFlagKey,
- type NavigationMenuItem,
-} from '~/generated-metadata/graphql';
+import { type NavigationMenuItem } from '~/generated-metadata/graphql';
import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';
import { useDeleteManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useDeleteManyNavigationMenuItems';
@@ -21,7 +18,6 @@ import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMeta
import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
type NavigationMenuItemFolderContentProps = {
folderId: string;
@@ -39,9 +35,6 @@ 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}`;
@@ -60,7 +53,6 @@ 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 231c63d9b8b..14021d222ce 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
@@ -1,7 +1,7 @@
import { NavigationMenuItemEditable } from '@/navigation-menu-item/edit/components/NavigationMenuItemEditable';
import { useLingui } from '@lingui/react/macro';
import { type ReactNode } from 'react';
-import { FeatureFlagKey, NavigationMenuItemType } from 'twenty-shared/types';
+import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
@@ -17,7 +17,6 @@ import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/displa
import { isCoreWorkflowsObjectNavigationMenuItem } from '@/navigation-menu-item/display/utils/isCoreWorkflowsObjectNavigationMenuItem';
import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import type { EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { NavigationDrawerSubItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem';
import { getNavigationSubItemLeftAdornment } from '@/ui/navigation/navigation-drawer/utils/getNavigationSubItemLeftAdornment';
@@ -55,9 +54,6 @@ export const NavigationMenuItemFolderSubItem = ({
useIsNavigationMenuItemEditHighlighted(navigationMenuItem);
const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
const views = useAtomStateValue(viewsSelector);
- const isInitialObjectViewEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
- );
const lastVisitedViewPerObjectMetadataItem = useAtomStateValue(
lastVisitedViewPerObjectMetadataItemState,
);
@@ -82,7 +78,6 @@ 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 bd9e6d8a0f5..3fe0b211d57 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,10 +4,7 @@ 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 {
- FeatureFlagKey,
- type NavigationMenuItem,
-} from '~/generated-metadata/graphql';
+import { type NavigationMenuItem } from '~/generated-metadata/graphql';
import { currentNavigationMenuItemFolderIdState } from '@/navigation-menu-item/common/states/currentNavigationMenuItemFolderIdState';
import { lastClickedNavigationMenuItemIdState } from '@/navigation-menu-item/common/states/lastClickedNavigationMenuItemIdState';
@@ -20,7 +17,6 @@ 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;
@@ -38,9 +34,6 @@ export const useNavigationMenuItemFolderOpenState = ({
const lastVisitedViewPerObjectMetadataItem = useAtomStateValue(
lastVisitedViewPerObjectMetadataItemState,
);
- const isInitialObjectViewEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
- );
const [openNavigationMenuItemFolderIds, setOpenNavigationMenuItemFolderIds] =
useAtomState(openNavigationMenuItemFolderIdsState);
@@ -90,7 +83,6 @@ export const useNavigationMenuItemFolderOpenState = ({
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
- isInitialObjectViewEnabled,
});
return isNonEmptyString(computedLink);
},
@@ -101,7 +93,6 @@ 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 744b0115846..85b0ba7ea89 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
@@ -16,8 +16,6 @@ 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[];
@@ -31,9 +29,6 @@ export const useIdentifyActiveNavigationMenuItems = (): {
const lastVisitedViewPerObjectMetadataItem = useAtomStateValue(
lastVisitedViewPerObjectMetadataItemState,
);
- const isInitialObjectViewEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
- );
const { activeObjectMetadataItems, objectMetadataItems } =
useFilteredObjectMetadataItems();
@@ -81,7 +76,6 @@ export const useIdentifyActiveNavigationMenuItems = (): {
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
- isInitialObjectViewEnabled,
});
const lastClickedObjectMetadataId =
getObjectMetadataForNavigationMenuItem(
@@ -130,7 +124,6 @@ export const useIdentifyActiveNavigationMenuItems = (): {
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
- isInitialObjectViewEnabled,
});
return link === currentPath;
})
@@ -216,7 +209,6 @@ 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 0c53848ee2b..307aeb72d55 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
@@ -16,7 +16,6 @@ import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMeta
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -25,7 +24,6 @@ import { viewsSelector } from '@/views/states/selectors/viewsSelector';
import { useNavigate } from 'react-router-dom';
import {
CoreObjectNameSingular,
- FeatureFlagKey,
NavigationMenuItemType,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
@@ -64,9 +62,6 @@ export const NavigationDrawerItemForObjectMetadataItem = ({
);
const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
const views = useAtomStateValue(viewsSelector);
- const isInitialObjectViewEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
- );
const canReadObjectRecords = getObjectPermissionsForObject(
objectPermissionsByObjectMetadataId,
@@ -94,7 +89,6 @@ export const NavigationDrawerItemForObjectMetadataItem = ({
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
- isInitialObjectViewEnabled,
});
const isActive = hasNavigationMenuItem
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
index 382d9132f1f..36794bc281e 100644
--- 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
@@ -35,31 +35,18 @@ const objectNavigationMenuItem = {
} as NavigationMenuItem;
describe('getObjectDrawerItemNavigationPath', () => {
- it('should target the index view without a navigation menu item when the flag is off', () => {
+ it('should target the initial view without a navigation menu item', () => {
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', () => {
+ it('should ignore a stale index last visited view', () => {
expect(
getObjectDrawerItemNavigationPath({
objectMetadataItem,
@@ -68,7 +55,6 @@ describe('getObjectDrawerItemNavigationPath', () => {
lastVisitedViewPerObjectMetadataItem: {
[OBJECT_METADATA_ID]: 'index-view-id',
},
- isInitialObjectViewEnabled: true,
}),
).toBe('/objects/companies?viewId=initial-view-id');
});
@@ -82,7 +68,6 @@ describe('getObjectDrawerItemNavigationPath', () => {
lastVisitedViewPerObjectMetadataItem: {
[OBJECT_METADATA_ID]: 'user-view-id',
},
- isInitialObjectViewEnabled: true,
}),
).toBe('/objects/companies?viewId=user-view-id');
});
@@ -95,7 +80,6 @@ describe('getObjectDrawerItemNavigationPath', () => {
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 8da39efbff7..3f475b3e984 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
@@ -83,40 +83,17 @@ describe('getObjectNavigationMenuItemComputedLink', () => {
expect(result).toBe('');
});
- it('should keep linking to the index view when the initial object view flag is off', () => {
+ it('should link to the initial view instead of the index view', () => {
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', () => {
+ it('should never target a fields widget view', () => {
const result = getObjectNavigationMenuItemComputedLink({
item: { targetObjectMetadataId: 'metadata-1' },
objectMetadataItems: mockObjectMetadataItems,
@@ -130,48 +107,33 @@ describe('getObjectNavigationMenuItemComputedLink', () => {
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', () => {
+ it('should ignore a last visited view pointing at the index view', () => {
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', () => {
+ it('should still honour a last visited view that is not the index view', () => {
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' },
@@ -186,7 +148,6 @@ describe('getObjectNavigationMenuItemComputedLink', () => {
},
...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
index 3b6bdbdf77a..163da82f482 100644
--- 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
@@ -12,14 +12,12 @@ export const getObjectDrawerItemNavigationPath = ({
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) &&
@@ -31,7 +29,6 @@ export const getObjectDrawerItemNavigationPath = ({
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
- isInitialObjectViewEnabled,
});
}
@@ -41,6 +38,5 @@ export const getObjectDrawerItemNavigationPath = ({
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 2c493755df0..48dbedc1b31 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
@@ -10,13 +10,11 @@ export const getObjectNavigationMenuItemComputedLink = ({
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,
@@ -28,13 +26,10 @@ export const getObjectNavigationMenuItemComputedLink = ({
const { firstSelectableViewId, indexViewId } = computeObjectViewTargetIds({
views,
objectMetadataId: objectMetadataItem.id,
- isInitialObjectViewEnabled,
});
const applicableLastVisitedViewId =
- isInitialObjectViewEnabled && lastVisitedViewId === indexViewId
- ? undefined
- : lastVisitedViewId;
+ lastVisitedViewId === indexViewId ? undefined : lastVisitedViewId;
const targetViewId =
applicableLastVisitedViewId ?? firstSelectableViewId ?? indexViewId;
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 1a10a80c4c9..c8a81e6631e 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,12 +27,8 @@ 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 {
- FeatureFlagKey,
- PermissionFlagType,
-} from '~/generated-metadata/graphql';
+import { PermissionFlagType } from '~/generated-metadata/graphql';
const StyledRightIconsContainer = styled.div`
align-items: center;
@@ -49,9 +45,6 @@ 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,
@@ -85,7 +78,6 @@ 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/getNavigationMenuItemComputedLink.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink.ts
index 7386ceab314..1c23f62d265 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,13 +14,11 @@ export const getNavigationMenuItemComputedLink = ({
objectMetadataItems,
views,
lastVisitedViewPerObjectMetadataItem,
- isInitialObjectViewEnabled = false,
}: {
item: NavigationMenuItem;
objectMetadataItems: EnrichedObjectMetadataItem[];
views: Pick<View, 'id' | 'objectMetadataId' | 'key' | 'type' | 'position'>[];
lastVisitedViewPerObjectMetadataItem?: Record<string, string> | null;
- isInitialObjectViewEnabled?: boolean;
}): string => {
switch (item.type) {
case NavigationMenuItemType.OBJECT: {
@@ -33,7 +31,6 @@ export const getNavigationMenuItemComputedLink = ({
objectMetadataItems,
views,
lastVisitedViewId,
- isInitialObjectViewEnabled,
});
}
case NavigationMenuItemType.VIEW:
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 706a5b0338c..082f738caee 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
@@ -26,17 +26,12 @@ import { setTestObjectMetadataItemsInMetadataStore } from '~/testing/utils/setTe
import { setTestViewsInMetadataStore } from '~/testing/utils/setTestViewsInMetadataStore';
let mockIsMobile = false;
-let mockIsInitialObjectViewEnabled = false;
jest.mock('twenty-ui/utilities', () => ({
...jest.requireActual('twenty-ui/utilities'),
useIsMobile: () => mockIsMobile,
}));
-jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({
- useIsFeatureEnabled: () => mockIsInitialObjectViewEnabled,
-}));
-
const Wrapper = ({ children }: { children: ReactNode }) =>
createElement(JotaiProvider, { store: jotaiStore }, children);
@@ -224,7 +219,6 @@ const renderHooks = ({
describe('useDefaultHomePagePath', () => {
afterEach(() => {
mockIsMobile = false;
- mockIsInitialObjectViewEnabled = false;
});
it('should return proper path when no currentUser', async () => {
@@ -328,9 +322,7 @@ 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;
-
+ it('should target the initial view rather than the index view when the menu has no object item', async () => {
const { result } = renderHooks({
withCurrentUser: true,
withExistingView: false,
@@ -348,24 +340,6 @@ describe('useDefaultHomePagePath', () => {
});
});
- 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 11a21fb41e2..955e6bc8397 100644
--- a/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts
+++ b/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts
@@ -14,8 +14,6 @@ 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';
@@ -41,9 +39,6 @@ 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(
() =>
@@ -58,16 +53,16 @@ export const useDefaultHomePagePath = () => {
const getTargetViewId = useCallback(
(objectMetadataItemId: string | undefined | null) => {
- const { firstSelectableViewId, indexViewId, firstAvailableViewId } =
- computeObjectViewTargetIds({
+ const { firstSelectableViewId, indexViewId } = computeObjectViewTargetIds(
+ {
views,
objectMetadataId: objectMetadataItemId ?? undefined,
- isInitialObjectViewEnabled,
- });
+ },
+ );
- return firstSelectableViewId ?? indexViewId ?? firstAvailableViewId;
+ return firstSelectableViewId ?? indexViewId;
},
- [views, isInitialObjectViewEnabled],
+ [views],
);
const firstNavigationMenuItemLink = useMemo(
@@ -77,14 +72,12 @@ export const useDefaultHomePagePath = () => {
objectMetadataItems,
views,
objectPermissionsByObjectMetadataId,
- isInitialObjectViewEnabled,
}),
[
objectMetadataItems,
objectPermissionsByObjectMetadataId,
views,
navigationMenuItemsInDisplayOrder,
- isInitialObjectViewEnabled,
],
);
diff --git a/packages/twenty-front/src/modules/navigation/hooks/useSetLastVisitedViewForObjectMetadataNamePlural.ts b/packages/twenty-front/src/modules/navigation/hooks/useSetLastVisitedViewForObjectMetadataNamePlural.ts
index 17084948ec9..b79dfadbb52 100644
--- a/packages/twenty-front/src/modules/navigation/hooks/useSetLastVisitedViewForObjectMetadataNamePlural.ts
+++ b/packages/twenty-front/src/modules/navigation/hooks/useSetLastVisitedViewForObjectMetadataNamePlural.ts
@@ -3,17 +3,12 @@ import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMeta
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,
@@ -40,7 +35,7 @@ export const useSetLastVisitedViewForObjectMetadataNamePlural = () => {
return;
}
- if (isInitialObjectViewEnabled && view.key === ViewKey.INDEX) {
+ if (view.key === ViewKey.INDEX) {
return;
}
@@ -58,7 +53,7 @@ export const useSetLastVisitedViewForObjectMetadataNamePlural = () => {
});
}
},
- [store, isInitialObjectViewEnabled],
+ [store],
);
return {
diff --git a/packages/twenty-front/src/modules/navigation/utils/getFirstNavigationMenuItemLink.ts b/packages/twenty-front/src/modules/navigation/utils/getFirstNavigationMenuItemLink.ts
index 78db7a55ffa..80c96c831d3 100644
--- a/packages/twenty-front/src/modules/navigation/utils/getFirstNavigationMenuItemLink.ts
+++ b/packages/twenty-front/src/modules/navigation/utils/getFirstNavigationMenuItemLink.ts
@@ -16,7 +16,6 @@ type GetFirstNavigationMenuItemLinkArgs = {
objectPermissionsByObjectMetadataId: Parameters<
typeof getObjectPermissionsForObject
>[0];
- isInitialObjectViewEnabled?: boolean;
};
export const getFirstNavigationMenuItemLink = ({
@@ -24,7 +23,6 @@ export const getFirstNavigationMenuItemLink = ({
objectMetadataItems,
views,
objectPermissionsByObjectMetadataId,
- isInitialObjectViewEnabled = false,
}: GetFirstNavigationMenuItemLinkArgs): string | null => {
for (const item of navigationMenuItemsInDisplayOrder) {
if (
@@ -57,7 +55,6 @@ export const getFirstNavigationMenuItemLink = ({
item,
objectMetadataItems,
views,
- isInitialObjectViewEnabled,
});
if (isNonEmptyString(link)) {
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
index 47e0041fd50..9193877ecb0 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
@@ -32,10 +32,6 @@ export const SETTINGS_ADMIN_FEATURE_FLAG_METADATA: Record<
label: msg`Application workflows`,
description: msg`Allow applications to install workflows and start new workflow runs.`,
},
- [FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED]: {
- label: msg`Initial object views`,
- description: msg`Use a dedicated initial view for each object in navigation and the view picker.`,
- },
[FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED]: {
label: msg`Record sharing`,
description: msg`Let people restrict and share individual records.`,
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
index 0f81d8fbf58..1bbc0158905 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/computeObjectViewTargetIds.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/computeObjectViewTargetIds.test.ts
@@ -26,34 +26,20 @@ const tableWidgetView = makeView(
);
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();
@@ -63,21 +49,17 @@ describe('computeObjectViewTargetIds', () => {
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
index 5eae3532cab..c9929d44f38 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/isUsableLastVisitedView.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/isUsableLastVisitedView.test.ts
@@ -6,43 +6,30 @@ describe('isUsableLastVisitedView', () => {
expect(
isUsableLastVisitedView({
lastVisitedView: undefined,
- isInitialObjectViewEnabled: true,
}),
).toBe(false);
});
- it('should refuse a widget view whatever the flag', () => {
+ it('should refuse a widget view', () => {
expect(
isUsableLastVisitedView({
lastVisitedView: { key: null, type: ViewType.TABLE_WIDGET },
- isInitialObjectViewEnabled: false,
}),
).toBe(false);
});
- it('should refuse the index view when the flag is on', () => {
+ it('should refuse the index view', () => {
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', () => {
+ it('should accept a user owned view', () => {
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
index a61d9b111ba..109f369e868 100644
--- a/packages/twenty-front/src/modules/views/utils/computeObjectViewTargetIds.ts
+++ b/packages/twenty-front/src/modules/views/utils/computeObjectViewTargetIds.ts
@@ -10,15 +10,12 @@ export const computeObjectViewTargetIds = <
>({
views,
objectMetadataId,
- isInitialObjectViewEnabled,
}: {
views: TView[];
objectMetadataId?: string;
- isInitialObjectViewEnabled: boolean;
}): {
firstSelectableViewId?: string;
indexViewId?: string;
- firstAvailableViewId?: string;
} => {
const selectableViewsOnObject = views
.filter(
@@ -29,12 +26,11 @@ export const computeObjectViewTargetIds = <
.sort((a, b) => a.position - b.position || a.id.localeCompare(b.id));
return {
- firstSelectableViewId: isInitialObjectViewEnabled
- ? selectableViewsOnObject.find((view) => view.key !== ViewKey.INDEX)?.id
- : undefined,
+ firstSelectableViewId: selectableViewsOnObject.find(
+ (view) => view.key !== ViewKey.INDEX,
+ )?.id,
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
index 7f690abad2d..57031d87f13 100644
--- a/packages/twenty-front/src/modules/views/utils/isUsableLastVisitedView.ts
+++ b/packages/twenty-front/src/modules/views/utils/isUsableLastVisitedView.ts
@@ -4,10 +4,8 @@ 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;
@@ -17,5 +15,5 @@ export const isUsableLastVisitedView = ({
return false;
}
- return !isInitialObjectViewEnabled || lastVisitedView.key !== ViewKey.INDEX;
+ return 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 cdc930f7703..e32031ba57e 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
@@ -12,10 +12,8 @@ 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 } =
@@ -30,14 +28,9 @@ export const ViewPickerEditButton = () => {
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;
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 70e7be3c3bf..d94932357b4 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
@@ -22,11 +22,10 @@ import { ViewPickerOptionDropdown } from '@/views/view-picker/components/ViewPic
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 { themeCssVariables } from 'twenty-ui/theme';
-import { FeatureFlagKey, ViewVisibility } from '~/generated-metadata/graphql';
+import { ViewVisibility } from '~/generated-metadata/graphql';
import { moveArrayItem } from '~/utils/array/moveArrayItem';
const StyledBoldDropdownMenuItemsContainerWrapper = styled.div`
@@ -45,14 +44,9 @@ export const ViewPickerListContent = () => {
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(
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
index 0d2f659acb3..32db5114a7f 100644
--- 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
@@ -6,19 +6,9 @@ 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', () => {
+ it('hides the index view', () => {
const result = computeViewPickerVisibleViews({
views: [INDEX_VIEW, INITIAL_VIEW, USER_VIEW],
- isInitialObjectViewEnabled: true,
});
expect(result).toEqual([INITIAL_VIEW, USER_VIEW]);
@@ -28,7 +18,6 @@ describe('computeViewPickerVisibleViews', () => {
const result = computeViewPickerVisibleViews({
views: [INDEX_VIEW, INITIAL_VIEW],
currentViewId: INDEX_VIEW.id,
- isInitialObjectViewEnabled: true,
});
expect(result).toEqual([INDEX_VIEW, INITIAL_VIEW]);
@@ -37,7 +26,6 @@ describe('computeViewPickerVisibleViews', () => {
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
index a70aa0de490..f4c2496c41d 100644
--- a/packages/twenty-front/src/modules/views/view-picker/utils/computeViewPickerVisibleViews.ts
+++ b/packages/twenty-front/src/modules/views/view-picker/utils/computeViewPickerVisibleViews.ts
@@ -7,16 +7,10 @@ export const computeViewPickerVisibleViews = <
>({
views,
currentViewId,
- isInitialObjectViewEnabled,
}: {
views: TView[];
currentViewId?: string;
- isInitialObjectViewEnabled: boolean;
}): TView[] => {
- if (!isInitialObjectViewEnabled) {
- return views;
- }
-
const viewsWithoutIndexView = views.filter(
(view) => view.key !== ViewKey.INDEX,
);
diff --git a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.module.ts
index 3c21582b25e..54f3090d730 100644
--- a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.module.ts
@@ -1,12 +1,11 @@
import { Module } from '@nestjs/common';
-import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { MinimalMetadataResolver } from 'src/engine/metadata-modules/minimal-metadata/minimal-metadata.resolver';
import { MinimalMetadataService } from 'src/engine/metadata-modules/minimal-metadata/minimal-metadata.service';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@Module({
- imports: [FeatureFlagModule, WorkspaceCacheModule],
+ imports: [WorkspaceCacheModule],
providers: [MinimalMetadataResolver, MinimalMetadataService],
})
export class MinimalMetadataModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.service.ts
index b1e7be88294..ff675e20338 100644
--- a/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/minimal-metadata/minimal-metadata.service.ts
@@ -5,13 +5,11 @@ import {
type AllMetadataName,
} from 'twenty-shared/metadata';
import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';
-import { FeatureFlagKey, ViewVisibility } from 'twenty-shared/types';
+import { ViewVisibility } from 'twenty-shared/types';
import { isDefined, uncapitalize } from 'twenty-shared/utils';
import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import { ALL_FLAT_ENTITY_MAPS_PROPERTIES } from 'src/engine/metadata-modules/flat-entity/constant/all-flat-entity-maps-properties.constant';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
-import { isInitialObjectView } from 'src/engine/metadata-modules/view/utils/is-initial-object-view.util';
import { type CollectionHashDTO } from 'src/engine/metadata-modules/minimal-metadata/dtos/collection-hash.dto';
import { MinimalMetadataDTO } from 'src/engine/metadata-modules/minimal-metadata/dtos/minimal-metadata.dto';
import { MinimalObjectMetadataDTO } from 'src/engine/metadata-modules/minimal-metadata/dtos/minimal-object-metadata.dto';
@@ -40,7 +38,6 @@ export class MinimalMetadataService {
constructor(
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly i18nService: I18nService,
- private readonly featureFlagService: FeatureFlagService,
) {}
async getMinimalMetadata({
@@ -143,20 +140,10 @@ export class MinimalMetadataService {
};
});
- const isInitialObjectViewEnabled =
- await this.featureFlagService.isFeatureEnabled(
- FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
- workspaceId,
- );
-
const views: MinimalViewDTO[] = Object.values(
flatViewMaps.byUniversalIdentifier,
)
.filter(isDefined)
- .filter(
- (flatView) =>
- isInitialObjectViewEnabled || !isInitialObjectView(flatView),
- )
.filter((flatView) => flatView.workspaceId === workspaceId)
.filter((flatView) => flatView.deletedAt === null)
.filter(
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/view-permissions.module.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/view-permissions.module.ts
index b6fd9304748..e7f130ae9d5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/view-permissions.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/view-permissions.module.ts
@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
-import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';
@@ -17,7 +16,6 @@ import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-perm
@Module({
imports: [
- FeatureFlagModule,
TypeOrmModule.forFeature([ViewEntity]),
ApplicationModule,
PermissionsModule,
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
index a607d6c19cb..e59c924bd6a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
@@ -1,11 +1,10 @@
import { Injectable } from '@nestjs/common';
-import { FeatureFlagKey, ViewType } from 'twenty-shared/types';
+import { ViewType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
@@ -46,7 +45,6 @@ export class ViewService {
private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
private readonly applicationService: ApplicationService,
- private readonly featureFlagService: FeatureFlagService,
) {}
async createOne({
@@ -344,12 +342,6 @@ export class ViewService {
},
);
- const isInitialObjectViewEnabled =
- await this.featureFlagService.isFeatureEnabled(
- FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
- workspaceId,
- );
-
return Object.values(flatViewMaps.byUniversalIdentifier)
.filter(isDefined)
.filter((flatView) => flatView.workspaceId === workspaceId)
@@ -364,11 +356,7 @@ export class ViewService {
viewTypes.includes(flatView.type),
)
.filter((flatView) =>
- isViewAvailableToUser({
- flatView,
- userWorkspaceId,
- isInitialObjectViewEnabled,
- }),
+ isViewAvailableToUser({ flatView, userWorkspaceId }),
)
.sort((a, b) => a.position - b.position || a.id.localeCompare(b.id));
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/utils/is-initial-object-view.util.ts b/packages/twenty-server/src/engine/metadata-modules/view/utils/is-initial-object-view.util.ts
deleted file mode 100644
index f7e80f7956f..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/view/utils/is-initial-object-view.util.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { getInitialObjectViewUniversalIdentifier } from 'src/engine/metadata-modules/view/utils/get-initial-object-view-universal-identifier.util';
-
-import { type UniversalFlatView } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view.type';
-
-export const isInitialObjectView = (
- flatView: Pick<
- UniversalFlatView,
- | 'universalIdentifier'
- | 'applicationUniversalIdentifier'
- | 'objectMetadataUniversalIdentifier'
- >,
-): boolean =>
- flatView.universalIdentifier ===
- getInitialObjectViewUniversalIdentifier({
- viewApplicationUniversalIdentifier: flatView.applicationUniversalIdentifier,
- objectUniversalIdentifier: flatView.objectMetadataUniversalIdentifier,
- });
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/utils/is-view-available-to-user.util.ts b/packages/twenty-server/src/engine/metadata-modules/view/utils/is-view-available-to-user.util.ts
index 0b9c094bd30..e443012f1a0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/utils/is-view-available-to-user.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/utils/is-view-available-to-user.util.ts
@@ -1,24 +1,14 @@
import { type FlatView } from 'src/engine/metadata-modules/flat-view/types/flat-view.type';
-import { isInitialObjectView } from 'src/engine/metadata-modules/view/utils/is-initial-object-view.util';
import { isViewVisibleToUser } from 'src/engine/metadata-modules/view/utils/is-view-visible-to-user.util';
export const isViewAvailableToUser = ({
flatView,
userWorkspaceId,
- isInitialObjectViewEnabled,
}: {
flatView: Pick<
FlatView,
- | 'deletedAt'
- | 'visibility'
- | 'createdByUserWorkspaceId'
- | 'universalIdentifier'
- | 'applicationUniversalIdentifier'
- | 'objectMetadataUniversalIdentifier'
+ 'deletedAt' | 'visibility' | 'createdByUserWorkspaceId'
>;
userWorkspaceId?: string;
- isInitialObjectViewEnabled: boolean;
}): boolean =>
- flatView.deletedAt === null &&
- (isInitialObjectViewEnabled || !isInitialObjectView(flatView)) &&
- isViewVisibleToUser(flatView, userWorkspaceId);
+ flatView.deletedAt === null && isViewVisibleToUser(flatView, userWorkspaceId);
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts
index 9b13beacd43..b927b6b3613 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts
@@ -5,7 +5,6 @@ const tableName = 'featureFlag';
const DEFAULT_SEEDED_FEATURE_FLAGS: Partial<Record<FeatureFlagKey, boolean>> = {
[FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED]: true,
- [FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED]: false,
[FeatureFlagKey.IS_RECORD_CREATION_FORM_ENABLED]: true,
[FeatureFlagKey.IS_LOGS_SETTINGS_SECTION_ENABLED]: true,
[FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED]: false,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts
index 4d42fa5c0a5..a6e31f106e9 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts
@@ -2,5 +2,4 @@ import { FeatureFlagKey } from 'twenty-shared/types';
export const DEFAULT_FEATURE_FLAGS = [
FeatureFlagKey.IS_REST_METADATA_API_NEW_FORMAT_DIRECT,
- FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
] as const satisfies FeatureFlagKey[];
diff --git a/packages/twenty-server/test/integration/metadata/suites/object-metadata/view-side-effect-on-object-metadata-creation.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/object-metadata/view-side-effect-on-object-metadata-creation.integration-spec.ts
index f97bc40bfa6..b37014c5fcb 100644
--- a/packages/twenty-server/test/integration/metadata/suites/object-metadata/view-side-effect-on-object-metadata-creation.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/object-metadata/view-side-effect-on-object-metadata-creation.integration-spec.ts
@@ -5,8 +5,7 @@ import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/object
import { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';
import { findViewFields } from 'test/integration/metadata/suites/view-field/utils/find-view-fields.util';
import { findViews } from 'test/integration/metadata/suites/view/utils/find-views.util';
-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';
-import { FeatureFlagKey, ViewType } from 'twenty-shared/types';
+import { ViewType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { type FlatView } from 'src/engine/metadata-modules/flat-view/types/flat-view.type';
@@ -115,9 +114,6 @@ describe('View side effect on object creation', () => {
type: ViewType.TABLE,
});
- expect(createdViews.length).toBe(2);
- expect(findInitialViews(createdViews)).toHaveLength(0);
-
const {
data: { getViewFields: indexViewFields },
} = await findViewFields({
@@ -128,55 +124,40 @@ describe('View side effect on object creation', () => {
expect(indexViewFields.length).toBe(5);
});
- it('should expose the initial view and its view fields once the feature flag is enabled', async () => {
+ it('should expose the initial view and its view fields', async () => {
const createOneObject = await createDishesObject();
createdObjectMetadataId = createOneObject.id;
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
- value: true,
+ const {
+ data: { getViews: createdViews },
+ } = await findViews({
+ objectMetadataId: createdObjectMetadataId,
expectToFail: false,
});
- try {
- const {
- data: { getViews: createdViews },
- } = await findViews({
- objectMetadataId: createdObjectMetadataId,
- expectToFail: false,
- });
-
- const [initialView, ...extraInitialViews] =
- findInitialViews(createdViews);
-
- if (!isDefined(initialView)) {
- throw new Error('expected a initial user-owned view to be exposed');
- }
-
- expect(extraInitialViews).toHaveLength(0);
-
- expect(initialView).toMatchObject<Partial<FlatView>>({
- objectMetadataId: createdObjectMetadataId,
- type: ViewType.TABLE,
- name: 'All Dishes I love',
- });
-
- const {
- data: { getViewFields: initialViewFields },
- } = await findViewFields({
- viewId: initialView.id,
- expectToFail: false,
- });
-
- expect(initialViewFields.length).toBe(5);
- } finally {
- await updateFeatureFlag({
- featureFlag: FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED,
- value: false,
- expectToFail: false,
- });
+ const [initialView, ...extraInitialViews] = findInitialViews(createdViews);
+
+ if (!isDefined(initialView)) {
+ throw new Error('expected a initial user-owned view to be exposed');
}
+
+ expect(extraInitialViews).toHaveLength(0);
+
+ expect(initialView).toMatchObject<Partial<FlatView>>({
+ objectMetadataId: createdObjectMetadataId,
+ type: ViewType.TABLE,
+ name: 'All Dishes I love',
+ });
+
+ const {
+ data: { getViewFields: initialViewFields },
+ } = await findViewFields({
+ viewId: initialView.id,
+ expectToFail: false,
+ });
+
+ expect(initialViewFields.length).toBe(5);
});
it('should keep the same INDEX view when the object is renamed (lossless, deterministic identifier)', async () => {
diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.ts
index 5f6a7666613..f90094c7905 100644
--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts
+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts
@@ -5,7 +5,6 @@ export enum FeatureFlagKey {
IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',
IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
- IS_INITIAL_OBJECT_VIEW_ENABLED = 'IS_INITIAL_OBJECT_VIEW_ENABLED',
IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED = 'IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED',
IS_RECORD_CREATION_FORM_ENABLED = 'IS_RECORD_CREATION_FORM_ENABLED',
IS_LOGS_SETTINGS_SECTION_ENABLED = 'IS_LOGS_SETTINGS_SECTION_ENABLED',