The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
refactor(twenty-front): reorganize NavigationMenuItem module into common/display/edit subfolders (#18691)
Charles Bochetf1dfcfd1635f
diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/useShouldCommandMenuItemBeRegisteredParams.ts b/packages/twenty-front/src/modules/command-menu-item/hooks/useShouldCommandMenuItemBeRegisteredParams.tsindex d42d0e1359b..a3a83212cce 100644--- a/packages/twenty-front/src/modules/command-menu-item/hooks/useShouldCommandMenuItemBeRegisteredParams.ts+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/useShouldCommandMenuItemBeRegisteredParams.ts@@ -7,7 +7,7 @@ import { contextStoreCurrentViewTypeComponentState } from '@/context-store/stateimport { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType';-import { useNavigationMenuItemsData } from '@/navigation-menu-item/hooks/useNavigationMenuItemsData';+import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';import { CoreObjectNameSingular } from 'twenty-shared/types';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';diff --git a/packages/twenty-front/src/modules/command-menu-item/record/no-selection/components/EditNavigationSidebarNoSelectionRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/record/no-selection/components/EditNavigationSidebarNoSelectionRecordCommand.tsxindex 57e13744fa0..aa7635d0e2b 100644--- a/packages/twenty-front/src/modules/command-menu-item/record/no-selection/components/EditNavigationSidebarNoSelectionRecordCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/record/no-selection/components/EditNavigationSidebarNoSelectionRecordCommand.tsx@@ -1,5 +1,5 @@import { Command } from '@/command-menu-item/display/components/Command';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';export const EditNavigationSidebarNoSelectionRecordCommand = () => {diff --git a/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/AddToFavoritesSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/AddToFavoritesSingleRecordCommand.tsxindex 72ec78f57d1..45e8ef3b4ee 100644--- a/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/AddToFavoritesSingleRecordCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/AddToFavoritesSingleRecordCommand.tsx@@ -1,7 +1,7 @@import { Command } from '@/command-menu-item/display/components/Command';import { useSelectedRecordIdOrThrow } from '@/command-menu-item/record/single-record/hooks/useSelectedRecordIdOrThrow';import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/useContextStoreObjectMetadataItemOrThrow';-import { useCreateNavigationMenuItem } from '@/navigation-menu-item/hooks/useCreateNavigationMenuItem';+import { useCreateNavigationMenuItem } from '@/navigation-menu-item/common/hooks/useCreateNavigationMenuItem';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';import { isDefined } from 'twenty-shared/utils';diff --git a/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/DeleteSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/DeleteSingleRecordCommand.tsxindex 3766da74c76..ce83d783187 100644--- a/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/DeleteSingleRecordCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/DeleteSingleRecordCommand.tsx@@ -1,7 +1,7 @@import { Command } from '@/command-menu-item/display/components/Command';import { useSelectedRecordIdOrThrow } from '@/command-menu-item/record/single-record/hooks/useSelectedRecordIdOrThrow';-import { useNavigationMenuItemsData } from '@/navigation-menu-item/hooks/useNavigationMenuItemsData';-import { useRemoveNavigationMenuItemByTargetRecordId } from '@/navigation-menu-item/hooks/useRemoveNavigationMenuItemByTargetRecordId';+import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';+import { useRemoveNavigationMenuItemByTargetRecordId } from '@/navigation-menu-item/common/hooks/useRemoveNavigationMenuItemByTargetRecordId';import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';import { useRemoveSelectedRecordsFromRecordBoard } from '@/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard';import { useRecordIndexIdFromCurrentContextStore } from '@/object-record/record-index/hooks/useRecordIndexIdFromCurrentContextStore';diff --git a/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/RemoveFromFavoritesSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/RemoveFromFavoritesSingleRecordCommand.tsxindex 3b996db0a44..9cab614aa46 100644--- a/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/RemoveFromFavoritesSingleRecordCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/record/single-record/components/RemoveFromFavoritesSingleRecordCommand.tsx@@ -1,8 +1,8 @@import { Command } from '@/command-menu-item/display/components/Command';import { useSelectedRecordIdOrThrow } from '@/command-menu-item/record/single-record/hooks/useSelectedRecordIdOrThrow';import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/useContextStoreObjectMetadataItemOrThrow';-import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/hooks/useDeleteNavigationMenuItem';-import { useNavigationMenuItemsData } from '@/navigation-menu-item/hooks/useNavigationMenuItemsData';+import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/common/hooks/useDeleteNavigationMenuItem';+import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';import { isDefined } from 'twenty-shared/utils';export const RemoveFromFavoritesSingleRecordCommand = () => {diff --git a/packages/twenty-front/src/modules/command-menu-item/server-items/hooks/useCommandMenuContextApi.ts b/packages/twenty-front/src/modules/command-menu-item/server-items/hooks/useCommandMenuContextApi.tsindex 5e86caf85bf..3d5a4d9b6cc 100644--- a/packages/twenty-front/src/modules/command-menu-item/server-items/hooks/useCommandMenuContextApi.ts+++ b/packages/twenty-front/src/modules/command-menu-item/server-items/hooks/useCommandMenuContextApi.ts@@ -7,7 +7,7 @@ import { contextStoreIsPageInEditModeComponentState } from '@/context-store/statimport { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType';-import { useNavigationMenuItemsData } from '@/navigation-menu-item/hooks/useNavigationMenuItemsData';+import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';import { hasAnySoftDeleteFilterOnViewComponentSelector } from '@/object-record/record-filter/states/hasAnySoftDeleteFilterOnView';diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuAddToNavDroppableDndKit.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuAddToNavDroppableDndKit.tsxindex 66a0a6e52bc..a2ac2662a34 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuAddToNavDroppableDndKit.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuAddToNavDroppableDndKit.tsx@@ -1,7 +1,7 @@import { useDroppable } from '@dnd-kit/react';import { type ReactNode } from 'react';-import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/constants/AddToNavSourceDroppableId';+import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';import type { AddToNavDroppableProvided } from '@/command-menu/components/CommandMenuAddToNavDroppableTypes';diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemWithAddToNavigationDragDndKit.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemWithAddToNavigationDragDndKit.tsxindex dc3b408c9af..116305cea43 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemWithAddToNavigationDragDndKit.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemWithAddToNavigationDragDndKit.tsx@@ -1,7 +1,7 @@import { useDraggable } from '@dnd-kit/react';import { type ReactNode } from 'react';-import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/constants/AddToNavSourceDroppableId';+import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';type CommandMenuItemWithAddToNavigationDragDndKitProps = {id: string;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/constants/AddToNavSourceDroppableId.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/AddToNavSourceDroppableId.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/constants/AddToNavSourceDroppableId.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/constants/AddToNavSourceDroppableId.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/constants/DndKitDropTargetIdSeparator.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/DndKitDropTargetIdSeparator.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/constants/DndKitDropTargetIdSeparator.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/constants/DndKitDropTargetIdSeparator.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/constants/FolderIconDefault.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/FolderIconDefault.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/constants/FolderIconDefault.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/constants/FolderIconDefault.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationMenuItemDefaultColorFolder.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationMenuItemDefaultColorFolder.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationMenuItemDefaultColorLink.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationMenuItemDefaultColorLink.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationMenuItemDefaultIconColor.constant.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemDefaultIconColor.constant.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationMenuItemDefaultIconColor.constant.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemDefaultIconColor.constant.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationMenuItemDroppableIds.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationMenuItemDroppableIds.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationMenuItemFolderDeleteModalId.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemFolderDeleteModalId.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationMenuItemFolderDeleteModalId.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemFolderDeleteModalId.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationSections.constants.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationSections.constants.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/constants/NavigationSections.constants.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationSections.constants.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/contexts/NavigationDragSourceContext.tsx b/packages/twenty-front/src/modules/navigation-menu-item/common/contexts/NavigationDragSourceContext.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/contexts/NavigationDragSourceContext.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/common/contexts/NavigationDragSourceContext.tsxdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/contexts/NavigationDropTargetContext.tsx b/packages/twenty-front/src/modules/navigation-menu-item/common/contexts/NavigationDropTargetContext.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/contexts/NavigationDropTargetContext.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/common/contexts/NavigationDropTargetContext.tsxdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/contexts/NavigationMenuItemDragContext.tsx b/packages/twenty-front/src/modules/navigation-menu-item/common/contexts/NavigationMenuItemDragContext.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/contexts/NavigationMenuItemDragContext.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/common/contexts/NavigationMenuItemDragContext.tsxdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/contexts/SortableDropTargetRefContext.tsx b/packages/twenty-front/src/modules/navigation-menu-item/common/contexts/SortableDropTargetRefContext.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/contexts/SortableDropTargetRefContext.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/common/contexts/SortableDropTargetRefContext.tsxdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/graphql/fragments/navigationMenuItemFragment.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/fragments/navigationMenuItemFragment.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/graphql/fragments/navigationMenuItemFragment.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/graphql/fragments/navigationMenuItemFragment.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/graphql/fragments/navigationMenuItemQueryFragment.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/fragments/navigationMenuItemQueryFragment.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/graphql/fragments/navigationMenuItemQueryFragment.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/graphql/fragments/navigationMenuItemQueryFragment.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/graphql/mutations/createNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/mutations/createNavigationMenuItem.tssimilarity index 85%rename from packages/twenty-front/src/modules/navigation-menu-item/graphql/mutations/createNavigationMenuItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/graphql/mutations/createNavigationMenuItem.tsindex a26ff9ebf75..f9c5188f9cc 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/graphql/mutations/createNavigationMenuItem.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/mutations/createNavigationMenuItem.ts@@ -1,5 +1,5 @@import { gql } from '@apollo/client';-import { NAVIGATION_MENU_ITEM_FRAGMENT } from '@/navigation-menu-item/graphql/fragments/navigationMenuItemFragment';+import { NAVIGATION_MENU_ITEM_FRAGMENT } from '@/navigation-menu-item/common/graphql/fragments/navigationMenuItemFragment';export const CREATE_NAVIGATION_MENU_ITEM = gql`${NAVIGATION_MENU_ITEM_FRAGMENT}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/graphql/mutations/deleteNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/mutations/deleteNavigationMenuItem.tssimilarity index 84%rename from packages/twenty-front/src/modules/navigation-menu-item/graphql/mutations/deleteNavigationMenuItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/graphql/mutations/deleteNavigationMenuItem.tsindex 86ead1d973e..e8fcf3d6082 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/graphql/mutations/deleteNavigationMenuItem.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/mutations/deleteNavigationMenuItem.ts@@ -1,5 +1,5 @@import { gql } from '@apollo/client';-import { NAVIGATION_MENU_ITEM_FRAGMENT } from '@/navigation-menu-item/graphql/fragments/navigationMenuItemFragment';+import { NAVIGATION_MENU_ITEM_FRAGMENT } from '@/navigation-menu-item/common/graphql/fragments/navigationMenuItemFragment';export const DELETE_NAVIGATION_MENU_ITEM = gql`${NAVIGATION_MENU_ITEM_FRAGMENT}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/graphql/mutations/updateNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/mutations/updateNavigationMenuItem.tssimilarity index 85%rename from packages/twenty-front/src/modules/navigation-menu-item/graphql/mutations/updateNavigationMenuItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/graphql/mutations/updateNavigationMenuItem.tsindex 67a92551ae5..448f45afa14 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/graphql/mutations/updateNavigationMenuItem.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/mutations/updateNavigationMenuItem.ts@@ -1,5 +1,5 @@import { gql } from '@apollo/client';-import { NAVIGATION_MENU_ITEM_FRAGMENT } from '@/navigation-menu-item/graphql/fragments/navigationMenuItemFragment';+import { NAVIGATION_MENU_ITEM_FRAGMENT } from '@/navigation-menu-item/common/graphql/fragments/navigationMenuItemFragment';export const UPDATE_NAVIGATION_MENU_ITEM = gql`${NAVIGATION_MENU_ITEM_FRAGMENT}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/graphql/queries/findManyNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/queries/findManyNavigationMenuItems.tssimilarity index 81%rename from packages/twenty-front/src/modules/navigation-menu-item/graphql/queries/findManyNavigationMenuItems.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/graphql/queries/findManyNavigationMenuItems.tsindex 79502d0b9e1..a1a56915998 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/graphql/queries/findManyNavigationMenuItems.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/queries/findManyNavigationMenuItems.ts@@ -1,4 +1,4 @@-import { NAVIGATION_MENU_ITEM_QUERY_FRAGMENT } from '@/navigation-menu-item/graphql/fragments/navigationMenuItemQueryFragment';+import { NAVIGATION_MENU_ITEM_QUERY_FRAGMENT } from '@/navigation-menu-item/common/graphql/fragments/navigationMenuItemQueryFragment';import { gql } from '@apollo/client';export const FIND_MANY_NAVIGATION_MENU_ITEMS = gql`diff --git a/packages/twenty-front/src/modules/navigation-menu-item/graphql/queries/findOneNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/queries/findOneNavigationMenuItem.tssimilarity index 82%rename from packages/twenty-front/src/modules/navigation-menu-item/graphql/queries/findOneNavigationMenuItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/graphql/queries/findOneNavigationMenuItem.tsindex 1a9a603af69..dcd631c04c9 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/graphql/queries/findOneNavigationMenuItem.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/graphql/queries/findOneNavigationMenuItem.ts@@ -1,4 +1,4 @@-import { NAVIGATION_MENU_ITEM_QUERY_FRAGMENT } from '@/navigation-menu-item/graphql/fragments/navigationMenuItemQueryFragment';+import { NAVIGATION_MENU_ITEM_QUERY_FRAGMENT } from '@/navigation-menu-item/common/graphql/fragments/navigationMenuItemQueryFragment';import { gql } from '@apollo/client';export const FIND_ONE_NAVIGATION_MENU_ITEM = gql`diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useCreateNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useCreateNavigationMenuItem.tssimilarity index 98%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useCreateNavigationMenuItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useCreateNavigationMenuItem.tsindex 5f2719349fe..b44d9014453 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useCreateNavigationMenuItem.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useCreateNavigationMenuItem.ts@@ -3,7 +3,7 @@ import { isDefined } from 'twenty-shared/utils';import { useMutation } from '@apollo/client/react';import { CreateNavigationMenuItemDocument } from '~/generated-metadata/graphql';-import { useNavigationMenuItemsData } from '@/navigation-menu-item/hooks/useNavigationMenuItemsData';+import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { type ObjectRecord } from '@/object-record/types/ObjectRecord';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useDeleteNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useDeleteNavigationMenuItem.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useDeleteNavigationMenuItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useDeleteNavigationMenuItem.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useObjectNavItemColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useObjectNavItemColor.tssimilarity index 93%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useObjectNavItemColor.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useObjectNavItemColor.tsindex c076c27b1a5..18b4a559a29 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useObjectNavItemColor.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useObjectNavItemColor.ts@@ -1,6 +1,6 @@import { isNonEmptyString } from '@sniptt/guards';-import { getStandardObjectIconColor } from '@/navigation-menu-item/utils/getStandardObjectIconColor';+import { getStandardObjectIconColor } from '@/navigation-menu-item/common/utils/getStandardObjectIconColor';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';export const useObjectNavItemColor = (objectNameSingular: string): string => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useRemoveNavigationMenuItemByTargetRecordId.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useRemoveNavigationMenuItemByTargetRecordId.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useRemoveNavigationMenuItemByTargetRecordId.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useRemoveNavigationMenuItemByTargetRecordId.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useUpdateNavigationMenuItem.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateNavigationMenuItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useUpdateNavigationMenuItem.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/states/addMenuItemInsertionContextState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/addMenuItemInsertionContextState.tssimilarity index 86%rename from packages/twenty-front/src/modules/navigation-menu-item/states/addMenuItemInsertionContextState.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/states/addMenuItemInsertionContextState.tsindex 435da314621..e3b7c66bebb 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/states/addMenuItemInsertionContextState.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/states/addMenuItemInsertionContextState.ts@@ -1,4 +1,4 @@-import type { AddMenuItemInsertionContext } from '@/navigation-menu-item/types/AddMenuItemInsertionContext';+import type { AddMenuItemInsertionContext } from '@/navigation-menu-item/common/types/AddMenuItemInsertionContext';import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/states/addToNavPayloadRegistryState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/addToNavPayloadRegistryState.tssimilarity index 86%rename from packages/twenty-front/src/modules/navigation-menu-item/states/addToNavPayloadRegistryState.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/states/addToNavPayloadRegistryState.tsindex 14c437b2dcc..d9822f2c694 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/states/addToNavPayloadRegistryState.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/states/addToNavPayloadRegistryState.ts@@ -1,4 +1,4 @@-import type { AddToNavigationDragPayload } from '@/navigation-menu-item/types/add-to-navigation-drag-payload';+import type { AddToNavigationDragPayload } from '@/navigation-menu-item/common/types/add-to-navigation-drag-payload';import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/states/currentNavigationMenuItemFolderIdState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/currentNavigationMenuItemFolderIdState.tssimilarity index 100%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/states/currentNavigationMenuItemFolderIdState.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/states/currentNavigationMenuItemFolderIdState.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/states/isNavigationMenuInEditModeState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/isNavigationMenuInEditModeState.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/states/isNavigationMenuInEditModeState.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/states/isNavigationMenuInEditModeState.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/states/isNavigationMenuItemFolderCreatingState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/isNavigationMenuItemFolderCreatingState.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/states/isNavigationMenuItemFolderCreatingState.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/states/isNavigationMenuItemFolderCreatingState.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/states/navigationMenuItemsDraftState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemsDraftState.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/states/navigationMenuItemsDraftState.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemsDraftState.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/states/navigationMenuItemsSelector.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemsSelector.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/states/navigationMenuItemsSelector.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemsSelector.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/states/openNavigationMenuItemFolderIdsState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/states/openNavigationMenuItemFolderIdsState.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/types/AddMenuItemInsertionContext.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/types/AddMenuItemInsertionContext.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/types/AddMenuItemInsertionContext.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/types/AddMenuItemInsertionContext.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/types/add-to-navigation-drag-payload.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/types/add-to-navigation-drag-payload.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/types/add-to-navigation-drag-payload.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/types/add-to-navigation-drag-payload.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/computeInsertIndexAndPosition.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/computeInsertIndexAndPosition.test.tssimilarity index 97%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/computeInsertIndexAndPosition.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/computeInsertIndexAndPosition.test.tsindex a4e36eb9dd4..4a69cafc4bf 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/computeInsertIndexAndPosition.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/computeInsertIndexAndPosition.test.ts@@ -1,4 +1,4 @@-import { computeInsertIndexAndPosition } from '@/navigation-menu-item/utils/computeInsertIndexAndPosition';+import { computeInsertIndexAndPosition } from '@/navigation-menu-item/common/utils/computeInsertIndexAndPosition';import { type NavigationMenuItem } from '~/generated-metadata/graphql';describe('computeInsertIndexAndPosition', () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/filterAndSortNavigationMenuItems.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterAndSortNavigationMenuItems.test.tssimilarity index 99%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/filterAndSortNavigationMenuItems.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterAndSortNavigationMenuItems.test.tsindex f39c721a50a..70c2938d6d7 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/filterAndSortNavigationMenuItems.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterAndSortNavigationMenuItems.test.ts@@ -1,6 +1,6 @@import { NavigationMenuItemType } from 'twenty-shared/types';-import { filterAndSortNavigationMenuItems } from '@/navigation-menu-item/utils/filterAndSortNavigationMenuItems';+import { filterAndSortNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { type View } from '@/views/types/View';import { ViewKey } from '@/views/types/ViewKey';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/filterWorkspaceNavigationMenuItems.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterWorkspaceNavigationMenuItems.test.tssimilarity index 91%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/filterWorkspaceNavigationMenuItems.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterWorkspaceNavigationMenuItems.test.tsindex 13c5372c364..930f0c8bf14 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/filterWorkspaceNavigationMenuItems.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterWorkspaceNavigationMenuItems.test.ts@@ -1,4 +1,4 @@-import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/utils/filterWorkspaceNavigationMenuItems';+import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterWorkspaceNavigationMenuItems';import { type NavigationMenuItem } from '~/generated-metadata/graphql';describe('filterWorkspaceNavigationMenuItems', () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getDropTargetIdFromDestination.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/getDropTargetIdFromDestination.test.tssimilarity index 95%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getDropTargetIdFromDestination.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/getDropTargetIdFromDestination.test.tsindex 356559a111d..457561e445e 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getDropTargetIdFromDestination.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/getDropTargetIdFromDestination.test.ts@@ -1,4 +1,4 @@-import { getDropTargetIdFromDestination } from '@/navigation-menu-item/utils/getDropTargetIdFromDestination';+import { getDropTargetIdFromDestination } from '@/navigation-menu-item/common/utils/getDropTargetIdFromDestination';describe('getDropTargetIdFromDestination', () => {it('should return null when destination is null or droppableId is not workspace', () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getPositionBetween.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/getPositionBetween.test.tssimilarity index 90%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getPositionBetween.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/getPositionBetween.test.tsindex ef1fee2df03..98a41afcf2e 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getPositionBetween.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/getPositionBetween.test.ts@@ -1,4 +1,4 @@-import { getPositionBetween } from '@/navigation-menu-item/utils/getPositionBetween';+import { getPositionBetween } from '@/navigation-menu-item/common/utils/getPositionBetween';describe('getPositionBetween', () => {it('returns next - 1 when only next is defined (insert before)', () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/isLocationMatchingNavigationMenuItem.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/isLocationMatchingNavigationMenuItem.test.tssimilarity index 95%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/isLocationMatchingNavigationMenuItem.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/isLocationMatchingNavigationMenuItem.test.tsindex c279e589de0..26a41c0aec0 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/isLocationMatchingNavigationMenuItem.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/isLocationMatchingNavigationMenuItem.test.ts@@ -1,5 +1,5 @@import { NavigationMenuItemType } from 'twenty-shared/types';-import { isLocationMatchingNavigationMenuItem } from '@/navigation-menu-item/utils/isLocationMatchingNavigationMenuItem';+import { isLocationMatchingNavigationMenuItem } from '@/navigation-menu-item/common/utils/isLocationMatchingNavigationMenuItem';describe('isLocationMatchingNavigationMenuItem', () => {it('should return true when item link matches current path (non-view) or current view path (view)', () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/isNavigationMenuItemFolder.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/isNavigationMenuItemFolder.test.tssimilarity index 94%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/isNavigationMenuItemFolder.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/isNavigationMenuItemFolder.test.tsindex b4cc063259b..f6e064820a7 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/isNavigationMenuItemFolder.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/isNavigationMenuItemFolder.test.ts@@ -1,6 +1,6 @@import { NavigationMenuItemType } from 'twenty-shared/types';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';describe('isNavigationMenuItemFolder', () => {it('should return true when type is folder', () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/isNavigationMenuItemLink.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/isNavigationMenuItemLink.test.tssimilarity index 95%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/isNavigationMenuItemLink.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/isNavigationMenuItemLink.test.tsindex fd2ac0f9bf4..04379ae0262 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/isNavigationMenuItemLink.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/isNavigationMenuItemLink.test.ts@@ -1,6 +1,6 @@import { NavigationMenuItemType } from 'twenty-shared/types';-import { isNavigationMenuItemLink } from '@/navigation-menu-item/utils/isNavigationMenuItemLink';+import { isNavigationMenuItemLink } from '@/navigation-menu-item/common/utils/isNavigationMenuItemLink';describe('isNavigationMenuItemLink', () => {it('should return true when type is link', () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/orderFoldersForCreation.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/orderFoldersForCreation.test.tssimilarity index 97%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/orderFoldersForCreation.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/orderFoldersForCreation.test.tsindex 44ed5e6ddae..02397aa7431 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/orderFoldersForCreation.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/orderFoldersForCreation.test.ts@@ -1,4 +1,4 @@-import { orderFoldersForCreation } from '@/navigation-menu-item/utils/orderFoldersForCreation';+import { orderFoldersForCreation } from '@/navigation-menu-item/common/utils/orderFoldersForCreation';describe('orderFoldersForCreation', () => {it('returns empty array for empty input', () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/recordIdentifierToObjectRecordIdentifier.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/recordIdentifierToObjectRecordIdentifier.test.tssimilarity index 96%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/recordIdentifierToObjectRecordIdentifier.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/recordIdentifierToObjectRecordIdentifier.test.tsindex 79c9e5658d6..4be0612492b 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/recordIdentifierToObjectRecordIdentifier.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/recordIdentifierToObjectRecordIdentifier.test.ts@@ -1,4 +1,4 @@-import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/utils/recordIdentifierToObjectRecordIdentifier';+import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier';import { CoreObjectNameSingular } from 'twenty-shared/types';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/validateAndExtractWorkspaceFolderId.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/validateAndExtractWorkspaceFolderId.test.tssimilarity index 95%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/validateAndExtractWorkspaceFolderId.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/validateAndExtractWorkspaceFolderId.test.tsindex 1da5429d7e7..1b330d3cb88 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/validateAndExtractWorkspaceFolderId.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/validateAndExtractWorkspaceFolderId.test.ts@@ -1,7 +1,7 @@import {matchesWorkspaceFolderId,validateAndExtractWorkspaceFolderId,-} from '@/navigation-menu-item/utils/validateAndExtractWorkspaceFolderId';+} from '@/navigation-menu-item/common/utils/validateAndExtractWorkspaceFolderId';import { type NavigationMenuItem } from '~/generated-metadata/graphql';describe('matchesWorkspaceFolderId', () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/buildCreateNavigationMenuItemInput.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildCreateNavigationMenuItemInput.tssimilarity index 92%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/buildCreateNavigationMenuItemInput.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildCreateNavigationMenuItemInput.tsindex 3e02ce5024b..d5860446333 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/buildCreateNavigationMenuItemInput.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildCreateNavigationMenuItemInput.ts@@ -5,9 +5,9 @@ import type {import { isDefined } from 'twenty-shared/utils';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';-import { isNavigationMenuItemLink } from '@/navigation-menu-item/utils/isNavigationMenuItemLink';-import { isNavigationMenuItemObject } from '@/navigation-menu-item/utils/isNavigationMenuItemObject';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';+import { isNavigationMenuItemLink } from '@/navigation-menu-item/common/utils/isNavigationMenuItemLink';+import { isNavigationMenuItemObject } from '@/navigation-menu-item/common/utils/isNavigationMenuItemObject';export const buildCreateNavigationMenuItemInput = (draftItem: NavigationMenuItem,diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/computeInsertIndexAndPosition.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/computeInsertIndexAndPosition.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/computeInsertIndexAndPosition.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/computeInsertIndexAndPosition.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/filterAndSortNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/filterAndSortNavigationMenuItems.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/filterWorkspaceNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterWorkspaceNavigationMenuItems.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/filterWorkspaceNavigationMenuItems.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterWorkspaceNavigationMenuItems.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getColorFromTheme.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getColorFromTheme.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getColorFromTheme.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/getColorFromTheme.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getDndKitDropTargetId.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getDndKitDropTargetId.tssimilarity index 79%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getDndKitDropTargetId.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/getDndKitDropTargetId.tsindex cdfe08c7def..91c1c972540 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/getDndKitDropTargetId.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getDndKitDropTargetId.ts@@ -1,4 +1,4 @@-import { DND_KIT_DROP_TARGET_ID_SEPARATOR } from '@/navigation-menu-item/constants/DndKitDropTargetIdSeparator';+import { DND_KIT_DROP_TARGET_ID_SEPARATOR } from '@/navigation-menu-item/common/constants/DndKitDropTargetIdSeparator';export const getDndKitDropTargetId = (droppableId: string,diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getDropTargetIdFromDestination.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getDropTargetIdFromDestination.tssimilarity index 66%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getDropTargetIdFromDestination.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/getDropTargetIdFromDestination.tsindex 88fe8c489dc..47f79b42106 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/getDropTargetIdFromDestination.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getDropTargetIdFromDestination.ts@@ -1,6 +1,6 @@-import { NavigationSections } from '@/navigation-menu-item/constants/NavigationSections.constants';-import { isWorkspaceDroppableId } from '@/navigation-menu-item/utils/isWorkspaceDroppableId';-import { validateAndExtractWorkspaceFolderId } from '@/navigation-menu-item/utils/validateAndExtractWorkspaceFolderId';+import { NavigationSections } from '@/navigation-menu-item/common/constants/NavigationSections.constants';+import { isWorkspaceDroppableId } from '@/navigation-menu-item/common/utils/isWorkspaceDroppableId';+import { validateAndExtractWorkspaceFolderId } from '@/navigation-menu-item/common/utils/validateAndExtractWorkspaceFolderId';import type { DropResult } from '@hello-pangea/dnd';export const getDropTargetIdFromDestination = (diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getEffectiveNavigationMenuItemColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getEffectiveNavigationMenuItemColor.tssimilarity index 87%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getEffectiveNavigationMenuItemColor.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/getEffectiveNavigationMenuItemColor.tsindex 697f9228a1d..dc096f8c95d 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/getEffectiveNavigationMenuItemColor.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getEffectiveNavigationMenuItemColor.ts@@ -1,7 +1,7 @@import { isNonEmptyString } from '@sniptt/guards';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultColorFolder';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultColorLink';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink';import { NavigationMenuItemType } from 'twenty-shared/types';export const getEffectiveNavigationMenuItemColor = (diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getFavoritesDropTargetIdFromDestination.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getFavoritesDropTargetIdFromDestination.tssimilarity index 81%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getFavoritesDropTargetIdFromDestination.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/getFavoritesDropTargetIdFromDestination.tsindex 284f1485e35..7d5a2921507 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/getFavoritesDropTargetIdFromDestination.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getFavoritesDropTargetIdFromDestination.ts@@ -1,5 +1,5 @@-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';-import { NavigationSections } from '@/navigation-menu-item/constants/NavigationSections.constants';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';+import { NavigationSections } from '@/navigation-menu-item/common/constants/NavigationSections.constants';import type { DropResult } from '@hello-pangea/dnd';const FOLDER_PREFIX = 'folder-';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemIconBorderColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemIconBorderColor.tsnew file mode 100644index 00000000000..e0f94480e72--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemIconBorderColor.ts@@ -0,0 +1,8 @@+import type { ThemeColor } from 'twenty-ui/theme';++import { getColorFromTheme } from '@/navigation-menu-item/common/utils/getColorFromTheme';+import { COLOR_SHADE_BORDER } from '@/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBorder';++export const getNavigationMenuItemIconBorderColor = (+ themeColor: ThemeColor,+): string => getColorFromTheme(themeColor, COLOR_SHADE_BORDER);diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor.tsnew file mode 100644index 00000000000..22c6be939a3--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor.ts@@ -0,0 +1,18 @@+import { DEFAULT_NAV_ITEM_ICON_COLOR } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultIconColor.constant';+import { getColorFromTheme } from '@/navigation-menu-item/common/utils/getColorFromTheme';+import { COLOR_SHADE_BACKGROUND } from '@/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBackground';+import { COLOR_SHADE_BORDER } from '@/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBorder';+import { COLOR_SHADE_ICON } from '@/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeIcon';+import { type NavigationMenuItemIconStyle } from '@/navigation-menu-item/common/utils/navigationMenuItemIconStyle';+import { parseThemeColor } from '@/navigation-menu-item/common/utils/parseThemeColor';++export const getNavigationMenuItemIconStyleFromColor = (+ color: string | null | undefined,+): NavigationMenuItemIconStyle => {+ const themeColor = parseThemeColor(color ?? DEFAULT_NAV_ITEM_ICON_COLOR);+ return {+ backgroundColor: getColorFromTheme(themeColor, COLOR_SHADE_BACKGROUND),+ iconColor: getColorFromTheme(themeColor, COLOR_SHADE_ICON),+ borderColor: getColorFromTheme(themeColor, COLOR_SHADE_BORDER),+ };+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getObjectMetadataIdsInDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getObjectMetadataIdsInDraft.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getObjectMetadataIdsInDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/getObjectMetadataIdsInDraft.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getPositionBetween.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getPositionBetween.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getPositionBetween.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/getPositionBetween.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getStandardObjectIconColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getStandardObjectIconColor.tssimilarity index 95%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getStandardObjectIconColor.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/getStandardObjectIconColor.tsindex 2ac88eeeb28..8c3a04b69f2 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/getStandardObjectIconColor.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getStandardObjectIconColor.ts@@ -1,6 +1,6 @@import { type ThemeColor, MAIN_COLOR_NAMES } from 'twenty-ui/theme';-import { DEFAULT_NAV_ITEM_ICON_COLOR } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultIconColor.constant';+import { DEFAULT_NAV_ITEM_ICON_COLOR } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultIconColor.constant';import { CoreObjectNameSingular } from 'twenty-shared/types';const STANDARD_OBJECT_ICON_COLOR: Partial<diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/hasNavigationMenuItemOwnColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/hasNavigationMenuItemOwnColor.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/hasNavigationMenuItemOwnColor.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/hasNavigationMenuItemOwnColor.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/isLocationMatchingNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/isLocationMatchingNavigationMenuItem.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/isLocationMatchingNavigationMenuItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/isLocationMatchingNavigationMenuItem.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/isNavigationMenuItemFolder.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/isNavigationMenuItemFolder.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/isNavigationMenuItemFolder.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/isNavigationMenuItemFolder.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/isNavigationMenuItemLink.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/isNavigationMenuItemLink.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/isNavigationMenuItemLink.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/isNavigationMenuItemLink.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/isNavigationMenuItemObject.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/isNavigationMenuItemObject.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/isNavigationMenuItemObject.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/isNavigationMenuItemObject.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/isWorkspaceDroppableId.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/isWorkspaceDroppableId.tssimilarity index 91%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/isWorkspaceDroppableId.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/isWorkspaceDroppableId.tsindex a6585502648..9849108c6a5 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/isWorkspaceDroppableId.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/isWorkspaceDroppableId.ts@@ -1,6 +1,6 @@import { isDefined } from 'twenty-shared/utils';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';export const isWorkspaceDroppableId = (droppableId: string | null | undefined,diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/navigationMenuItemIconColorShadeBackground.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBackground.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/navigationMenuItemIconColorShadeBackground.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBackground.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/navigationMenuItemIconColorShadeBorder.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBorder.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/navigationMenuItemIconColorShadeBorder.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBorder.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/navigationMenuItemIconColorShadeIcon.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeIcon.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/navigationMenuItemIconColorShadeIcon.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeIcon.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/navigationMenuItemIconStyle.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconStyle.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/navigationMenuItemIconStyle.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconStyle.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/orderFoldersForCreation.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/orderFoldersForCreation.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/orderFoldersForCreation.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/orderFoldersForCreation.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/parseThemeColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/parseThemeColor.tssimilarity index 85%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/parseThemeColor.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/parseThemeColor.tsindex 7a407a80a97..847a242720d 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/parseThemeColor.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/parseThemeColor.ts@@ -1,7 +1,7 @@import { type ThemeColor } from 'twenty-ui/theme';import { themeColorSchema } from 'twenty-ui/utilities';-import { DEFAULT_NAV_ITEM_ICON_COLOR } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultIconColor.constant';+import { DEFAULT_NAV_ITEM_ICON_COLOR } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultIconColor.constant';export const parseThemeColor = (color: string | null | undefined,diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/recordIdentifierToObjectRecordIdentifier.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/recordIdentifierToObjectRecordIdentifier.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/validateAndExtractWorkspaceFolderId.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/validateAndExtractWorkspaceFolderId.tssimilarity index 96%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/validateAndExtractWorkspaceFolderId.tsrename to packages/twenty-front/src/modules/navigation-menu-item/common/utils/validateAndExtractWorkspaceFolderId.tsindex c861d438343..aa064466650 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/validateAndExtractWorkspaceFolderId.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/validateAndExtractWorkspaceFolderId.ts@@ -2,7 +2,7 @@ import { isNonEmptyString } from '@sniptt/guards';import { CustomError, isDefined } from 'twenty-shared/utils';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';export const matchesWorkspaceFolderId = (item: NavigationMenuItem,diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItemFoldersDispatcher.tsx b/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItemFoldersDispatcher.tsxdeleted file mode 100644index d4b31dcb4a5..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItemFoldersDispatcher.tsx+++ /dev/null@@ -1,19 +0,0 @@-import { CurrentWorkspaceMemberNavigationMenuItemFolders } from '@/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItemFolders';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { FavoritesDragDropProviderContent } from '@/navigation/components/FavoritesDragDropProviderContent';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { AnimatedEaseInOut } from 'twenty-ui/utilities';--export const CurrentWorkspaceMemberNavigationMenuItemFoldersDispatcher = () => {- const isNavigationMenuInEditMode = useAtomStateValue(- isNavigationMenuInEditModeState,- );-- return (- <AnimatedEaseInOut isOpen={!isNavigationMenuInEditMode} initial>- <FavoritesDragDropProviderContent>- <CurrentWorkspaceMemberNavigationMenuItemFolders />- </FavoritesDragDropProviderContent>- </AnimatedEaseInOut>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberOrphanNavigationMenuItems.tsx b/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberOrphanNavigationMenuItems.tsxdeleted file mode 100644index e3d97937b10..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberOrphanNavigationMenuItems.tsx+++ /dev/null@@ -1,138 +0,0 @@-import { styled } from '@linaria/react';-import { useContext } from 'react';-import { useLocation } from 'react-router-dom';-import { IconHeartOff } from 'twenty-ui/display';-import { LightIconButton } from 'twenty-ui/input';-import { themeCssVariables } from 'twenty-ui/theme-constants';--import { NavigationItemDropTarget } from '@/navigation-menu-item/components/NavigationItemDropTarget';-import { NavigationMenuItemDroppable } from '@/navigation-menu-item/components/NavigationMenuItemDroppable';-import { NavigationMenuItemIcon } from '@/navigation-menu-item/components/NavigationMenuItemIcon';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';-import { NavigationSections } from '@/navigation-menu-item/constants/NavigationSections.constants';-import { NavigationMenuItemDragContext } from '@/navigation-menu-item/contexts/NavigationMenuItemDragContext';-import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/hooks/useDeleteNavigationMenuItem';-import { useSortedNavigationMenuItems } from '@/navigation-menu-item/hooks/useSortedNavigationMenuItems';-import { getEffectiveNavigationMenuItemColor } from '@/navigation-menu-item/utils/getEffectiveNavigationMenuItemColor';-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/utils/getNavigationMenuItemComputedLink';-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemLabel';-import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/utils/getNavigationMenuItemObjectNameSingular';-import { getNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemSecondaryLabel';-import { isLocationMatchingNavigationMenuItem } from '@/navigation-menu-item/utils/isLocationMatchingNavigationMenuItem';-import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { viewsSelector } from '@/views/states/selectors/viewsSelector';-import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';-import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';--const StyledEmptyContainer = styled.div`- width: 100%;-`;--const StyledOrphanNavigationMenuItemsContainer = styled.div`- margin-bottom: ${themeCssVariables.betweenSiblingsGap};-`;--export const CurrentWorkspaceMemberOrphanNavigationMenuItems = () => {- const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);- const views = useAtomStateValue(viewsSelector);- const { navigationMenuItemsSorted } = useSortedNavigationMenuItems();- const { deleteNavigationMenuItem } = useDeleteNavigationMenuItem();- const currentPath = useLocation().pathname;- const currentViewPath = useLocation().pathname + useLocation().search;- const { isDragging } = useContext(NavigationMenuItemDragContext);-- const orphanNavigationMenuItems = navigationMenuItemsSorted.filter(- (item) => !item.folderId,- );-- return (- <NavigationMenuItemDroppable- droppableId={NavigationMenuItemDroppableIds.ORPHAN_NAVIGATION_MENU_ITEMS}- isWorkspaceSection={false}- >- {orphanNavigationMenuItems.length > 0 ? (- <>- {orphanNavigationMenuItems.map((navigationMenuItem, index) => {- const label = getNavigationMenuItemLabel(- navigationMenuItem,- objectMetadataItems,- views,- );- const computedLink = getNavigationMenuItemComputedLink(- navigationMenuItem,- objectMetadataItems,- views,- );- const objectNameSingular = getNavigationMenuItemObjectNameSingular(- navigationMenuItem,- objectMetadataItems,- views,- );-- return (- <NavigationItemDropTarget- key={navigationMenuItem.id}- folderId={null}- index={index}- sectionId={NavigationSections.FAVORITES}- >- <DraggableItem- draggableId={navigationMenuItem.id}- index={index}- isInsideScrollableContainer={true}- itemComponent={- <StyledOrphanNavigationMenuItemsContainer>- <NavigationDrawerItem- secondaryLabel={getNavigationMenuItemSecondaryLabel({- objectMetadataItems,- navigationMenuItemObjectNameSingular:- objectNameSingular ?? '',- })}- label={label}- Icon={() => (- <NavigationMenuItemIcon- navigationMenuItem={navigationMenuItem}- />- )}- iconColor={getEffectiveNavigationMenuItemColor(- navigationMenuItem,- )}- active={isLocationMatchingNavigationMenuItem(- currentPath,- currentViewPath,- navigationMenuItem.type,- computedLink,- )}- to={isDragging ? undefined : computedLink}- rightOptions={- <LightIconButton- Icon={IconHeartOff}- onClick={(e) => {- e.stopPropagation();- deleteNavigationMenuItem(navigationMenuItem.id);- }}- accent="tertiary"- />- }- isDragging={isDragging}- triggerEvent="CLICK"- />- </StyledOrphanNavigationMenuItemsContainer>- }- />- </NavigationItemDropTarget>- );- })}- <NavigationItemDropTarget- folderId={null}- index={orphanNavigationMenuItems.length}- sectionId={NavigationSections.FAVORITES}- />- </>- ) : (- <StyledEmptyContainer style={{ height: isDragging ? '24px' : '1px' }} />- )}- </NavigationMenuItemDroppable>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemFolderContent.tsx b/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemFolderContent.tsxdeleted file mode 100644index 5fdc3b3ef56..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemFolderContent.tsx+++ /dev/null@@ -1,104 +0,0 @@-import { Droppable } from '@hello-pangea/dnd';-import { IconHeartOff } from 'twenty-ui/display';-import { LightIconButton } from 'twenty-ui/input';-import { type NavigationMenuItem } from '~/generated-metadata/graphql';--import { NavigationMenuItemBackButton } from '@/navigation-menu-item/components/NavigationMenuItemBackButton';-import { NavigationMenuItemIcon } from '@/navigation-menu-item/components/NavigationMenuItemIcon';-import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/hooks/useDeleteNavigationMenuItem';-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/utils/getNavigationMenuItemComputedLink';-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemLabel';-import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/utils/getNavigationMenuItemObjectNameSingular';-import { getNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemSecondaryLabel';-import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';-import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';-import { viewsSelector } from '@/views/states/selectors/viewsSelector';--type NavigationMenuItemFolderContentProps = {- folderId: string;- folderName: string;- navigationMenuItems: NavigationMenuItem[];-};--export const NavigationMenuItemFolderContent = ({- folderName,- folderId,- navigationMenuItems,-}: NavigationMenuItemFolderContentProps) => {- const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);- const views = useAtomStateValue(viewsSelector);- const { deleteNavigationMenuItem } = useDeleteNavigationMenuItem();-- return (- <>- <NavigationMenuItemBackButton folderName={folderName} />- <Droppable droppableId={`folder-${folderId}`}>- {(provided) => (- <div- ref={provided.innerRef}- // oxlint-disable-next-line react/jsx-props-no-spreading- {...provided.droppableProps}- >- {navigationMenuItems.map((navigationMenuItem, index) => {- const label = getNavigationMenuItemLabel(- navigationMenuItem,- objectMetadataItems,- views,- );- const computedLink = getNavigationMenuItemComputedLink(- navigationMenuItem,- objectMetadataItems,- views,- );- const objectNameSingular =- getNavigationMenuItemObjectNameSingular(- navigationMenuItem,- objectMetadataItems,- views,- );-- return (- <DraggableItem- key={navigationMenuItem.id}- draggableId={navigationMenuItem.id}- index={index}- isInsideScrollableContainer- itemComponent={- <NavigationDrawerItem- secondaryLabel={getNavigationMenuItemSecondaryLabel({- objectMetadataItems,- navigationMenuItemObjectNameSingular:- objectNameSingular ?? '',- })}- label={label}- Icon={() => (- <NavigationMenuItemIcon- navigationMenuItem={navigationMenuItem}- />- )}- rightOptions={- <LightIconButton- Icon={IconHeartOff}- onClick={(e) => {- e.stopPropagation();- deleteNavigationMenuItem(navigationMenuItem.id);- }}- accent="tertiary"- />- }- triggerEvent="CLICK"- to={computedLink}- />- }- />- );- })}- {provided.placeholder}- </div>- )}- </Droppable>- </>- );-};diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemContent.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemDisplay.tsxsimilarity index 62%rename from packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemContent.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemDisplay.tsxindex da87abeb4cf..e33943e0f34 100644--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemContent.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemDisplay.tsx@@ -1,13 +1,12 @@import { NavigationMenuItemType } from 'twenty-shared/types';-import { NavigationDrawerSectionForWorkspaceItemFolderContent } from '@/object-metadata/components/NavigationDrawerSectionForWorkspaceItemFolderContent';-import { NavigationDrawerSectionForWorkspaceItemLinkContent } from '@/object-metadata/components/NavigationDrawerSectionForWorkspaceItemLinkContent';-import { NavigationDrawerSectionForWorkspaceItemObjectContent } from '@/object-metadata/components/NavigationDrawerSectionForWorkspaceItemObjectContent';-import type { WorkspaceSectionItemContentProps } from '@/object-metadata/components/WorkspaceSectionItemContentProps';+import { NavigationMenuItemFolderDisplay } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDisplay';+import { NavigationMenuItemLinkDisplay } from '@/navigation-menu-item/display/link/components/NavigationMenuItemLinkDisplay';+import { NavigationMenuItemObjectDisplay } from '@/navigation-menu-item/display/object/components/NavigationMenuItemObjectDisplay';+import type { WorkspaceSectionItemContentProps } from '@/navigation-menu-item/display/sections/types/WorkspaceSectionItemContentProps';-type NavigationDrawerSectionForWorkspaceItemContentProps =- WorkspaceSectionItemContentProps;+type NavigationMenuItemDisplayProps = WorkspaceSectionItemContentProps;-export const NavigationDrawerSectionForWorkspaceItemContent = ({+export const NavigationMenuItemDisplay = ({item,editModeProps,isDragging,@@ -17,11 +16,11 @@ export const NavigationDrawerSectionForWorkspaceItemContent = ({onNavigationMenuItemClick,onActiveObjectMetadataItemClick,readOnly,-}: NavigationDrawerSectionForWorkspaceItemContentProps) => {+}: NavigationMenuItemDisplayProps) => {switch (item.type) {case NavigationMenuItemType.FOLDER:return (- <NavigationDrawerSectionForWorkspaceItemFolderContent+ <NavigationMenuItemFolderDisplayitem={item}editModeProps={editModeProps}isDragging={isDragging}@@ -34,7 +33,7 @@ export const NavigationDrawerSectionForWorkspaceItemContent = ({);case NavigationMenuItemType.LINK:return (- <NavigationDrawerSectionForWorkspaceItemLinkContent+ <NavigationMenuItemLinkDisplayitem={item}editModeProps={editModeProps}isDragging={isDragging}@@ -48,7 +47,7 @@ export const NavigationDrawerSectionForWorkspaceItemContent = ({);default:return (- <NavigationDrawerSectionForWorkspaceItemObjectContent+ <NavigationMenuItemObjectDisplayitem={item}editModeProps={editModeProps}isDragging={isDragging}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemIcon.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsxsimilarity index 88%rename from packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemIcon.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsxindex 529cee54018..1d0cd6ef929 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemIcon.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx@@ -5,16 +5,16 @@ import { Avatar, IconLink, IconWorld, useIcons } from 'twenty-ui/display';import { themeCssVariables } from 'twenty-ui/theme-constants';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { LinkIconWithLinkOverlay } from '@/navigation-menu-item/components/LinkIconWithLinkOverlay';-import { StyledNavigationMenuItemIconContainer } from '@/navigation-menu-item/components/NavigationMenuItemIconContainer';-import { ObjectIconWithViewOverlay } from '@/navigation-menu-item/components/ObjectIconWithViewOverlay';-import { useObjectNavItemColor } from '@/navigation-menu-item/hooks/useObjectNavItemColor';-import { getEffectiveNavigationMenuItemColor } from '@/navigation-menu-item/utils/getEffectiveNavigationMenuItemColor';-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/utils/getNavigationMenuItemComputedLink';-import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/utils/getNavigationMenuItemIconStyleFromColor';-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemLabel';-import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/utils/getNavigationMenuItemObjectNameSingular';-import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/utils/recordIdentifierToObjectRecordIdentifier';+import { LinkIconWithLinkOverlay } from '@/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay';+import { StyledNavigationMenuItemIconContainer } from '@/navigation-menu-item/display/components/NavigationMenuItemIconContainer';+import { ObjectIconWithViewOverlay } from '@/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay';+import { useObjectNavItemColor } from '@/navigation-menu-item/common/hooks/useObjectNavItemColor';+import { getEffectiveNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getEffectiveNavigationMenuItemColor';+import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';+import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor';+import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';+import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';+import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier';import { useGetStandardObjectIcon } from '@/object-metadata/hooks/useGetStandardObjectIcon';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemIconContainer.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIconContainer.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemIconContainer.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIconContainer.tsxdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemSkeletonLoader.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemSkeletonLoader.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemSkeletonLoader.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemSkeletonLoader.tsxdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemStyleIcon.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemStyleIcon.tsxsimilarity index 86%rename from packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemStyleIcon.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemStyleIcon.tsxindex 59b2d3dbb19..7a8d57047a4 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemStyleIcon.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemStyleIcon.tsx@@ -1,6 +1,6 @@import type { IconComponent } from 'twenty-ui/display';-import { StyledNavigationMenuItemIconContainer } from '@/navigation-menu-item/components/NavigationMenuItemIconContainer';-import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/utils/getNavigationMenuItemIconStyleFromColor';+import { StyledNavigationMenuItemIconContainer } from '@/navigation-menu-item/display/components/NavigationMenuItemIconContainer';+import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor';import { useContext } from 'react';import { ThemeContext } from 'twenty-ui/theme-constants';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/AddToNavigationDragHandle.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsxsimilarity index 95%rename from packages/twenty-front/src/modules/navigation-menu-item/components/AddToNavigationDragHandle.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsxindex 1c44d562976..b8c235cb90f 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/AddToNavigationDragHandle.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsx@@ -4,10 +4,10 @@ import { isDefined } from 'twenty-shared/utils';import { IconGripVertical, type IconComponent } from 'twenty-ui/display';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';import { NavigationMenuItemType } from 'twenty-shared/types';-import type { AddToNavigationDragPayload } from '@/navigation-menu-item/types/add-to-navigation-drag-payload';-import { getEffectiveNavigationMenuItemColor } from '@/navigation-menu-item/utils/getEffectiveNavigationMenuItemColor';+import type { AddToNavigationDragPayload } from '@/navigation-menu-item/common/types/add-to-navigation-drag-payload';+import { getEffectiveNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getEffectiveNavigationMenuItemColor';const StyledIconSlot = styled.div<{$hasFixedSize: boolean;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationItemDropTarget.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationItemDropTarget.tsxsimilarity index 95%rename from packages/twenty-front/src/modules/navigation-menu-item/components/NavigationItemDropTarget.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationItemDropTarget.tsxindex 0f3e7e1c5b1..861774a8a0a 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationItemDropTarget.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationItemDropTarget.tsx@@ -2,8 +2,8 @@ import { styled } from '@linaria/react';import { type ReactNode, useContext } from 'react';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { type NavigationSections } from '@/navigation-menu-item/constants/NavigationSections.constants';-import { NavigationDropTargetContext } from '@/navigation-menu-item/contexts/NavigationDropTargetContext';+import { type NavigationSections } from '@/navigation-menu-item/common/constants/NavigationSections.constants';+import { NavigationDropTargetContext } from '@/navigation-menu-item/common/contexts/NavigationDropTargetContext';const StyledDropTarget = styled.div<{ $compact?: boolean }>`min-height: ${({ $compact }) =>diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemDroppable.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationMenuItemDroppable.tsxsimilarity index 97%rename from packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemDroppable.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationMenuItemDroppable.tsxindex 2d17e484827..790a6638779 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemDroppable.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationMenuItemDroppable.tsx@@ -2,7 +2,7 @@ import { Droppable } from '@hello-pangea/dnd';import { styled } from '@linaria/react';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { useIsDropDisabledForSection } from '@/navigation-menu-item/hooks/useIsDropDisabledForSection';+import { useIsDropDisabledForSection } from '@/navigation-menu-item/display/dnd/hooks/useIsDropDisabledForSection';type NavigationMenuItemDroppableProps = {droppableId: string;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceDndKitDroppableSlot.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/WorkspaceDndKitDroppableSlot.tsxsimilarity index 92%rename from packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceDndKitDroppableSlot.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/WorkspaceDndKitDroppableSlot.tsxindex f3901562920..9ed499a2612 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceDndKitDroppableSlot.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/WorkspaceDndKitDroppableSlot.tsx@@ -3,7 +3,7 @@ import { styled } from '@linaria/react';import { type ReactNode } from 'react';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { getDndKitDropTargetId } from '@/navigation-menu-item/utils/getDndKitDropTargetId';+import { getDndKitDropTargetId } from '@/navigation-menu-item/common/utils/getDndKitDropTargetId';import type { DroppableData } from '@/navigation/types/workspaceDndKitDroppableData';const StyledSlotWrapper = styled.div<{ $empty: boolean }>`diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceDndKitSortableItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/WorkspaceDndKitSortableItem.tsxsimilarity index 96%rename from packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceDndKitSortableItem.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/WorkspaceDndKitSortableItem.tsxindex fe9ea049a1a..8a45bfbf38d 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceDndKitSortableItem.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/WorkspaceDndKitSortableItem.tsx@@ -3,7 +3,7 @@ import { useSortable } from '@dnd-kit/react/sortable';import { styled } from '@linaria/react';import { type ReactNode } from 'react';-import { SortableDropTargetRefContext } from '@/navigation-menu-item/contexts/SortableDropTargetRefContext';+import { SortableDropTargetRefContext } from '@/navigation-menu-item/common/contexts/SortableDropTargetRefContext';const SORTABLE_COLLISION_PRIORITY = 3;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useHandleAddToNavigationDrop.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop.tssimilarity index 89%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useHandleAddToNavigationDrop.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop.tsindex 2552a304364..50d3840ae58 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useHandleAddToNavigationDrop.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop.ts@@ -4,23 +4,23 @@ import { useCallback } from 'react';import { isDefined } from 'twenty-shared/utils';import { IconFolder, IconLink, useIcons } from 'twenty-ui/display';-import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/constants/AddToNavSourceDroppableId';+import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';import { NavigationMenuItemType } from 'twenty-shared/types';-import { useAddFolderToNavigationMenuDraft } from '@/navigation-menu-item/hooks/useAddFolderToNavigationMenuDraft';-import { useAddLinkToNavigationMenuDraft } from '@/navigation-menu-item/hooks/useAddLinkToNavigationMenuDraft';-import { useAddObjectToNavigationMenuDraft } from '@/navigation-menu-item/hooks/useAddObjectToNavigationMenuDraft';-import { useAddRecordToNavigationMenuDraft } from '@/navigation-menu-item/hooks/useAddRecordToNavigationMenuDraft';-import { useAddViewToNavigationMenuDraft } from '@/navigation-menu-item/hooks/useAddViewToNavigationMenuDraft';-import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/hooks/useNavigationMenuItemsDraftState';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel';-import { addToNavPayloadRegistryState } from '@/navigation-menu-item/states/addToNavPayloadRegistryState';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/states/openNavigationMenuItemFolderIdsState';-import { getObjectMetadataIdsInDraft } from '@/navigation-menu-item/utils/getObjectMetadataIdsInDraft';-import { getStandardObjectIconColor } from '@/navigation-menu-item/utils/getStandardObjectIconColor';-import { isWorkspaceDroppableId } from '@/navigation-menu-item/utils/isWorkspaceDroppableId';-import { validateAndExtractWorkspaceFolderId } from '@/navigation-menu-item/utils/validateAndExtractWorkspaceFolderId';+import { useAddFolderToNavigationMenuDraft } from '@/navigation-menu-item/edit/folder/hooks/useAddFolderToNavigationMenuDraft';+import { useAddLinkToNavigationMenuDraft } from '@/navigation-menu-item/edit/link/hooks/useAddLinkToNavigationMenuDraft';+import { useAddObjectToNavigationMenuDraft } from '@/navigation-menu-item/edit/object/hooks/useAddObjectToNavigationMenuDraft';+import { useAddRecordToNavigationMenuDraft } from '@/navigation-menu-item/edit/record/hooks/useAddRecordToNavigationMenuDraft';+import { useAddViewToNavigationMenuDraft } from '@/navigation-menu-item/edit/view/hooks/useAddViewToNavigationMenuDraft';+import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState';+import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';+import { addToNavPayloadRegistryState } from '@/navigation-menu-item/common/states/addToNavPayloadRegistryState';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState';+import { getObjectMetadataIdsInDraft } from '@/navigation-menu-item/common/utils/getObjectMetadataIdsInDraft';+import { getStandardObjectIconColor } from '@/navigation-menu-item/common/utils/getStandardObjectIconColor';+import { isWorkspaceDroppableId } from '@/navigation-menu-item/common/utils/isWorkspaceDroppableId';+import { validateAndExtractWorkspaceFolderId } from '@/navigation-menu-item/common/utils/validateAndExtractWorkspaceFolderId';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useHandleNavigationMenuItemDragAndDrop.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleNavigationMenuItemDragAndDrop.tssimilarity index 91%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useHandleNavigationMenuItemDragAndDrop.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleNavigationMenuItemDragAndDrop.tsindex d3930daab57..9962f5b96dc 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useHandleNavigationMenuItemDragAndDrop.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleNavigationMenuItemDragAndDrop.ts@@ -1,16 +1,16 @@import { type OnDragEndResponder } from '@hello-pangea/dnd';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';-import { isWorkspaceDroppableId } from '@/navigation-menu-item/utils/isWorkspaceDroppableId';-import { useSortedNavigationMenuItems } from '@/navigation-menu-item/hooks/useSortedNavigationMenuItems';-import { useUpdateNavigationMenuItem } from '@/navigation-menu-item/hooks/useUpdateNavigationMenuItem';-import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/states/openNavigationMenuItemFolderIdsState';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';+import { isWorkspaceDroppableId } from '@/navigation-menu-item/common/utils/isWorkspaceDroppableId';+import { useSortedNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useSortedNavigationMenuItems';+import { useUpdateNavigationMenuItem } from '@/navigation-menu-item/common/hooks/useUpdateNavigationMenuItem';+import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { calculateNewPosition } from '@/ui/layout/draggable-list/utils/calculateNewPosition';import { FOLDER_DROPPABLE_IDS } from '@/ui/layout/draggable-list/utils/folderDroppableIds';import { validateAndExtractFolderId } from '@/ui/layout/draggable-list/utils/validateAndExtractFolderId';-import { useNavigationMenuItemsData } from './useNavigationMenuItemsData';+import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';export const useHandleNavigationMenuItemDragAndDrop = () => {const { navigationMenuItems } = useNavigationMenuItemsData();diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useHandleWorkspaceNavigationMenuItemDragAndDrop.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleWorkspaceNavigationMenuItemDragAndDrop.tssimilarity index 90%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useHandleWorkspaceNavigationMenuItemDragAndDrop.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleWorkspaceNavigationMenuItemDragAndDrop.tsindex b712bf4a9f9..4b062cac213 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useHandleWorkspaceNavigationMenuItemDragAndDrop.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleWorkspaceNavigationMenuItemDragAndDrop.ts@@ -2,20 +2,20 @@ import { type OnDragEndResponder } from '@hello-pangea/dnd';import { useStore } from 'jotai';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/states/openNavigationMenuItemFolderIdsState';-import { getPositionBetween } from '@/navigation-menu-item/utils/getPositionBetween';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState';+import { getPositionBetween } from '@/navigation-menu-item/common/utils/getPositionBetween';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';import {matchesWorkspaceFolderId,validateAndExtractWorkspaceFolderId,-} from '@/navigation-menu-item/utils/validateAndExtractWorkspaceFolderId';+} from '@/navigation-menu-item/common/utils/validateAndExtractWorkspaceFolderId';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { isDefined } from 'twenty-shared/utils';-import { useNavigationMenuItemsData } from './useNavigationMenuItemsData';+import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';export const useHandleWorkspaceNavigationMenuItemDragAndDrop = () => {const store = useStore();diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useIsDropDisabledForSection.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useIsDropDisabledForSection.tssimilarity index 74%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useIsDropDisabledForSection.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useIsDropDisabledForSection.tsindex ffb69c514b2..d7493da4fcf 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useIsDropDisabledForSection.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useIsDropDisabledForSection.ts@@ -1,6 +1,6 @@-import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/constants/AddToNavSourceDroppableId';-import { NavigationDragSourceContext } from '@/navigation-menu-item/contexts/NavigationDragSourceContext';-import { isWorkspaceDroppableId } from '@/navigation-menu-item/utils/isWorkspaceDroppableId';+import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';+import { NavigationDragSourceContext } from '@/navigation-menu-item/common/contexts/NavigationDragSourceContext';+import { isWorkspaceDroppableId } from '@/navigation-menu-item/common/utils/isWorkspaceDroppableId';import { useContext } from 'react';import { isDefined } from 'twenty-shared/utils';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.tsxnew file mode 100644index 00000000000..46bdc03cc0e--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent.tsx@@ -0,0 +1,91 @@+import { IconHeartOff } from 'twenty-ui/display';+import { LightIconButton } from 'twenty-ui/input';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';++import { NavigationMenuItemBackButton } from '@/navigation-menu-item/edit/components/NavigationMenuItemBackButton';+import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';+import { WorkspaceDndKitSortableItem } from '@/navigation-menu-item/display/dnd/components/WorkspaceDndKitSortableItem';+import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/common/hooks/useDeleteNavigationMenuItem';+import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';+import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';+import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';+import { getObjectNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemSecondaryLabel';+import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';+import { viewsSelector } from '@/views/states/selectors/viewsSelector';++type NavigationMenuItemFolderContentProps = {+ folderId: string;+ folderName: string;+ navigationMenuItems: NavigationMenuItem[];+};++export const NavigationMenuItemFolderContent = ({+ folderName,+ folderId,+ navigationMenuItems,+}: NavigationMenuItemFolderContentProps) => {+ const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);+ const views = useAtomStateValue(viewsSelector);+ const { deleteNavigationMenuItem } = useDeleteNavigationMenuItem();++ const folderDroppableId = `folder-${folderId}`;++ return (+ <>+ <NavigationMenuItemBackButton folderName={folderName} />+ {navigationMenuItems.map((navigationMenuItem, index) => {+ const label = getNavigationMenuItemLabel(+ navigationMenuItem,+ objectMetadataItems,+ views,+ );+ const computedLink = getNavigationMenuItemComputedLink(+ navigationMenuItem,+ objectMetadataItems,+ views,+ );+ const objectNameSingular = getNavigationMenuItemObjectNameSingular(+ navigationMenuItem,+ objectMetadataItems,+ views,+ );++ return (+ <WorkspaceDndKitSortableItem+ key={navigationMenuItem.id}+ id={navigationMenuItem.id}+ index={index}+ group={folderDroppableId}+ >+ <NavigationDrawerItem+ secondaryLabel={getObjectNavigationMenuItemSecondaryLabel({+ objectMetadataItems,+ navigationMenuItemObjectNameSingular: objectNameSingular ?? '',+ })}+ label={label}+ Icon={() => (+ <NavigationMenuItemIcon+ navigationMenuItem={navigationMenuItem}+ />+ )}+ rightOptions={+ <LightIconButton+ Icon={IconHeartOff}+ onClick={(e) => {+ e.stopPropagation();+ deleteNavigationMenuItem(navigationMenuItem.id);+ }}+ accent="tertiary"+ />+ }+ triggerEvent="CLICK"+ to={computedLink}+ />+ </WorkspaceDndKitSortableItem>+ );+ })}+ </>+ );+};diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemFolderContent.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDisplay.tsxsimilarity index 73%rename from packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemFolderContent.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDisplay.tsxindex 12dd4e15809..cf20662fd08 100644--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemFolderContent.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDisplay.tsx@@ -1,18 +1,17 @@import { lazy, Suspense } from 'react';-import { WorkspaceFolderReadOnly } from '@/object-metadata/components/WorkspaceFolderReadOnly';-import type { WorkspaceSectionItemContentProps } from '@/object-metadata/components/WorkspaceSectionItemContentProps';+import { NavigationMenuItemFolderReadOnly } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolderReadOnly';+import type { WorkspaceSectionItemContentProps } from '@/navigation-menu-item/display/sections/types/WorkspaceSectionItemContentProps';const LazyWorkspaceNavigationMenuItemsFolder = lazy(() =>import(- '@/navigation-menu-item/components/WorkspaceNavigationMenuItemsFolder'+ '@/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemsFolder').then((m) => ({ default: m.WorkspaceNavigationMenuItemsFolder })),);-type NavigationDrawerSectionForWorkspaceItemFolderContentProps =- WorkspaceSectionItemContentProps;+type NavigationMenuItemFolderDisplayProps = WorkspaceSectionItemContentProps;-export const NavigationDrawerSectionForWorkspaceItemFolderContent = ({+export const NavigationMenuItemFolderDisplay = ({item,editModeProps,isDragging,@@ -21,7 +20,7 @@ export const NavigationDrawerSectionForWorkspaceItemFolderContent = ({selectedNavigationMenuItemId,onNavigationMenuItemClick,readOnly = false,-}: NavigationDrawerSectionForWorkspaceItemFolderContentProps) => {+}: NavigationMenuItemFolderDisplayProps) => {const folderId = item.id;const folderName = item.name ?? 'Folder';const folderIconKey = item.icon;@@ -31,7 +30,7 @@ export const NavigationDrawerSectionForWorkspaceItemFolderContent = ({if (readOnly) {return (- <WorkspaceFolderReadOnly+ <NavigationMenuItemFolderReadOnlyfolderId={folderId}folderName={folderName}folderIconKey={folderIconKey}@@ -44,7 +43,7 @@ export const NavigationDrawerSectionForWorkspaceItemFolderContent = ({return (<Suspensefallback={- <WorkspaceFolderReadOnly+ <NavigationMenuItemFolderReadOnlyfolderId={folderId}folderName={folderName}folderIconKey={folderIconKey}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsxdiff --git a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceFolderReadOnly.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderReadOnly.tsxsimilarity index 90%rename from packages/twenty-front/src/modules/object-metadata/components/WorkspaceFolderReadOnly.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderReadOnly.tsxindex ad7d4d82cf2..461c9b1eb40 100644--- a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceFolderReadOnly.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderReadOnly.tsx@@ -7,10 +7,10 @@ import { useState } from 'react';import { isDefined } from 'twenty-shared/utils';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { WorkspaceNavigationMenuItemFolderSubItem } from '@/navigation-menu-item/components/WorkspaceNavigationMenuItemFolderSubItem';-import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/constants/FolderIconDefault';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultColorFolder';-import { useWorkspaceFolderOpenState } from '@/navigation-menu-item/hooks/useWorkspaceFolderOpenState';+import { WorkspaceNavigationMenuItemFolderSubItem } from '@/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemFolderSubItem';+import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';+import { useWorkspaceFolderOpenState } from '@/navigation-menu-item/display/folder/hooks/useWorkspaceFolderOpenState';import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';import { NavigationDrawerItemsCollapsableContainer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemsCollapsableContainer';@@ -30,7 +30,7 @@ const StyledFolderExpandableWrapper = styled.div`}`;-type WorkspaceFolderReadOnlyProps = {+type NavigationMenuItemFolderReadOnlyProps = {folderId: string;folderName: string;folderIconKey?: string | null;@@ -39,14 +39,14 @@ type WorkspaceFolderReadOnlyProps = {isGroup: boolean;};-export const WorkspaceFolderReadOnly = ({+export const NavigationMenuItemFolderReadOnly = ({folderId,folderName,folderIconKey,folderColor,navigationMenuItems,isGroup,-}: WorkspaceFolderReadOnlyProps) => {+}: NavigationMenuItemFolderReadOnlyProps) => {const { getIcon } = useIcons();const FolderIcon = getIcon(folderIconKey ?? FOLDER_ICON_DEFAULT);const isMobile = useIsMobile();diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemFolders.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolders.tsxsimilarity index 88%rename from packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemFolders.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolders.tsxindex 9c7585f8315..86e023fb1fd 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemFolders.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolders.tsx@@ -1,10 +1,10 @@import { useState } from 'react';import { IconFolder } from 'twenty-ui/display';-import { CurrentWorkspaceMemberNavigationMenuItems } from '@/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItems';-import { useCreateNavigationMenuItemFolder } from '@/navigation-menu-item/hooks/useCreateNavigationMenuItemFolder';-import { useNavigationMenuItemsByFolder } from '@/navigation-menu-item/hooks/useNavigationMenuItemsByFolder';-import { isNavigationMenuItemFolderCreatingState } from '@/navigation-menu-item/states/isNavigationMenuItemFolderCreatingState';+import { FavoritesFolderItem } from '@/navigation-menu-item/display/sections/favorites/components/FavoritesFolderItem';+import { useCreateNavigationMenuItemFolder } from '@/navigation-menu-item/display/folder/hooks/useCreateNavigationMenuItemFolder';+import { useNavigationMenuItemsByFolder } from '@/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder';+import { isNavigationMenuItemFolderCreatingState } from '@/navigation-menu-item/common/states/isNavigationMenuItemFolderCreatingState';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';import { NavigationDrawerInput } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerInput';@@ -70,7 +70,7 @@ export const NavigationMenuItemFolders = () => {</NavigationDrawerAnimatedCollapseWrapper>)}{userNavigationMenuItemsByFolder.map((folder) => (- <CurrentWorkspaceMemberNavigationMenuItems+ <FavoritesFolderItemkey={folder.id}folder={folder}isGroup={userNavigationMenuItemsByFolder.length > 1}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemFolderDragClone.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemFolderDragClone.tsxsimilarity index 89%rename from packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemFolderDragClone.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemFolderDragClone.tsxindex 2b990cbcaac..3ba16dfe2a9 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemFolderDragClone.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemFolderDragClone.tsx@@ -8,10 +8,10 @@ import { isDefined } from 'twenty-shared/utils';import { ThemeContext } from 'twenty-ui/theme-constants';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { NavigationMenuItemIcon } from '@/navigation-menu-item/components/NavigationMenuItemIcon';-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemLabel';-import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/utils/getNavigationMenuItemObjectNameSingular';-import { getNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemSecondaryLabel';+import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';+import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';+import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';+import { getObjectNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemSecondaryLabel';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { NavigationDrawerSubItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem';@@ -78,7 +78,7 @@ export const WorkspaceNavigationMenuItemFolderDragClone = ({secondaryLabel={isIndexView? undefined- : getNavigationMenuItemSecondaryLabel({+ : getObjectNavigationMenuItemSecondaryLabel({objectMetadataItems,navigationMenuItemObjectNameSingular: objectNameSingular ?? '',})diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemFolderSubItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemFolderSubItem.tsxsimilarity index 86%rename from packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemFolderSubItem.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemFolderSubItem.tsxindex e77a1788028..a921d66d93b 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemFolderSubItem.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemFolderSubItem.tsx@@ -2,14 +2,14 @@ import { NavigationMenuItemType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { NavigationMenuItemIcon } from '@/navigation-menu-item/components/NavigationMenuItemIcon';-import { type NavigationMenuItemClickParams } from '@/navigation-menu-item/hooks/useWorkspaceSectionItems';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/utils/getNavigationMenuItemComputedLink';-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemLabel';-import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/utils/getNavigationMenuItemObjectNameSingular';-import { getNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemSecondaryLabel';-import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/utils/getObjectMetadataForNavigationMenuItem';+import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';+import { type NavigationMenuItemClickParams } from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';+import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';+import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';+import { getObjectNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemSecondaryLabel';+import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/display/object/utils/getObjectMetadataForNavigationMenuItem';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { NavigationDrawerSubItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem';import { getNavigationSubItemLeftAdornment } from '@/ui/navigation/navigation-drawer/utils/getNavigationSubItemLeftAdornment';@@ -94,7 +94,7 @@ export const WorkspaceNavigationMenuItemFolderSubItem = ({secondaryLabel={isIndexView? undefined- : getNavigationMenuItemSecondaryLabel({+ : getObjectNavigationMenuItemSecondaryLabel({objectMetadataItems,navigationMenuItemObjectNameSingular: objectNameSingular ?? '',})diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemsFolder.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemsFolder.tsxsimilarity index 90%rename from packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemsFolder.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemsFolder.tsxindex 0761e505e42..17d8150a483 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemsFolder.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemsFolder.tsx@@ -11,31 +11,31 @@ import {} from 'twenty-ui/display';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';-import { useIsDropDisabledForSection } from '@/navigation-menu-item/hooks/useIsDropDisabledForSection';-import { useOpenAddItemToFolderPage } from '@/navigation-menu-item/hooks/useOpenAddItemToFolderPage';-import { useWorkspaceFolderOpenState } from '@/navigation-menu-item/hooks/useWorkspaceFolderOpenState';-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';+import { useIsDropDisabledForSection } from '@/navigation-menu-item/display/dnd/hooks/useIsDropDisabledForSection';+import { useOpenAddItemToFolderPage } from '@/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage';+import { useWorkspaceFolderOpenState } from '@/navigation-menu-item/display/folder/hooks/useWorkspaceFolderOpenState';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';import { AnimatedExpandableContainer } from 'twenty-ui/layout';import { useIsMobile } from 'twenty-ui/utilities';-import { NavigationItemDropTarget } from '@/navigation-menu-item/components/NavigationItemDropTarget';+import { NavigationItemDropTarget } from '@/navigation-menu-item/display/dnd/components/NavigationItemDropTarget';import {FOLDER_HEADER_SLOT_COLLISION_PRIORITY,WorkspaceDndKitDroppableSlot,-} from '@/navigation-menu-item/components/WorkspaceDndKitDroppableSlot';-import { WorkspaceDndKitSortableItem } from '@/navigation-menu-item/components/WorkspaceDndKitSortableItem';-import { WorkspaceNavigationMenuItemFolderSubItem } from '@/navigation-menu-item/components/WorkspaceNavigationMenuItemFolderSubItem';-import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/constants/FolderIconDefault';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultColorFolder';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';-import { NavigationSections } from '@/navigation-menu-item/constants/NavigationSections.constants';-import { NavigationDropTargetContext } from '@/navigation-menu-item/contexts/NavigationDropTargetContext';-import { NavigationMenuItemDragContext } from '@/navigation-menu-item/contexts/NavigationMenuItemDragContext';-import { SortableDropTargetRefContext } from '@/navigation-menu-item/contexts/SortableDropTargetRefContext';-import { type NavigationMenuItemClickParams } from '@/navigation-menu-item/hooks/useWorkspaceSectionItems';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { getDndKitDropTargetId } from '@/navigation-menu-item/utils/getDndKitDropTargetId';+} from '@/navigation-menu-item/display/dnd/components/WorkspaceDndKitDroppableSlot';+import { WorkspaceDndKitSortableItem } from '@/navigation-menu-item/display/dnd/components/WorkspaceDndKitSortableItem';+import { WorkspaceNavigationMenuItemFolderSubItem } from '@/navigation-menu-item/display/folder/components/WorkspaceNavigationMenuItemFolderSubItem';+import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';+import { NavigationSections } from '@/navigation-menu-item/common/constants/NavigationSections.constants';+import { NavigationDropTargetContext } from '@/navigation-menu-item/common/contexts/NavigationDropTargetContext';+import { NavigationMenuItemDragContext } from '@/navigation-menu-item/common/contexts/NavigationMenuItemDragContext';+import { SortableDropTargetRefContext } from '@/navigation-menu-item/common/contexts/SortableDropTargetRefContext';+import { type NavigationMenuItemClickParams } from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { getDndKitDropTargetId } from '@/navigation-menu-item/common/utils/getDndKitDropTargetId';import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';import { type NavigationMenuItem } from '~/generated-metadata/graphql';import { NavigationDrawerItemsCollapsableContainer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemsCollapsableContainer';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useCreateNavigationMenuItemFolder.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useCreateNavigationMenuItemFolder.tssimilarity index 97%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useCreateNavigationMenuItemFolder.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useCreateNavigationMenuItemFolder.tsindex 6f75b06dd61..650c58c3d2f 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useCreateNavigationMenuItemFolder.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useCreateNavigationMenuItemFolder.ts@@ -3,7 +3,7 @@ import { isDefined } from 'twenty-shared/utils';import { useMutation } from '@apollo/client/react';import { CreateNavigationMenuItemDocument } from '~/generated-metadata/graphql';-import { useNavigationMenuItemsData } from '@/navigation-menu-item/hooks/useNavigationMenuItemsData';+import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';export const useCreateNavigationMenuItemFolder = () => {const { navigationMenuItems, currentWorkspaceMemberId } =diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemsByFolder.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder.tssimilarity index 94%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemsByFolder.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder.tsindex e9ea5273fe8..5b8ce1d061e 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemsByFolder.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder.ts@@ -1,13 +1,13 @@import { isDefined } from 'twenty-shared/utils';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { filterAndSortNavigationMenuItems } from '@/navigation-menu-item/utils/filterAndSortNavigationMenuItems';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';+import { filterAndSortNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { viewsSelector } from '@/views/states/selectors/viewsSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useNavigationMenuItemsData } from './useNavigationMenuItemsData';+import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';type NavigationMenuItemFolder = {id: string;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useWorkspaceFolderOpenState.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useWorkspaceFolderOpenState.tssimilarity index 91%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useWorkspaceFolderOpenState.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useWorkspaceFolderOpenState.tsindex cc8be664924..7dfc3b99e71 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useWorkspaceFolderOpenState.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useWorkspaceFolderOpenState.ts@@ -5,11 +5,11 @@ import { useIsMobile } from 'twenty-ui/utilities';import { isNonEmptyString } from '@sniptt/guards';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/states/openNavigationMenuItemFolderIdsState';-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/utils/getNavigationMenuItemComputedLink';-import { isLocationMatchingNavigationMenuItem } from '@/navigation-menu-item/utils/isLocationMatchingNavigationMenuItem';+import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState';+import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';+import { isLocationMatchingNavigationMenuItem } from '@/navigation-menu-item/common/utils/isLocationMatchingNavigationMenuItem';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';-import { currentNavigationMenuItemFolderIdState } from '@/ui/navigation/navigation-drawer/states/currentNavigationMenuItemFolderIdState';+import { currentNavigationMenuItemFolderIdState } from '@/navigation-menu-item/common/states/currentNavigationMenuItemFolderIdState';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/utils/getFolderNavigationMenuItemLabel.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/utils/getFolderNavigationMenuItemLabel.tsnew file mode 100644index 00000000000..dc4c7235679--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/utils/getFolderNavigationMenuItemLabel.ts@@ -0,0 +1,7 @@+import { type NavigationMenuItem } from '~/generated-metadata/graphql';++export const getFolderNavigationMenuItemLabel = (+ item: Pick<NavigationMenuItem, 'name'>,+): string => {+ return item.name ?? 'Folder';+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemsData.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useNavigationMenuItemsData.tssimilarity index 89%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemsData.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useNavigationMenuItemsData.tsindex 120566f3eb4..3784c5de065 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemsData.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useNavigationMenuItemsData.ts@@ -1,8 +1,8 @@import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/utils/filterWorkspaceNavigationMenuItems';-import { navigationMenuItemsSelector } from '@/navigation-menu-item/states/navigationMenuItemsSelector';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterWorkspaceNavigationMenuItems';+import { navigationMenuItemsSelector } from '@/navigation-menu-item/common/states/navigationMenuItemsSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { isDefined } from 'twenty-shared/utils';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useSortedNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useSortedNavigationMenuItems.tssimilarity index 95%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useSortedNavigationMenuItems.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useSortedNavigationMenuItems.tsindex 38844894313..66a46837faa 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useSortedNavigationMenuItems.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useSortedNavigationMenuItems.ts@@ -1,6 +1,6 @@import { useMemo } from 'react';-import { filterAndSortNavigationMenuItems } from '@/navigation-menu-item/utils/filterAndSortNavigationMenuItems';+import { filterAndSortNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { viewsSelector } from '@/views/states/selectors/viewsSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useWorkspaceNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useWorkspaceNavigationMenuItems.tssimilarity index 98%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useWorkspaceNavigationMenuItems.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useWorkspaceNavigationMenuItems.tsindex 70a1914cbac..db339c26a81 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useWorkspaceNavigationMenuItems.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useWorkspaceNavigationMenuItems.ts@@ -1,6 +1,6 @@import { useMemo } from 'react';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useWorkspaceSectionItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useWorkspaceSectionItems.tssimilarity index 90%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useWorkspaceSectionItems.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useWorkspaceSectionItems.tsindex 07398c975ca..b13a7651ee9 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useWorkspaceSectionItems.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useWorkspaceSectionItems.ts@@ -1,9 +1,9 @@import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/constants/FolderIconDefault';+import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';import { NavigationMenuItemType } from 'twenty-shared/types';-import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/utils/getObjectMetadataForNavigationMenuItem';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';+import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/display/object/utils/getObjectMetadataForNavigationMenuItem';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';@@ -12,7 +12,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateimport { viewsSelector } from '@/views/states/selectors/viewsSelector';import { isDefined } from 'twenty-shared/utils';-import { useNavigationMenuItemsByFolder } from './useNavigationMenuItemsByFolder';+import { useNavigationMenuItemsByFolder } from '@/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder';import { useNavigationMenuItemsData } from './useNavigationMenuItemsData';import { useSortedNavigationMenuItems } from './useSortedNavigationMenuItems';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/LinkIconWithLinkOverlay.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay.tsxsimilarity index 93%rename from packages/twenty-front/src/modules/navigation-menu-item/components/LinkIconWithLinkOverlay.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay.tsxindex 4e93748e0cd..6d764ce5a04 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/LinkIconWithLinkOverlay.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay.tsx@@ -4,9 +4,9 @@ import { isDefined } from 'twenty-shared/utils';import type { IconComponent } from 'twenty-ui/display';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultColorLink';-import { getLinkFaviconUrl } from '@/navigation-menu-item/utils/getLinkFaviconUrl';-import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/utils/getNavigationMenuItemIconStyleFromColor';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink';+import { getLinkFaviconUrl } from '@/navigation-menu-item/display/link/utils/getLinkFaviconUrl';+import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor';const failedFaviconUrls = new Set<string>();diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemLinkContent.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/NavigationMenuItemLinkDisplay.tsxsimilarity index 51%rename from packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemLinkContent.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/link/components/NavigationMenuItemLinkDisplay.tsxindex 3544b919919..32394406c68 100644--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemLinkContent.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/NavigationMenuItemLinkDisplay.tsx@@ -1,35 +1,26 @@-import { NavigationMenuItemIcon } from '@/navigation-menu-item/components/NavigationMenuItemIcon';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/utils/getNavigationMenuItemComputedLink';-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemLabel';-import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';-import type { WorkspaceSectionItemContentProps } from '@/object-metadata/components/WorkspaceSectionItemContentProps';+import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { getLinkNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/link/utils/getLinkNavigationMenuItemComputedLink';+import { getLinkNavigationMenuItemLabel } from '@/navigation-menu-item/display/link/utils/getLinkNavigationMenuItemLabel';+import type { WorkspaceSectionItemContentProps } from '@/navigation-menu-item/display/sections/types/WorkspaceSectionItemContentProps';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 { IconArrowUpRight } from 'twenty-ui/display';import { themeCssVariables } from 'twenty-ui/theme-constants';-type NavigationDrawerSectionForWorkspaceItemLinkContentProps =- WorkspaceSectionItemContentProps;+type NavigationMenuItemLinkDisplayProps = WorkspaceSectionItemContentProps;-export const NavigationDrawerSectionForWorkspaceItemLinkContent = ({+export const NavigationMenuItemLinkDisplay = ({item,editModeProps,isDragging,-}: NavigationDrawerSectionForWorkspaceItemLinkContentProps) => {+}: NavigationMenuItemLinkDisplayProps) => {const isNavigationMenuInEditMode = useAtomStateValue(isNavigationMenuInEditModeState,);- const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);- const views = useAtomStateValue(viewsSelector);- const label = getNavigationMenuItemLabel(item, objectMetadataItems, views);- const computedLink = getNavigationMenuItemComputedLink(- item,- objectMetadataItems,- views,- );+ const label = getLinkNavigationMenuItemLabel(item);+ const computedLink = getLinkNavigationMenuItemComputedLink(item);return (<NavigationDrawerItemdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/extractDomainFromUrl.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/__tests__/extractDomainFromUrl.test.tssimilarity index 81%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/extractDomainFromUrl.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/__tests__/extractDomainFromUrl.test.tsindex 63bfbc16334..631b32bf89b 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/extractDomainFromUrl.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/__tests__/extractDomainFromUrl.test.ts@@ -1,4 +1,4 @@-import { extractDomainFromUrl } from '@/navigation-menu-item/utils/extractDomainFromUrl';+import { extractDomainFromUrl } from '@/navigation-menu-item/display/link/utils/extractDomainFromUrl';describe('extractDomainFromUrl', () => {it('returns hostname and strips www prefix', () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/normalizeUrl.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/__tests__/normalizeUrl.test.tssimilarity index 85%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/normalizeUrl.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/__tests__/normalizeUrl.test.tsindex 7d3d3fb699b..de563055ca1 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/normalizeUrl.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/__tests__/normalizeUrl.test.ts@@ -1,4 +1,4 @@-import { normalizeUrl } from '@/navigation-menu-item/utils/normalizeUrl';+import { normalizeUrl } from '@/navigation-menu-item/display/link/utils/normalizeUrl';describe('normalizeUrl', () => {it('should leave url unchanged when it has protocol, otherwise prepend https', () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/extractDomainFromUrl.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/extractDomainFromUrl.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/extractDomainFromUrl.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/extractDomainFromUrl.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getLinkFaviconUrl.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/getLinkFaviconUrl.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getLinkFaviconUrl.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/getLinkFaviconUrl.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/getLinkNavigationMenuItemComputedLink.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/getLinkNavigationMenuItemComputedLink.tsnew file mode 100644index 00000000000..72ba6e96251--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/getLinkNavigationMenuItemComputedLink.ts@@ -0,0 +1,11 @@+import { type NavigationMenuItem } from '~/generated-metadata/graphql';++export const getLinkNavigationMenuItemComputedLink = (+ item: Pick<NavigationMenuItem, 'link'>,+): string => {+ const linkUrl = (item.link ?? '').trim();+ if (linkUrl.startsWith('http://') || linkUrl.startsWith('https://')) {+ return linkUrl;+ }+ return linkUrl ? `https://${linkUrl}` : '';+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/getLinkNavigationMenuItemLabel.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/getLinkNavigationMenuItemLabel.tsnew file mode 100644index 00000000000..83a85f10311--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/getLinkNavigationMenuItemLabel.ts@@ -0,0 +1,8 @@+import { type NavigationMenuItem } from '~/generated-metadata/graphql';++export const getLinkNavigationMenuItemLabel = (+ item: Pick<NavigationMenuItem, 'name' | 'link'>,+): string => {+ const linkUrl = (item.link ?? '').trim();+ return (item.name ?? linkUrl) || 'Link';+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/normalizeUrl.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/normalizeUrl.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/normalizeUrl.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/normalizeUrl.tsdiff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsxsimilarity index 94%rename from packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsxindex 4c275586515..ab9e2f6c07d 100644--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx@@ -1,9 +1,9 @@-import { ObjectIconWithViewOverlay } from '@/navigation-menu-item/components/ObjectIconWithViewOverlay';-import { useObjectNavItemColor } from '@/navigation-menu-item/hooks/useObjectNavItemColor';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/utils/getNavigationMenuItemComputedLink';-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemLabel';-import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/utils/recordIdentifierToObjectRecordIdentifier';+import { ObjectIconWithViewOverlay } from '@/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay';+import { useObjectNavItemColor } from '@/navigation-menu-item/common/hooks/useObjectNavItemColor';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';+import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';+import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier';import { lastVisitedViewPerObjectMetadataItemState } from '@/navigation/states/lastVisitedViewPerObjectMetadataItemState';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemObjectContent.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationMenuItemObjectDisplay.tsxsimilarity index 68%rename from packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemObjectContent.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationMenuItemObjectDisplay.tsxindex 4a3ccd6a18b..1dbbe1ae086 100644--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemObjectContent.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationMenuItemObjectDisplay.tsx@@ -1,19 +1,18 @@-import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/utils/getObjectMetadataForNavigationMenuItem';-import { NavigationDrawerItemForObjectMetadataItem } from '@/object-metadata/components/NavigationDrawerItemForObjectMetadataItem';-import type { WorkspaceSectionItemContentProps } from '@/object-metadata/components/WorkspaceSectionItemContentProps';+import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/display/object/utils/getObjectMetadataForNavigationMenuItem';+import { NavigationDrawerItemForObjectMetadataItem } from '@/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem';+import type { WorkspaceSectionItemContentProps } from '@/navigation-menu-item/display/sections/types/WorkspaceSectionItemContentProps';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { viewsSelector } from '@/views/states/selectors/viewsSelector';-type NavigationDrawerSectionForWorkspaceItemObjectContentProps =- WorkspaceSectionItemContentProps;+type NavigationMenuItemObjectDisplayProps = WorkspaceSectionItemContentProps;-export const NavigationDrawerSectionForWorkspaceItemObjectContent = ({+export const NavigationMenuItemObjectDisplay = ({item,editModeProps,isDragging,onActiveObjectMetadataItemClick,-}: NavigationDrawerSectionForWorkspaceItemObjectContentProps) => {+}: NavigationMenuItemObjectDisplayProps) => {const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);const views = useAtomStateValue(viewsSelector);const objectMetadataItem = getObjectMetadataForNavigationMenuItem(diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getNavigationMenuItemSecondaryLabel.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getNavigationMenuItemSecondaryLabel.test.tssimilarity index 67%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getNavigationMenuItemSecondaryLabel.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getNavigationMenuItemSecondaryLabel.test.tsindex c8d9ad5c9c3..e200c528e2e 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getNavigationMenuItemSecondaryLabel.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getNavigationMenuItemSecondaryLabel.test.ts@@ -1,9 +1,9 @@import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';-import { getNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemSecondaryLabel';+import { getObjectNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemSecondaryLabel';-describe('getNavigationMenuItemSecondaryLabel', () => {+describe('getObjectNavigationMenuItemSecondaryLabel', () => {it('should return "View" for view object', () => {- const result = getNavigationMenuItemSecondaryLabel({+ const result = getObjectNavigationMenuItemSecondaryLabel({objectMetadataItems: generatedMockObjectMetadataItems,navigationMenuItemObjectNameSingular: 'view',});@@ -12,7 +12,7 @@ describe('getNavigationMenuItemSecondaryLabel', () => {});it('should return labelSingular for matching object metadata item', () => {- const result = getNavigationMenuItemSecondaryLabel({+ const result = getObjectNavigationMenuItemSecondaryLabel({objectMetadataItems: generatedMockObjectMetadataItems,navigationMenuItemObjectNameSingular: 'person',});@@ -21,7 +21,7 @@ describe('getNavigationMenuItemSecondaryLabel', () => {});it('should return undefined when object metadata item is not found', () => {- const result = getNavigationMenuItemSecondaryLabel({+ const result = getObjectNavigationMenuItemSecondaryLabel({objectMetadataItems: generatedMockObjectMetadataItems,navigationMenuItemObjectNameSingular: 'nonexistent',});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getObjectMetadataForNavigationMenuItem.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getObjectMetadataForNavigationMenuItem.test.tssimilarity index 97%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getObjectMetadataForNavigationMenuItem.test.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getObjectMetadataForNavigationMenuItem.test.tsindex 262aa58a105..21ad5aaed6e 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/__tests__/getObjectMetadataForNavigationMenuItem.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/__tests__/getObjectMetadataForNavigationMenuItem.test.ts@@ -1,5 +1,5 @@import { NavigationMenuItemType } from 'twenty-shared/types';-import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/utils/getObjectMetadataForNavigationMenuItem';+import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/display/object/utils/getObjectMetadataForNavigationMenuItem';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { type View } from '@/views/types/View';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemObjectNameSingular.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemObjectNameSingular.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getObjectMetadataForNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectMetadataForNavigationMenuItem.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getObjectMetadataForNavigationMenuItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectMetadataForNavigationMenuItem.tsdiff --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.tsnew file mode 100644index 00000000000..6bc9ebaf998--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemComputedLink.ts@@ -0,0 +1,29 @@+import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';+import { type View } from '@/views/types/View';+import { ViewKey } from '@/views/types/ViewKey';+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: ObjectMetadataItem[],+ views: Pick<View, 'id' | 'objectMetadataId' | 'key'>[],+): string => {+ const objectMetadataItem = objectMetadataItems.find(+ (meta) => meta.id === item.targetObjectMetadataId,+ );+ if (!isDefined(objectMetadataItem)) {+ return '';+ }+ const indexView = views.find(+ (view) =>+ view.objectMetadataId === objectMetadataItem.id &&+ view.key === ViewKey.INDEX,+ );+ return getAppPath(+ AppPath.RecordIndexPage,+ { objectNamePlural: objectMetadataItem.namePlural },+ indexView ? { viewId: indexView.id } : {},+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemLabel.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemLabel.tsnew file mode 100644index 00000000000..3c043cbd6f0--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemLabel.ts@@ -0,0 +1,12 @@+import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';++export const getObjectNavigationMenuItemLabel = (+ item: Pick<NavigationMenuItem, 'targetObjectMetadataId'>,+ objectMetadataItems: Pick<ObjectMetadataItem, 'id' | 'labelPlural'>[],+): string => {+ const objectMetadataItem = objectMetadataItems.find(+ (meta) => meta.id === item.targetObjectMetadataId,+ );+ return objectMetadataItem?.labelPlural ?? '';+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemSecondaryLabel.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemSecondaryLabel.tssimilarity index 76%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemSecondaryLabel.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemSecondaryLabel.tsindex 19089718522..ac01eac4909 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemSecondaryLabel.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemSecondaryLabel.ts@@ -1,6 +1,6 @@import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';-type GetNavigationMenuItemSecondaryLabelProps = {+type GetObjectNavigationMenuItemSecondaryLabelProps = {objectMetadataItems: Pick<ObjectMetadataItem,'nameSingular' | 'labelSingular'@@ -8,10 +8,10 @@ type GetNavigationMenuItemSecondaryLabelProps = {navigationMenuItemObjectNameSingular: string;};-export const getNavigationMenuItemSecondaryLabel = ({+export const getObjectNavigationMenuItemSecondaryLabel = ({objectMetadataItems,navigationMenuItemObjectNameSingular,-}: GetNavigationMenuItemSecondaryLabelProps) => {+}: GetObjectNavigationMenuItemSecondaryLabelProps) => {if (navigationMenuItemObjectNameSingular === 'view') {return 'View';}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/record/utils/getRecordNavigationMenuItemComputedLink.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/record/utils/getRecordNavigationMenuItemComputedLink.tsnew file mode 100644index 00000000000..7d532e1b37e--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/record/utils/getRecordNavigationMenuItemComputedLink.ts@@ -0,0 +1,27 @@+import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier';+import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';+import { isDefined } from 'twenty-shared/utils';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';++export const getRecordNavigationMenuItemComputedLink = (+ item: Pick<+ NavigationMenuItem,+ 'targetObjectMetadataId' | 'targetRecordIdentifier'+ >,+ objectMetadataItems: ObjectMetadataItem[],+): string => {+ const objectMetadataItem = objectMetadataItems.find(+ (meta) => meta.id === item.targetObjectMetadataId,+ );+ if (+ !isDefined(objectMetadataItem) ||+ !isDefined(item.targetRecordIdentifier)+ ) {+ return '';+ }+ const objectRecordIdentifier = recordIdentifierToObjectRecordIdentifier({+ recordIdentifier: item.targetRecordIdentifier,+ objectMetadataItem,+ });+ return objectRecordIdentifier.linkToShowPage ?? '';+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/record/utils/getRecordNavigationMenuItemLabel.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/record/utils/getRecordNavigationMenuItemLabel.tsnew file mode 100644index 00000000000..204e550157b--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/record/utils/getRecordNavigationMenuItemLabel.ts@@ -0,0 +1,7 @@+import { type NavigationMenuItem } from '~/generated-metadata/graphql';++export const getRecordNavigationMenuItemLabel = (+ item: Pick<NavigationMenuItem, 'targetRecordIdentifier'>,+): string => {+ return item.targetRecordIdentifier?.labelIdentifier ?? '';+};diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerOpenedSection.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerOpenedSection.tsxsimilarity index 97%rename from packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerOpenedSection.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerOpenedSection.tsxindex 77edafae88d..b453096bc11 100644--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerOpenedSection.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerOpenedSection.tsx@@ -1,6 +1,6 @@import { useParams } from 'react-router-dom';-import { useWorkspaceNavigationMenuItems } from '@/navigation-menu-item/hooks/useWorkspaceNavigationMenuItems';+import { useWorkspaceNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useWorkspaceNavigationMenuItems';import { NavigationDrawerSectionForObjectMetadataItems } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { CoreObjectNameSingular } from 'twenty-shared/types';diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItems.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItems.tsxsimilarity index 93%rename from packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItems.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItems.tsxindex c606a7929a8..7b07d672b9b 100644--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItems.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItems.tsx@@ -1,16 +1,16 @@-import { NavigationDropTargetContext } from '@/navigation-menu-item/contexts/NavigationDropTargetContext';+import { NavigationDropTargetContext } from '@/navigation-menu-item/common/contexts/NavigationDropTargetContext';import React, { lazy, Suspense, useContext } from 'react';import { NavigationMenuItemType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { AnimatedExpandableContainer } from 'twenty-ui/layout';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';-import { type NavigationMenuItemClickParams } from '@/navigation-menu-item/hooks/useWorkspaceSectionItems';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/utils/getObjectMetadataForNavigationMenuItem';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';+import { type NavigationMenuItemClickParams } from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/display/object/utils/getObjectMetadataForNavigationMenuItem';import type { EditModeProps } from '@/object-metadata/components/EditModeProps';-import { NavigationDrawerSectionForWorkspaceItemsListReadOnly } from '@/object-metadata/components/NavigationDrawerSectionForWorkspaceItemsListReadOnly';+import { NavigationDrawerSectionForWorkspaceItemsListReadOnly } from '@/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItemsListReadOnly';import { WorkspaceSectionListEditModeFallback } from '@/object-metadata/components/WorkspaceSectionListEditModeFallback';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';@@ -27,7 +27,7 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';const LazyWorkspaceSectionListDndKit = lazy(() =>import(- '@/object-metadata/components/NavigationDrawerSectionForWorkspaceItemsListDndKit'+ '@/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItemsListDndKit').then((m) => ({ default: m.WorkspaceSectionListDndKit })),);diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemsListDndKit.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItemsListDndKit.tsxsimilarity index 81%rename from packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemsListDndKit.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItemsListDndKit.tsxindex 1c65fa3ee4e..f875855b4f0 100644--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemsListDndKit.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItemsListDndKit.tsx@@ -1,20 +1,20 @@-import { WorkspaceDndKitDroppableSlot } from '@/navigation-menu-item/components/WorkspaceDndKitDroppableSlot';-import { WorkspaceDndKitSortableItem } from '@/navigation-menu-item/components/WorkspaceDndKitSortableItem';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';+import { WorkspaceDndKitDroppableSlot } from '@/navigation-menu-item/display/dnd/components/WorkspaceDndKitDroppableSlot';+import { WorkspaceDndKitSortableItem } from '@/navigation-menu-item/display/dnd/components/WorkspaceDndKitSortableItem';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';import { NavigationMenuItemType } from 'twenty-shared/types';-import { NavigationDropTargetContext } from '@/navigation-menu-item/contexts/NavigationDropTargetContext';-import { useIsDropDisabledForSection } from '@/navigation-menu-item/hooks/useIsDropDisabledForSection';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';+import { NavigationDropTargetContext } from '@/navigation-menu-item/common/contexts/NavigationDropTargetContext';+import { useIsDropDisabledForSection } from '@/navigation-menu-item/display/dnd/hooks/useIsDropDisabledForSection';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { styled } from '@linaria/react';import { useContext } from 'react';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { NavigationMenuItemDragContext } from '@/navigation-menu-item/contexts/NavigationMenuItemDragContext';-import { NavigationDrawerSectionForWorkspaceItemContent } from '@/object-metadata/components/NavigationDrawerSectionForWorkspaceItemContent';-import { WorkspaceOrphanDropTarget } from '@/object-metadata/components/WorkspaceOrphanDropTarget';-import { WorkspaceSectionAddMenuItemButton } from '@/object-metadata/components/WorkspaceSectionAddMenuItemButton';-import type { WorkspaceSectionListDndKitProps } from '@/object-metadata/components/WorkspaceSectionListDndKitProps';+import { NavigationMenuItemDragContext } from '@/navigation-menu-item/common/contexts/NavigationMenuItemDragContext';+import { NavigationMenuItemDisplay } from '@/navigation-menu-item/display/components/NavigationMenuItemDisplay';+import { WorkspaceOrphanDropTarget } from '@/navigation-menu-item/display/sections/components/WorkspaceOrphanDropTarget';+import { WorkspaceSectionAddMenuItemButton } from '@/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton';+import type { WorkspaceSectionListDndKitProps } from '@/navigation-menu-item/display/sections/types/WorkspaceSectionListDndKitProps';const StyledList = styled.div`display: flex;@@ -62,7 +62,7 @@ export const WorkspaceSectionListDndKit = ({}disabled={!isNavigationMenuInEditMode || workspaceDropDisabled}>- <NavigationDrawerSectionForWorkspaceItemContent+ <NavigationMenuItemDisplayitem={item}editModeProps={getEditModeProps(item)}isDragging={isDragging}diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemsListReadOnly.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItemsListReadOnly.tsxsimilarity index 82%rename from packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemsListReadOnly.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItemsListReadOnly.tsxindex 033040e748a..8ed3dfb9d22 100644--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForWorkspaceItemsListReadOnly.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItemsListReadOnly.tsx@@ -3,8 +3,8 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';import type { NavigationMenuItem } from '~/generated-metadata/graphql';import { NavigationMenuItemType } from 'twenty-shared/types';-import type { WorkspaceSectionListDndKitProps } from '@/object-metadata/components/WorkspaceSectionListDndKitProps';-import { NavigationDrawerSectionForWorkspaceItemContent } from '@/object-metadata/components/NavigationDrawerSectionForWorkspaceItemContent';+import type { WorkspaceSectionListDndKitProps } from '@/navigation-menu-item/display/sections/types/WorkspaceSectionListDndKitProps';+import { NavigationMenuItemDisplay } from '@/navigation-menu-item/display/components/NavigationMenuItemDisplay';const StyledList = styled.div`display: flex;@@ -35,7 +35,7 @@ export const NavigationDrawerSectionForWorkspaceItemsListReadOnly = ({return (<StyledList>{filteredItems.map((item: NavigationMenuItem) => (- <NavigationDrawerSectionForWorkspaceItemContent+ <NavigationMenuItemDisplaykey={item.id}item={item}editModeProps={READ_ONLY_EDIT_MODE_PROPS}diff --git a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceOrphanDropTarget.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/WorkspaceOrphanDropTarget.tsxsimilarity index 69%rename from packages/twenty-front/src/modules/object-metadata/components/WorkspaceOrphanDropTarget.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/WorkspaceOrphanDropTarget.tsxindex d543e9f7815..58a8d507216 100644--- a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceOrphanDropTarget.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/components/WorkspaceOrphanDropTarget.tsx@@ -1,9 +1,9 @@import type { ReactNode } from 'react';-import { NavigationItemDropTarget } from '@/navigation-menu-item/components/NavigationItemDropTarget';-import { NavigationSections } from '@/navigation-menu-item/constants/NavigationSections.constants';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';-import { getDndKitDropTargetId } from '@/navigation-menu-item/utils/getDndKitDropTargetId';+import { NavigationItemDropTarget } from '@/navigation-menu-item/display/dnd/components/NavigationItemDropTarget';+import { NavigationSections } from '@/navigation-menu-item/common/constants/NavigationSections.constants';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';+import { getDndKitDropTargetId } from '@/navigation-menu-item/common/utils/getDndKitDropTargetId';type WorkspaceOrphanDropTargetProps = {index: number;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItems.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesFolderItem.tsxsimilarity index 59%rename from packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItems.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesFolderItem.tsxindex e1a13e8f823..b356de125e7 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItems.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesFolderItem.tsx@@ -1,10 +1,8 @@-import { Droppable } from '@hello-pangea/dnd';import { useLingui } from '@lingui/react/macro';import { useContext, useState } from 'react';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { NavigationSections } from '@/navigation-menu-item/constants/NavigationSections.constants';-import { useIsDropDisabledForSection } from '@/navigation-menu-item/hooks/useIsDropDisabledForSection';+import { NavigationSections } from '@/navigation-menu-item/common/constants/NavigationSections.constants';import { createPortal } from 'react-dom';import { useLocation, useNavigate } from 'react-router-dom';import { NavigationMenuItemType } from 'twenty-shared/types';@@ -15,25 +13,24 @@ import { LightIconButton } from 'twenty-ui/input';import { AnimatedExpandableContainer } from 'twenty-ui/layout';import { useIsMobile } from 'twenty-ui/utilities';-import { NavigationItemDropTarget } from '@/navigation-menu-item/components/NavigationItemDropTarget';-import { NavigationMenuItemDroppable } from '@/navigation-menu-item/components/NavigationMenuItemDroppable';-import { NavigationMenuItemFolderNavigationDrawerItemDropdown } from '@/navigation-menu-item/components/NavigationMenuItemFolderNavigationDrawerItemDropdown';-import { NavigationMenuItemIcon } from '@/navigation-menu-item/components/NavigationMenuItemIcon';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultColorFolder';-import { NAVIGATION_MENU_ITEM_FOLDER_DELETE_MODAL_ID } from '@/navigation-menu-item/constants/NavigationMenuItemFolderDeleteModalId';-import { NavigationMenuItemDragContext } from '@/navigation-menu-item/contexts/NavigationMenuItemDragContext';-import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/hooks/useDeleteNavigationMenuItem';-import { useDeleteNavigationMenuItemFolder } from '@/navigation-menu-item/hooks/useDeleteNavigationMenuItemFolder';-import { useRenameNavigationMenuItemFolder } from '@/navigation-menu-item/hooks/useRenameNavigationMenuItemFolder';-import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/states/openNavigationMenuItemFolderIdsState';-import { getEffectiveNavigationMenuItemColor } from '@/navigation-menu-item/utils/getEffectiveNavigationMenuItemColor';-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/utils/getNavigationMenuItemComputedLink';-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemLabel';-import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/utils/getNavigationMenuItemObjectNameSingular';-import { getNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemSecondaryLabel';-import { isLocationMatchingNavigationMenuItem } from '@/navigation-menu-item/utils/isLocationMatchingNavigationMenuItem';+import { NavigationItemDropTarget } from '@/navigation-menu-item/display/dnd/components/NavigationItemDropTarget';+import { WorkspaceDndKitSortableItem } from '@/navigation-menu-item/display/dnd/components/WorkspaceDndKitSortableItem';+import { NavigationMenuItemFolderNavigationDrawerItemDropdown } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown';+import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';+import { NAVIGATION_MENU_ITEM_FOLDER_DELETE_MODAL_ID } from '@/navigation-menu-item/common/constants/NavigationMenuItemFolderDeleteModalId';+import { NavigationMenuItemDragContext } from '@/navigation-menu-item/common/contexts/NavigationMenuItemDragContext';+import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/common/hooks/useDeleteNavigationMenuItem';+import { useDeleteNavigationMenuItemFolder } from '@/navigation-menu-item/edit/folder/hooks/useDeleteNavigationMenuItemFolder';+import { useRenameNavigationMenuItemFolder } from '@/navigation-menu-item/edit/folder/hooks/useRenameNavigationMenuItemFolder';+import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState';+import { getEffectiveNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getEffectiveNavigationMenuItemColor';+import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';+import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';+import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';+import { getObjectNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemSecondaryLabel';+import { isLocationMatchingNavigationMenuItem } from '@/navigation-menu-item/common/utils/isLocationMatchingNavigationMenuItem';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';-import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';@@ -43,7 +40,7 @@ import { NavigationDrawerInput } from '@/ui/navigation/navigation-drawer/componeimport { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';import { NavigationDrawerItemsCollapsableContainer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemsCollapsableContainer';import { NavigationDrawerSubItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem';-import { currentNavigationMenuItemFolderIdState } from '@/ui/navigation/navigation-drawer/states/currentNavigationMenuItemFolderIdState';+import { currentNavigationMenuItemFolderIdState } from '@/navigation-menu-item/common/states/currentNavigationMenuItemFolderIdState';import { getNavigationSubItemLeftAdornment } from '@/ui/navigation/navigation-drawer/utils/getNavigationSubItemLeftAdornment';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';@@ -53,7 +50,7 @@ import { viewsSelector } from '@/views/states/selectors/viewsSelector';import { ViewKey } from '@/views/types/ViewKey';import { isNonEmptyString } from '@sniptt/guards';-type CurrentWorkspaceMemberNavigationMenuItemsProps = {+type FavoritesFolderItemProps = {folder: {id: string;folderName: string;@@ -63,11 +60,11 @@ type CurrentWorkspaceMemberNavigationMenuItemsProps = {isWorkspaceFolder?: boolean;};-export const CurrentWorkspaceMemberNavigationMenuItems = ({+export const FavoritesFolderItem = ({folder,isGroup,isWorkspaceFolder = false,-}: CurrentWorkspaceMemberNavigationMenuItemsProps) => {+}: FavoritesFolderItemProps) => {const { t } = useLingui();const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);const views = useAtomStateValue(viewsSelector);@@ -166,8 +163,6 @@ export const CurrentWorkspaceMemberNavigationMenuItems = ({);const { deleteNavigationMenuItem } = useDeleteNavigationMenuItem();- const folderContentDropDisabled =- useIsDropDisabledForSection(isWorkspaceFolder);const navigationMenuItemFolderContentLength =folder.navigationMenuItems.length;@@ -231,6 +226,8 @@ export const CurrentWorkspaceMemberNavigationMenuItems = ({const navigationMenuItemCount = folder.navigationMenuItems.length;+ const folderDroppableId = `folder-${folder.id}`;+return (<><NavigationDrawerItemsCollapsableContainer@@ -247,32 +244,27 @@ export const CurrentWorkspaceMemberNavigationMenuItems = ({onClickOutside={handleClickOutside}/>) : (- <NavigationMenuItemDroppable- droppableId={`folder-header-${folder.id}`}- isWorkspaceSection={isWorkspaceFolder}+ <NavigationItemDropTarget+ folderId={folder.id}+ index={0}+ sectionId={+ isWorkspaceFolder+ ? NavigationSections.WORKSPACE+ : NavigationSections.FAVORITES+ }>- <NavigationItemDropTarget- folderId={folder.id}- index={0}- sectionId={- isWorkspaceFolder- ? NavigationSections.WORKSPACE- : NavigationSections.FAVORITES- }- >- <NavigationDrawerItem- label={folder.folderName}- Icon={isOpen ? IconFolderOpen : IconFolder}- iconColor={DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER}- onClick={handleToggle}- rightOptions={rightOptions}- className="navigation-drawer-item"- isRightOptionsDropdownOpen={isDropdownOpen}- triggerEvent="CLICK"- preventCollapseOnMobile={isMobile}- />- </NavigationItemDropTarget>- </NavigationMenuItemDroppable>+ <NavigationDrawerItem+ label={folder.folderName}+ Icon={isOpen ? IconFolderOpen : IconFolder}+ iconColor={DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER}+ onClick={handleToggle}+ rightOptions={rightOptions}+ className="navigation-drawer-item"+ isRightOptionsDropdownOpen={isDropdownOpen}+ triggerEvent="CLICK"+ preventCollapseOnMobile={isMobile}+ />+ </NavigationItemDropTarget>)}<AnimatedExpandableContainer@@ -281,98 +273,78 @@ export const CurrentWorkspaceMemberNavigationMenuItems = ({mode="fit-content"containAnimation>- <Droppable- droppableId={`folder-${folder.id}`}- isDropDisabled={folderContentDropDisabled}- >- {(provided) => (- <div- ref={provided.innerRef}- // oxlint-disable-next-line react/jsx-props-no-spreading- {...provided.droppableProps}+ {folder.navigationMenuItems.map((navigationMenuItem, index) => {+ const label = getNavigationMenuItemLabel(+ navigationMenuItem,+ objectMetadataItems,+ views,+ );+ const computedLink = getNavigationMenuItemComputedLink(+ navigationMenuItem,+ objectMetadataItems,+ views,+ );+ const objectNameSingular = getNavigationMenuItemObjectNameSingular(+ navigationMenuItem,+ objectMetadataItems,+ views,+ );+ const view = isDefined(navigationMenuItem.viewId)+ ? views.find((view) => view.id === navigationMenuItem.viewId)+ : undefined;+ const isIndexView = view?.key === ViewKey.INDEX;++ return (+ <WorkspaceDndKitSortableItem+ key={navigationMenuItem.id}+ id={navigationMenuItem.id}+ index={index}+ group={folderDroppableId}>- {folder.navigationMenuItems.map((navigationMenuItem, index) => {- const label = getNavigationMenuItemLabel(- navigationMenuItem,- objectMetadataItems,- views,- );- const computedLink = getNavigationMenuItemComputedLink(- navigationMenuItem,- objectMetadataItems,- views,- );- const objectNameSingular =- getNavigationMenuItemObjectNameSingular(- navigationMenuItem,- objectMetadataItems,- views,- );- const view = isDefined(navigationMenuItem.viewId)- ? views.find(- (view) => view.id === navigationMenuItem.viewId,- )- : undefined;- const isIndexView = view?.key === ViewKey.INDEX;-- return (- <DraggableItem- key={navigationMenuItem.id}- draggableId={navigationMenuItem.id}- index={index}- isInsideScrollableContainer- itemComponent={- <NavigationDrawerSubItem- secondaryLabel={- isIndexView- ? undefined- : getNavigationMenuItemSecondaryLabel({- objectMetadataItems,- navigationMenuItemObjectNameSingular:- objectNameSingular ?? '',- })- }- label={label}- Icon={() => (- <NavigationMenuItemIcon- navigationMenuItem={navigationMenuItem}- />- )}- to={isDragging ? undefined : computedLink}- active={index === selectedNavigationMenuItemIndex}- subItemState={getNavigationSubItemLeftAdornment({- index,- arrayLength: navigationMenuItemFolderContentLength,- selectedIndex: selectedNavigationMenuItemIndex,- })}- rightOptions={- isWorkspaceFolder ? undefined : (- <LightIconButton- Icon={IconHeartOff}- onClick={(e) => {- e.stopPropagation();- deleteNavigationMenuItem(- navigationMenuItem.id,- );- }}- accent="tertiary"- />- )- }- isDragging={isDragging}- triggerEvent="CLICK"- iconColor={getEffectiveNavigationMenuItemColor(- navigationMenuItem,- )}- />- }+ <NavigationDrawerSubItem+ secondaryLabel={+ isIndexView+ ? undefined+ : getObjectNavigationMenuItemSecondaryLabel({+ objectMetadataItems,+ navigationMenuItemObjectNameSingular:+ objectNameSingular ?? '',+ })+ }+ label={label}+ Icon={() => (+ <NavigationMenuItemIcon+ navigationMenuItem={navigationMenuItem}/>- );- })}- {provided.placeholder}- </div>- )}- </Droppable>+ )}+ to={isDragging ? undefined : computedLink}+ active={index === selectedNavigationMenuItemIndex}+ subItemState={getNavigationSubItemLeftAdornment({+ index,+ arrayLength: navigationMenuItemFolderContentLength,+ selectedIndex: selectedNavigationMenuItemIndex,+ })}+ rightOptions={+ isWorkspaceFolder ? undefined : (+ <LightIconButton+ Icon={IconHeartOff}+ onClick={(e) => {+ e.stopPropagation();+ deleteNavigationMenuItem(navigationMenuItem.id);+ }}+ accent="tertiary"+ />+ )+ }+ isDragging={isDragging}+ triggerEvent="CLICK"+ iconColor={getEffectiveNavigationMenuItemColor(+ navigationMenuItem,+ )}+ />+ </WorkspaceDndKitSortableItem>+ );+ })}</AnimatedExpandableContainer></NavigationDrawerItemsCollapsableContainer>diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesOrphanItems.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesOrphanItems.tsxnew file mode 100644index 00000000000..03708b55f3b--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesOrphanItems.tsx@@ -0,0 +1,116 @@+import { styled } from '@linaria/react';+import { useContext } from 'react';+import { useLocation } from 'react-router-dom';+import { IconHeartOff } from 'twenty-ui/display';+import { LightIconButton } from 'twenty-ui/input';+import { themeCssVariables } from 'twenty-ui/theme-constants';++import { WorkspaceDndKitSortableItem } from '@/navigation-menu-item/display/dnd/components/WorkspaceDndKitSortableItem';+import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';+import { NavigationMenuItemDragContext } from '@/navigation-menu-item/common/contexts/NavigationMenuItemDragContext';+import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/common/hooks/useDeleteNavigationMenuItem';+import { useSortedNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useSortedNavigationMenuItems';+import { getEffectiveNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getEffectiveNavigationMenuItemColor';+import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';+import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';+import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';+import { getObjectNavigationMenuItemSecondaryLabel } from '@/navigation-menu-item/display/object/utils/getObjectNavigationMenuItemSecondaryLabel';+import { isLocationMatchingNavigationMenuItem } from '@/navigation-menu-item/common/utils/isLocationMatchingNavigationMenuItem';+import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { viewsSelector } from '@/views/states/selectors/viewsSelector';+import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';++const StyledEmptyContainer = styled.div`+ width: 100%;+`;++const StyledOrphanNavigationMenuItemsContainer = styled.div`+ margin-bottom: ${themeCssVariables.betweenSiblingsGap};+`;++export const FavoritesOrphanItems = () => {+ const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);+ const views = useAtomStateValue(viewsSelector);+ const { navigationMenuItemsSorted } = useSortedNavigationMenuItems();+ const { deleteNavigationMenuItem } = useDeleteNavigationMenuItem();+ const currentPath = useLocation().pathname;+ const currentViewPath = useLocation().pathname + useLocation().search;+ const { isDragging } = useContext(NavigationMenuItemDragContext);++ const orphanNavigationMenuItems = navigationMenuItemsSorted.filter(+ (item) => !item.folderId,+ );++ return orphanNavigationMenuItems.length > 0 ? (+ <>+ {orphanNavigationMenuItems.map((navigationMenuItem, index) => {+ const label = getNavigationMenuItemLabel(+ navigationMenuItem,+ objectMetadataItems,+ views,+ );+ const computedLink = getNavigationMenuItemComputedLink(+ navigationMenuItem,+ objectMetadataItems,+ views,+ );+ const objectNameSingular = getNavigationMenuItemObjectNameSingular(+ navigationMenuItem,+ objectMetadataItems,+ views,+ );++ return (+ <WorkspaceDndKitSortableItem+ key={navigationMenuItem.id}+ id={navigationMenuItem.id}+ index={index}+ group={NavigationMenuItemDroppableIds.ORPHAN_NAVIGATION_MENU_ITEMS}+ >+ <StyledOrphanNavigationMenuItemsContainer>+ <NavigationDrawerItem+ secondaryLabel={getObjectNavigationMenuItemSecondaryLabel({+ objectMetadataItems,+ navigationMenuItemObjectNameSingular:+ objectNameSingular ?? '',+ })}+ label={label}+ Icon={() => (+ <NavigationMenuItemIcon+ navigationMenuItem={navigationMenuItem}+ />+ )}+ iconColor={getEffectiveNavigationMenuItemColor(+ navigationMenuItem,+ )}+ active={isLocationMatchingNavigationMenuItem(+ currentPath,+ currentViewPath,+ navigationMenuItem.type,+ computedLink,+ )}+ to={isDragging ? undefined : computedLink}+ rightOptions={+ <LightIconButton+ Icon={IconHeartOff}+ onClick={(e) => {+ e.stopPropagation();+ deleteNavigationMenuItem(navigationMenuItem.id);+ }}+ accent="tertiary"+ />+ }+ isDragging={isDragging}+ triggerEvent="CLICK"+ />+ </StyledOrphanNavigationMenuItemsContainer>+ </WorkspaceDndKitSortableItem>+ );+ })}+ </>+ ) : (+ <StyledEmptyContainer style={{ height: isDragging ? '24px' : '1px' }} />+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItemFolders.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsxsimilarity index 86%rename from packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItemFolders.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsxindex 960378d9bbe..976072c04cf 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItemFolders.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx@@ -2,11 +2,11 @@ import { useLingui } from '@lingui/react/macro';import { IconFolderPlus } from 'twenty-ui/display';import { LightIconButton } from 'twenty-ui/input';import { AnimatedExpandableContainer } from 'twenty-ui/layout';-import { CurrentWorkspaceMemberOrphanNavigationMenuItems } from '@/navigation-menu-item/components/CurrentWorkspaceMemberOrphanNavigationMenuItems';-import { NavigationMenuItemFolders } from '@/navigation-menu-item/components/NavigationMenuItemFolders';-import { useNavigationMenuItemsByFolder } from '@/navigation-menu-item/hooks/useNavigationMenuItemsByFolder';-import { useSortedNavigationMenuItems } from '@/navigation-menu-item/hooks/useSortedNavigationMenuItems';-import { isNavigationMenuItemFolderCreatingState } from '@/navigation-menu-item/states/isNavigationMenuItemFolderCreatingState';+import { FavoritesOrphanItems } from '@/navigation-menu-item/display/sections/favorites/components/FavoritesOrphanItems';+import { NavigationMenuItemFolders } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolders';+import { useNavigationMenuItemsByFolder } from '@/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder';+import { useSortedNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useSortedNavigationMenuItems';+import { isNavigationMenuItemFolderCreatingState } from '@/navigation-menu-item/common/states/isNavigationMenuItemFolderCreatingState';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';@@ -15,7 +15,7 @@ import { useNavigationSection } from '@/ui/navigation/navigation-drawer/hooks/usimport { isNavigationSectionOpenFamilyState } from '@/ui/navigation/navigation-drawer/states/isNavigationSectionOpenFamilyState';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';-export const CurrentWorkspaceMemberNavigationMenuItemFolders = () => {+export const FavoritesSection = () => {const { navigationMenuItemsSorted } = useSortedNavigationMenuItems();const { userNavigationMenuItemsByFolder } = useNavigationMenuItemsByFolder();@@ -70,7 +70,7 @@ export const CurrentWorkspaceMemberNavigationMenuItemFolders = () => {initial={false}><NavigationMenuItemFolders />- <CurrentWorkspaceMemberOrphanNavigationMenuItems />+ <FavoritesOrphanItems /></AnimatedExpandableContainer></NavigationDrawerSection>);diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher.tsxnew file mode 100644index 00000000000..e1e005b2346--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher.tsx@@ -0,0 +1,19 @@+import { FavoritesSection } from '@/navigation-menu-item/display/sections/favorites/components/FavoritesSection';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { FavoritesDndKitProvider } from '@/navigation/components/FavoritesDndKitProvider';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { AnimatedEaseInOut } from 'twenty-ui/utilities';++export const FavoritesSectionDispatcher = () => {+ const isNavigationMenuInEditMode = useAtomStateValue(+ isNavigationMenuInEditModeState,+ );++ return (+ <AnimatedEaseInOut isOpen={!isNavigationMenuInEditMode} initial>+ <FavoritesDndKitProvider>+ <FavoritesSection />+ </FavoritesDndKitProvider>+ </AnimatedEaseInOut>+ );+};diff --git a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionItemContentProps.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/types/WorkspaceSectionItemContentProps.tssimilarity index 93%rename from packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionItemContentProps.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/sections/types/WorkspaceSectionItemContentProps.tsindex ee6bcc6049d..beb490461d7 100644--- a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionItemContentProps.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/types/WorkspaceSectionItemContentProps.ts@@ -1,4 +1,4 @@-import type { NavigationMenuItemClickParams } from '@/navigation-menu-item/hooks/useWorkspaceSectionItems';+import type { NavigationMenuItemClickParams } from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';import type { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import type { NavigationMenuItem } from '~/generated-metadata/graphql';diff --git a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionListDndKitProps.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/types/WorkspaceSectionListDndKitProps.tssimilarity index 93%rename from packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionListDndKitProps.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/sections/types/WorkspaceSectionListDndKitProps.tsindex c9bfe31474f..673ab211496 100644--- a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionListDndKitProps.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/types/WorkspaceSectionListDndKitProps.ts@@ -1,4 +1,4 @@-import type { NavigationMenuItemClickParams } from '@/navigation-menu-item/hooks/useWorkspaceSectionItems';+import type { NavigationMenuItemClickParams } from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';import type { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import type { NavigationMenuItem } from '~/generated-metadata/graphql';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItems.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceNavigationMenuItems.tsxsimilarity index 89%rename from packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItems.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceNavigationMenuItems.tsxindex 9a98ce87399..53845afcfdf 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItems.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceNavigationMenuItems.tsx@@ -12,26 +12,26 @@ import {import { LightIconButton } from 'twenty-ui/input';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/constants/FolderIconDefault';+import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';import { NavigationMenuItemType, SidePanelPages } from 'twenty-shared/types';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel';-import { useSortedNavigationMenuItems } from '@/navigation-menu-item/hooks/useSortedNavigationMenuItems';+import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';+import { useSortedNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useSortedNavigationMenuItems';import {type NavigationMenuItemClickParams,useWorkspaceSectionItems,-} from '@/navigation-menu-item/hooks/useWorkspaceSectionItems';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/states/openNavigationMenuItemFolderIdsState';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';-import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/utils/filterWorkspaceNavigationMenuItems';-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/utils/getNavigationMenuItemComputedLink';-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemLabel';+} from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';+import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterWorkspaceNavigationMenuItems';+import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';+import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';import { preloadWorkspaceDndKit } from '@/navigation/preloadWorkspaceDndKit';-import { NavigationDrawerSectionForWorkspaceItems } from '@/object-metadata/components/NavigationDrawerSectionForWorkspaceItems';+import { NavigationDrawerSectionForWorkspaceItems } from '@/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItems';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';-import { navigationMenuItemsSelector } from '@/navigation-menu-item/states/navigationMenuItemsSelector';+import { navigationMenuItemsSelector } from '@/navigation-menu-item/common/states/navigationMenuItemsSelector';import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemsDispatcher.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceNavigationMenuItemsDispatcher.tsxsimilarity index 70%rename from packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemsDispatcher.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceNavigationMenuItemsDispatcher.tsxindex 937e69a9ed9..f24e8c7fdfe 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItemsDispatcher.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceNavigationMenuItemsDispatcher.tsx@@ -1,4 +1,4 @@-import { WorkspaceNavigationMenuItems } from '@/navigation-menu-item/components/WorkspaceNavigationMenuItems';+import { WorkspaceNavigationMenuItems } from '@/navigation-menu-item/display/sections/workspace/components/WorkspaceNavigationMenuItems';export const WorkspaceNavigationMenuItemsDispatcher = () => {return <WorkspaceNavigationMenuItems />;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemComputedLink.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink.tssimilarity index 97%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemComputedLink.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink.tsindex 58823ab98b0..f2906812a77 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemComputedLink.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink.ts@@ -1,5 +1,5 @@import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';-import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/utils/recordIdentifierToObjectRecordIdentifier';+import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier';import { type View } from '@/views/types/View';import { ViewKey } from '@/views/types/ViewKey';import { AppPath, NavigationMenuItemType } from 'twenty-shared/types';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemLabel.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/getNavigationMenuItemLabel.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemLabel.tsrename to packages/twenty-front/src/modules/navigation-menu-item/display/utils/getNavigationMenuItemLabel.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/ObjectIconWithViewOverlay.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsxsimilarity index 96%rename from packages/twenty-front/src/modules/navigation-menu-item/components/ObjectIconWithViewOverlay.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsxindex 131469f8c17..544862fc3e2 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/ObjectIconWithViewOverlay.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsx@@ -3,7 +3,7 @@ import { useContext } from 'react';import type { IconComponent } from 'twenty-ui/display';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';-import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/utils/getNavigationMenuItemIconStyleFromColor';+import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor';const StyledCompositeContainer = styled.div`align-items: center;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/view/utils/getViewNavigationMenuItemComputedLink.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/view/utils/getViewNavigationMenuItemComputedLink.tsnew file mode 100644index 00000000000..cf15ac5469c--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/view/utils/getViewNavigationMenuItemComputedLink.ts@@ -0,0 +1,27 @@+import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';+import { type View } from '@/views/types/View';+import { AppPath } from 'twenty-shared/types';+import { getAppPath, isDefined } from 'twenty-shared/utils';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';++export const getViewNavigationMenuItemComputedLink = (+ item: Pick<NavigationMenuItem, 'viewId'>,+ objectMetadataItems: ObjectMetadataItem[],+ views: Pick<View, 'id' | 'objectMetadataId' | 'key'>[],+): string => {+ const view = views.find((view) => view.id === item.viewId);+ if (!isDefined(view)) {+ return '';+ }+ const objectMetadataItem = objectMetadataItems.find(+ (meta) => meta.id === view.objectMetadataId,+ );+ if (!isDefined(objectMetadataItem)) {+ return '';+ }+ return getAppPath(+ AppPath.RecordIndexPage,+ { objectNamePlural: objectMetadataItem.namePlural },+ { viewId: item.viewId! },+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/view/utils/getViewNavigationMenuItemLabel.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/view/utils/getViewNavigationMenuItemLabel.tsnew file mode 100644index 00000000000..dcf46139f9e--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/view/utils/getViewNavigationMenuItemLabel.ts@@ -0,0 +1,23 @@+import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';+import { type View } from '@/views/types/View';+import { ViewKey } from '@/views/types/ViewKey';+import { isDefined } from 'twenty-shared/utils';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';++export const getViewNavigationMenuItemLabel = (+ item: Pick<NavigationMenuItem, 'viewId'>,+ views: Pick<View, 'id' | 'name' | 'objectMetadataId' | 'key'>[],+ objectMetadataItems: Pick<ObjectMetadataItem, 'id' | 'labelPlural'>[],+): string => {+ const view = views.find((view) => view.id === item.viewId);+ if (!isDefined(view)) {+ return '';+ }+ if (view.key === ViewKey.INDEX) {+ const objectMetadataItem = objectMetadataItems.find(+ (meta) => meta.id === view.objectMetadataId,+ );+ return objectMetadataItem?.labelPlural ?? view.name;+ }+ return view.name;+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuEditModeBar.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuEditModeBar.tsxsimilarity index 93%rename from packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuEditModeBar.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuEditModeBar.tsxindex 10aca8b366e..98ca84ffc33 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuEditModeBar.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuEditModeBar.tsx@@ -1,8 +1,8 @@-import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/hooks/useNavigationMenuItemsDraftState';-import { useSaveNavigationMenuItemsDraft } from '@/navigation-menu-item/hooks/useSaveNavigationMenuItemsDraft';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';+import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState';+import { useSaveNavigationMenuItemsDraft } from '@/navigation-menu-item/edit/hooks/useSaveNavigationMenuItemsDraft';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemBackButton.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemBackButton.tsxsimilarity index 92%rename from packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemBackButton.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemBackButton.tsxindex a9c99466822..e6c6d400753 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemBackButton.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemBackButton.tsx@@ -3,7 +3,7 @@ import { useContext } from 'react';import { IconX } from 'twenty-ui/display';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';-import { currentNavigationMenuItemFolderIdState } from '@/ui/navigation/navigation-drawer/states/currentNavigationMenuItemFolderIdState';+import { currentNavigationMenuItemFolderIdState } from '@/navigation-menu-item/common/states/currentNavigationMenuItemFolderIdState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';const StyledBackButton = styled.button`diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemFolderContentDispatcher.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemFolderContentDispatcher.tsxsimilarity index 91%rename from packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemFolderContentDispatcher.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemFolderContentDispatcher.tsxindex ee2e30d3c17..3d02e9f444f 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/components/NavigationMenuItemFolderContentDispatcher.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemFolderContentDispatcher.tsx@@ -1,7 +1,7 @@import { isDefined } from 'twenty-shared/utils';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { NavigationMenuItemFolderContent } from '@/navigation-menu-item/components/NavigationMenuItemFolderContent';+import { NavigationMenuItemFolderContent } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolderContent';type NavigationMenuItemFolderContentDispatcherEffectProps = {folderName: string;diff --git a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionAddMenuItemButton.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton.tsxsimilarity index 93%rename from packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionAddMenuItemButton.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton.tsxindex 0776e19885d..6b3f47680a9 100644--- a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionAddMenuItemButton.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton.tsx@@ -3,8 +3,8 @@ import React from 'react';import { SidePanelPages } from 'twenty-shared/types';import { IconColumnInsertRight, IconPlus } from 'twenty-ui/display';-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddFolderToNavigationMenuDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useAddFolderToNavigationMenuDraft.tssimilarity index 91%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddFolderToNavigationMenuDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useAddFolderToNavigationMenuDraft.tsindex 18b92882682..8ea389e9b6f 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddFolderToNavigationMenuDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useAddFolderToNavigationMenuDraft.ts@@ -3,9 +3,9 @@ import { isDefined } from 'twenty-shared/utils';import { v4 } from 'uuid';import type { NavigationMenuItem } from '~/generated-metadata/graphql';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultColorFolder';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { computeInsertIndexAndPosition } from '@/navigation-menu-item/utils/computeInsertIndexAndPosition';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { computeInsertIndexAndPosition } from '@/navigation-menu-item/common/utils/computeInsertIndexAndPosition';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';export const useAddFolderToNavigationMenuDraft = () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useDeleteNavigationMenuItemFolder.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useDeleteNavigationMenuItemFolder.tssimilarity index 89%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useDeleteNavigationMenuItemFolder.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useDeleteNavigationMenuItemFolder.tsindex 6246f80cfa7..2620f1ba628 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useDeleteNavigationMenuItemFolder.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useDeleteNavigationMenuItemFolder.ts@@ -1,4 +1,4 @@-import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/hooks/useDeleteNavigationMenuItem';+import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/common/hooks/useDeleteNavigationMenuItem';export const useDeleteNavigationMenuItemFolder = () => {const { deleteNavigationMenuItem } = useDeleteNavigationMenuItem();diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useRenameNavigationMenuItemFolder.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useRenameNavigationMenuItemFolder.tssimilarity index 91%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useRenameNavigationMenuItemFolder.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useRenameNavigationMenuItemFolder.tsindex a3f43f1c460..62133b2c7bb 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useRenameNavigationMenuItemFolder.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useRenameNavigationMenuItemFolder.ts@@ -1,4 +1,4 @@-import { useUpdateNavigationMenuItem } from '@/navigation-menu-item/hooks/useUpdateNavigationMenuItem';+import { useUpdateNavigationMenuItem } from '@/navigation-menu-item/common/hooks/useUpdateNavigationMenuItem';export const useRenameNavigationMenuItemFolder = () => {const { updateNavigationMenuItem } = useUpdateNavigationMenuItem();diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateFolderInDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useUpdateFolderInDraft.tssimilarity index 89%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateFolderInDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useUpdateFolderInDraft.tsindex 3bb54628352..9c9695c9bde 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateFolderInDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useUpdateFolderInDraft.ts@@ -1,5 +1,5 @@-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';export type UpdateFolderInDraftUpdates = {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateFolderNameInDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useUpdateFolderNameInDraft.tssimilarity index 88%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateFolderNameInDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useUpdateFolderNameInDraft.tsindex 5a7a1b9ffad..a968d3761b8 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateFolderNameInDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useUpdateFolderNameInDraft.ts@@ -1,6 +1,6 @@-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';export const useUpdateFolderNameInDraft = () => {const setNavigationMenuItemsDraft = useSetAtomState(diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useDraftNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems.tssimilarity index 83%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useDraftNavigationMenuItems.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems.tsindex fcfff31d191..d26bac6f01b 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useDraftNavigationMenuItems.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems.ts@@ -1,5 +1,5 @@-import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/hooks/useNavigationMenuItemsDraftState';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';+import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';export const useDraftNavigationMenuItems = () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useDraftNavigationMenuItemsAllFolders.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useDraftNavigationMenuItemsAllFolders.tssimilarity index 85%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useDraftNavigationMenuItemsAllFolders.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useDraftNavigationMenuItemsAllFolders.tsindex f12389dd9dd..09d69d31445 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useDraftNavigationMenuItemsAllFolders.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useDraftNavigationMenuItemsAllFolders.ts@@ -1,5 +1,5 @@-import { useDraftNavigationMenuItems } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItems';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';+import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';export const useDraftNavigationMenuItemsAllFolders = () => {const { currentDraft } = useDraftNavigationMenuItems();diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useDraftNavigationMenuItemsWorkspaceFolders.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useDraftNavigationMenuItemsWorkspaceFolders.tssimilarity index 88%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useDraftNavigationMenuItemsWorkspaceFolders.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useDraftNavigationMenuItemsWorkspaceFolders.tsindex 33cbfe4c66d..938cfe11282 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useDraftNavigationMenuItemsWorkspaceFolders.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useDraftNavigationMenuItemsWorkspaceFolders.ts@@ -1,4 +1,4 @@-import { useNavigationMenuItemsByFolder } from '@/navigation-menu-item/hooks/useNavigationMenuItemsByFolder';+import { useNavigationMenuItemsByFolder } from '@/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder';export const useDraftNavigationMenuItemsWorkspaceFolders = () => {const { workspaceNavigationMenuItemsByFolder } =diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemMoveRemove.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove.tssimilarity index 94%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemMoveRemove.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove.tsindex 4ea3d470aea..cc3deb3a338 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemMoveRemove.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove.ts@@ -1,11 +1,11 @@import { isDefined } from 'twenty-shared/utils';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { getPositionBetween } from '@/navigation-menu-item/utils/getPositionBetween';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { getPositionBetween } from '@/navigation-menu-item/common/utils/getPositionBetween';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { useWorkspaceSectionItems } from './useWorkspaceSectionItems';+import { useWorkspaceSectionItems } from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';export const useNavigationMenuItemMoveRemove = () => {const setNavigationMenuItemsDraft = useSetAtomState(diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemsDraftState.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState.tssimilarity index 86%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemsDraftState.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState.tsindex e7d5c4cc6aa..cf5cbe70207 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuItemsDraftState.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState.ts@@ -1,10 +1,10 @@import { isDefined } from 'twenty-shared/utils';import { isDeeplyEqual } from '~/utils/isDeeplyEqual';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/utils/filterWorkspaceNavigationMenuItems';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { navigationMenuItemsSelector } from '@/navigation-menu-item/states/navigationMenuItemsSelector';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterWorkspaceNavigationMenuItems';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { navigationMenuItemsSelector } from '@/navigation-menu-item/common/states/navigationMenuItemsSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';export const useNavigationMenuItemsDraftState = () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuObjectMetadataFromDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataFromDraft.tssimilarity index 96%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuObjectMetadataFromDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataFromDraft.tsindex 943b4225256..dd1147d50e7 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useNavigationMenuObjectMetadataFromDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataFromDraft.ts@@ -1,6 +1,6 @@import { isDefined } from 'twenty-shared/utils';-import { getObjectMetadataIdsInDraft } from '@/navigation-menu-item/utils/getObjectMetadataIdsInDraft';+import { getObjectMetadataIdsInDraft } from '@/navigation-menu-item/common/utils/getObjectMetadataIdsInDraft';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { viewsSelector } from '@/views/states/selectors/viewsSelector';import { ViewKey } from '@/views/types/ViewKey';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useOpenAddItemToFolderPage.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage.tssimilarity index 91%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useOpenAddItemToFolderPage.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage.tsindex 6e7aeec1955..6c56f13cf49 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useOpenAddItemToFolderPage.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage.ts@@ -1,5 +1,5 @@-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useLingui } from '@lingui/react/macro';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel.tssimilarity index 93%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel.tsindex 7c98eaea432..63fd6e07573 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel.ts@@ -1,4 +1,4 @@-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { SidePanelPages } from 'twenty-shared/types';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useSaveNavigationMenuItemsDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSaveNavigationMenuItemsDraft.tssimilarity index 94%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useSaveNavigationMenuItemsDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSaveNavigationMenuItemsDraft.tsindex 8135a115527..d427e0d082d 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useSaveNavigationMenuItemsDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSaveNavigationMenuItemsDraft.ts@@ -5,15 +5,15 @@ import { isDefined } from 'twenty-shared/utils';import { useMutation } from '@apollo/client/react';import { CreateNavigationMenuItemDocument } from '~/generated-metadata/graphql';-import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/hooks/useDeleteNavigationMenuItem';-import { useUpdateNavigationMenuItem } from '@/navigation-menu-item/hooks/useUpdateNavigationMenuItem';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { buildCreateNavigationMenuItemInput } from '@/navigation-menu-item/utils/buildCreateNavigationMenuItemInput';-import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/utils/filterWorkspaceNavigationMenuItems';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';-import { isNavigationMenuItemLink } from '@/navigation-menu-item/utils/isNavigationMenuItemLink';-import { orderFoldersForCreation } from '@/navigation-menu-item/utils/orderFoldersForCreation';-import { navigationMenuItemsSelector } from '@/navigation-menu-item/states/navigationMenuItemsSelector';+import { useDeleteNavigationMenuItem } from '@/navigation-menu-item/common/hooks/useDeleteNavigationMenuItem';+import { useUpdateNavigationMenuItem } from '@/navigation-menu-item/common/hooks/useUpdateNavigationMenuItem';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { buildCreateNavigationMenuItemInput } from '@/navigation-menu-item/common/utils/buildCreateNavigationMenuItemInput';+import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterWorkspaceNavigationMenuItems';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';+import { isNavigationMenuItemLink } from '@/navigation-menu-item/common/utils/isNavigationMenuItemLink';+import { orderFoldersForCreation } from '@/navigation-menu-item/common/utils/orderFoldersForCreation';+import { navigationMenuItemsSelector } from '@/navigation-menu-item/common/states/navigationMenuItemsSelector';import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { useStore } from 'jotai';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem.tssimilarity index 84%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem.tsindex ce5ad4a1532..4b0e98c37f4 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItem.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem.ts@@ -1,5 +1,5 @@-import { useWorkspaceSectionItems } from '@/navigation-menu-item/hooks/useWorkspaceSectionItems';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';+import { useWorkspaceSectionItems } from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';export const useSelectedNavigationMenuItemEditItem = () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItemLabel.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemLabel.tssimilarity index 90%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItemLabel.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemLabel.tsindex d70b3bbc9d0..3b839ac611e 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItemLabel.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemLabel.ts@@ -1,9 +1,9 @@import { NavigationMenuItemType } from 'twenty-shared/types';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/utils/getNavigationMenuItemLabel';-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItem';-import { useSelectedNavigationMenuItemEditItemObjectMetadata } from '@/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata';+import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';+import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';+import { useSelectedNavigationMenuItemEditItemObjectMetadata } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { viewsSelector } from '@/views/states/selectors/viewsSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata.tssimilarity index 85%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata.tsindex 77f6fdbb979..4652bdf3d5c 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata.ts@@ -1,5 +1,5 @@-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItem';-import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/utils/getObjectMetadataForNavigationMenuItem';+import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';+import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/display/object/utils/getObjectMetadataForNavigationMenuItem';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { viewsSelector } from '@/views/states/selectors/viewsSelector';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateNavigationMenuItemInDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useUpdateNavigationMenuItemInDraft.tssimilarity index 94%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateNavigationMenuItemInDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useUpdateNavigationMenuItemInDraft.tsindex 993f339b491..4cd8f64ec03 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateNavigationMenuItemInDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useUpdateNavigationMenuItemInDraft.ts@@ -1,4 +1,4 @@-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';export type UpdateNavigationMenuItemInDraftUpdates = {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddLinkToNavigationMenuDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/link/hooks/useAddLinkToNavigationMenuDraft.tssimilarity index 88%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddLinkToNavigationMenuDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/link/hooks/useAddLinkToNavigationMenuDraft.tsindex d9c34bcb344..e835fb9af19 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddLinkToNavigationMenuDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/link/hooks/useAddLinkToNavigationMenuDraft.ts@@ -3,10 +3,10 @@ import { isDefined } from 'twenty-shared/utils';import { v4 } from 'uuid';import type { NavigationMenuItem } from '~/generated-metadata/graphql';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultColorLink';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { computeInsertIndexAndPosition } from '@/navigation-menu-item/utils/computeInsertIndexAndPosition';-import { normalizeUrl } from '@/navigation-menu-item/utils/normalizeUrl';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { computeInsertIndexAndPosition } from '@/navigation-menu-item/common/utils/computeInsertIndexAndPosition';+import { normalizeUrl } from '@/navigation-menu-item/display/link/utils/normalizeUrl';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';export const useAddLinkToNavigationMenuDraft = () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateLinkInDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/link/hooks/useUpdateLinkInDraft.tssimilarity index 91%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateLinkInDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/link/hooks/useUpdateLinkInDraft.tsindex fe078780f5d..ec74934c744 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateLinkInDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/link/hooks/useUpdateLinkInDraft.ts@@ -1,6 +1,6 @@-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { isNavigationMenuItemLink } from '@/navigation-menu-item/utils/isNavigationMenuItemLink';+import { isNavigationMenuItemLink } from '@/navigation-menu-item/common/utils/isNavigationMenuItemLink';export const useUpdateLinkInDraft = () => {const setNavigationMenuItemsDraft = useSetAtomState(diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddObjectToNavigationMenuDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/object/hooks/useAddObjectToNavigationMenuDraft.tssimilarity index 94%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddObjectToNavigationMenuDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/object/hooks/useAddObjectToNavigationMenuDraft.tsindex 2cf3a9e7b5b..cb58f2c665c 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddObjectToNavigationMenuDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/object/hooks/useAddObjectToNavigationMenuDraft.ts@@ -3,8 +3,8 @@ import { isDefined } from 'twenty-shared/utils';import { v4 } from 'uuid';import type { NavigationMenuItem } from '~/generated-metadata/graphql';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { computeInsertIndexAndPosition } from '@/navigation-menu-item/utils/computeInsertIndexAndPosition';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { computeInsertIndexAndPosition } from '@/navigation-menu-item/common/utils/computeInsertIndexAndPosition';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';export const useAddObjectToNavigationMenuDraft = () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddRecordToNavigationMenuDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/record/hooks/useAddRecordToNavigationMenuDraft.tssimilarity index 96%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddRecordToNavigationMenuDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/record/hooks/useAddRecordToNavigationMenuDraft.tsindex 2d8729fa23d..b773acc4354 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddRecordToNavigationMenuDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/record/hooks/useAddRecordToNavigationMenuDraft.ts@@ -3,11 +3,11 @@ import { NavigationMenuItemType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import type { NavigationMenuItem } from '~/generated-metadata/graphql';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { computeInsertIndexAndPosition } from '@/navigation-menu-item/utils/computeInsertIndexAndPosition';+import { computeInsertIndexAndPosition } from '@/navigation-menu-item/common/utils/computeInsertIndexAndPosition';type SearchRecord = {recordId: string;diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditColorOption.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption.tsxsimilarity index 98%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditColorOption.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption.tsxindex 3d969e273ab..f659af88b3b 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditColorOption.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption.tsx@@ -1,5 +1,5 @@import { CommandMenuItemDropdown } from '@/command-menu/components/CommandMenuItemDropdown';-import { useUpdateNavigationMenuItemInDraft } from '@/navigation-menu-item/hooks/useUpdateNavigationMenuItemInDraft';+import { useUpdateNavigationMenuItemInDraft } from '@/navigation-menu-item/edit/hooks/useUpdateNavigationMenuItemInDraft';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditFolderPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsxsimilarity index 90%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditFolderPickerSubPage.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsxindex a07574d905a..531d06e0c64 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditFolderPickerSubPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsx@@ -3,13 +3,13 @@ import { useState } from 'react';import { useIcons } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';-import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/constants/FolderIconDefault';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultColorFolder';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';+import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';-import { useFolderPickerSelectionData } from '@/side-panel/pages/navigation-menu-item/hooks/useFolderPickerSelectionData';+import { useFolderPickerSelectionData } from '@/navigation-menu-item/edit/side-panel/hooks/useFolderPickerSelectionData';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditFolderPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubView.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditFolderPickerSubView.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubView.tsxdiff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditLinkItemView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView.tsxsimilarity index 87%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditLinkItemView.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView.tsxindex 48eb88f3430..99eb96c36bf 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditLinkItemView.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView.tsx@@ -4,15 +4,15 @@ import { useState } from 'react';import { getAbsoluteUrl } from 'twenty-shared/utils';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { extractDomainFromUrl } from '@/navigation-menu-item/utils/extractDomainFromUrl';+import { extractDomainFromUrl } from '@/navigation-menu-item/display/link/utils/extractDomainFromUrl';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';import {type OrganizeActionsProps,SidePanelEditOrganizeActions,-} from '@/side-panel/pages/navigation-menu-item/components/SidePanelEditOrganizeActions';-import { SidePanelEditOwnerSection } from '@/side-panel/pages/navigation-menu-item/components/SidePanelEditOwnerSection';-import { getOrganizeActionsSelectableItemIds } from '@/side-panel/pages/navigation-menu-item/utils/getOrganizeActionsSelectableItemIds';+} from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions';+import { SidePanelEditOwnerSection } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection';+import { getOrganizeActionsSelectableItemIds } from '@/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds';import { TextInput } from '@/ui/input/components/TextInput';type SidePanelEditLinkItemViewProps = OrganizeActionsProps & {diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditObjectViewBase.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase.tsxsimilarity index 81%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditObjectViewBase.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase.tsxindex c66180dd7cd..5c5a43896f1 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditObjectViewBase.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase.tsx@@ -1,17 +1,17 @@-import { useObjectNavItemColor } from '@/navigation-menu-item/hooks/useObjectNavItemColor';-import { navigationMenuItemsSelector } from '@/navigation-menu-item/states/navigationMenuItemsSelector';-import { getEffectiveNavigationMenuItemColor } from '@/navigation-menu-item/utils/getEffectiveNavigationMenuItemColor';-import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/utils/getNavigationMenuItemObjectNameSingular';-import { parseThemeColor } from '@/navigation-menu-item/utils/parseThemeColor';+import { useObjectNavItemColor } from '@/navigation-menu-item/common/hooks/useObjectNavItemColor';+import { navigationMenuItemsSelector } from '@/navigation-menu-item/common/states/navigationMenuItemsSelector';+import { getEffectiveNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getEffectiveNavigationMenuItemColor';+import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';+import { parseThemeColor } from '@/navigation-menu-item/common/utils/parseThemeColor';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { SidePanelEditColorOption } from '@/side-panel/pages/navigation-menu-item/components/SidePanelEditColorOption';+import { SidePanelEditColorOption } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption';import {type OrganizeActionsProps,SidePanelEditOrganizeActions,-} from '@/side-panel/pages/navigation-menu-item/components/SidePanelEditOrganizeActions';-import { getOrganizeActionsSelectableItemIds } from '@/side-panel/pages/navigation-menu-item/utils/getOrganizeActionsSelectableItemIds';+} from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions';+import { getOrganizeActionsSelectableItemIds } from '@/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { viewsSelector } from '@/views/states/selectors/viewsSelector';import { useLingui } from '@lingui/react/macro';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditOrganizeActions.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsxsimilarity index 96%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditOrganizeActions.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsxindex c59a578adea..b2bc85f1055 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditOrganizeActions.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsx@@ -10,7 +10,7 @@ import {import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { SidePanelNavigationItemActions } from '@/side-panel/pages/navigation-menu-item/side-panel-navigation-item-actions';+import { SidePanelNavigationItemActions } from '@/navigation-menu-item/edit/side-panel/constants/side-panel-navigation-item-actions';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';export type OrganizeActionsProps = {diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditOwnerSection.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection.tsxsimilarity index 94%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditOwnerSection.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection.tsxindex 15010de29d8..cf13d9c1241 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelEditOwnerSection.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection.tsx@@ -4,8 +4,8 @@ import { IconApps } from 'twenty-ui/display';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { useDraftNavigationMenuItems } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItems';-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItem';+import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';+import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useQuery } from '@apollo/client/react';import { FindOneApplicationDocument } from '~/generated-metadata/graphql';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNavigationMenuItemEditPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsxsimilarity index 82%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNavigationMenuItemEditPage.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsxindex 3051fb26ffa..e25130574f8 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNavigationMenuItemEditPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsx@@ -1,22 +1,22 @@import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';import { NavigationMenuItemType } from 'twenty-shared/types';-import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/hooks/useNavigationMenuItemsDraftState';-import { useOpenAddItemToFolderPage } from '@/navigation-menu-item/hooks/useOpenAddItemToFolderPage';-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItem';-import { useSelectedNavigationMenuItemEditItemLabel } from '@/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItemLabel';-import { useUpdateLinkInDraft } from '@/navigation-menu-item/hooks/useUpdateLinkInDraft';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';-import { parseThemeColor } from '@/navigation-menu-item/utils/parseThemeColor';+import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState';+import { useOpenAddItemToFolderPage } from '@/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage';+import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';+import { useSelectedNavigationMenuItemEditItemLabel } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemLabel';+import { useUpdateLinkInDraft } from '@/navigation-menu-item/edit/link/hooks/useUpdateLinkInDraft';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';+import { parseThemeColor } from '@/navigation-menu-item/common/utils/parseThemeColor';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';-import { SidePanelEditColorOption } from '@/side-panel/pages/navigation-menu-item/components/SidePanelEditColorOption';-import { SidePanelEditLinkItemView } from '@/side-panel/pages/navigation-menu-item/components/SidePanelEditLinkItemView';-import { SidePanelEditObjectViewBase } from '@/side-panel/pages/navigation-menu-item/components/SidePanelEditObjectViewBase';-import { SidePanelEditOrganizeActions } from '@/side-panel/pages/navigation-menu-item/components/SidePanelEditOrganizeActions';-import { SidePanelEditOwnerSection } from '@/side-panel/pages/navigation-menu-item/components/SidePanelEditOwnerSection';-import { useNavigationMenuItemEditOrganizeActions } from '@/side-panel/pages/navigation-menu-item/hooks/useNavigationMenuItemEditOrganizeActions';-import { getOrganizeActionsSelectableItemIds } from '@/side-panel/pages/navigation-menu-item/utils/getOrganizeActionsSelectableItemIds';+import { SidePanelEditColorOption } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption';+import { SidePanelEditLinkItemView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView';+import { SidePanelEditObjectViewBase } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase';+import { SidePanelEditOrganizeActions } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions';+import { SidePanelEditOwnerSection } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection';+import { useNavigationMenuItemEditOrganizeActions } from '@/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions';+import { getOrganizeActionsSelectableItemIds } from '@/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds';import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemMainMenu.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsxsimilarity index 94%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemMainMenu.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsxindex 082881d77a4..1526abb82dc 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemMainMenu.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsx@@ -10,15 +10,15 @@ import {import { themeCssVariables } from 'twenty-ui/theme-constants';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';import { NavigationMenuItemType } from 'twenty-shared/types';-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelItemWithAddToNavigationDrag } from '@/side-panel/components/SidePanelItemWithAddToNavigationDrag';import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { useAddFolderToNavigationMenu } from '@/side-panel/pages/navigation-menu-item/hooks/useAddFolderToNavigationMenu';-import { useAddLinkToNavigationMenu } from '@/side-panel/pages/navigation-menu-item/hooks/useAddLinkToNavigationMenu';+import { useAddFolderToNavigationMenu } from '@/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu';+import { useAddLinkToNavigationMenu } from '@/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemObjectSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage.tsxsimilarity index 85%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemObjectSubPage.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage.tsxindex e384308e84b..e3691475890 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemObjectSubPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage.tsx@@ -1,17 +1,17 @@import { useState } from 'react';-import { useAddObjectToNavigationMenuDraft } from '@/navigation-menu-item/hooks/useAddObjectToNavigationMenuDraft';-import { useDraftNavigationMenuItems } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItems';-import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/hooks/useNavigationMenuObjectMetadataFromDraft';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel';-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';-import { getStandardObjectIconColor } from '@/navigation-menu-item/utils/getStandardObjectIconColor';+import { useAddObjectToNavigationMenuDraft } from '@/navigation-menu-item/edit/object/hooks/useAddObjectToNavigationMenuDraft';+import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';+import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataFromDraft';+import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';+import { getStandardObjectIconColor } from '@/navigation-menu-item/common/utils/getStandardObjectIconColor';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';-import { SidePanelObjectPickerSubView } from '@/side-panel/pages/navigation-menu-item/components/SidePanelObjectPickerSubView';-import { getAvailableObjectMetadataForNewSidebarItem } from '@/side-panel/pages/navigation-menu-item/utils/getAvailableObjectMetadataForNewSidebarItem';+import { SidePanelObjectPickerSubView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView';+import { getAvailableObjectMetadataForNewSidebarItem } from '@/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem';import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsxsimilarity index 84%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsxindex 791d068f1e3..bc78ed6cea9 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsx@@ -1,16 +1,16 @@import { useLingui } from '@lingui/react/macro';-import { useAddObjectToNavigationMenuDraft } from '@/navigation-menu-item/hooks/useAddObjectToNavigationMenuDraft';-import { useDraftNavigationMenuItems } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItems';-import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/hooks/useNavigationMenuObjectMetadataFromDraft';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel';-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';-import { getStandardObjectIconColor } from '@/navigation-menu-item/utils/getStandardObjectIconColor';+import { useAddObjectToNavigationMenuDraft } from '@/navigation-menu-item/edit/object/hooks/useAddObjectToNavigationMenuDraft';+import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';+import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataFromDraft';+import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';+import { getStandardObjectIconColor } from '@/navigation-menu-item/common/utils/getStandardObjectIconColor';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';-import { SidePanelSystemObjectPickerSubView } from '@/side-panel/pages/navigation-menu-item/components/SidePanelSystemObjectPickerSubView';-import { getAvailableObjectMetadataForNewSidebarItem } from '@/side-panel/pages/navigation-menu-item/utils/getAvailableObjectMetadataForNewSidebarItem';+import { SidePanelSystemObjectPickerSubView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelSystemObjectPickerSubView';+import { getAvailableObjectMetadataForNewSidebarItem } from '@/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { ViewKey } from '@/views/types/ViewKey';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemPage.tsxsimilarity index 84%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemPage.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemPage.tsxindex 3088c37424f..affae8cfee3 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemPage.tsx@@ -1,5 +1,5 @@import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';-import { SidePanelNewSidebarItemMainMenu } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemMainMenu';+import { SidePanelNewSidebarItemMainMenu } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu';import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';export const SidePanelNewSidebarItemPage = () => {diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemRecordItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem.tsxsimilarity index 92%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemRecordItem.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem.tsxindex 224d742a0e2..04bb91bd7c2 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemRecordItem.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem.tsx@@ -1,10 +1,10 @@import { Avatar, IconFolder, useIcons } from 'twenty-ui/display';-import { useAddRecordToNavigationMenuDraft } from '@/navigation-menu-item/hooks/useAddRecordToNavigationMenuDraft';-import { useDraftNavigationMenuItems } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItems';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel';-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';-import type { AddToNavigationDragPayload } from '@/navigation-menu-item/types/add-to-navigation-drag-payload';+import { useAddRecordToNavigationMenuDraft } from '@/navigation-menu-item/edit/record/hooks/useAddRecordToNavigationMenuDraft';+import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';+import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';+import type { AddToNavigationDragPayload } from '@/navigation-menu-item/common/types/add-to-navigation-drag-payload';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { SidePanelItemWithAddToNavigationDrag } from '@/side-panel/components/SidePanelItemWithAddToNavigationDrag';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemRecordSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage.tsxsimilarity index 95%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemRecordSubPage.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage.tsxindex dbf90e66e4c..dafa740af86 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemRecordSubPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage.tsx@@ -4,8 +4,8 @@ import { isDefined } from 'twenty-shared/utils';import { useDebounce } from 'use-debounce';import { MAX_SEARCH_RESULTS } from '@/command-menu/constants/MaxSearchResults';-import { useDraftNavigationMenuItems } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItems';-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';+import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';@@ -14,7 +14,7 @@ import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePimport { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';-import { SidePanelNewSidebarItemRecordItem } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemRecordItem';+import { SidePanelNewSidebarItemRecordItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useQuery } from '@apollo/client/react';import { SearchDocument } from '~/generated/graphql';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewObjectPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubPage.tsxsimilarity index 88%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewObjectPickerSubPage.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubPage.tsxindex 1598b836a8d..9925baa53e2 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewObjectPickerSubPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubPage.tsx@@ -1,11 +1,11 @@-import { useDraftNavigationMenuItems } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItems';-import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/hooks/useNavigationMenuObjectMetadataFromDraft';+import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';+import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataFromDraft';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';-import { SidePanelNewSidebarItemViewObjectPickerSubView } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewObjectPickerSubView';-import { getAvailableObjectMetadataForNewSidebarItem } from '@/side-panel/pages/navigation-menu-item/utils/getAvailableObjectMetadataForNewSidebarItem';+import { SidePanelNewSidebarItemViewObjectPickerSubView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView';+import { getAvailableObjectMetadataForNewSidebarItem } from '@/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem';import { selectedObjectMetadataIdForViewFlowState } from '@/side-panel/states/selectedObjectMetadataIdForViewFlowState';import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsxsimilarity index 97%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsxindex a336fd07bb8..47d27309825 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx@@ -2,8 +2,8 @@ import { useLingui } from '@lingui/react/macro';import { IconSettings, useIcons } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';-import { getStandardObjectIconColor } from '@/navigation-menu-item/utils/getStandardObjectIconColor';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';+import { getStandardObjectIconColor } from '@/navigation-menu-item/common/utils/getStandardObjectIconColor';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubPage.tsxsimilarity index 82%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewPickerSubPage.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubPage.tsxindex 23506c43fcf..186700b3d04 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewPickerSubPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubPage.tsx@@ -1,4 +1,4 @@-import { SidePanelNewSidebarItemViewPickerSubView } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewPickerSubView';+import { SidePanelNewSidebarItemViewPickerSubView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView';import { selectedObjectMetadataIdForViewFlowState } from '@/side-panel/states/selectedObjectMetadataIdForViewFlowState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { isDefined } from 'twenty-shared/utils';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView.tsxsimilarity index 94%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewPickerSubView.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView.tsxindex a7f4b82158c..10ba48bc4fe 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewPickerSubView.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView.tsx@@ -1,11 +1,11 @@-import { ObjectIconWithViewOverlay } from '@/navigation-menu-item/components/ObjectIconWithViewOverlay';+import { ObjectIconWithViewOverlay } from '@/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay';import { NavigationMenuItemType } from 'twenty-shared/types';-import { useAddViewToNavigationMenuDraft } from '@/navigation-menu-item/hooks/useAddViewToNavigationMenuDraft';-import { useDraftNavigationMenuItems } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItems';-import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/hooks/useNavigationMenuObjectMetadataFromDraft';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel';-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';-import { getStandardObjectIconColor } from '@/navigation-menu-item/utils/getStandardObjectIconColor';+import { useAddViewToNavigationMenuDraft } from '@/navigation-menu-item/edit/view/hooks/useAddViewToNavigationMenuDraft';+import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';+import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataFromDraft';+import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';+import { getStandardObjectIconColor } from '@/navigation-menu-item/common/utils/getStandardObjectIconColor';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewSystemPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemPickerSubPage.tsxsimilarity index 86%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewSystemPickerSubPage.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemPickerSubPage.tsxindex 2037d0d9212..ef2c9bdbdc5 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewSystemPickerSubPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemPickerSubPage.tsx@@ -1,11 +1,11 @@-import { useDraftNavigationMenuItems } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItems';-import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/hooks/useNavigationMenuObjectMetadataFromDraft';+import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';+import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataFromDraft';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';-import { SidePanelNewSidebarItemViewSystemSubView } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewSystemSubView';-import { getAvailableObjectMetadataForNewSidebarItem } from '@/side-panel/pages/navigation-menu-item/utils/getAvailableObjectMetadataForNewSidebarItem';+import { SidePanelNewSidebarItemViewSystemSubView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView';+import { getAvailableObjectMetadataForNewSidebarItem } from '@/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem';import { selectedObjectMetadataIdForViewFlowState } from '@/side-panel/states/selectedObjectMetadataIdForViewFlowState';import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewSystemSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView.tsxsimilarity index 96%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewSystemSubView.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView.tsxindex 3536a4c613e..083858f065f 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewSystemSubView.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView.tsx@@ -2,8 +2,8 @@ import { useLingui } from '@lingui/react/macro';import { useIcons } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';-import { getStandardObjectIconColor } from '@/navigation-menu-item/utils/getStandardObjectIconColor';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';+import { getStandardObjectIconColor } from '@/navigation-menu-item/common/utils/getStandardObjectIconColor';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelObjectMenuItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem.tsxsimilarity index 93%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelObjectMenuItem.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem.tsxindex 4ecc3b6f683..1a8b2d5cf1f 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelObjectMenuItem.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem.tsx@@ -3,11 +3,11 @@ import { isDefined } from 'twenty-shared/utils';import { useIcons } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';import { NavigationMenuItemType } from 'twenty-shared/types';-import { useDraftNavigationMenuItems } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItems';-import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/hooks/useNavigationMenuObjectMetadataFromDraft';-import { getStandardObjectIconColor } from '@/navigation-menu-item/utils/getStandardObjectIconColor';+import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';+import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataFromDraft';+import { getStandardObjectIconColor } from '@/navigation-menu-item/common/utils/getStandardObjectIconColor';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { SidePanelItemWithAddToNavigationDrag } from '@/side-panel/components/SidePanelItemWithAddToNavigationDrag';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelObjectPickerItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem.tsxsimilarity index 90%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelObjectPickerItem.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem.tsxindex 70b42f88b55..36a33eea84a 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelObjectPickerItem.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem.tsx@@ -2,10 +2,10 @@ import { isDefined } from 'twenty-shared/utils';import { useIcons } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';-import { getStandardObjectIconColor } from '@/navigation-menu-item/utils/getStandardObjectIconColor';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';+import { getStandardObjectIconColor } from '@/navigation-menu-item/common/utils/getStandardObjectIconColor';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';-import { SidePanelObjectMenuItem } from '@/side-panel/pages/navigation-menu-item/components/SidePanelObjectMenuItem';+import { SidePanelObjectMenuItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';type SidePanelObjectPickerItemProps = {diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelObjectPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsxsimilarity index 95%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelObjectPickerSubView.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsxindex 5fd8069fa84..4743c151bbe 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelObjectPickerSubView.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsx@@ -2,14 +2,14 @@ import { useLingui } from '@lingui/react/macro';import { IconSettings } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';import { useSidePanelFilteredPickerItems } from '@/side-panel/hooks/useSidePanelFilteredPickerItems';-import { SidePanelObjectPickerItem } from '@/side-panel/pages/navigation-menu-item/components/SidePanelObjectPickerItem';+import { SidePanelObjectPickerItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';type SidePanelObjectPickerSubViewProps = {diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelSystemObjectPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelSystemObjectPickerSubView.tsxsimilarity index 96%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelSystemObjectPickerSubView.tsxrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelSystemObjectPickerSubView.tsxindex f081b1c6da6..35bac348938 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/components/SidePanelSystemObjectPickerSubView.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelSystemObjectPickerSubView.tsx@@ -6,7 +6,7 @@ import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';import { useSidePanelFilteredPickerItems } from '@/side-panel/hooks/useSidePanelFilteredPickerItems';-import { SidePanelObjectPickerItem } from '@/side-panel/pages/navigation-menu-item/components/SidePanelObjectPickerItem';+import { SidePanelObjectPickerItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem';type SidePanelSystemObjectPickerSubViewProps = {systemObjects: ObjectMetadataItem[];diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/side-panel-navigation-item-actions.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/constants/side-panel-navigation-item-actions.tssimilarity index 100%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/side-panel-navigation-item-actions.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/constants/side-panel-navigation-item-actions.tsdiff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useAddFolderToNavigationMenu.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu.tssimilarity index 86%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useAddFolderToNavigationMenu.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu.tsindex 58f758615cd..977f3c8c445 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useAddFolderToNavigationMenu.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu.ts@@ -2,11 +2,11 @@ import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import { IconFolder } from 'twenty-ui/display';-import { useAddFolderToNavigationMenuDraft } from '@/navigation-menu-item/hooks/useAddFolderToNavigationMenuDraft';-import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/hooks/useNavigationMenuItemsDraftState';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel';-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';+import { useAddFolderToNavigationMenuDraft } from '@/navigation-menu-item/edit/folder/hooks/useAddFolderToNavigationMenuDraft';+import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState';+import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useAddLinkToNavigationMenu.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu.tssimilarity index 87%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useAddLinkToNavigationMenu.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu.tsindex 48f0e51b40d..e21615e1761 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useAddLinkToNavigationMenu.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu.ts@@ -2,11 +2,11 @@ import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import { IconLink } from 'twenty-ui/display';-import { useAddLinkToNavigationMenuDraft } from '@/navigation-menu-item/hooks/useAddLinkToNavigationMenuDraft';-import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/hooks/useNavigationMenuItemsDraftState';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel';-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';+import { useAddLinkToNavigationMenuDraft } from '@/navigation-menu-item/edit/link/hooks/useAddLinkToNavigationMenuDraft';+import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState';+import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useFolderPickerSelectionData.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useFolderPickerSelectionData.tssimilarity index 90%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useFolderPickerSelectionData.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useFolderPickerSelectionData.tsindex 6a70b68232f..bda847ed7d4 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useFolderPickerSelectionData.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useFolderPickerSelectionData.ts@@ -1,11 +1,11 @@import { isDefined } from 'twenty-shared/utils';import { NavigationMenuItemType } from 'twenty-shared/types';-import { useDraftNavigationMenuItemsAllFolders } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItemsAllFolders';-import { useDraftNavigationMenuItemsWorkspaceFolders } from '@/navigation-menu-item/hooks/useDraftNavigationMenuItemsWorkspaceFolders';-import { useNavigationMenuItemMoveRemove } from '@/navigation-menu-item/hooks/useNavigationMenuItemMoveRemove';-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItem';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';+import { useDraftNavigationMenuItemsAllFolders } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItemsAllFolders';+import { useDraftNavigationMenuItemsWorkspaceFolders } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItemsWorkspaceFolders';+import { useNavigationMenuItemMoveRemove } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove';+import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useNavigationMenuItemEditOrganizeActions.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.tssimilarity index 91%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useNavigationMenuItemEditOrganizeActions.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.tsindex 31fb1dce9c7..bdd02111e5a 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/hooks/useNavigationMenuItemEditOrganizeActions.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.ts@@ -4,13 +4,13 @@ import { IconColumnInsertRight } from 'twenty-ui/display';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';-import { type OrganizeActionsProps } from '@/side-panel/pages/navigation-menu-item/components/SidePanelEditOrganizeActions';-import { useNavigationMenuItemMoveRemove } from '@/navigation-menu-item/hooks/useNavigationMenuItemMoveRemove';-import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/hooks/useNavigationMenuItemsDraftState';-import { useWorkspaceSectionItems } from '@/navigation-menu-item/hooks/useWorkspaceSectionItems';-import { addMenuItemInsertionContextState } from '@/navigation-menu-item/states/addMenuItemInsertionContextState';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';-import { type AddMenuItemInsertionContext } from '@/navigation-menu-item/types/AddMenuItemInsertionContext';+import { type OrganizeActionsProps } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions';+import { useNavigationMenuItemMoveRemove } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove';+import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState';+import { useWorkspaceSectionItems } from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';+import { addMenuItemInsertionContextState } from '@/navigation-menu-item/common/states/addMenuItemInsertionContextState';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';+import { type AddMenuItemInsertionContext } from '@/navigation-menu-item/common/types/AddMenuItemInsertionContext';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { SidePanelPages } from 'twenty-shared/types';diff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/utils/getAvailableObjectMetadataForNewSidebarItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem.tssimilarity index 100%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/utils/getAvailableObjectMetadataForNewSidebarItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem.tsdiff --git a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/utils/getOrganizeActionsSelectableItemIds.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds.tssimilarity index 87%rename from packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/utils/getOrganizeActionsSelectableItemIds.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds.tsindex fa088f4f2a4..073889d7ab5 100644--- a/packages/twenty-front/src/modules/side-panel/pages/navigation-menu-item/utils/getOrganizeActionsSelectableItemIds.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds.ts@@ -1,4 +1,4 @@-import { SidePanelNavigationItemActions } from '@/side-panel/pages/navigation-menu-item/side-panel-navigation-item-actions';+import { SidePanelNavigationItemActions } from '@/navigation-menu-item/edit/side-panel/constants/side-panel-navigation-item-actions';const ORGANIZE_ACTIONS_WITHOUT_MOVE_TO_FOLDER: SidePanelNavigationItemActions[] =[diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddViewToNavigationMenuDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/view/hooks/useAddViewToNavigationMenuDraft.tssimilarity index 94%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddViewToNavigationMenuDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/view/hooks/useAddViewToNavigationMenuDraft.tsindex 85d58ec7d40..bbd3fdfdcd4 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useAddViewToNavigationMenuDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/view/hooks/useAddViewToNavigationMenuDraft.ts@@ -3,8 +3,8 @@ import { isDefined } from 'twenty-shared/utils';import { v4 } from 'uuid';import type { NavigationMenuItem } from '~/generated-metadata/graphql';-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';-import { computeInsertIndexAndPosition } from '@/navigation-menu-item/utils/computeInsertIndexAndPosition';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { computeInsertIndexAndPosition } from '@/navigation-menu-item/common/utils/computeInsertIndexAndPosition';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';export const useAddViewToNavigationMenuDraft = () => {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateViewInDraft.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/view/hooks/useUpdateViewInDraft.tssimilarity index 93%rename from packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateViewInDraft.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/view/hooks/useUpdateViewInDraft.tsindex afd5f676529..18ca0ede8a6 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/hooks/useUpdateViewInDraft.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/view/hooks/useUpdateViewInDraft.ts@@ -1,4 +1,4 @@-import { navigationMenuItemsDraftState } from '@/navigation-menu-item/states/navigationMenuItemsDraftState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { type View } from '@/views/types/View';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemIconBorderColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemIconBorderColor.tsdeleted file mode 100644index 4a982680c5a..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemIconBorderColor.ts+++ /dev/null@@ -1,8 +0,0 @@-import type { ThemeColor } from 'twenty-ui/theme';--import { getColorFromTheme } from '@/navigation-menu-item/utils/getColorFromTheme';-import { COLOR_SHADE_BORDER } from '@/navigation-menu-item/utils/navigationMenuItemIconColorShadeBorder';--export const getNavigationMenuItemIconBorderColor = (- themeColor: ThemeColor,-): string => getColorFromTheme(themeColor, COLOR_SHADE_BORDER);diff --git a/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemIconStyleFromColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemIconStyleFromColor.tsdeleted file mode 100644index 0ad0ea5624b..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/utils/getNavigationMenuItemIconStyleFromColor.ts+++ /dev/null@@ -1,18 +0,0 @@-import { DEFAULT_NAV_ITEM_ICON_COLOR } from '@/navigation-menu-item/constants/NavigationMenuItemDefaultIconColor.constant';-import { getColorFromTheme } from '@/navigation-menu-item/utils/getColorFromTheme';-import { COLOR_SHADE_BACKGROUND } from '@/navigation-menu-item/utils/navigationMenuItemIconColorShadeBackground';-import { COLOR_SHADE_BORDER } from '@/navigation-menu-item/utils/navigationMenuItemIconColorShadeBorder';-import { COLOR_SHADE_ICON } from '@/navigation-menu-item/utils/navigationMenuItemIconColorShadeIcon';-import { type NavigationMenuItemIconStyle } from '@/navigation-menu-item/utils/navigationMenuItemIconStyle';-import { parseThemeColor } from '@/navigation-menu-item/utils/parseThemeColor';--export const getNavigationMenuItemIconStyleFromColor = (- color: string | null | undefined,-): NavigationMenuItemIconStyle => {- const themeColor = parseThemeColor(color ?? DEFAULT_NAV_ITEM_ICON_COLOR);- return {- backgroundColor: getColorFromTheme(themeColor, COLOR_SHADE_BACKGROUND),- iconColor: getColorFromTheme(themeColor, COLOR_SHADE_ICON),- borderColor: getColorFromTheme(themeColor, COLOR_SHADE_BORDER),- };-};diff --git a/packages/twenty-front/src/modules/navigation/components/FavoritesDndKitProvider.tsx b/packages/twenty-front/src/modules/navigation/components/FavoritesDndKitProvider.tsxnew file mode 100644index 00000000000..86a1f6ceb05--- /dev/null+++ b/packages/twenty-front/src/modules/navigation/components/FavoritesDndKitProvider.tsx@@ -0,0 +1,50 @@+import { PointerActivationConstraints } from '@dnd-kit/dom';+import {+ DragDropProvider,+ KeyboardSensor,+ PointerSensor,+} from '@dnd-kit/react';+import type { ReactNode } from 'react';++import { NavigationDragSourceContext } from '@/navigation-menu-item/common/contexts/NavigationDragSourceContext';+import { NavigationDropTargetContext } from '@/navigation-menu-item/common/contexts/NavigationDropTargetContext';+import { NavigationMenuItemDragContext } from '@/navigation-menu-item/common/contexts/NavigationMenuItemDragContext';+import type { DraggableData } from '@/navigation/types/workspaceDndKitDraggableData';++import { useFavoritesDndKit } from '@/navigation/hooks/useFavoritesDndKit';++const FAVORITES_DND_SENSORS = [+ PointerSensor.configure({+ activationConstraints: [+ new PointerActivationConstraints.Distance({ value: 8 }),+ ],+ }),+ KeyboardSensor,+];++type FavoritesDndKitProviderProps = {+ children: ReactNode;+};++export const FavoritesDndKitProvider = ({+ children,+}: FavoritesDndKitProviderProps) => {+ const { contextValues, handlers } = useFavoritesDndKit();++ return (+ <NavigationDragSourceContext.Provider value={contextValues.dragSource}>+ <NavigationMenuItemDragContext.Provider value={contextValues.drag}>+ <NavigationDropTargetContext.Provider value={contextValues.dropTarget}>+ <DragDropProvider<DraggableData>+ sensors={FAVORITES_DND_SENSORS}+ onDragStart={handlers.onDragStart}+ onDragOver={handlers.onDragOver}+ onDragEnd={handlers.onDragEnd}+ >+ {children}+ </DragDropProvider>+ </NavigationDropTargetContext.Provider>+ </NavigationMenuItemDragContext.Provider>+ </NavigationDragSourceContext.Provider>+ );+};diff --git a/packages/twenty-front/src/modules/navigation/components/FavoritesDragDropProviderContent.tsx b/packages/twenty-front/src/modules/navigation/components/FavoritesDragDropProviderContent.tsxdeleted file mode 100644index a1ccdc61ade..00000000000--- a/packages/twenty-front/src/modules/navigation/components/FavoritesDragDropProviderContent.tsx+++ /dev/null@@ -1,167 +0,0 @@-import {- DragDropContext,- type DragStart,- type DropResult,- type OnDragUpdateResponder,- type ResponderProvided,-} from '@hello-pangea/dnd';-import { useState, type ReactNode } from 'react';--import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/constants/AddToNavSourceDroppableId';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';-import { NavigationDragSourceContext } from '@/navigation-menu-item/contexts/NavigationDragSourceContext';-import { NavigationDropTargetContext } from '@/navigation-menu-item/contexts/NavigationDropTargetContext';-import { NavigationMenuItemDragContext } from '@/navigation-menu-item/contexts/NavigationMenuItemDragContext';-import { useHandleAddToNavigationDrop } from '@/navigation-menu-item/hooks/useHandleAddToNavigationDrop';-import { useHandleNavigationMenuItemDragAndDrop } from '@/navigation-menu-item/hooks/useHandleNavigationMenuItemDragAndDrop';-import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/hooks/useNavigationMenuItemsDraftState';-import { addToNavPayloadRegistryState } from '@/navigation-menu-item/states/addToNavPayloadRegistryState';-import { getDropTargetIdFromDestination } from '@/navigation-menu-item/utils/getDropTargetIdFromDestination';-import { getFavoritesDropTargetIdFromDestination } from '@/navigation-menu-item/utils/getFavoritesDropTargetIdFromDestination';-import { isWorkspaceDroppableId } from '@/navigation-menu-item/utils/isWorkspaceDroppableId';-import { validateAndExtractWorkspaceFolderId } from '@/navigation-menu-item/utils/validateAndExtractWorkspaceFolderId';-import { useStore } from 'jotai';-import { isDefined } from 'twenty-shared/utils';--type FavoritesDragDropProviderContentProps = {- children: ReactNode;-};--export const FavoritesDragDropProviderContent = ({- children,-}: FavoritesDragDropProviderContentProps) => {- const [isDragging, setIsDragging] = useState(false);- const [sourceDroppableId, setSourceDroppableId] = useState<string | null>(- null,- );- const [activeDropTargetId, setActiveDropTargetId] = useState<string | null>(- null,- );- const [forbiddenDropTargetId, setForbiddenDropTargetId] = useState<- string | null- >(null);- const [- addToNavigationFallbackDestination,- setAddToNavigationFallbackDestination,- ] = useState<{ droppableId: string; index: number } | null>(null);-- const store = useStore();- const { workspaceNavigationMenuItems } = useNavigationMenuItemsDraftState();- const { handleAddToNavigationDrop } = useHandleAddToNavigationDrop();- const { handleNavigationMenuItemDragAndDrop } =- useHandleNavigationMenuItemDragAndDrop();-- const isNavigationMenuItemDroppableId = (droppableId: string) =>- droppableId ===- NavigationMenuItemDroppableIds.ORPHAN_NAVIGATION_MENU_ITEMS ||- droppableId.startsWith('folder-');-- const orphanItemCount = workspaceNavigationMenuItems.filter(- (item: { folderId?: string | null }) => !isDefined(item.folderId),- ).length;-- const handleDragStart = (dragStart: DragStart) => {- setIsDragging(true);- setSourceDroppableId(dragStart.source.droppableId);- if (dragStart.source.droppableId === ADD_TO_NAV_SOURCE_DROPPABLE_ID) {- const defaultDestination = {- droppableId:- NavigationMenuItemDroppableIds.WORKSPACE_ORPHAN_NAVIGATION_MENU_ITEMS,- index: orphanItemCount,- };- setAddToNavigationFallbackDestination(defaultDestination);- setActiveDropTargetId(getDropTargetIdFromDestination(defaultDestination));- }- };-- const handleDragUpdate = (update: Parameters<OnDragUpdateResponder>[0]) => {- const { source, destination } = update;-- if (source.droppableId === ADD_TO_NAV_SOURCE_DROPPABLE_ID) {- if (- destination !== null &&- isWorkspaceDroppableId(destination.droppableId)- ) {- setAddToNavigationFallbackDestination(destination);- const dropTargetId = getDropTargetIdFromDestination(destination);- setActiveDropTargetId(dropTargetId);-- const payload =- store- .get(addToNavPayloadRegistryState.atom)- .get(update.draggableId) ?? null;- const folderId = validateAndExtractWorkspaceFolderId(- destination.droppableId,- );- const isFolderOverFolder =- payload?.type === 'FOLDER' && folderId !== null;- setForbiddenDropTargetId(isFolderOverFolder ? dropTargetId : null);- } else {- setForbiddenDropTargetId(null);- const fallback = addToNavigationFallbackDestination;- setActiveDropTargetId(- fallback ? getDropTargetIdFromDestination(fallback) : null,- );- }- return;- }-- if (isNavigationMenuItemDroppableId(source.droppableId)) {- if (isDefined(destination)) {- const dropTargetId =- getFavoritesDropTargetIdFromDestination(destination);- setActiveDropTargetId(dropTargetId);- } else {- setActiveDropTargetId(null);- }- }- };-- const handleDragEnd = (result: DropResult, provided: ResponderProvided) => {- const isAddToNavigationSource =- result.source.droppableId === ADD_TO_NAV_SOURCE_DROPPABLE_ID;- const effectiveResult: DropResult =- isAddToNavigationSource &&- !result.destination &&- addToNavigationFallbackDestination- ? { ...result, destination: addToNavigationFallbackDestination }- : result;-- setIsDragging(false);- setSourceDroppableId(null);- setActiveDropTargetId(null);- setForbiddenDropTargetId(null);- setAddToNavigationFallbackDestination(null);-- if (isAddToNavigationSource) {- handleAddToNavigationDrop(effectiveResult, provided);- return;- }-- handleNavigationMenuItemDragAndDrop(result, provided);- };-- return (- <NavigationDragSourceContext.Provider value={{ sourceDroppableId }}>- <NavigationMenuItemDragContext.Provider value={{ isDragging }}>- <NavigationDropTargetContext.Provider- value={{- activeDropTargetId,- setActiveDropTargetId,- forbiddenDropTargetId,- setForbiddenDropTargetId,- addToNavigationFallbackDestination,- }}- >- <DragDropContext- onDragStart={handleDragStart}- onDragUpdate={handleDragUpdate}- onDragEnd={handleDragEnd}- >- {children}- </DragDropContext>- </NavigationDropTargetContext.Provider>- </NavigationMenuItemDragContext.Provider>- </NavigationDragSourceContext.Provider>- );-};diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerNavigationContent.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerNavigationContent.tsxindex 2721b25f734..f0dc6890449 100644--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerNavigationContent.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerNavigationContent.tsx@@ -1,9 +1,9 @@import { styled } from '@linaria/react';-import { NavigationMenuItemFolderContentDispatcherEffect } from '@/navigation-menu-item/components/NavigationMenuItemFolderContentDispatcher';-import { useNavigationMenuItemsByFolder } from '@/navigation-menu-item/hooks/useNavigationMenuItemsByFolder';+import { NavigationMenuItemFolderContentDispatcherEffect } from '@/navigation-menu-item/edit/components/NavigationMenuItemFolderContentDispatcher';+import { useNavigationMenuItemsByFolder } from '@/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder';import { MainNavigationDrawerScrollableItems } from '@/navigation/components/MainNavigationDrawerScrollableItems';-import { currentNavigationMenuItemFolderIdState } from '@/ui/navigation/navigation-drawer/states/currentNavigationMenuItemFolderIdState';+import { currentNavigationMenuItemFolderIdState } from '@/navigation-menu-item/common/states/currentNavigationMenuItemFolderIdState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';const StyledScrollableContent = styled.div`diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerScrollableItems.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerScrollableItems.tsxindex 2a67bc5097a..411957be085 100644--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerScrollableItems.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerScrollableItems.tsx@@ -1,4 +1,4 @@-import { NavigationDrawerOpenedSection } from '@/object-metadata/components/NavigationDrawerOpenedSection';+import { NavigationDrawerOpenedSection } from '@/navigation-menu-item/display/sections/components/NavigationDrawerOpenedSection';import { NavigationDrawerWorkspaceSectionSkeletonLoader } from '@/object-metadata/components/NavigationDrawerWorkspaceSectionSkeletonLoader';import { RemoteNavigationDrawerSection } from '@/object-metadata/components/RemoteNavigationDrawerSection';@@ -8,17 +8,17 @@ import { lazy, Suspense } from 'react';import { themeCssVariables } from 'twenty-ui/theme-constants';-const CurrentWorkspaceMemberNavigationMenuItemFoldersDispatcher = lazy(() =>+const FavoritesSectionDispatcher = lazy(() =>import(- '@/navigation-menu-item/components/CurrentWorkspaceMemberNavigationMenuItemFoldersDispatcher'+ '@/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher').then((module) => ({- default: module.CurrentWorkspaceMemberNavigationMenuItemFoldersDispatcher,+ default: module.FavoritesSectionDispatcher,})),);const WorkspaceNavigationMenuItemsDispatcher = lazy(() =>import(- '@/navigation-menu-item/components/WorkspaceNavigationMenuItemsDispatcher'+ '@/navigation-menu-item/display/sections/workspace/components/WorkspaceNavigationMenuItemsDispatcher').then((module) => ({default: module.WorkspaceNavigationMenuItemsDispatcher,})),@@ -35,7 +35,7 @@ export const MainNavigationDrawerScrollableItems = () => {<StyledScrollableItemsContainer><NavigationDrawerOpenedSection /><Suspense fallback={<NavigationDrawerWorkspaceSectionSkeletonLoader />}>- <CurrentWorkspaceMemberNavigationMenuItemFoldersDispatcher />+ <FavoritesSectionDispatcher /><WorkspaceNavigationMenuItemsDispatcher /></Suspense><RemoteNavigationDrawerSection />diff --git a/packages/twenty-front/src/modules/navigation/components/NavbarDragProvider.tsx b/packages/twenty-front/src/modules/navigation/components/NavbarDragProvider.tsxdeleted file mode 100644index e3b00161aeb..00000000000--- a/packages/twenty-front/src/modules/navigation/components/NavbarDragProvider.tsx+++ /dev/null@@ -1,59 +0,0 @@-import {- DragDropContext,- type DragStart,- type DropResult,- type ResponderProvided,-} from '@hello-pangea/dnd';-import { type ReactNode, useState } from 'react';--import { NavigationDragSourceContext } from '@/navigation-menu-item/contexts/NavigationDragSourceContext';-import { NavigationMenuItemDragContext } from '@/navigation-menu-item/contexts/NavigationMenuItemDragContext';-import { useHandleNavigationMenuItemDragAndDrop } from '@/navigation-menu-item/hooks/useHandleNavigationMenuItemDragAndDrop';-import { useHandleWorkspaceNavigationMenuItemDragAndDrop } from '@/navigation-menu-item/hooks/useHandleWorkspaceNavigationMenuItemDragAndDrop';--type NavbarDragProviderProps = {- children: ReactNode;-};--export const NavbarDragProvider = ({ children }: NavbarDragProviderProps) => {- const [isDragging, setIsDragging] = useState(false);- const [sourceDroppableId, setSourceDroppableId] = useState<string | null>(- null,- );- const { handleNavigationMenuItemDragAndDrop } =- useHandleNavigationMenuItemDragAndDrop();- const { handleWorkspaceNavigationMenuItemDragAndDrop } =- useHandleWorkspaceNavigationMenuItemDragAndDrop();-- const handleDragStart = (dragStart: DragStart) => {- setIsDragging(true);- setSourceDroppableId(dragStart.source.droppableId);- };-- const handleDragEnd = (result: DropResult, provided: ResponderProvided) => {- setIsDragging(false);- setSourceDroppableId(null);-- const isWorkspaceDrop =- (result.source?.droppableId?.startsWith('workspace-') ?? false) &&- (result.destination?.droppableId?.startsWith('workspace-') ?? false);- if (isWorkspaceDrop) {- handleWorkspaceNavigationMenuItemDragAndDrop(result, provided);- } else {- handleNavigationMenuItemDragAndDrop(result, provided);- }- };-- return (- <NavigationDragSourceContext.Provider value={{ sourceDroppableId }}>- <NavigationMenuItemDragContext.Provider value={{ isDragging }}>- <DragDropContext- onDragEnd={handleDragEnd}- onDragStart={handleDragStart}- >- {children}- </DragDropContext>- </NavigationMenuItemDragContext.Provider>- </NavigationDragSourceContext.Provider>- );-};diff --git a/packages/twenty-front/src/modules/navigation/components/PageDragDropProviderMountEffect.tsx b/packages/twenty-front/src/modules/navigation/components/PageDragDropProviderMountEffect.tsxindex 87a2aa9e71e..329ef4d1a49 100644--- a/packages/twenty-front/src/modules/navigation/components/PageDragDropProviderMountEffect.tsx+++ b/packages/twenty-front/src/modules/navigation/components/PageDragDropProviderMountEffect.tsx@@ -1,6 +1,6 @@import { useEffect } from 'react';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';type PageDragDropProviderMountEffectProps = {diff --git a/packages/twenty-front/src/modules/navigation/components/WorkspaceDndKitProvider.tsx b/packages/twenty-front/src/modules/navigation/components/WorkspaceDndKitProvider.tsxindex 434f29a87d5..4268852e676 100644--- a/packages/twenty-front/src/modules/navigation/components/WorkspaceDndKitProvider.tsx+++ b/packages/twenty-front/src/modules/navigation/components/WorkspaceDndKitProvider.tsx@@ -6,9 +6,9 @@ import {} from '@dnd-kit/react';import type { ReactNode } from 'react';-import { NavigationDragSourceContext } from '@/navigation-menu-item/contexts/NavigationDragSourceContext';-import { NavigationDropTargetContext } from '@/navigation-menu-item/contexts/NavigationDropTargetContext';-import { NavigationMenuItemDragContext } from '@/navigation-menu-item/contexts/NavigationMenuItemDragContext';+import { NavigationDragSourceContext } from '@/navigation-menu-item/common/contexts/NavigationDragSourceContext';+import { NavigationDropTargetContext } from '@/navigation-menu-item/common/contexts/NavigationDropTargetContext';+import { NavigationMenuItemDragContext } from '@/navigation-menu-item/common/contexts/NavigationMenuItemDragContext';import type { DraggableData } from '@/navigation/types/workspaceDndKitDraggableData';import { useWorkspaceDndKit } from '@/navigation/hooks/useWorkspaceDndKit';diff --git a/packages/twenty-front/src/modules/navigation/hooks/useFavoritesDndKit.ts b/packages/twenty-front/src/modules/navigation/hooks/useFavoritesDndKit.tsnew file mode 100644index 00000000000..7bc69094bb8--- /dev/null+++ b/packages/twenty-front/src/modules/navigation/hooks/useFavoritesDndKit.ts@@ -0,0 +1,267 @@+import { type DragDropProvider } from '@dnd-kit/react';+import { isSortable } from '@dnd-kit/react/sortable';+import type { ResponderProvided } from '@hello-pangea/dnd';+import { type ComponentProps, useCallback, useState } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';++import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';+import { useHandleAddToNavigationDrop } from '@/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop';+import { useHandleNavigationMenuItemDragAndDrop } from '@/navigation-menu-item/display/dnd/hooks/useHandleNavigationMenuItemDragAndDrop';+import { getDndKitDropTargetId } from '@/navigation-menu-item/common/utils/getDndKitDropTargetId';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';+import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';+import { useSortedNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useSortedNavigationMenuItems';++import { DROP_RESULT_OPTIONS } from '@/navigation/constants/workspaceDndKitDropResultOptions';+import type { DraggableData } from '@/navigation/types/workspaceDndKitDraggableData';+import type { DropDestination } from '@/navigation/types/workspaceDndKitDropDestination';+import { toDropResult } from '@/navigation/utils/workspaceDndKitToDropResult';++type DragStartPayload = Parameters<+ NonNullable<+ ComponentProps<typeof DragDropProvider<DraggableData>>['onDragStart']+ >+>[0];+type DragOverPayload = Parameters<+ NonNullable<+ ComponentProps<typeof DragDropProvider<DraggableData>>['onDragOver']+ >+>[0];+type DragEndPayload = Parameters<+ NonNullable<+ ComponentProps<typeof DragDropProvider<DraggableData>>['onDragEnd']+ >+>[0];++export type FavoritesDndKitContextValues = {+ dragSource: { sourceDroppableId: string | null };+ drag: { isDragging: boolean };+ dropTarget: {+ activeDropTargetId: string | null;+ setActiveDropTargetId: (id: string | null) => void;+ forbiddenDropTargetId: string | null;+ setForbiddenDropTargetId: (id: string | null) => void;+ addToNavigationFallbackDestination: DropDestination | null;+ };+};++const resolveFavoritesDropTarget = (+ target: {+ id?: unknown;+ group?: unknown;+ index?: unknown;+ data?: unknown;+ } | null,+ getNavItemById: (id: string | undefined) => NavigationMenuItem | undefined,+): {+ destination: DropDestination;+ effectiveDropTargetId: string;+ isTargetFolder: boolean;+} | null => {+ if (target === null || target === undefined) {+ return null;+ }++ if (isDefined(target.group) && isDefined(target.index)) {+ const group = String(target.group);+ const index = Number(target.index);+ if (!Number.isInteger(index) || index < 0) {+ return null;+ }++ const targetItem = getNavItemById(+ target.id != null ? String(target.id) : undefined,+ );+ const isTargetFolder =+ isDefined(targetItem) && isNavigationMenuItemFolder(targetItem);++ const destination: DropDestination = isTargetFolder+ ? { droppableId: `folder-header-${target.id}`, index: 0 }+ : { droppableId: group, index };++ const effectiveDropTargetId = isTargetFolder+ ? getDndKitDropTargetId(`folder-header-${target.id}`, 0)+ : getDndKitDropTargetId(group, index);++ return { destination, effectiveDropTargetId, isTargetFolder };+ }++ return null;+};++export const useFavoritesDndKit = (): {+ contextValues: FavoritesDndKitContextValues;+ handlers: {+ onDragStart: (event: DragStartPayload) => void;+ onDragOver: (event: DragOverPayload) => void;+ onDragEnd: (event: DragEndPayload) => void;+ };+} => {+ const [isDragging, setIsDragging] = useState(false);+ const [sourceDroppableId, setSourceDroppableId] = useState<string | null>(+ null,+ );+ const [activeDropTargetId, setActiveDropTargetId] = useState<string | null>(+ null,+ );+ const [forbiddenDropTargetId, setForbiddenDropTargetId] = useState<+ string | null+ >(null);+ const [+ addToNavigationFallbackDestination,+ setAddToNavigationFallbackDestination,+ ] = useState<DropDestination | null>(null);++ const { navigationMenuItems } = useNavigationMenuItemsData();+ const { navigationMenuItemsSorted } = useSortedNavigationMenuItems();+ const { handleAddToNavigationDrop } = useHandleAddToNavigationDrop();+ const { handleNavigationMenuItemDragAndDrop } =+ useHandleNavigationMenuItemDragAndDrop();++ const orphanItemCount = navigationMenuItemsSorted.filter(+ (item: { folderId?: string | null }) => !isDefined(item.folderId),+ ).length;++ const getNavItemById = useCallback(+ (id: string | undefined) =>+ id ? navigationMenuItems.find((item) => item.id === id) : undefined,+ [navigationMenuItems],+ );++ const handleDragStart = (event: DragStartPayload) => {+ const { operation } = event;+ setIsDragging(true);+ const source = operation.source;+ const sourceId = source?.data?.sourceDroppableId ?? null;+ setSourceDroppableId(sourceId);++ if (sourceId === ADD_TO_NAV_SOURCE_DROPPABLE_ID) {+ const defaultDestination: DropDestination = {+ droppableId:+ NavigationMenuItemDroppableIds.ORPHAN_NAVIGATION_MENU_ITEMS,+ index: orphanItemCount,+ };+ setAddToNavigationFallbackDestination(defaultDestination);+ setActiveDropTargetId(+ getDndKitDropTargetId(+ defaultDestination.droppableId,+ defaultDestination.index,+ ),+ );+ }+ };++ const handleDragOver = useCallback(+ (event: DragOverPayload) => {+ const { operation } = event;+ const source = operation.source;+ const target = operation.target;+ const isAddToNavDrag =+ sourceDroppableId === ADD_TO_NAV_SOURCE_DROPPABLE_ID;+ const resolved = resolveFavoritesDropTarget(target, getNavItemById);++ if (+ resolved !== null &&+ source !== null &&+ target !== null &&+ isSortable(source) &&+ isSortable(target)+ ) {+ setActiveDropTargetId(resolved.effectiveDropTargetId);+ setForbiddenDropTargetId(null);+ return;+ }++ if (resolved !== null && source !== null && isSortable(source)) {+ setActiveDropTargetId(resolved.effectiveDropTargetId);+ setAddToNavigationFallbackDestination(resolved.destination);+ setForbiddenDropTargetId(null);+ return;+ }++ if (!isAddToNavDrag) {+ return;+ }++ if (resolved !== null) {+ setAddToNavigationFallbackDestination(resolved.destination);+ setActiveDropTargetId(resolved.effectiveDropTargetId);+ setForbiddenDropTargetId(null);+ return;+ }++ const fallback = addToNavigationFallbackDestination;+ setActiveDropTargetId(+ fallback+ ? getDndKitDropTargetId(fallback.droppableId, fallback.index)+ : null,+ );+ setForbiddenDropTargetId(null);+ },+ [+ sourceDroppableId,+ addToNavigationFallbackDestination,+ getNavItemById,+ setActiveDropTargetId,+ setForbiddenDropTargetId,+ setAddToNavigationFallbackDestination,+ ],+ );++ const handleDragEnd = (event: DragEndPayload) => {+ const { operation } = event;+ const source = operation.source;+ const target = operation.target;+ const draggableId = String(source?.id);+ const data = source?.data;+ const sourceId = data?.sourceDroppableId ?? null;+ const fallback = addToNavigationFallbackDestination;++ setIsDragging(false);+ setSourceDroppableId(null);+ setActiveDropTargetId(null);+ setForbiddenDropTargetId(null);+ setAddToNavigationFallbackDestination(null);++ const resolved = resolveFavoritesDropTarget(target, getNavItemById);+ let destination: DropDestination | null = resolved?.destination ?? null;++ if (destination == null && isDefined(fallback)) {+ destination = fallback;+ }++ const result = toDropResult(draggableId, data, destination);+ const dropResult = { ...result, ...DROP_RESULT_OPTIONS };+ const provided: ResponderProvided = { announce: () => {} };++ if (sourceId === ADD_TO_NAV_SOURCE_DROPPABLE_ID) {+ handleAddToNavigationDrop(dropResult, provided);+ return;+ }++ handleNavigationMenuItemDragAndDrop(dropResult, provided);+ };++ const contextValues: FavoritesDndKitContextValues = {+ dragSource: { sourceDroppableId },+ drag: { isDragging },+ dropTarget: {+ activeDropTargetId,+ setActiveDropTargetId,+ forbiddenDropTargetId,+ setForbiddenDropTargetId,+ addToNavigationFallbackDestination,+ },+ };++ return {+ contextValues,+ handlers: {+ onDragStart: handleDragStart,+ onDragOver: handleDragOver,+ onDragEnd: handleDragEnd,+ },+ };+};diff --git a/packages/twenty-front/src/modules/navigation/hooks/useWorkspaceDndKit.ts b/packages/twenty-front/src/modules/navigation/hooks/useWorkspaceDndKit.tsindex 3a21b0f0fa3..0bf9a6c261c 100644--- a/packages/twenty-front/src/modules/navigation/hooks/useWorkspaceDndKit.ts+++ b/packages/twenty-front/src/modules/navigation/hooks/useWorkspaceDndKit.ts@@ -5,16 +5,16 @@ import { useStore } from 'jotai';import { type ComponentProps, useCallback, useState } from 'react';import { isDefined } from 'twenty-shared/utils';-import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/constants/AddToNavSourceDroppableId';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';-import { useHandleAddToNavigationDrop } from '@/navigation-menu-item/hooks/useHandleAddToNavigationDrop';-import { useHandleWorkspaceNavigationMenuItemDragAndDrop } from '@/navigation-menu-item/hooks/useHandleWorkspaceNavigationMenuItemDragAndDrop';-import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/hooks/useNavigationMenuItemsDraftState';-import { addToNavPayloadRegistryState } from '@/navigation-menu-item/states/addToNavPayloadRegistryState';-import { getDndKitDropTargetId } from '@/navigation-menu-item/utils/getDndKitDropTargetId';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';-import { isWorkspaceDroppableId } from '@/navigation-menu-item/utils/isWorkspaceDroppableId';-import { validateAndExtractWorkspaceFolderId } from '@/navigation-menu-item/utils/validateAndExtractWorkspaceFolderId';+import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';+import { useHandleAddToNavigationDrop } from '@/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop';+import { useHandleWorkspaceNavigationMenuItemDragAndDrop } from '@/navigation-menu-item/display/dnd/hooks/useHandleWorkspaceNavigationMenuItemDragAndDrop';+import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState';+import { addToNavPayloadRegistryState } from '@/navigation-menu-item/common/states/addToNavPayloadRegistryState';+import { getDndKitDropTargetId } from '@/navigation-menu-item/common/utils/getDndKitDropTargetId';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';+import { isWorkspaceDroppableId } from '@/navigation-menu-item/common/utils/isWorkspaceDroppableId';+import { validateAndExtractWorkspaceFolderId } from '@/navigation-menu-item/common/utils/validateAndExtractWorkspaceFolderId';import { DROP_RESULT_OPTIONS } from '@/navigation/constants/workspaceDndKitDropResultOptions';import type { DraggableData } from '@/navigation/types/workspaceDndKitDraggableData';diff --git a/packages/twenty-front/src/modules/navigation/preloadWorkspaceDndKit.ts b/packages/twenty-front/src/modules/navigation/preloadWorkspaceDndKit.tsindex c2b638941a2..3e2e97654a1 100644--- a/packages/twenty-front/src/modules/navigation/preloadWorkspaceDndKit.ts+++ b/packages/twenty-front/src/modules/navigation/preloadWorkspaceDndKit.ts@@ -3,7 +3,7 @@ let preloadScheduled = false;const preload = () => {void import('@/navigation/components/WorkspaceDndKitProvider');void import(- '@/object-metadata/components/NavigationDrawerSectionForWorkspaceItemsListDndKit'+ '@/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItemsListDndKit');};diff --git a/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitGetDestinationFromSortableTarget.ts b/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitGetDestinationFromSortableTarget.tsindex 2e1b9bf5ee9..9719b8ac9be 100644--- a/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitGetDestinationFromSortableTarget.ts+++ b/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitGetDestinationFromSortableTarget.ts@@ -1,9 +1,9 @@import { isDefined } from 'twenty-shared/utils';import type { NavigationMenuItem } from '~/generated-metadata/graphql';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/constants/NavigationMenuItemDroppableIds';-import { getDndKitDropTargetId } from '@/navigation-menu-item/utils/getDndKitDropTargetId';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';+import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';+import { getDndKitDropTargetId } from '@/navigation-menu-item/common/utils/getDndKitDropTargetId';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';import type { DropDestination } from '@/navigation/types/workspaceDndKitDropDestination';import type { SortableTargetDestination } from '@/navigation/types/workspaceDndKitSortableTargetDestination';diff --git a/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitIsFolderDrag.ts b/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitIsFolderDrag.tsindex df64aa313b8..ad1c3189125 100644--- a/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitIsFolderDrag.ts+++ b/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitIsFolderDrag.ts@@ -1,7 +1,7 @@import type { NavigationMenuItem } from '~/generated-metadata/graphql';import { isDefined } from 'twenty-shared/utils';-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/utils/isNavigationMenuItemFolder';+import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';type AddToNavPayload = { type?: string } | null;diff --git a/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitResolveDropTarget.ts b/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitResolveDropTarget.tsindex 0ffc6b6e163..04adcc7ae13 100644--- a/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitResolveDropTarget.ts+++ b/packages/twenty-front/src/modules/navigation/utils/workspaceDndKitResolveDropTarget.ts@@ -1,7 +1,7 @@import { isDefined } from 'twenty-shared/utils';import type { NavigationMenuItem } from '~/generated-metadata/graphql';-import { isWorkspaceDroppableId } from '@/navigation-menu-item/utils/isWorkspaceDroppableId';+import { isWorkspaceDroppableId } from '@/navigation-menu-item/common/utils/isWorkspaceDroppableId';import type { DroppableData } from '@/navigation/types/workspaceDndKitDroppableData';import type { SortableTargetDestination } from '@/navigation/types/workspaceDndKitSortableTargetDestination';diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsx b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsxindex 55be4ac7703..cea97ecbeb4 100644--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsx+++ b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsx@@ -1,4 +1,4 @@-import { NavigationDrawerItemForObjectMetadataItem } from '@/object-metadata/components/NavigationDrawerItemForObjectMetadataItem';+import { NavigationDrawerItemForObjectMetadataItem } from '@/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem';import { CoreObjectNameSingular } from 'twenty-shared/types';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';diff --git a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionListEditModeFallback.tsx b/packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionListEditModeFallback.tsxindex ac45104de97..455f9823f0e 100644--- a/packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionListEditModeFallback.tsx+++ b/packages/twenty-front/src/modules/object-metadata/components/WorkspaceSectionListEditModeFallback.tsx@@ -1,8 +1,8 @@import { styled } from '@linaria/react';-import { NavigationDrawerSectionForWorkspaceItemsListReadOnly } from '@/object-metadata/components/NavigationDrawerSectionForWorkspaceItemsListReadOnly';-import { WorkspaceSectionAddMenuItemButton } from '@/object-metadata/components/WorkspaceSectionAddMenuItemButton';-import type { WorkspaceSectionListDndKitProps } from '@/object-metadata/components/WorkspaceSectionListDndKitProps';+import { NavigationDrawerSectionForWorkspaceItemsListReadOnly } from '@/navigation-menu-item/display/sections/components/NavigationDrawerSectionForWorkspaceItemsListReadOnly';+import { WorkspaceSectionAddMenuItemButton } from '@/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton';+import type { WorkspaceSectionListDndKitProps } from '@/navigation-menu-item/display/sections/types/WorkspaceSectionListDndKitProps';import { themeCssVariables } from 'twenty-ui/theme-constants';const StyledFallback = styled.div`diff --git a/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.tsindex 84fefc7a472..08e066f3c7b 100644--- a/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts+++ b/packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts@@ -1,7 +1,7 @@import { triggerUpdateRecordOptimisticEffectByBatch } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffectByBatch';import { dispatchObjectRecordOperationBrowserEvent } from '@/browser-event/utils/dispatchObjectRecordOperationBrowserEvent';import { apiConfigState } from '@/client-config/states/apiConfigState';-import { useRemoveNavigationMenuItemByTargetRecordId } from '@/navigation-menu-item/hooks/useRemoveNavigationMenuItemByTargetRecordId';+import { useRemoveNavigationMenuItemByTargetRecordId } from '@/navigation-menu-item/common/hooks/useRemoveNavigationMenuItemByTargetRecordId';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';diff --git a/packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecords.tsindex ac692c90779..759ab7f4685 100644--- a/packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecords.ts+++ b/packages/twenty-front/src/modules/object-record/hooks/useDestroyManyRecords.ts@@ -2,7 +2,7 @@ import { triggerCreateRecordsOptimisticEffect } from '@/apollo/optimistic-effectimport { triggerDestroyRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDestroyRecordsOptimisticEffect';import { dispatchObjectRecordOperationBrowserEvent } from '@/browser-event/utils/dispatchObjectRecordOperationBrowserEvent';import { apiConfigState } from '@/client-config/states/apiConfigState';-import { useRemoveNavigationMenuItemByTargetRecordId } from '@/navigation-menu-item/hooks/useRemoveNavigationMenuItemByTargetRecordId';+import { useRemoveNavigationMenuItemByTargetRecordId } from '@/navigation-menu-item/common/hooks/useRemoveNavigationMenuItemByTargetRecordId';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';diff --git a/packages/twenty-front/src/modules/object-record/hooks/useIncrementalDeleteManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useIncrementalDeleteManyRecords.tsindex 607f0a99aae..417a9197600 100644--- a/packages/twenty-front/src/modules/object-record/hooks/useIncrementalDeleteManyRecords.ts+++ b/packages/twenty-front/src/modules/object-record/hooks/useIncrementalDeleteManyRecords.ts@@ -1,6 +1,6 @@import { triggerUpdateRecordOptimisticEffectByBatch } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffectByBatch';import { dispatchObjectRecordOperationBrowserEvent } from '@/browser-event/utils/dispatchObjectRecordOperationBrowserEvent';-import { useRemoveNavigationMenuItemByTargetRecordId } from '@/navigation-menu-item/hooks/useRemoveNavigationMenuItemByTargetRecordId';+import { useRemoveNavigationMenuItemByTargetRecordId } from '@/navigation-menu-item/common/hooks/useRemoveNavigationMenuItemByTargetRecordId';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';diff --git a/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordReadOnly.ts b/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordReadOnly.tsindex 826d8dba777..59719080b13 100644--- a/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordReadOnly.ts+++ b/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordReadOnly.ts@@ -1,6 +1,6 @@import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';import { isRecordReadOnly } from '@/object-record/read-only/utils/isRecordReadOnly';import { useIsRecordDeleted } from '@/object-record/record-field/ui/hooks/useIsRecordDeleted';diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeaderIcon.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeaderIcon.tsxindex 80ef4208eaa..12f89e4f9fb 100644--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeaderIcon.tsx+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeaderIcon.tsx@@ -1,7 +1,7 @@import { isNonEmptyString } from '@sniptt/guards';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';-import { getStandardObjectIconColor } from '@/navigation-menu-item/utils/getStandardObjectIconColor';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';+import { getStandardObjectIconColor } from '@/navigation-menu-item/common/utils/getStandardObjectIconColor';import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';import { isDefined } from 'twenty-shared/utils';import { useIcons } from 'twenty-ui/display';diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/ObjectRecordShowPageBreadcrumb.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/ObjectRecordShowPageBreadcrumb.tsxindex 33e6369ece6..401edcb393e 100644--- a/packages/twenty-front/src/modules/object-record/record-show/components/ObjectRecordShowPageBreadcrumb.tsx+++ b/packages/twenty-front/src/modules/object-record/record-show/components/ObjectRecordShowPageBreadcrumb.tsx@@ -1,7 +1,7 @@import { isNonEmptyString } from '@sniptt/guards';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';-import { getStandardObjectIconColor } from '@/navigation-menu-item/utils/getStandardObjectIconColor';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';+import { getStandardObjectIconColor } from '@/navigation-menu-item/common/utils/getStandardObjectIconColor';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay.tsxindex ced91b42079..7f1afbca2b9 100644--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay.tsx@@ -1,4 +1,4 @@-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';import { hasAnySoftDeleteFilterOnViewComponentSelector } from '@/object-record/record-filter/states/hasAnySoftDeleteFilterOnView';diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsxindex f99f81a1747..32685a88661 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderLabelIdentifierCellPlusButton.tsx@@ -1,4 +1,4 @@-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';import { hasAnySoftDeleteFilterOnViewComponentSelector } from '@/object-record/record-filter/states/hasAnySoftDeleteFilterOnView';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelAddToNavigationDroppable.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelAddToNavigationDroppable.tsxindex 720086f6a8a..de7a2f0cb18 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelAddToNavigationDroppable.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelAddToNavigationDroppable.tsx@@ -1,7 +1,7 @@import { lazy, Suspense, useContext, type ReactNode } from 'react';-import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/constants/AddToNavSourceDroppableId';-import { NavigationDragSourceContext } from '@/navigation-menu-item/contexts/NavigationDragSourceContext';+import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';+import { NavigationDragSourceContext } from '@/navigation-menu-item/common/contexts/NavigationDragSourceContext';import type { AddToNavDroppableProvided } from '@/command-menu/components/CommandMenuAddToNavDroppableTypes';diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsxindex e54310d16f5..370652ffe59 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx@@ -5,12 +5,12 @@ import { useIcons } from 'twenty-ui/display';import { SidePanelPageInfoLayout } from '@/side-panel/components/SidePanelPageInfoLayout';import { sidePanelPageInfoState } from '@/side-panel/states/sidePanelPageInfoState';import { sidePanelShouldFocusTitleInputComponentState } from '@/side-panel/states/sidePanelShouldFocusTitleInputComponentState';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';-import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/constants/FolderIconDefault';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';+import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';import { NavigationMenuItemType } from 'twenty-shared/types';-import { useUpdateFolderInDraft } from '@/navigation-menu-item/hooks/useUpdateFolderInDraft';-import { useWorkspaceSectionItems } from '@/navigation-menu-item/hooks/useWorkspaceSectionItems';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';+import { useUpdateFolderInDraft } from '@/navigation-menu-item/edit/folder/hooks/useUpdateFolderInDraft';+import { useWorkspaceSectionItems } from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';import { IconPicker } from '@/ui/input/components/IconPicker';import { TitleInput } from '@/ui/input/components/TitleInput';import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelItemWithAddToNavigationDrag.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelItemWithAddToNavigationDrag.tsxindex ebc95143761..d5240ac238b 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelItemWithAddToNavigationDrag.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelItemWithAddToNavigationDrag.tsx@@ -5,9 +5,9 @@ import { isDefined } from 'twenty-shared/utils';import { type IconComponent } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { AddToNavigationDragHandle } from '@/navigation-menu-item/components/AddToNavigationDragHandle';-import { addToNavPayloadRegistryState } from '@/navigation-menu-item/states/addToNavPayloadRegistryState';-import type { AddToNavigationDragPayload } from '@/navigation-menu-item/types/add-to-navigation-drag-payload';+import { AddToNavigationDragHandle } from '@/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle';+import { addToNavPayloadRegistryState } from '@/navigation-menu-item/common/states/addToNavPayloadRegistryState';+import type { AddToNavigationDragPayload } from '@/navigation-menu-item/common/types/add-to-navigation-drag-payload';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';const CommandMenuItemWithAddToNavigationDragDndKit = lazy(() =>diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelLinkInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelLinkInfo.tsxindex e2473bf0520..e9f5ef9666e 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelLinkInfo.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelLinkInfo.tsx@@ -1,11 +1,11 @@import { useLingui } from '@lingui/react/macro';import { IconLink, IconWorld } from 'twenty-ui/display';-import { LinkIconWithLinkOverlay } from '@/navigation-menu-item/components/LinkIconWithLinkOverlay';+import { LinkIconWithLinkOverlay } from '@/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay';import { NavigationMenuItemType } from 'twenty-shared/types';-import { useUpdateLinkInDraft } from '@/navigation-menu-item/hooks/useUpdateLinkInDraft';-import { useWorkspaceSectionItems } from '@/navigation-menu-item/hooks/useWorkspaceSectionItems';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';+import { useUpdateLinkInDraft } from '@/navigation-menu-item/edit/link/hooks/useUpdateLinkInDraft';+import { useWorkspaceSectionItems } from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';import { SidePanelPageInfoLayout } from '@/side-panel/components/SidePanelPageInfoLayout';import { sidePanelPageInfoState } from '@/side-panel/states/sidePanelPageInfoState';import { sidePanelShouldFocusTitleInputComponentState } from '@/side-panel/states/sidePanelShouldFocusTitleInputComponentState';diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectViewRecordInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectViewRecordInfo.tsxindex 2f7be5bfa5b..0e96071cd75 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectViewRecordInfo.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectViewRecordInfo.tsx@@ -2,11 +2,11 @@ import { useLingui } from '@lingui/react/macro';import { OverflowingTextWithTooltip } from 'twenty-ui/display';import { SidePanelPageInfoLayout } from '@/side-panel/components/SidePanelPageInfoLayout';-import { NavigationMenuItemIcon } from '@/navigation-menu-item/components/NavigationMenuItemIcon';+import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';import { NavigationMenuItemType } from 'twenty-shared/types';-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItem';-import { useSelectedNavigationMenuItemEditItemLabel } from '@/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItemLabel';-import { useSelectedNavigationMenuItemEditItemObjectMetadata } from '@/navigation-menu-item/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata';+import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';+import { useSelectedNavigationMenuItemEditItemLabel } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemLabel';+import { useSelectedNavigationMenuItemEditItemObjectMetadata } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata';export const SidePanelObjectViewRecordInfo = () => {const { t } = useLingui();diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsxindex a3d32140f4e..58a2757c6a1 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx@@ -6,8 +6,8 @@ import {} from 'twenty-ui/display';import { NavigationMenuItemType, SidePanelPages } from 'twenty-shared/types';-import { useWorkspaceSectionItems } from '@/navigation-menu-item/hooks/useWorkspaceSectionItems';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';+import { useWorkspaceSectionItems } from '@/navigation-menu-item/display/hooks/useWorkspaceSectionItems';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';import { SidePanelAskAIInfo } from '@/side-panel/components/SidePanelAskAIInfo';import { SidePanelFolderInfo } from '@/side-panel/components/SidePanelFolderInfo';import { SidePanelLinkInfo } from '@/side-panel/components/SidePanelLinkInfo';diff --git a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsxindex 2d242c72947..207305c8906 100644--- a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx+++ b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx@@ -3,8 +3,8 @@ import { SidePanelAskAIPage } from '@/side-panel/pages/ask-ai/components/SidePanimport { SidePanelCalendarEventPage } from '@/side-panel/pages/calendar-event/components/SidePanelCalendarEventPage';import { SidePanelFrontComponentPage } from '@/side-panel/pages/front-component/components/SidePanelFrontComponentPage';import { SidePanelMessageThreadPage } from '@/side-panel/pages/message-thread/components/SidePanelMessageThreadPage';-import { SidePanelNavigationMenuItemEditPage } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNavigationMenuItemEditPage';-import { SidePanelNewSidebarItemPage } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemPage';+import { SidePanelNavigationMenuItemEditPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage';+import { SidePanelNewSidebarItemPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemPage';import { SidePanelPageLayoutChartSettings } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutChartSettings';import { SidePanelPageLayoutFieldsSettings } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutFieldsSettings';import { SidePanelPageLayoutIframeSettings } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutIframeSettings';diff --git a/packages/twenty-front/src/modules/side-panel/constants/SidePanelSubPagesConfig.tsx b/packages/twenty-front/src/modules/side-panel/constants/SidePanelSubPagesConfig.tsxindex 54de9d008ca..5e54f118105 100644--- a/packages/twenty-front/src/modules/side-panel/constants/SidePanelSubPagesConfig.tsx+++ b/packages/twenty-front/src/modules/side-panel/constants/SidePanelSubPagesConfig.tsx@@ -1,10 +1,10 @@-import { SidePanelEditFolderPickerSubPage } from '@/side-panel/pages/navigation-menu-item/components/SidePanelEditFolderPickerSubPage';-import { SidePanelNewSidebarItemObjectSubPage } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemObjectSubPage';-import { SidePanelNewSidebarItemObjectSystemPickerSubPage } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemObjectSystemPickerSubPage';-import { SidePanelNewSidebarItemRecordSubPage } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemRecordSubPage';-import { SidePanelNewSidebarItemViewObjectPickerSubPage } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewObjectPickerSubPage';-import { SidePanelNewSidebarItemViewPickerSubPage } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewPickerSubPage';-import { SidePanelNewSidebarItemViewSystemPickerSubPage } from '@/side-panel/pages/navigation-menu-item/components/SidePanelNewSidebarItemViewSystemPickerSubPage';+import { SidePanelEditFolderPickerSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage';+import { SidePanelNewSidebarItemObjectSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage';+import { SidePanelNewSidebarItemObjectSystemPickerSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage';+import { SidePanelNewSidebarItemRecordSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage';+import { SidePanelNewSidebarItemViewObjectPickerSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubPage';+import { SidePanelNewSidebarItemViewPickerSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubPage';+import { SidePanelNewSidebarItemViewSystemPickerSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemPickerSubPage';import { SidePanelChartFilterSubPage } from '@/side-panel/pages/page-layout/components/SidePanelChartFilterSubPage';import { SidePanelFieldsLayoutSubPage } from '@/side-panel/pages/page-layout/components/SidePanelFieldsLayoutSubPage';import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.tsindex c22b5d21f92..3e245dd709b 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts+++ b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts@@ -3,9 +3,9 @@ import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';import { sidePanelSearchState } from '@/side-panel/states/sidePanelSearchState';import { isSidePanelClosingState } from '@/side-panel/states/isSidePanelClosingState';import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';-import { addToNavPayloadRegistryState } from '@/navigation-menu-item/states/addToNavPayloadRegistryState';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';-import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/states/selectedNavigationMenuItemInEditModeState';+import { addToNavPayloadRegistryState } from '@/navigation-menu-item/common/states/addToNavPayloadRegistryState';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';+import { selectedNavigationMenuItemInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemInEditModeState';import { useCloseAnyOpenDropdown } from '@/ui/layout/dropdown/hooks/useCloseAnyOpenDropdown';import { emitSidePanelOpenEvent } from '@/ui/layout/side-panel/utils/emitSidePanelOpenEvent';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';diff --git a/packages/twenty-front/src/modules/ui/layout/page-header/components/PageHeaderToggleSidePanelButton.tsx b/packages/twenty-front/src/modules/ui/layout/page-header/components/PageHeaderToggleSidePanelButton.tsxindex c8deedf4826..3f320bf499d 100644--- a/packages/twenty-front/src/modules/ui/layout/page-header/components/PageHeaderToggleSidePanelButton.tsx+++ b/packages/twenty-front/src/modules/ui/layout/page-header/components/PageHeaderToggleSidePanelButton.tsx@@ -1,7 +1,7 @@import { SIDE_PANEL_TOP_BAR_HEIGHT_MOBILE } from '@/side-panel/constants/SidePanelTopBarHeightMobile';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';-import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/states/isNavigationMenuInEditModeState';+import { isNavigationMenuInEditModeState } from '@/navigation-menu-item/common/states/isNavigationMenuInEditModeState';import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingContextZIndices';import { PAGE_HEADER_SIDE_PANEL_BUTTON_CLICK_OUTSIDE_ID } from '@/ui/layout/page-header/constants/PageHeaderSidePanelButtonClickOutsideId';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsxindex c61d890c796..8d86a775e23 100644--- a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx+++ b/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx@@ -5,7 +5,7 @@ import { AppPageErrorFallback } from '@/error-handler/components/AppPageErrorFalimport { FileUploadProvider } from '@/file-upload/components/FileUploadProvider';import { InformationBannerIsImpersonating } from '@/information-banner/components/impersonate/InformationBannerIsImpersonating';import { KeyboardShortcutMenu } from '@/keyboard-shortcut-menu/components/KeyboardShortcutMenu';-import { NavigationMenuEditModeBar } from '@/navigation-menu-item/components/NavigationMenuEditModeBar';+import { NavigationMenuEditModeBar } from '@/navigation-menu-item/edit/components/NavigationMenuEditModeBar';import { AppNavigationDrawer } from '@/navigation/components/AppNavigationDrawer';import { MobileNavigationBar } from '@/navigation/components/MobileNavigationBar';import { PageDragDropProvider } from '@/navigation/components/PageDragDropProvider';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsxindex ce7ab0438c0..65719e118ba 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx@@ -1,4 +1,4 @@-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/components/NavigationMenuItemStyleIcon';+import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';import { useIsSettingsPage } from '@/navigation/hooks/useIsSettingsPage';import { NAVIGATION_DRAWER_COLLAPSED_WIDTH } from '@/ui/layout/resizable-panel/constants/NavigationDrawerCollapsedWidth';import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsxindex ad8715fde63..961d12a4d61 100644--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx@@ -1,5 +1,5 @@-import { useCreateNavigationMenuItem } from '@/navigation-menu-item/hooks/useCreateNavigationMenuItem';-import { useNavigationMenuItemsData } from '@/navigation-menu-item/hooks/useNavigationMenuItemsData';+import { useCreateNavigationMenuItem } from '@/navigation-menu-item/common/hooks/useCreateNavigationMenuItem';+import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';import { type ObjectRecord } from '@/object-record/types/ObjectRecord';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';