Skip to content

Deactivate Plugins From Url Parameters #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yann300 merged 3 commits into from
Oct 5, 2020
Merged

Deactivate Plugins From Url Parameters #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0d932d
deactivatePluginsFromUrl
yann300 Oct 2, 2020
89e4b2b
add e2e tests - deactivate plugins
yann300 Oct 5, 2020
536816f
renaming:
yann300 Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions apps/remix-ide-e2e/src/tests/workspace.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import sauce from './sauce'

module.exports = {
before: function (browser: NightwatchBrowser, done: VoidFunction) {
init(browser, done, 'http://127.0.0.1:8080?plugins=solidity,udapp&plugincall=fileManager//open//3_Ballot.sol', false)
init(browser, done, 'http://127.0.0.1:8080?activate=solidity,udapp&call=fileManager//open//3_Ballot.sol&deactivate=home', false)
},

'CheckSolidityActivatedAndUDapp': function (browser: NightwatchBrowser) {
Expand All @@ -20,7 +20,12 @@ module.exports = {
.pause(5000)
.getEditorValue((content) => {
browser.assert.ok(content.indexOf('contract Ballot {') != -1, 'content doesn\'t include Ballot contract')
})
})
},

'Home page should be deactivated': function (browser: NightwatchBrowser) {
browser
.waitForElementNotPresent('[data-id="landingPageHomeContainer"]')
.end()
},

Expand Down
12 changes: 10 additions & 2 deletions apps/remix-ide/src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,19 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
// Set workspace after initial activation
if (Array.isArray(workspace)) {
appManager.activatePlugin(workspace).then(() => {
try {
if (params.deactivate) {
appManager.deactivatePlugin(params.deactivate.split(','))
}
} catch (e) {
console.log(e)
}

// If plugins are loaded from the URL params, we focus on the last one.
if (pluginLoader.current === 'queryParams' && workspace.length > 0) menuicons.select(workspace[workspace.length - 1])

if (params.plugincall) {
const callDetails = params.plugincall.split('//')
if (params.call) {
const callDetails = params.call.split('//')
if (callDetails.length > 1) {
toolTip(`initiating ${callDetails[0]} ...`)
// @todo(remove the timeout when activatePlugin is on 0.3.0)
Expand Down
8 changes: 4 additions & 4 deletions apps/remix-ide/src/remixAppManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ class PluginLoader {
this.loaders['queryParams'] = {
set: () => {},
get: () => {
const { plugins } = queryParams.get()
if (!plugins) return []
return plugins.split(',')
const { activate } = queryParams.get()
if (!activate) return []
return activate.split(',')
}
}

this.current = queryParams.get()['plugins'] ? 'queryParams' : 'localStorage'
this.current = queryParams.get()['activate'] ? 'queryParams' : 'localStorage'
}

set (plugin, actives) {
Expand Down