diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx index 370faadfcd8b..0ba381b98347 100644 --- a/app/client/src/pages/Editor/EditorHeader.tsx +++ b/app/client/src/pages/Editor/EditorHeader.tsx @@ -46,6 +46,7 @@ import RealtimeAppEditors from "./RealtimeAppEditors"; import { EditorSaveIndicator } from "./EditorSaveIndicator"; import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors"; import { fetchUsersForWorkspace } from "@appsmith/actions/workspaceActions"; +import { useNavigationMenuData } from "./EditorName/useNavigationMenuData"; import { getIsGitConnected, @@ -207,6 +208,7 @@ export function EditorHeader() { editInteractionKind={EditInteractionKind.SINGLE} editorName="Application" fill + getNavigationMenu={useNavigationMenuData} isError={isErroredSavingName} isNewEditor={ applicationList.filter((el) => el.id === applicationId) diff --git a/app/client/src/pages/Editor/EditorName/index.tsx b/app/client/src/pages/Editor/EditorName/index.tsx index 21ef14192e94..0c23e95512c9 100644 --- a/app/client/src/pages/Editor/EditorName/index.tsx +++ b/app/client/src/pages/Editor/EditorName/index.tsx @@ -13,7 +13,8 @@ import ForkApplicationModal from "pages/Applications/ForkApplicationModal"; import { Container, StyledIcon } from "./components"; import { useSelector } from "react-redux"; import { getCurrentApplicationId } from "selectors/editorSelectors"; -import { useNavigationMenuData } from "./useNavigationMenuData"; +import type { NavigationMenuDataProps } from "./useNavigationMenuData"; +import type { MenuItemData } from "./NavigationMenuItem"; type EditorNameProps = CommonComponentProps & { applicationId?: string | undefined; @@ -31,6 +32,10 @@ type EditorNameProps = CommonComponentProps & { isPopoverOpen: boolean; setIsPopoverOpen: typeof noop; editorName: string; + getNavigationMenu: ({ + editMode, + setForkApplicationModalOpen, + }: NavigationMenuDataProps) => MenuItemData[]; }; export function EditorName(props: EditorNameProps) { @@ -38,6 +43,7 @@ export function EditorName(props: EditorNameProps) { defaultSavingState, defaultValue, editorName, + getNavigationMenu, isNewEditor, isPopoverOpen, setIsPopoverOpen, @@ -92,7 +98,7 @@ export function EditorName(props: EditorNameProps) { } }, []); - const navigationMenuData = useNavigationMenuData({ + const navigationMenuData = getNavigationMenu({ editMode, setForkApplicationModalOpen, }); diff --git a/app/client/src/pages/Editor/IDE/Header/index.tsx b/app/client/src/pages/Editor/IDE/Header/index.tsx index 3fde69faf453..b2200c367ae8 100644 --- a/app/client/src/pages/Editor/IDE/Header/index.tsx +++ b/app/client/src/pages/Editor/IDE/Header/index.tsx @@ -76,6 +76,7 @@ import { EditorSaveIndicator } from "pages/Editor/EditorSaveIndicator"; import type { Page } from "@appsmith/constants/ReduxActionConstants"; import { IDEHeader, IDEHeaderTitle } from "IDE"; import { APPLICATIONS_URL } from "constants/routes"; +import { useNavigationMenuData } from "../../EditorName/useNavigationMenuData"; const StyledDivider = styled(Divider)` height: 50%; @@ -239,6 +240,7 @@ const Header = () => { editInteractionKind={EditInteractionKind.SINGLE} editorName="Application" fill + getNavigationMenu={useNavigationMenuData} isError={isErroredSavingName} isNewEditor={ applicationList.filter((el) => el.id === applicationId)