From 9d53121b83116584bf4b3849123422717c9edf62 Mon Sep 17 00:00:00 2001
From: joseph izang <joeizang@hotmail.com>
Date: Wed, 21 Jul 2021 13:01:03 +0100
Subject: [PATCH] Refactor prop requirements for pluginmanager

---
 .../components/plugin-manager-component.js    |  6 ---
 .../src/lib/components/ActivateButton.tsx     |  4 +-
 .../src/lib/components/deactivateButton.tsx   |  4 +-
 .../src/lib/components/rootView.tsx           |  2 +-
 .../src/lib/remix-ui-plugin-manager.tsx       | 42 -------------------
 libs/remix-ui/plugin-manager/src/types.d.ts   |  6 ---
 6 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/apps/remix-ide/src/app/components/plugin-manager-component.js b/apps/remix-ide/src/app/components/plugin-manager-component.js
index d82001319f..96c1f1ab85 100644
--- a/apps/remix-ide/src/app/components/plugin-manager-component.js
+++ b/apps/remix-ide/src/app/components/plugin-manager-component.js
@@ -153,12 +153,6 @@ class PluginManagerComponent extends ViewPlugin {
     ReactDOM.render(
       <RemixUiPluginManager
         pluginComponent={this}
-        appManager={this.appManager}
-        engine={this.engine}
-        localPlugin={this.localPlugin}
-        activePluginNames={this.pluginNames}
-        _paq={_paq}
-        filter={this.filter}
       />,
       document.getElementById('pluginManager'))
   }
diff --git a/libs/remix-ui/plugin-manager/src/lib/components/ActivateButton.tsx b/libs/remix-ui/plugin-manager/src/lib/components/ActivateButton.tsx
index f1c3e9f4ad..586a89d8a8 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/ActivateButton.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/ActivateButton.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useState } from 'react'
 import { PluginManagerComponent } from '../../types'
 
 interface ActivateButtonProps {
@@ -12,7 +12,7 @@ function ActivateButton ({
   pluginName,
   pluginComponent
 }: ActivateButtonProps) {
-  const dataId = `pluginManagerComponent${buttonText}Button${pluginName}`
+  const [dataId] = useState(`pluginManagerComponent${buttonText}Button${pluginName}`)
 
   return (
     <button
diff --git a/libs/remix-ui/plugin-manager/src/lib/components/deactivateButton.tsx b/libs/remix-ui/plugin-manager/src/lib/components/deactivateButton.tsx
index 1aea469b44..c32d4ffab1 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/deactivateButton.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/deactivateButton.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useState } from 'react'
 import { PluginManagerComponent } from '../../types'
 
 interface DeactivateButtonProps {
@@ -12,7 +12,7 @@ function DeactivateButton ({
   pluginName,
   pluginComponent
 }: DeactivateButtonProps) {
-  const dataId = `pluginManagerComponent${buttonText}Button${pluginName}`
+  const [dataId] = useState(`pluginManagerComponent${buttonText}Button${pluginName}`)
   return (
     <button
       onClick={() => {
diff --git a/libs/remix-ui/plugin-manager/src/lib/components/rootView.tsx b/libs/remix-ui/plugin-manager/src/lib/components/rootView.tsx
index 27eae62a4d..17e50e7bce 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/rootView.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/rootView.tsx
@@ -57,7 +57,7 @@ function RootView ({ pluginComponent }: RootViewProps) {
     if (pluginComponent.inactivePlugins && pluginComponent.inactivePlugins.length) {
       setInactiveP(pluginComponent.inactivePlugins)
     }
-  }, [pluginComponent.activePlugins, pluginComponent.inactivePlugins])
+  }, [pluginComponent.activePlugins, pluginComponent.inactivePlugins, activeP, inactiveP])
 
   return (
     <Fragment>
diff --git a/libs/remix-ui/plugin-manager/src/lib/remix-ui-plugin-manager.tsx b/libs/remix-ui/plugin-manager/src/lib/remix-ui-plugin-manager.tsx
index 1e0989d89c..ae6bfa4937 100644
--- a/libs/remix-ui/plugin-manager/src/lib/remix-ui-plugin-manager.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/remix-ui-plugin-manager.tsx
@@ -3,48 +3,6 @@ import { RemixUiPluginManagerProps } from '../types'
 import RootView from './components/rootView'
 import './remix-ui-plugin-manager.css'
 
-// const test = () => {
-//   const appManager = new RemixAppManager()
-//   const activePlugins: Profile<any>[] = new Array<Profile<any>>()
-//   const inactivePlugins: Profile<any>[] = new Array<Profile<any>>()
-//   const isFiltered = (profile) => (profile.displayName ? profile.displayName : profile.name).toLowerCase().includes(this.filter)
-//   const isNotRequired = (profile) => !appManager.isRequired(profile.name)
-//   const isNotDependent = (profile) => !appManager.isDependent(profile.name)
-//   const isNotHome = (profile) => profile.name !== 'home'
-//   const sortByName = (profileA, profileB) => {
-//     const nameA = ((profileA.displayName) ? profileA.displayName : profileA.name).toUpperCase()
-//     const nameB = ((profileB.displayName) ? profileB.displayName : profileB.name).toUpperCase()
-//     return (nameA < nameB) ? -1 : (nameA > nameB) ? 1 : 0
-//   }
-//   // const { finalActives, finalInactives } =
-//   const tempArray = appManager.getAll()
-//     .filter(isFiltered)
-//     .filter(isNotRequired)
-//     .filter(isNotDependent)
-//     .filter(isNotHome)
-//     .sort(sortByName)
-
-//   tempArray.forEach(profile => {
-//     if (appManager.actives.includes(profile.name)) {
-//       activePlugins.push(profile)
-//     } else {
-//       inactivePlugins.push(profile)
-//     }
-//   })
-
-//   return { activePlugins, inactivePlugins }
-//   // .reduce(({ actives, inactives }, profile) => {
-//   //   return isActive(profile.name)
-//   //     ? { actives: [...actives, profile], inactives }
-//   //     : { inactives: [...inactives, profile], actives }
-//   // }, { actives: [], inactives: [] })
-
-//   // // eslint-disable-next-line no-debugger
-//   // // debugger
-//   // activePlugins = finalActives
-//   // inactivePlugins = finalInactives
-// }
-
 export const RemixUiPluginManager = (props: RemixUiPluginManagerProps) => {
   return (
     <RootView pluginComponent={props.pluginComponent}/>
diff --git a/libs/remix-ui/plugin-manager/src/types.d.ts b/libs/remix-ui/plugin-manager/src/types.d.ts
index 471ae5c86c..d37dcfae2c 100644
--- a/libs/remix-ui/plugin-manager/src/types.d.ts
+++ b/libs/remix-ui/plugin-manager/src/types.d.ts
@@ -150,12 +150,6 @@ export interface PluginManagerContextProviderProps {
 export interface RemixUiPluginManagerProps {
   appManager: RemixAppManager
   pluginComponent: PluginManagerComponent
-  pluginSettings: PluginManagerSettings // Window & typeof globalThis | []
-  activePluginNames: string[]
-  isActive?: (name: string) => boolean
-  filterPlugins: () => void
-  profile: Partial<PluginManagerProfile>
-  headingLabel: string
 }
 /** @class Reference loaders.
  *  A loader is a get,set based object which load a workspace from a defined sources.