diff --git a/extensions/notebook/src/book/bookTocManager.ts b/extensions/notebook/src/book/bookTocManager.ts index ce0f6a3f52..8615683f43 100644 --- a/extensions/notebook/src/book/bookTocManager.ts +++ b/extensions/notebook/src/book/bookTocManager.ts @@ -316,7 +316,7 @@ export class BookTocManager implements IBookTocManager { * @param section The section that's been moved. * @param book The target book. */ - async moveSectionFiles(section: BookTreeItem, book: BookTreeItem): Promise { + async moveSectionFiles(section: BookTreeItem, bookItem: BookTreeItem): Promise { const uri = path.posix.join(path.posix.sep, path.relative(section.rootContentPath, section.book.contentPath)); let moveFile = path.join(path.parse(uri).dir, path.parse(uri).name); let fileName = undefined; @@ -349,9 +349,9 @@ export class BookTocManager implements IBookTocManager { this.cleanUp(path.dirname(section.book.contentPath)); } - if (book.version === BookVersion.v1) { + if (bookItem.book.version === BookVersion.v1) { // here we only convert if is v1 because we are already using the v2 notation for every book that we read. - this.newSection = convertTo(book.version, this.newSection); + this.newSection = convertTo(bookItem.book.version, this.newSection); } } @@ -385,9 +385,9 @@ export class BookTocManager implements IBookTocManager { fileName = fileName === undefined ? filePath.name : path.parse(fileName).name; this.newSection.file = path.posix.join(path.posix.sep, fileName); this.newSection.title = file.book.title; - if (book.version === BookVersion.v1) { + if (book.book.version === BookVersion.v1) { // here we only convert if is v1 because we are already using the v2 notation for every book that we read. - this.newSection = convertTo(book.version, this.newSection); + this.newSection = convertTo(book.book.version, this.newSection); } } diff --git a/extensions/notebook/src/book/bookTreeItem.ts b/extensions/notebook/src/book/bookTreeItem.ts index 7b52b90b97..a2ff98d17d 100644 --- a/extensions/notebook/src/book/bookTreeItem.ts +++ b/extensions/notebook/src/book/bookTreeItem.ts @@ -41,7 +41,6 @@ export class BookTreeItem extends vscode.TreeItem { private _uri: string | undefined; private _previousUri: string; private _nextUri: string; - public readonly version: BookVersion; public command: vscode.Command; public resourceUri: vscode.Uri; private _rootContentPath: string; @@ -52,7 +51,6 @@ export class BookTreeItem extends vscode.TreeItem { if (book.type === BookTreeItemType.Book) { this.collapsibleState = book.treeItemCollapsibleState; this._sections = book.page; - this.version = book.version; if (book.isUntitled) { this.contextValue = BookTreeItemType.providedBook; } else { diff --git a/extensions/notebook/src/book/bookTreeView.ts b/extensions/notebook/src/book/bookTreeView.ts index b85d1c3612..b555ad0c13 100644 --- a/extensions/notebook/src/book/bookTreeView.ts +++ b/extensions/notebook/src/book/bookTreeView.ts @@ -498,7 +498,7 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider { let folderToSearch: string; if (treeItem && treeItem.sections !== undefined) { - folderToSearch = treeItem.uri ? getContentPath(treeItem.version, treeItem.book.root, path.dirname(treeItem.uri)) : getContentPath(treeItem.version, treeItem.book.root, ''); + folderToSearch = treeItem.uri ? getContentPath(treeItem.book.version, treeItem.book.root, path.dirname(treeItem.uri)) : getContentPath(treeItem.book.version, treeItem.book.root, ''); } else if (this.currentBook && !this.currentBook.isNotebook) { folderToSearch = path.join(this.currentBook.contentFolderPath); } else { diff --git a/extensions/notebook/src/book/bookTrustManager.ts b/extensions/notebook/src/book/bookTrustManager.ts index de24683a85..8ecb5b90f9 100644 --- a/extensions/notebook/src/book/bookTrustManager.ts +++ b/extensions/notebook/src/book/bookTrustManager.ts @@ -28,7 +28,7 @@ export class BookTrustManager implements IBookTrustManager { let trustableBookPaths = this.getTrustableBookPaths(); let hasTrustedBookPath: boolean = treeBookItems .filter(bookItem => trustableBookPaths.some(trustableBookPath => trustableBookPath === path.join(bookItem.book.root, path.sep))) - .some(bookItem => normalizedNotebookUri.startsWith(bookItem.version === BookVersion.v1 ? path.join(bookItem.book.root, 'content', path.sep) : path.join(bookItem.book.root, path.sep))); + .some(bookItem => normalizedNotebookUri.startsWith(bookItem.book.version === BookVersion.v1 ? path.join(bookItem.book.root, 'content', path.sep) : path.join(bookItem.book.root, path.sep))); let isNotebookTrusted = hasTrustedBookPath && this.books.some(bookModel => bookModel.getNotebook(normalizedNotebookUri)); return isNotebookTrusted; }