Skip to content

fix: revert to passing hook as a prop for EE compatibility #34367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-golovanov merged 1 commit into from
Jun 20, 2024
Merged

fix: revert to passing hook as a prop for EE compatibility #34367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/client/src/pages/Editor/EditorHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -207,6 +208,7 @@ export function EditorHeader() {
editInteractionKind={EditInteractionKind.SINGLE}
editorName="Application"
fill
getNavigationMenu={useNavigationMenuData}
isError={isErroredSavingName}
isNewEditor={
applicationList.filter((el) => el.id === applicationId)
Expand Down
10 changes: 8 additions & 2 deletions app/client/src/pages/Editor/EditorName/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,13 +32,18 @@ type EditorNameProps = CommonComponentProps & {
isPopoverOpen: boolean;
setIsPopoverOpen: typeof noop;
editorName: string;
getNavigationMenu: ({
editMode,
setForkApplicationModalOpen,
}: NavigationMenuDataProps) => MenuItemData[];
};

export function EditorName(props: EditorNameProps) {
const {
defaultSavingState,
defaultValue,
editorName,
getNavigationMenu,
isNewEditor,
isPopoverOpen,
setIsPopoverOpen,
Expand Down Expand Up @@ -92,7 +98,7 @@ export function EditorName(props: EditorNameProps) {
}
}, []);

const navigationMenuData = useNavigationMenuData({
const navigationMenuData = getNavigationMenu({
editMode,
setForkApplicationModalOpen,
});
Expand Down
2 changes: 2 additions & 0 deletions app/client/src/pages/Editor/IDE/Header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand Down Expand Up @@ -239,6 +240,7 @@ const Header = () => {
editInteractionKind={EditInteractionKind.SINGLE}
editorName="Application"
fill
getNavigationMenu={useNavigationMenuData}
isError={isErroredSavingName}
isNewEditor={
applicationList.filter((el) => el.id === applicationId)
Expand Down