Merge pull request amplication#28 from amplication/fix/teleportet-name

Fix/teleportet name
Spotrix · Feb 6, 2022 · 6a032f9 · 6a032f9
2 parents 5308ac6 + 325c9f5
commit 6a032f9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git 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) {
           </div>
         </MainLayout.Content>
         <MainLayout.Aside>
-          <MenuFixedPanel.Target className="main-layout__aside__expandable" />
+          <AsidePanel.Target className="main-layout__aside__expandable" />
         </MainLayout.Aside>
 
         <ScreenResolutionMessage />

diff --git 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 = ({
           </Tooltip>
         )}
       </div>
-      {isOpen && <MenuFixedPanel.Source>{children}</MenuFixedPanel.Source>}
+      {isOpen && <AsidePanel.Source>{children}</AsidePanel.Source>}
     </div>
   );
 };

diff --git 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) => {
         </Tooltip>
       </div>
       {panelOpen && (
-        <MenuFixedPanel.Source>
+        <AsidePanel.Source>
           <PendingChangesBar applicationId={applicationId} />
-        </MenuFixedPanel.Source>
+        </AsidePanel.Source>
       )}
     </div>
   );

diff --git 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
@@ -36,7 +36,8 @@ import { GoogleSecretsManagerService } from 'src/services/googleSecretsManager.s
         '..',
         'amplication-client',
         'build'
-      )
+      ),
+      exclude: ['/graphql']
     }),
 
     RootWinstonModule,
-Original file line number
+Diff line change
@@ Expand Up @@
             '..',
             'amplication-client',
             'build'
-          )
+          ),
+          exclude: ['/graphql']
         }),
         RootWinstonModule,
@@ Expand Down @@