From 02ad5c64aa6beda7d9bea55761842f248e42a03b Mon Sep 17 00:00:00 2001
From: Michel Weststrate <mweststrate@fb.com>
Date: Fri, 13 Dec 2019 07:07:48 -0800
Subject: [PATCH] Fix last startup warnings

Summary: There were a few warnings printed when starting Flipper. This fixes the last of them!

Reviewed By: nikoant

Differential Revision: D19011385

fbshipit-source-id: 15bc46c4a67e8c8fd3c8b5d96dc67e61911a7e53
---
 headless/index.tsx          |  4 ++--
 src/utils/exportData.tsx    | 20 +-------------------
 src/utils/exportMetrics.tsx |  3 ++-
 src/utils/icons.js          |  2 ++
 src/utils/pluginUtils.tsx   | 20 ++++++++++++++++++--
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/headless/index.tsx b/headless/index.tsx
index e35b8dc67..d1b312373 100644
--- a/headless/index.tsx
+++ b/headless/index.tsx
@@ -14,14 +14,14 @@ import yargs, {Argv} from 'yargs';
 import dispatcher from '../src/dispatcher/index';
 import reducers, {Actions, State} from '../src/reducers/index';
 import {init as initLogger} from '../src/fb-stubs/Logger';
-import {exportStore, pluginsClassMap} from '../src/utils/exportData';
+import {exportStore} from '../src/utils/exportData';
 import {
   exportMetricsWithoutTrace,
   exportMetricsFromTrace,
 } from '../src/utils/exportMetrics';
 import {listDevices} from '../src/utils/listDevices';
 import setup from '../static/setup.js';
-import {getPersistentPlugins} from '../src/utils/pluginUtils';
+import {getPersistentPlugins, pluginsClassMap} from '../src/utils/pluginUtils';
 import {serialize} from '../src/utils/serialization';
 import {getStringFromErrorLike} from '../src/utils/index';
 import AndroidDevice from '../src/devices/AndroidDevice';
diff --git a/src/utils/exportData.tsx b/src/utils/exportData.tsx
index 957fe9a5d..55351b9eb 100644
--- a/src/utils/exportData.tsx
+++ b/src/utils/exportData.tsx
@@ -15,8 +15,7 @@ import {Store, State as ReduxState} from '../reducers';
 import {DeviceExport} from '../devices/BaseDevice';
 import {State as PluginStatesState} from '../reducers/pluginStates';
 import {PluginNotification} from '../reducers/notifications';
-import {ClientExport, ClientQuery} from '../Client.js';
-import {State as PluginsState} from '../reducers/plugins';
+import Client, {ClientExport, ClientQuery} from '../Client';
 import {pluginKey} from '../reducers/pluginStates';
 import {
   FlipperDevicePlugin,
@@ -26,7 +25,6 @@ import {
 } from '../plugin';
 import {default as BaseDevice} from '../devices/BaseDevice';
 import {default as ArchivedDevice} from '../devices/ArchivedDevice';
-import {default as Client} from '../Client';
 import fs from 'fs';
 import uuid from 'uuid';
 import {remote, OpenDialogOptions} from 'electron';
@@ -107,22 +105,6 @@ export function processClients(
   return filteredClients;
 }
 
-export function pluginsClassMap(
-  plugins: PluginsState,
-): Map<string, typeof FlipperDevicePlugin | typeof FlipperPlugin> {
-  const pluginsMap: Map<
-    string,
-    typeof FlipperDevicePlugin | typeof FlipperPlugin
-  > = new Map([]);
-  plugins.clientPlugins.forEach((val, key) => {
-    pluginsMap.set(key, val);
-  });
-  plugins.devicePlugins.forEach((val, key) => {
-    pluginsMap.set(key, val);
-  });
-  return pluginsMap;
-}
-
 export function processPluginStates(
   options: ProcessPluginStatesOptions,
 ): PluginStatesState {
diff --git a/src/utils/exportMetrics.tsx b/src/utils/exportMetrics.tsx
index 43c30f83a..c498db141 100644
--- a/src/utils/exportMetrics.tsx
+++ b/src/utils/exportMetrics.tsx
@@ -12,9 +12,10 @@ import {serialize} from './serialization';
 import {State as PluginStatesState} from '../reducers/pluginStates';
 import {Store} from '../reducers';
 import fs from 'fs';
-import {ExportType, fetchMetadata, pluginsClassMap} from './exportData';
+import {ExportType, fetchMetadata} from './exportData';
 import {deserializeObject} from './serialization';
 import {deconstructPluginKey} from './clientUtils';
+import {pluginsClassMap} from './pluginUtils';
 
 export type MetricType = {[metricName: string]: number};
 type MetricPluginType = {[pluginID: string]: MetricType};
diff --git a/src/utils/icons.js b/src/utils/icons.js
index 33519acde..cdd3200f1 100644
--- a/src/utils/icons.js
+++ b/src/utils/icons.js
@@ -81,10 +81,12 @@ const ICONS = {
   tree: [12],
   translate: [12],
   trash: [12, 16],
+  'trash-outline': [16],
   'star-slash': [16],
   'life-event-major': [16],
   target: [12, 16],
   tools: [12, 20],
+  underline: [12],
   'washing-machine': [12],
   'watch-tv': [12],
 };
diff --git a/src/utils/pluginUtils.tsx b/src/utils/pluginUtils.tsx
index c9a79d5e2..7021aa1b8 100644
--- a/src/utils/pluginUtils.tsx
+++ b/src/utils/pluginUtils.tsx
@@ -10,11 +10,27 @@
 import {FlipperDevicePlugin, FlipperPlugin, FlipperBasePlugin} from '../plugin';
 import BaseDevice from '../devices/BaseDevice';
 import {State as PluginStatesState} from '../reducers/pluginStates';
-import {pluginsClassMap} from './exportData';
 import {State as PluginsState} from '../reducers/plugins';
 import {PluginDefinition} from '../dispatcher/plugins';
 import {deconstructPluginKey} from './clientUtils';
-import Client from '../Client';
+
+type Client = import('../Client').default;
+
+export function pluginsClassMap(
+  plugins: PluginsState,
+): Map<string, typeof FlipperDevicePlugin | typeof FlipperPlugin> {
+  const pluginsMap: Map<
+    string,
+    typeof FlipperDevicePlugin | typeof FlipperPlugin
+  > = new Map([]);
+  plugins.clientPlugins.forEach((val, key) => {
+    pluginsMap.set(key, val);
+  });
+  plugins.devicePlugins.forEach((val, key) => {
+    pluginsMap.set(key, val);
+  });
+  return pluginsMap;
+}
 
 export function getPluginKey(
   selectedApp: string | null,