Skip to content

Fix regressions in trusted notebooks #12902

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
joyceerhl merged 4 commits into from
Jul 13, 2020
Merged

Fix regressions in trusted notebooks #12902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
319f852
Handle trustAllNotebooks
joyceerhl Jul 11, 2020
2d6f903
Fix bug where after trusting, UI didn't update
joyceerhl Jul 11, 2020
d4c51a1
Minor refactor
joyceerhl Jul 11, 2020
3230238
Feedback from Don
joyceerhl Jul 13, 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
2 changes: 1 addition & 1 deletion src/client/datascience/interactive-ipynb/nativeEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {

// Sign up for dirty events
model.changed(this.modelChanged.bind(this));
this.previouslyNotTrusted = model.isTrusted;
this.previouslyNotTrusted = !model.isTrusted;
Copy link
Author

@joyceerhl joyceerhl Jul 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ensures that monitorChangesToTrust tells the UI to update when the user trusts a previously untrusted notebook

}

// tslint:disable-next-line: no-any
Expand Down
33 changes: 20 additions & 13 deletions src/client/datascience/interactive-ipynb/trustCommandHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
'use strict';

import { inject, injectable } from 'inversify';
import { Uri } from 'vscode';
import { commands, Uri } from 'vscode';
import { IExtensionSingleActivationService } from '../../activation/types';
import { IApplicationShell, ICommandManager } from '../../common/application/types';
import { ContextKey } from '../../common/contextKey';
Expand Down Expand Up @@ -59,18 +59,25 @@ export class TrustCommandHandler implements IExtensionSingleActivationService {
DataScience.doNotTrustNotebook(),
DataScience.trustAllNotebooks()
);
if (selection !== DataScience.trustNotebook() || model.isTrusted) {
return;

switch (selection) {
Copy link
Author

@joyceerhl joyceerhl Jul 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor selection handling code to explicitly handle each case

case DataScience.trustAllNotebooks():
commands.executeCommand('workbench.action.openSettings', 'python.dataScience.alwaysTrustNotebooks');
break;
case DataScience.trustNotebook():
// Update model trust
model.update({
source: 'user',
kind: 'updateTrust',
oldDirty: model.isDirty,
newDirty: model.isDirty,
isNotebookTrusted: true
});
const contents = model.getContent();
await this.trustService.trustNotebook(model.file, contents);
break;
default:
break;
}
// Update model trust
model.update({
source: 'user',
kind: 'updateTrust',
oldDirty: model.isDirty,
newDirty: model.isDirty,
isNotebookTrusted: true
});
const contents = model.getContent();
await this.trustService.trustNotebook(model.file, contents);
}
}