Add notebook children loading

Linsen Wu · Linsen Wu · commit fe7e629f63a3 · 2019-02-20T16:38:28.000-08:00
diff --git a/src/components/notebookRenderStrategy.tsx b/src/components/notebookRenderStrategy.tsx
@@ -12,9 +12,13 @@ import { NotebookOpenedIconSvg } from './icons/notebookOpenedIcon.svg';
 import { NotebookClosedIconSvg } from './icons/notebookClosedIcon.svg';
 import { ChevronSvg } from './icons/chevron.svg';
 import { CreateNewSectionNode } from './createNewSection/createNewSectionNode';
+import * as OneNoteApi from 'onenoteapi';
+import { SpinnerIconSvg } from './icons/spinnerIcon.svg';
+import { Strings } from '../strings';
 
 export class NotebookRenderStrategy implements ExpandableNodeRenderStrategy {
 	onClickBinded = () => {};
+	onExpandBinded = this.onExpand.bind(this);
 
 	constructor(private notebook: Notebook, private globals: InnerGlobals) { }
 
@@ -42,6 +46,23 @@ export class NotebookRenderStrategy implements ExpandableNodeRenderStrategy {
 	}
 
 	getChildren(childrenLevel: number): JSX.Element[] {
+		if (typeof (this.notebook.apiHttpErrorCode) === 'number') {
+			const errorString = Strings.getError(this.notebook.apiHttpErrorCode);
+			return [
+				<li role='status' aria-live='polite' aria-label={errorString} className='progress-row'>
+					<div>{errorString}</div>
+				</li>
+			];
+		}
+
+		if (this.notebook.needsToFetchChildren) {
+			return [
+				<li className='progress-row'>
+					<SpinnerIconSvg />
+				</li>
+			];
+		}
+
 		const createNewSection = this.globals.callbacks.onSectionCreated || this.globals.shouldShowCreateEntityInputs ?
 			[<CreateNewSectionNode
 				key={this.notebook.id + 'createnewsectionnode'}
@@ -121,4 +142,20 @@ export class NotebookRenderStrategy implements ExpandableNodeRenderStrategy {
 	private onChevronClick() {
 		this.expandNode();
 	}
+
+	private onExpand() {
+		if (this.notebook.needsToFetchChildren && this.notebook.apiUrl && this.globals.oneNoteDataProvider && !!this.globals.callbacks.onNotebookInfoReturned) {
+			this.globals.oneNoteDataProvider.getNotebookBySelfUrl(this.notebook.apiUrl, 5).then((notebook) => {
+				this.notebook.sections = notebook.sections
+				this.notebook.sectionGroups = notebook.sectionGroups
+			}).catch((apiError: OneNoteApi.RequestError) => {
+				this.notebook.apiHttpErrorCode = apiError.statusCode;
+			}).then(() => {
+				this.notebook.needsToFetchChildren = false;
+				if (!!this.globals.callbacks.onNotebookInfoReturned) {
+					this.globals.callbacks.onNotebookInfoReturned(this.notebook);
+				}
+			})
+		}
+	}
 }
diff --git a/src/oneNoteDataStructures/notebook.ts b/src/oneNoteDataStructures/notebook.ts
@@ -3,10 +3,14 @@ import { Section } from './section';
 import { SectionGroup } from './sectionGroup';
 
 export interface Notebook extends OneNoteItem {
+	// Properties that need to be loaded-on-demand
+	apiHttpErrorCode?: number;
+
 	expanded: boolean;
 	sectionGroups: SectionGroup[];
 	sections: Section[];
 	webUrl: string;
 	apiUrl?: string;
 	lastModifiedTime: Date;
+	needsToFetchChildren?: boolean
 }
diff --git a/src/oneNoteDataStructures/sharedNotebook.ts b/src/oneNoteDataStructures/sharedNotebook.ts
@@ -9,7 +9,6 @@ import { SectionGroup } from './sectionGroup';
 export interface SharedNotebook extends Notebook {
 	// Properties that need to be loaded-on-demand
 	apiProperties?: SharedNotebookApiProperties;
-	apiHttpErrorCode?: number;
 	startedLoading?: boolean;
 
 	// Properties returned from GetRecentNotebooks
diff --git a/src/props/oneNotePickerCallbacks.ts b/src/props/oneNotePickerCallbacks.ts
@@ -22,6 +22,7 @@ export interface OneNotePickerCallbacks {
 	// Shared notebooks have to be loaded on demand, as we only have their URLs and names
 	// to begin with. This is because getting sections for a shared notebook is expensive.
 	onSharedNotebookInfoReturned?: (sharedNotebook: SharedNotebook) => void;
+	onNotebookInfoReturned?: (notebook: Notebook) => void;
 
 	// Selection callbacks
 	onNotebookSelected?: (notebook: Notebook, breadcrumbs: OneNoteItem[]) => void;
diff --git a/src/providers/oneNoteApiDataProvider.ts b/src/providers/oneNoteApiDataProvider.ts
@@ -47,6 +47,12 @@ export class OneNoteApiDataProvider implements OneNoteDataProvider {
 		});
 	}
 
+	getNotebookBySelfUrl(selfUrl: string, expands?: number): Promise<Notebook> {
+		return this.api.getNotebookBySelfUrl(selfUrl, expands).then((response) => {
+			return this.responseTransformer.transformNotebook(response.parsedResponse);
+		});
+	}
+
 	getPages(section: Section): Promise<Page[]> {
 		// tslint:disable-next-line:no-any
 		return this.api.getPages({ sectionId: section.id }).then((responsePackage: OneNoteApi.ResponsePackage<any>) => {
diff --git a/src/providers/oneNoteDataProvider.ts b/src/providers/oneNoteDataProvider.ts
@@ -14,6 +14,7 @@ export interface OneNoteDataProvider {
 	createSectionUnderSectionGroup(parent: SectionGroup, name: string): Promise<Section>;
 
 	getNotebooks(expands?: number, excludeReadOnlyNotebooks?: boolean): Promise<Notebook[]>;
+	getNotebookBySelfUrl(selfUrl: string, expands?: number): Promise<Notebook>;
 	getPages(section: Section): Promise<Page[]>;
 
 	getSpNotebooks(): Promise<SharedNotebook[]>;
