From f5a81d9643f30aaab6611a55c98ae00a13203eb2 Mon Sep 17 00:00:00 2001
From: GrandSchtroumpf <francois.guezengar@hotmail.fr>
Date: Mon, 30 Nov 2020 12:32:32 +0100
Subject: [PATCH] remove ensureActivated

---
 apps/remix-ide/src/app.js                     |  3 +-
 .../src/app/components/vertical-icons.js      |  4 +-
 .../src/app/ui/landing-page/landing-page.js   | 48 ++++++++-----------
 apps/remix-ide/src/remixAppManager.js         |  7 ---
 4 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index b759906d21..4abc4c30cc 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -429,8 +429,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
     }).catch(console.error)
   } else {
     // activate solidity plugin
-    appManager.ensureActivated('solidity')
-    appManager.ensureActivated('udapp')
+    appManager.activatePlugin(['solidity', 'udapp'])
   }
 
   // Load and start the service who manager layout and frame
diff --git a/apps/remix-ide/src/app/components/vertical-icons.js b/apps/remix-ide/src/app/components/vertical-icons.js
index d59c3d0722..4c5282793c 100644
--- a/apps/remix-ide/src/app/components/vertical-icons.js
+++ b/apps/remix-ide/src/app/components/vertical-icons.js
@@ -225,9 +225,7 @@ export class VerticalIcons extends Plugin {
     const home = yo`
       <div
         class="${css.homeIcon}"
-        onclick="${(e) => {
-          this.appManager.ensureActivated('home')
-        }}"
+        onclick="${(e) => this.appManager.activatePlugin('home')}"
         plugin="home" title="Home"
         data-id="verticalIconsHomeIcon"
       >
diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
index 272f79a5b3..63bc0af8a8 100644
--- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js
+++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
@@ -240,53 +240,43 @@ export class LandingPage extends ViewPlugin {
       })
     }
 
-    const startSolidity = () => {
-      this.appManager.ensureActivated('solidity')
-      this.appManager.ensureActivated('udapp')
-      this.appManager.ensureActivated('solidityStaticAnalysis')
-      this.appManager.ensureActivated('solidityUnitTesting')
+
+    const startSolidity = async () => {
+      await this.appManager.activatePlugin(['solidity', 'udapp', 'solidityStaticAnalysis', 'solidityUnitTesting'])
       this.verticalIcons.select('solidity')
     }
-    /*
-    const startWorkshop = () => {
-      this.appManager.ensureActivated('box')
-      this.appManager.ensureActivated('solidity')
-      this.appManager.ensureActivated('solidityUnitTesting')
-      this.appManager.ensureActivated('workshops')
-      this.verticalIcons.select('workshops')
-    }
-    */
-
     const startPipeline = () => {
-      this.appManager.ensureActivated('solidity')
-      this.appManager.ensureActivated('pipeline')
-      this.appManager.ensureActivated('udapp')
+      this.appManager.activatePlugin(['solidity', 'pipeline', 'udapp'])
     }
-    const startDebugger = () => {
-      this.appManager.ensureActivated('debugger')
+    const startDebugger = async () => {
+      await this.appManager.activatePlugin('debugger')
       this.verticalIcons.select('debugger')
     }
-    const startMythX = () => {
-      this.appManager.ensureActivated('solidity')
-      this.appManager.ensureActivated('mythx')
+    const startMythX = async () => {
+      await this.appManager.activatePlugin(['solidity', 'mythx'])
       this.verticalIcons.select('mythx')
     }
-    const startSourceVerify = () => {
-      this.appManager.ensureActivated('solidity')
-      this.appManager.ensureActivated('source-verification')
+    const startSourceVerify = async () => {
+      await this.appManager.activatePlugin(['solidity', 'source-verification'])
       this.verticalIcons.select('source-verification')
     }
-    const startPluginManager = () => {
-      this.appManager.ensureActivated('pluginManager')
+    const startPluginManager = async () => {
+      await this.appManager.activatePlugin('pluginManager')
       this.verticalIcons.select('pluginManager')
     }
+    /*
+    const startWorkshop = async () => {
+      await this.appManager.activatePlugin(['box', 'solidity', 'solidityUnitTesting', 'workshops'])
+      this.verticalIcons.select('workshops')
+    }
+    */
 
     const createNewFile = () => {
       const fileExplorer = globalRegistry.get('fileexplorer/browser').api
       fileExplorer.createNewFile()
     }
     const connectToLocalhost = () => {
-      this.appManager.ensureActivated('remixd')
+      this.appManager.activatePlugin('remixd')
     }
     const importFromGist = () => {
       this.gistHandler.loadFromGist({ gist: '' }, globalRegistry.get('filemanager').api)
diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js
index f85a7b4f8e..432acd0154 100644
--- a/apps/remix-ide/src/remixAppManager.js
+++ b/apps/remix-ide/src/remixAppManager.js
@@ -70,13 +70,6 @@ export class RemixAppManager extends PluginManager {
     this.event.emit('deactivate', plugin)
   }
 
-  onRegistration () {}
-
-  async ensureActivated (apiName) {
-    await this.activatePlugin(apiName)
-    this.event.emit('ensureActivated', apiName)
-  }
-
   async ensureDeactivated (apiName) {
     await this.deactivatePlugin(apiName)
     this.event.emit('ensureDeactivated', apiName)