Skip to content

The open alternative to Salesforce, designed for AI.

Fix sidebar Link items in folders redirecting to a doubled URL (#25536)

Raphaël Bosi2b90c4453cae
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useNavigateToNavigationMenuItemLink.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useNavigateToNavigationMenuItemLink.ts
new file mode 100644
index 00000000000..2fd26052072
--- /dev/null
+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useNavigateToNavigationMenuItemLink.ts
@@ -0,0 +1,17 @@
+import { useNavigate } from 'react-router-dom';
+import { isAbsoluteUrl } from 'twenty-shared/utils';
+
+export const useNavigateToNavigationMenuItemLink = () => {
+ const navigate = useNavigate();
+
+ const navigateToNavigationMenuItemLink = (link: string) => {
+ if (isAbsoluteUrl(link)) {
+ window.open(link, '_blank', 'noopener,noreferrer');
+ return;
+ }
+
+ navigate(link);
+ };
+
+ return { navigateToNavigationMenuItemLink };
+};
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx
index 9dcd359b0fa..615a084db1c 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx
@@ -1,11 +1,11 @@
import { useLingui } from '@lingui/react/macro';
import { type ReactNode } from 'react';
-import { useNavigate } from 'react-router-dom';
import { FeatureFlagKey, NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
import { lastClickedNavigationMenuItemIdState } from '@/navigation-menu-item/common/states/lastClickedNavigationMenuItemIdState';
+import { useNavigateToNavigationMenuItemLink } from '@/navigation-menu-item/common/hooks/useNavigateToNavigationMenuItemLink';
import { getNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemColor';
import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';
import { useIdentifyActiveNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useIdentifyActiveNavigationMenuItems';
@@ -61,7 +61,8 @@ export const NavigationMenuItemFolderSubItem = ({
const lastVisitedViewPerObjectMetadataItem = useAtomStateValue(
lastVisitedViewPerObjectMetadataItemState,
);
- const navigate = useNavigate();
+ const { navigateToNavigationMenuItemLink } =
+ useNavigateToNavigationMenuItemLink();
const setLastClickedNavigationMenuItemId = useSetAtomState(
lastClickedNavigationMenuItemIdState,
);
@@ -114,7 +115,7 @@ export const NavigationMenuItemFolderSubItem = ({
})
: () => {
setLastClickedNavigationMenuItemId(navigationMenuItem.id);
- navigate(computedLink);
+ navigateToNavigationMenuItemLink(computedLink);
});
const isCoreWorkflowsIndexItem = isCoreWorkflowsObjectNavigationMenuItem({
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/__tests__/NavigationMenuItemFolderSubItem.test.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/__tests__/NavigationMenuItemFolderSubItem.test.tsx
new file mode 100644
index 00000000000..1a096f5e56c
--- /dev/null
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/__tests__/NavigationMenuItemFolderSubItem.test.tsx
@@ -0,0 +1,61 @@
+import { i18n } from '@lingui/core';
+import { I18nProvider } from '@lingui/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { MemoryRouter, useLocation } from 'react-router-dom';
+import { NavigationMenuItemType } from 'twenty-shared/types';
+import { type NavigationMenuItem } from '~/generated-metadata/graphql';
+
+import { NavigationMenuItemFolderSubItem } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem';
+
+const LocationProbe = () => {
+ const location = useLocation();
+
+ return <div data-testid="location">{location.pathname}</div>;
+};
+
+const linkNavigationMenuItem = {
+ id: 'link-item-id',
+ type: NavigationMenuItemType.LINK,
+ name: 'Q3 deck',
+ link: 'https://google.com/search',
+ folderId: 'folder-id',
+ position: 0,
+} as NavigationMenuItem;
+
+describe('NavigationMenuItemFolderSubItem', () => {
+ afterEach(() => {
+ jest.restoreAllMocks();
+ });
+
+ it('opens a link item in a new tab instead of routing to its absolute URL', async () => {
+ const windowOpen = jest.spyOn(window, 'open').mockImplementation();
+
+ render(
+ <I18nProvider i18n={i18n}>
+ <MemoryRouter initialEntries={['/objects/companies']}>
+ <NavigationMenuItemFolderSubItem
+ navigationMenuItem={linkNavigationMenuItem}
+ index={0}
+ arrayLength={1}
+ selectedIndex={-1}
+ isDragging={false}
+ />
+ <LocationProbe />
+ </MemoryRouter>
+ </I18nProvider>,
+ );
+
+ await userEvent.click(screen.getByText('Q3 deck'));
+
+ expect(windowOpen).toHaveBeenCalledTimes(1);
+ expect(windowOpen).toHaveBeenCalledWith(
+ 'https://google.com/search',
+ '_blank',
+ 'noopener,noreferrer',
+ );
+ expect(screen.getByTestId('location')).toHaveTextContent(
+ '/objects/companies',
+ );
+ });
+});
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.ts
index 94a83150211..b33fd97f6e5 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
@@ -1,6 +1,5 @@
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
-import { useNavigate } from 'react-router-dom';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { IconDotsVertical } from 'twenty-ui/icon';
@@ -8,6 +7,7 @@ import { IconDotsVertical } from 'twenty-ui/icon';
import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';
import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';
import { type PendingInsertionNavigationMenuItem } from '@/navigation-menu-item/common/types/PendingInsertionNavigationMenuItem';
+import { useNavigateToNavigationMenuItemLink } from '@/navigation-menu-item/common/hooks/useNavigateToNavigationMenuItemLink';
import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';
import { useNavigationMenuItemEditSectionItems } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems';
import { useNavigationMenuItemMoveRemove } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove';
@@ -49,7 +49,8 @@ const computeInsertionPosition = (
export const useNavigationMenuItemEditOrganizeActions =
(): OrganizeActionsProps => {
const { t } = useLingui();
- const navigate = useNavigate();
+ const { navigateToNavigationMenuItemLink } =
+ useNavigateToNavigationMenuItemLink();
const { closeSidePanelMenu } = useSidePanelMenu();
const { navigateSidePanel } = useNavigateSidePanel();
const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();
@@ -127,7 +128,7 @@ export const useNavigationMenuItemEditOrganizeActions =
lastVisitedViewPerObjectMetadataItem,
});
if (isNonEmptyString(link)) {
- navigate(link);
+ navigateToNavigationMenuItemLink(link);
}
navigateSidePanel({
page: SidePanelPages.NavigationMenuItemEdit,