Skip to content

Fix remixd workspace #946

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
ioedeveloper merged 3 commits into from
Mar 8, 2021
Merged

Fix remixd workspace #946

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
2e9ea9e
make sure plugins deactivated if modal not validated
yann300 Mar 8, 2021
1226ae9
switch workspace if connection lost
yann300 Mar 8, 2021
0da2716
add comment
yann300 Mar 8, 2021
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
6 changes: 3 additions & 3 deletions apps/remix-ide/src/app/files/remixd-handle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class RemixdHandle extends WebsocketPlugin {

deactivate () {
if (super.socket) super.deactivate()
this.call('manager', 'deactivatePlugin', 'git')
this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
this.locahostProvider.close((error) => {
if (error) console.log(error)
})
Expand All @@ -49,8 +49,8 @@ export class RemixdHandle extends WebsocketPlugin {
}

async canceled () {
this.call('manager', 'deactivatePlugin', 'git')
this.call('manager', 'deactivatePlugin', 'remixd')
await this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
await this.appManager.deactivatePlugin('remixd')
}

/**
Expand Down
1 change: 1 addition & 0 deletions libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export const Workspace = (props: WorkspaceProps) => {

props.localhost.event.register('disconnected', () => {
remixdExplorer.hide()
setWorkspace(props.workspaces.length > 0 ? props.workspaces[0] : NO_WORKSPACE)
})

if (props.initialWorkspace) {
Expand Down