ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-14 03:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reenabling book trust manager tests (#23594)

Browse Source 
* Reenabling book trust manager tests

* Also fix trustbook test
This commit is contained in:
Chris LaFreniere
2023-07-06 15:47:16 -07:00
committed by GitHub
parent 718bc0d737
commit 6125708b25
5 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/notebook/src/book/bookTreeView.ts
View File

@@ -110,10 +110,10 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
void this._extensionContext.globalState.update(constants.visitedNotebooksMementoKey, value);
}
trustBook(bookTreeItem?: BookTreeItem): void {
async trustBook(bookTreeItem?: BookTreeItem): Promise<void> {
let bookPathToTrust: string = bookTreeItem ? bookTreeItem.root : this.currentBook?.bookPath;
if (bookPathToTrust) {
let trustChanged = this._bookTrustManager.setBookAsTrusted(bookPathToTrust, true);
let trustChanged = await this._bookTrustManager.setBookAsTrusted(bookPathToTrust, true);
if (trustChanged) {
let notebookDocuments = azdata.nb.notebookDocuments;
if (notebookDocuments) {

12
extensions/notebook/src/book/bookTrustManager.ts
View File

@@ -11,7 +11,7 @@ import { BookVersion } from './bookVersionHandler';
export interface IBookTrustManager {
isNotebookTrustedByDefault(notebookUri: string): boolean;
setBookAsTrusted(bookRootPath: string, isTrusted: boolean): boolean;
setBookAsTrusted(bookRootPath: string, isTrusted: boolean): Promise<boolean>;
}
enum TrustBookOperation {
@@ -58,7 +58,7 @@ export class BookTrustManager implements IBookTrustManager {
.reduce((accumulator, currentBookItemList) => accumulator.concat(currentBookItemList), []);
}
setBookAsTrusted(bookRootPath: string, isTrusted: boolean): boolean {
async setBookAsTrusted(bookRootPath: string, isTrusted: boolean): Promise<boolean> {
if (isTrusted) {
return this.updateTrustedBooks(bookRootPath, TrustBookOperation.Add);
}
@@ -72,11 +72,11 @@ export class BookTrustManager implements IBookTrustManager {
return trustedBookDirectories;
}
setTrustedBookPathsInConfig(bookPaths: string[]) {
async setTrustedBookPathsInConfig(bookPaths: string[]): Promise<void> {
let config: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration(constants.notebookConfigKey);
let storeInWorspace: boolean = this.hasWorkspaceFolders();
void config.update(constants.trustedBooksConfigKey, bookPaths, storeInWorspace ? false : vscode.ConfigurationTarget.Global);
return config.update(constants.trustedBooksConfigKey, bookPaths, storeInWorspace ? false : vscode.ConfigurationTarget.Global);
}
hasWorkspaceFolders(): boolean {
@@ -84,7 +84,7 @@ export class BookTrustManager implements IBookTrustManager {
return workspaceFolders && workspaceFolders.length > 0;
}
updateTrustedBooks(bookPath: string, operation: TrustBookOperation) {
async updateTrustedBooks(bookPath: string, operation: TrustBookOperation): Promise<boolean> {
let modifiedTrustedBooks = false;
let bookPathToChange: string = path.join(bookPath, path.sep);
@@ -110,7 +110,7 @@ export class BookTrustManager implements IBookTrustManager {
modifiedTrustedBooks = true;
}
this.setTrustedBookPathsInConfig(trustedBooks);
await this.setTrustedBookPathsInConfig(trustedBooks);
return modifiedTrustedBooks;
}