fix existing e2e

Author: Aniket-Engg

apps/remix-ide-e2e/src/tests/toggle_panels.test.ts

@@ -26,24 +26,22 @@ module.exports = {
       .waitForElementVisible('*[data-pinnedPlugin="movePluginToLeft-solidity"]')
       .clickLaunchIcon('filePanel')
   },
-  'Toggle right side panel to hide pinned plugin and restore it #group1': function (browser: NightwatchBrowser) {
+  'Toggle right side panel to hide and show pinned plugin #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="hideRightSidePanel"]')
       .click('*[data-id="hideRightSidePanel"]')
       .waitForElementNotVisible('*[data-pinnedplugin="movePluginToLeft-solidity"]')
-      .waitForElementVisible('*[data-id="restoreClosedPlugin"')
-      .click('*[data-id="restoreClosedPlugin"]')
+      .click('*[data-id="toggleRightSidePanel"]')
       .waitForElementVisible('*[data-pinnedplugin="movePluginToLeft-solidity"]')
   },
   'Toggle right side panel, reload IDE, panel state should persist #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="hideRightSidePanel"]')
       .click('*[data-id="hideRightSidePanel"]')
       .waitForElementNotVisible('*[data-pinnedplugin="movePluginToLeft-solidity"]')
-      .waitForElementVisible('*[data-id="restoreClosedPlugin"')
       .refresh()
-      .waitForElementVisible('*[data-id="restoreClosedPlugin"')
-      .click('*[data-id="restoreClosedPlugin"]')
+      .waitForElementVisible('*[data-id="toggleRightSidePanel"')
+      .click('*[data-id="toggleRightSidePanel"]')
       .waitForElementVisible('*[data-pinnedplugin="movePluginToLeft-solidity"]')
   },
   'Swap pinned plugin from right side panel when panel is hidden #group1': function (browser: NightwatchBrowser) {
@@ -52,7 +50,6 @@ module.exports = {
       .waitForElementVisible('*[data-pinnedplugin="movePluginToLeft-solidity"]')
       .waitForElementVisible('*[data-id="hideRightSidePanel"]')
       .click('*[data-id="hideRightSidePanel"]')
-      .waitForElementVisible('*[data-id="restoreClosedPlugin"]')
       .clickLaunchIcon('udapp')
       .waitForElementVisible('*[data-pinnedplugin="movePluginToRight-udapp"]')
       .click('*[data-id="movePluginToRight"]')

apps/remix-ide/src/app/components/right-side-panel.tsx

@@ -151,21 +151,22 @@ export class RightSidePanel extends AbstractPanel {
 
   togglePanel () {
     const pinnedPanel = document.querySelector('#right-side-panel')
+    // Persist the hidden state to panelStates, preserving pluginProfile
+    const panelStates = JSON.parse(window.localStorage.getItem('panelStates') || '{}')
+    const currentPlugin = this.currentFocus()
+    const pluginProfile = currentPlugin && this.plugins[currentPlugin] ? this.plugins[currentPlugin].profile : null
     if (this.isHidden) {
       this.isHidden = false
       pinnedPanel?.classList.remove('d-none')
       this.emit('rightSidePanelShown')
       this.events.emit('rightSidePanelShown')
     } else {
       this.isHidden = true
+      this.hiddenPlugin = pluginProfile
       pinnedPanel?.classList.add('d-none')
       this.emit('rightSidePanelHidden')
       this.events.emit('rightSidePanelHidden')
     }
-    // Persist the hidden state to panelStates, preserving pluginProfile
-    const panelStates = JSON.parse(window.localStorage.getItem('panelStates') || '{}')
-    const currentPlugin = this.currentFocus()
-    const pluginProfile = currentPlugin && this.plugins[currentPlugin] ? this.plugins[currentPlugin].profile : null
     panelStates.rightSidePanel = {
       isHidden: this.isHidden,
       pluginProfile: pluginProfile