The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fix navigation “add before/after” insertion index (#18879)
Abdul Rahman27c0ca975ff5
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView.tsxindex ecace03c509..7d3cc3e5d45 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView.tsx@@ -5,14 +5,14 @@ import { ensureAbsoluteUrl } from 'twenty-shared/utils';import { type NavigationMenuItem } from '~/generated-metadata/graphql';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 '@/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 { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';+import { SidePanelList } from '@/side-panel/components/SidePanelList';import { TextInput } from '@/ui/input/components/TextInput';type SidePanelEditLinkItemViewProps = OrganizeActionsProps & {@@ -93,7 +93,6 @@ export const SidePanelEditLinkItemView = ({onAddAfter={onAddAfter}showMoveToFolderonMoveToFolder={onOpenFolderPicker}- moveToFolderHasSubMenu/><SidePanelEditOwnerSection applicationId={selectedItem.applicationId} /></SidePanelList>diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsxindex b2bc85f1055..33e438159b4 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsx@@ -26,7 +26,6 @@ export type OrganizeActionsProps = {type SidePanelEditOrganizeActionsProps = OrganizeActionsProps & {showMoveToFolder?: boolean;onMoveToFolder?: () => void;- moveToFolderHasSubMenu?: boolean;};export const SidePanelEditOrganizeActions = ({@@ -39,7 +38,6 @@ export const SidePanelEditOrganizeActions = ({onAddAfter,showMoveToFolder = false,onMoveToFolder,- moveToFolderHasSubMenu = false,}: SidePanelEditOrganizeActionsProps) => {const { t } = useLingui();@@ -78,7 +76,7 @@ export const SidePanelEditOrganizeActions = ({Icon={IconFolderSymlink}label={t`Move to folder`}id={SidePanelNavigationItemActions.MOVE_TO_FOLDER}- hasSubMenu={moveToFolderHasSubMenu}+ hasSubMenuonClick={onMoveToFolder}/></SelectableListItem>diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.tsindex e1394a84a07..b0730cdfd05 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.ts@@ -14,33 +14,32 @@ import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { SidePanelPages } from 'twenty-shared/types';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';const getAddMenuItemInsertionContext = (selectedItem: { id: string; folderId?: string | null },- workspaceNavigationMenuItems: Array<{- id: string;- folderId?: string | null;- userWorkspaceId?: string | null;- }>,+ workspaceNavigationMenuItems: NavigationMenuItem[],offset: 0 | 1,): AddMenuItemInsertionContext | null => {const targetFolderId = selectedItem.folderId ?? null;- const itemsInFolder = workspaceNavigationMenuItems.filter(- (item) =>- (item.folderId ?? null) === targetFolderId &&- !isDefined(item.userWorkspaceId),- );- const selectedIndexInFolder = itemsInFolder.findIndex(+ const itemsInFolderSorted = workspaceNavigationMenuItems+ .filter(+ (item) =>+ (item.folderId ?? null) === targetFolderId &&+ !isDefined(item.userWorkspaceId),+ )+ .sort((a, b) => a.position - b.position);+ const selectedIndexSorted = itemsInFolderSorted.findIndex((item) => item.id === selectedItem.id,);- if (selectedIndexInFolder < 0) {+ if (selectedIndexSorted < 0) {return null;}return {targetFolderId,- targetIndex: selectedIndexInFolder + offset,+ targetIndex: selectedIndexSorted + offset,disableDrag: true,};};