Skip to content

The open alternative to Salesforce, designed for AI.

Navigate to page when clicking nav item in edit mode (#18526)

Abdul Rahmane4e7137660df
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItems.tsx b/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItems.tsx
index b60a1e75fea..13c93bc122c 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItems.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/components/WorkspaceNavigationMenuItems.tsx
@@ -1,5 +1,7 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
+import { isNonEmptyString } from '@sniptt/guards';
+import { useNavigate } from 'react-router-dom';
import {
IconColumnInsertRight,
IconLink,
@@ -11,10 +13,10 @@ import { LightIconButton } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { FeatureFlagKey } from '~/generated-metadata/graphql';
-import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';
import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/constants/FolderIconDefault';
import { NavigationMenuItemType } from '@/navigation-menu-item/constants/NavigationMenuItemType';
import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/hooks/useOpenNavigationMenuItemInSidePanel';
+import { useSortedNavigationMenuItems } from '@/navigation-menu-item/hooks/useSortedNavigationMenuItems';
import {
type NavigationMenuItemClickParams,
useWorkspaceSectionItems,
@@ -30,13 +32,13 @@ import { NavigationDrawerSectionForWorkspaceItems } from '@/object-metadata/comp
import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { useIsPrefetchLoading } from '@/prefetch/hooks/useIsPrefetchLoading';
import { prefetchNavigationMenuItemsState } from '@/prefetch/states/prefetchNavigationMenuItemsState';
+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';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { useStore } from 'jotai';
import { SidePanelPages } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
const StyledRightIconsContainer = styled.div`
align-items: center;
@@ -46,6 +48,7 @@ const StyledRightIconsContainer = styled.div`
export const WorkspaceNavigationMenuItems = () => {
const items = useWorkspaceSectionItems();
+ const { workspaceNavigationMenuItemsSorted } = useSortedNavigationMenuItems();
const store = useStore();
const enterEditMode = () => {
const prefetchNavigationMenuItems = store.get(
@@ -70,6 +73,7 @@ export const WorkspaceNavigationMenuItems = () => {
const setOpenNavigationMenuItemFolderIds = useSetAtomState(
openNavigationMenuItemFolderIdsState,
);
+ const navigate = useNavigate();
const { navigateSidePanel } = useNavigateSidePanel();
const { openNavigationMenuItemInSidePanel } =
useOpenNavigationMenuItemInSidePanel();
@@ -83,37 +87,66 @@ export const WorkspaceNavigationMenuItems = () => {
enterEditMode();
};
- const handleNavigationMenuItemClick = (
- params: NavigationMenuItemClickParams,
+ const openFolderAndNavigateToFirstChild = (
+ folderId: string,
+ item: NavigationMenuItemClickParams['item'],
) => {
- const { item, objectMetadataItem } = params;
- const id = item.id;
- setSelectedNavigationMenuItemInEditMode(id);
- if (item.itemType === NavigationMenuItemType.FOLDER) {
- setOpenNavigationMenuItemFolderIds((currentOpenFolders) =>
- currentOpenFolders.includes(id)
- ? currentOpenFolders
- : [...currentOpenFolders, id],
- );
- openNavigationMenuItemInSidePanel({
- pageTitle: t`Edit folder`,
- pageIcon: getIcon(item.icon ?? item.Icon ?? FOLDER_ICON_DEFAULT),
- });
- } else if (item.itemType === NavigationMenuItemType.LINK) {
- openNavigationMenuItemInSidePanel({
- pageTitle: t`Edit link`,
- pageIcon: IconLink,
- });
- } else if (isDefined(objectMetadataItem)) {
- const pageTitle =
- item.itemType === NavigationMenuItemType.VIEW
- ? item.labelIdentifier
- : objectMetadataItem.labelSingular;
+ setOpenNavigationMenuItemFolderIds((current) =>
+ current.includes(folderId) ? current : [...current, folderId],
+ );
+ openNavigationMenuItemInSidePanel({
+ pageTitle: t`Edit folder`,
+ pageIcon: getIcon(item.icon ?? item.Icon ?? FOLDER_ICON_DEFAULT),
+ });
+ const firstChild = workspaceNavigationMenuItemsSorted.find(
+ (navItem) =>
+ navItem.folderId === folderId &&
+ navItem.itemType !== NavigationMenuItemType.LINK &&
+ isNonEmptyString(navItem.link),
+ );
+ if (firstChild?.link) {
+ navigate(firstChild.link);
+ }
+ };
+
+ const openViewOrRecordEditPanelAndNavigate = (
+ item: NavigationMenuItemClickParams['item'],
+ objectMetadataItem: ObjectMetadataItem | null | undefined,
+ ) => {
+ if (objectMetadataItem) {
openNavigationMenuItemInSidePanel({
- pageTitle,
+ pageTitle:
+ item.itemType === NavigationMenuItemType.VIEW
+ ? item.labelIdentifier
+ : objectMetadataItem.labelSingular,
pageIcon: getIcon(objectMetadataItem.icon),
});
}
+ const link = 'link' in item ? item.link : undefined;
+ if (isNonEmptyString(link)) {
+ navigate(link);
+ }
+ };
+
+ const handleNavigationMenuItemClick = (
+ params: NavigationMenuItemClickParams,
+ ) => {
+ const { item, objectMetadataItem } = params;
+ setSelectedNavigationMenuItemInEditMode(item.id);
+
+ switch (item.itemType) {
+ case NavigationMenuItemType.FOLDER:
+ openFolderAndNavigateToFirstChild(item.id, item);
+ break;
+ case NavigationMenuItemType.LINK:
+ openNavigationMenuItemInSidePanel({
+ pageTitle: t`Edit link`,
+ pageIcon: IconLink,
+ });
+ break;
+ default:
+ openViewOrRecordEditPanelAndNavigate(item, objectMetadataItem);
+ }
};
const handleActiveObjectMetadataItemClick = (