Merge pull request #6096 from ethereum/scriptrunfix

fix script runner tests and config loader

Author: yann300

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

@@ -28,11 +28,11 @@ const tests = {
       .click('button[data-id="script-config"]')
       .waitForElementVisible('[data-id="sr-loaded-default"]')
       .waitForElementVisible('[data-id="dependency-ethers-^5"]')
-      .waitForElementVisible('[data-id="sr-load-ethers6"]')
+      .waitForElementVisible('[data-id="sr-notloaded-ethers6"]')
   },
   'Should load script runner ethers6': function (browser: NightwatchBrowser) {
     browser
-      .click('[data-id="sr-load-ethers6"]')
+      .click('[data-id="sr-notloaded-ethers6"]')
       .waitForElementVisible('[data-id="sr-loaded-ethers6"]')
       .waitForElementPresent('[data-id="dependency-ethers-^6"]')
   },
@@ -74,6 +74,7 @@ const tests = {
       .waitForElementPresent('*[data-id="create-semaphore"]')
       .scrollAndClick('*[data-id="create-semaphore"]')
       .modalFooterOKClick('TemplatesSelection')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcircuits/semaphore.circom"]')
       .waitForElementVisible({
         locateStrategy: 'xpath',
         selector: "//li[@data-id='UIScriptRunner' and @role='tab']"
@@ -82,9 +83,37 @@ const tests = {
         locateStrategy: 'xpath',
         selector: "//li[@data-id='UIScriptRunner' and @role='tab']"
       })
-      .waitForElementVisible('[data-id="sr-load-default"]')
+      .waitForElementVisible('[data-id="sr-loaded-default"]')
       .waitForElementVisible('[data-id="dependency-ethers-^5"]')
-      .waitForElementVisible('[data-id="sr-load-zksyncv6"]')
+      .waitForElementVisible('[data-id="sr-notloaded-zksyncv6"]')
+  },
+  'open template that sets a config': function (browser: NightwatchBrowser) {
+    browser
+      .waitForElementVisible('*[data-id="workspacesMenuDropdown"]')
+      .click('*[data-id="workspacesMenuDropdown"]')
+      .click('*[data-id="workspacecreate"]')
+      .waitForElementPresent('*[data-id="create-introToEIP7702"]')
+      .scrollAndClick('*[data-id="create-introToEIP7702"]')
+      .modalFooterOKClick('TemplatesSelection')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/Example7702.sol"]')
+      .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-notloaded-default"]')
+      .waitForElementVisible('[data-id="sr-loaded-ethers6"]')
+  },
+  'reset to default after template': function (browser: NightwatchBrowser) {
+    browser
+      .refreshPage()
+      .waitForElementVisible('button[data-id="script-config"]')
+      .click('button[data-id="script-config"]')
+      .waitForElementVisible('[data-id="sr-notloaded-default"]')
+      .waitForElementVisible('[data-id="sr-loaded-ethers6"]')
   },
   'switch to default workspace that should be on ethers6': function (browser: NightwatchBrowser) {
     browser
@@ -99,7 +128,9 @@ const tests = {
       })
       .waitForElementVisible('[data-id="sr-loaded-ethers6"]')
       .waitForElementPresent('[data-id="dependency-ethers-^6"]')
-  }
+  },
+
+
 }
 
 module.exports = tests

apps/remix-ide/src/app/plugins/script-runner-bridge.tsx

@@ -78,9 +78,18 @@ export class ScriptRunnerBridgePlugin extends Plugin {
       this.renderComponent()
     })
 
+    this.plugin.on('fileManager', 'fileAdded', async (file: string) => {
+      if (file && file === configFileName) {
+        await this.loadCustomConfig()
+        await this.loadConfigurations()
+        this.renderComponent()
+      }
+    })
+
     this.plugin.on('fileManager', 'fileSaved', async (file: string) => {
-      if (file === configFileName && this.enableCustomScriptRunner) {
+      if (file && file === configFileName) {
         await this.loadCustomConfig()
+        await this.loadConfigurations()
         this.renderComponent()
       }
     })

libs/remix-ui/scriptrunner/src/lib/components/config-section.tsx

@@ -42,8 +42,8 @@ export default function ConfigSection(props: ConfigSectionProps) {
             checked={(props.activeConfig && props.activeConfig.name === props.config.name)}
           />
           <label className="pointer form-check-label custom-control-label" htmlFor={`${props.config.title || props.config.name}`}
-            data-id={`sr-load-${props.config.name}`}>
-            <div data-id={`sr-loaded-${props.config.name}`} className="pl-2">{props.config.title || props.config.name}</div>
+            data-id={`sr-${(props.activeConfig && props.activeConfig.name === props.config.name)?'loaded':'notloaded'}-${props.config.name}`}>
+            <div className="pl-2">{props.config.title || props.config.name}</div>
           </label>
         </div>
       </section>