ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #5765 Trusted state handling (#5775)

Browse Source 
- Notebooks Can be Improperly Trusted After Save + Reopen
Fix was to only save if actually trusted.
Also fixed condition where it wasn't correctly skipping if in the queue
This commit is contained in:
Kevin Cunnane
2019-05-31 10:21:30 -07:00
committed by GitHub
parent 6b76611c93
commit a364af5c4c
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/parts/notebook/notebookActions.ts
View File

@@ -377,9 +377,9 @@ export class AttachToDropdown extends SelectBox {
}).catch(err => }).catch(err =>
this.logService.error(err)); this.logService.error(err));
} }
model.onValidConnectionSelected(validConnection => { this._register(model.onValidConnectionSelected(validConnection => {
this.handleContextsChanged(!validConnection); this.handleContextsChanged(!validConnection);
}); }));
} }
private getKernelDisplayName(): string { private getKernelDisplayName(): string {

15
src/sql/workbench/services/notebook/common/notebookServiceImpl.ts
View File

@@ -553,16 +553,21 @@ export class NotebookService extends Disposable implements INotebookService {
} }
serializeNotebookStateChange(notebookUri: URI, changeType: SerializationStateChangeType): void { serializeNotebookStateChange(notebookUri: URI, changeType: SerializationStateChangeType): void {
let updateTrustState = changeType === SerializationStateChangeType.Saved;
if (notebookUri.scheme !== Schemas.untitled) { if (notebookUri.scheme !== Schemas.untitled) {
// Cache state for non-untitled notebooks only. // Conditions for saving:
// 1. Not untitled. They're always trusted as we open them
// 2. Serialization action was a save, since don't need to update on execution etc.
// 3. Not already saving (e.g. isn't in the queue to be cached)
// 4. Notebook is trusted. Don't need to save state of untrusted notebooks
let notebookUriString = notebookUri.toString(); let notebookUriString = notebookUri.toString();
if (updateTrustState && this._trustedCacheQueue.findIndex(uri => uri.toString() === notebookUriString)) { if (changeType === SerializationStateChangeType.Saved && this._trustedCacheQueue.findIndex(uri => uri.toString() === notebookUriString) < 0) {
// Only save if it's trusted
let notebook = this.listNotebookEditors().find(n => n.id === notebookUriString);
if (notebook && notebook.model.trustedMode) {
this._trustedCacheQueue.push(notebookUri); this._trustedCacheQueue.push(notebookUri);
this._updateTrustCacheScheduler.schedule(); this._updateTrustCacheScheduler.schedule();
} }
}
// TODO add history notification if a non-untitled notebook has a state change // TODO add history notification if a non-untitled notebook has a state change
} }
} }