Scriptrunner as main plugin

apps/remix-ide-e2e/src/tests/script-runner.test.ts

@@ -2,14 +2,22 @@
 import { NightwatchBrowser } from 'nightwatch'
 import init from '../helpers/init'
 
-module.exports = {
+const tests = {
 
     before: function (browser: NightwatchBrowser, done: VoidFunction) {
         init(browser, done, 'http://127.0.0.1:8080', false)
     },
+    'Should activate plugins': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="remixIdeSidePanel"]')
+            .waitForElementVisible('*[plugin="pluginManager"]')
+            .click('*[plugin="pluginManager"]')
+            .waitForElementVisible('*[data-id="pluginManagerComponentPluginManager"]')
+            .click('*[data-id="pluginManagerComponentPluginManager"]')
+            .scrollAndClick('*[data-id="pluginManagerComponentActivateButtonUIScriptRunner"]')
+    },
     'Should load default script runner': function (browser: NightwatchBrowser) {
         browser
-            .clickLaunchIcon('scriptRunnerBridge')
             .waitForElementVisible('[data-id="sr-loaded-default"]')
             .waitForElementVisible('[data-id="dependency-ethers-^5"]')
             .waitForElementVisible('[data-id="sr-toggle-ethers6"]')
@@ -57,21 +65,36 @@ module.exports = {
             .waitForElementPresent('*[data-id="create-semaphore"]')
             .scrollAndClick('*[data-id="create-semaphore"]')
             .modalFooterOKClick('TemplatesSelection')
-            .clickLaunchIcon('scriptRunnerBridge')
+            .waitForElementVisible({
+                locateStrategy: 'xpath',
+                selector: "//li[@data-id='UIScriptRunner' and @role='tab']"
+            })
+            .click({
+                locateStrategy: 'xpath',
+                selector: "//li[@data-id='UIScriptRunner' and @role='tab']"
+            })
             .waitForElementVisible('[data-id="sr-loaded-default"]')
             .waitForElementVisible('[data-id="dependency-ethers-^5"]')
             .waitForElementVisible('[data-id="sr-toggle-ethers6"]')
     },
     'switch to default workspace that should be on ethers6': function (browser: NightwatchBrowser) {
         browser
-            .clickLaunchIcon('filePanel')
             .switchWorkspace('default_workspace')
-            .clickLaunchIcon('scriptRunnerBridge')
+            .waitForElementVisible({
+                locateStrategy: 'xpath',
+                selector: "//li[@data-id='UIScriptRunner' and @role='tab']"
+            })
+            .click({
+                locateStrategy: 'xpath',
+                selector: "//li[@data-id='UIScriptRunner' and @role='tab']"
+            })
             .waitForElementVisible('[data-id="sr-loaded-ethers6"]')
             .waitForElementPresent('[data-id="dependency-ethers-^6"]')
     }
 }
 
+module.exports = tests
+
 
 const deployWithEthersJs = `
 import { ethers } from 'ethers'

apps/remix-ide/src/app.ts

@@ -78,7 +78,7 @@ import * as remixLib from '@remix-project/remix-lib'
 
 import { QueryParams } from '@remix-project/remix-lib'
 import { SearchPlugin } from './app/tabs/search'
-import { ScriptRunnerUIPlugin } from './app/tabs/script-runner-ui'
+import { ScriptRunnerBridgePlugin } from './app/plugins/script-runner-bridge'
 import { ElectronProvider } from './app/files/electronProvider'
 
 const Storage = remixLib.Storage
@@ -103,6 +103,7 @@ import Filepanel from './app/panels/file-panel'
 import Editor from './app/editor/editor'
 import Terminal from './app/panels/terminal'
 import TabProxy from './app/panels/tab-proxy.js'
+import { any } from 'async'
 
 const _paq = (window._paq = window._paq || [])
 
@@ -281,7 +282,7 @@ class AppComponent {
     const search = new SearchPlugin()
 
     //---------------- Script Runner UI Plugin -------------------------
-    const scriptRunnerUI = new ScriptRunnerUIPlugin(this.engine)
+    const scriptRunnerUI = new ScriptRunnerBridgePlugin(this.engine)
 
     //---- templates
     const templates = new TemplatesPlugin()
@@ -677,7 +678,9 @@ class AppComponent {
               this.appManager.call('sidePanel', 'pinView', JSON.parse(lastPinned))
             }
           })
-          .catch(console.error)
+          .catch((e) => {
+            console.error(e)
+          })
       }
       const loadedElement = document.createElement('span')
       loadedElement.setAttribute('data-id', 'apploaded')

apps/remix-ide/src/app/components/plugin-manager-component.js

@@ -136,7 +136,7 @@ export default class PluginManagerComponent extends ViewPlugin {
   }
 
   listenOnEvent () {
-    this.engine.event.on('onRegistration', () => this.renderComponent())
+    this.engine.event.on('onRegistration', () => this.getAndFilterPlugins())
     this.appManager.event.on('activate', () => {
       this.getAndFilterPlugins()
     })

apps/remix-ide/src/app/panels/tab-proxy.js

@@ -164,7 +164,9 @@ export default class TabProxy extends Plugin {
     })
 
     this.on('manager', 'pluginActivated', ({ name, location, displayName, icon, description }) => {
+
       if (location === 'mainPanel') {
+        console.log('pluginActivated', name, location, displayName, icon, description)
         this.addTab(
           name,
           displayName,
@@ -201,6 +203,7 @@ export default class TabProxy extends Plugin {
   }
 
   focus (name) {
+    console.log('focus', name)
     this.emit('switchApp', name)
     this.tabsApi.activateTab(name)
   }
@@ -324,6 +327,7 @@ export default class TabProxy extends Plugin {
   removeTab (name, currentFileTab) {
     delete this._handlers[name]
     let previous = currentFileTab
+    if(!this.loadedTabs.find(tab => tab.name === name)) return // prevent removing tab that doesn't exist
     this.loadedTabs = this.loadedTabs.filter((tab, index) => {
       if (!previous && tab.name === name) {
         if(index - 1  >= 0 && this.loadedTabs[index - 1])