From bb638d104831ac00d44061651a5c1436b0608959 Mon Sep 17 00:00:00 2001 From: yuval-hazaz Date: Sun, 6 Feb 2022 17:02:10 +0200 Subject: [PATCH] fix(client):teleporter-name --- .../src/Application/ApplicationLayout.tsx | 4 ++-- .../src/Layout/MenuItemWithFixedPanel.tsx | 4 ++-- .../src/VersionControl/PendingChangesMenuItem.tsx | 6 +++--- packages/amplication-client/src/util/teleporter.ts | 2 +- packages/amplication-server/src/app.module.ts | 3 ++- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/amplication-client/src/Application/ApplicationLayout.tsx b/packages/amplication-client/src/Application/ApplicationLayout.tsx index 853630ce81..48af74c3e7 100644 --- a/packages/amplication-client/src/Application/ApplicationLayout.tsx +++ b/packages/amplication-client/src/Application/ApplicationLayout.tsx @@ -10,7 +10,7 @@ import BuildPage from "../VersionControl/BuildPage"; import RolesPage from "../Roles/RolesPage"; import PendingChangesPage from "../VersionControl/PendingChangesPage"; -import { MenuFixedPanel } from "../util/teleporter"; +import { AsidePanel } from "../util/teleporter"; import "./ApplicationLayout.scss"; import * as models from "../models"; @@ -222,7 +222,7 @@ function ApplicationLayout({ match }: Props) { - + diff --git a/packages/amplication-client/src/Layout/MenuItemWithFixedPanel.tsx b/packages/amplication-client/src/Layout/MenuItemWithFixedPanel.tsx index bf7a959873..24e7513a6b 100644 --- a/packages/amplication-client/src/Layout/MenuItemWithFixedPanel.tsx +++ b/packages/amplication-client/src/Layout/MenuItemWithFixedPanel.tsx @@ -1,7 +1,7 @@ import React, { ReactNode, useCallback } from "react"; import classNames from "classnames"; import { Button, EnumButtonStyle } from "../Components/Button"; -import { MenuFixedPanel } from "../util/teleporter"; +import { AsidePanel } from "../util/teleporter"; import { Icon, Tooltip } from "@amplication/design-system"; @@ -61,7 +61,7 @@ const MenuItemWithFixedPanel = ({ )} - {isOpen && {children}} + {isOpen && {children}} ); }; diff --git a/packages/amplication-client/src/VersionControl/PendingChangesMenuItem.tsx b/packages/amplication-client/src/VersionControl/PendingChangesMenuItem.tsx index 5c688b2a43..2f8c2e52a0 100644 --- a/packages/amplication-client/src/VersionControl/PendingChangesMenuItem.tsx +++ b/packages/amplication-client/src/VersionControl/PendingChangesMenuItem.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useContext, useState } from "react"; import classNames from "classnames"; import PendingChangesBar from "../VersionControl/PendingChangesBar"; import "./PendingChangesMenuItem.scss"; -import { MenuFixedPanel } from "../util/teleporter"; +import { AsidePanel } from "../util/teleporter"; import PendingChangesContext from "./PendingChangesContext"; import { Tooltip } from "@amplication/design-system"; import { Button, EnumButtonStyle } from "../Components/Button"; @@ -53,9 +53,9 @@ const PendingChangesMenuItem = ({ applicationId }: Props) => { {panelOpen && ( - + - + )} ); diff --git a/packages/amplication-client/src/util/teleporter.ts b/packages/amplication-client/src/util/teleporter.ts index 6170531b80..af129809f6 100644 --- a/packages/amplication-client/src/util/teleporter.ts +++ b/packages/amplication-client/src/util/teleporter.ts @@ -1,4 +1,4 @@ import { createTeleporter } from "react-teleporter"; export const HeaderToolbar = createTeleporter(); -export const MenuFixedPanel = createTeleporter(); +export const AsidePanel = createTeleporter(); diff --git a/packages/amplication-server/src/app.module.ts b/packages/amplication-server/src/app.module.ts index 09756a7f33..10b031633e 100644 --- a/packages/amplication-server/src/app.module.ts +++ b/packages/amplication-server/src/app.module.ts @@ -26,7 +26,8 @@ import { RootStorageModule } from './core/storage/root-storage.module'; '..', 'amplication-client', 'build' - ) + ), + exclude: ['/graphql'] }), RootWinstonModule,