From a7d3c265c6ed9cfed708d52e1f993d0e25ed06c0 Mon Sep 17 00:00:00 2001
From: Anton Kastritskiy <antonk52@meta.com>
Date: Tue, 18 Jul 2023 03:52:34 -0700
Subject: [PATCH] plugin manager button

Reviewed By: elboman

Differential Revision: D47400185

fbshipit-source-id: fc2875808d8b2c2443766d7619091c65395b0c07
---
 desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx | 10 ----------
 desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx   | 11 +++++++++--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx b/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx
index e504828b2..a4af6da7f 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx
@@ -11,7 +11,6 @@ import React, {cloneElement, useState, useCallback, useMemo} from 'react';
 import {Button, Divider, Badge, Tooltip, Menu, Modal} from 'antd';
 import {
   MobileFilled,
-  AppstoreOutlined,
   BellOutlined,
   FileExclamationOutlined,
   SettingOutlined,
@@ -27,7 +26,6 @@ import {
   theme,
   Layout,
   withTrackingScope,
-  Dialog,
   useTrackedCallback,
   NUX,
 } from 'flipper-plugin';
@@ -48,7 +46,6 @@ import isProduction from '../utils/isProduction';
 import NetworkGraph from '../chrome/NetworkGraph';
 import FpsGraph from '../chrome/FpsGraph';
 import UpdateIndicator from '../chrome/UpdateIndicator';
-import PluginManager from '../chrome/plugin-manager/PluginManager';
 import constants from '../fb-stubs/constants';
 import {
   canFileExport,
@@ -163,13 +160,6 @@ export const LeftRail = withTrackingScope(function LeftRail({
               setToplevelSelection('appinspect');
             }}
           />
-          <LeftRailButton
-            icon={<AppstoreOutlined />}
-            title="Plugin Manager"
-            onClick={() => {
-              Dialog.showModal((onHide) => <PluginManager onHide={onHide} />);
-            }}
-          />
           <NotificationButton
             toplevelSelection={toplevelSelection}
             setToplevelSelection={setToplevelSelection}
diff --git a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
index ecfac160a..0af2c1e22 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
@@ -7,7 +7,7 @@
  * @format
  */
 
-import {Layout, styled, theme, useValue} from 'flipper-plugin';
+import {Dialog, Layout, styled, theme, useValue} from 'flipper-plugin';
 import React, {cloneElement, useCallback, useState} from 'react';
 import {useDispatch, useStore} from '../utils/useStore';
 import config from '../fb-stubs/config';
@@ -28,6 +28,7 @@ import {
   WarningOutlined,
 } from '@ant-design/icons';
 import {toggleLeftSidebarVisible} from '../reducers/application';
+import PluginManager from '../chrome/plugin-manager/PluginManager';
 
 export function Navbar() {
   return (
@@ -48,7 +49,13 @@ export function Navbar() {
         <NavbarButton label="Record" icon={VideoCameraOutlined} />
       </Layout.Horizontal>
       <Layout.Horizontal style={{gap: 4, alignItems: 'center'}}>
-        <NavbarButton label="Add Plugins" icon={AppstoreAddOutlined} />
+        <NavbarButton
+          label="Add Plugins"
+          icon={AppstoreAddOutlined}
+          onClick={() => {
+            Dialog.showModal((onHide) => <PluginManager onHide={onHide} />);
+          }}
+        />
         <NavbarButton label="Logs" icon={FileExclamationOutlined} />
         <NavbarButton label="Alerts" icon={BellOutlined} />
         <NavbarButton label="Doctor" icon={MedicineBoxOutlined} />