Fix OneDrive next page invalid data.

Fix TSLint warnings.
Fix bugs.

Author: Piotr Siatka

src/controls/filePicker/OneDriveFilesTab/OneDriveFilesTab.tsx

@@ -38,7 +38,7 @@ export class OneDriveFilesTab extends React.Component<IOneDriveFilesTabProps, IO
       fileLeafRef: libraryTitle,
       docIcon: "",
       fileRef: "",
-    }
+    };
 
     const breadcrumbItems = this.state.breadcrumbItems;
     // Add OneDrive folder as a first node
@@ -48,14 +48,14 @@ export class OneDriveFilesTab extends React.Component<IOneDriveFilesTabProps, IO
       text: oneDriveFolderData.fileLeafRef,
       key: oneDriveFolderData.absoluteRef
     };
-    breadcrumbNode.onClick = () => { this.onBreadcrumpItemClick(breadcrumbNode); }
+    breadcrumbNode.onClick = () => { this.onBreadcrumpItemClick(breadcrumbNode); };
     breadcrumbItems.push(breadcrumbNode);
 
     this.setState({
       libraryAbsolutePath: libraryAbsolutePath,
       folderName: folderPath,
       libraryTitle
-    })
+    });
   }
 
   public render(): React.ReactElement<IOneDriveFilesTabProps> {
@@ -161,7 +161,7 @@ export class OneDriveFilesTab extends React.Component<IOneDriveFilesTabProps, IO
         text: folder.fileLeafRef,
         key: folder.absoluteRef
       };
-      breadcrumbNode.onClick = () => { this.onBreadcrumpItemClick(breadcrumbNode); }
+      breadcrumbNode.onClick = () => { this.onBreadcrumpItemClick(breadcrumbNode); };
       breadcrumbItems.push(breadcrumbNode);
     }
 

src/controls/filePicker/SiteFilePickerTab/SiteFilePickerTab.tsx

@@ -25,8 +25,8 @@ export default class SiteFilePickerTab extends React.Component<ISiteFilePickerTa
       isCurrentItem: true,
       text: props.context.pageContext.web.title,
       key: props.context.pageContext.web.id.toString()
-    }
-    breadcrumbSiteNode.onClick = () => { this.onBreadcrumpItemClick(breadcrumbSiteNode); }
+    };
+    breadcrumbSiteNode.onClick = () => { this.onBreadcrumpItemClick(breadcrumbSiteNode); };
 
     this.state = {
       libraryAbsolutePath: undefined,
@@ -144,7 +144,7 @@ export default class SiteFilePickerTab extends React.Component<ISiteFilePickerTa
         text: folder.fileLeafRef,
         key: folder.absoluteRef
       };
-      breadcrumbNode.onClick = () => { this.onBreadcrumpItemClick(breadcrumbNode); }
+      breadcrumbNode.onClick = () => { this.onBreadcrumpItemClick(breadcrumbNode); };
       breadcrumbItems.push(breadcrumbNode);
     }
 
@@ -169,7 +169,7 @@ export default class SiteFilePickerTab extends React.Component<ISiteFilePickerTa
         text: library.title,
         key: library.serverRelativeUrl
       };
-      breadcrumbNode.onClick = () => { this.onBreadcrumpItemClick(breadcrumbNode); }
+      breadcrumbNode.onClick = () => { this.onBreadcrumpItemClick(breadcrumbNode); };
       breadcrumbItems.push(breadcrumbNode);
     }
     this.setState({

src/services/FileBrowserService.ts

@@ -74,7 +74,7 @@ export class FileBrowserService {
       filesQueryResult = {
         items: items,
         nextHref: filesResult.ListData.NextHref
-      }
+      };
     } catch (error) {
       filesQueryResult.items = null;
       console.error(error.message);

src/services/OneDriveService.ts

@@ -26,17 +26,27 @@ export class OneDriveService extends FileBrowserService {
   /**
    * Gets files from OneDrive personal library
    */
-  public getListItems = async (libraryName: string, folderPath?: string, acceptedFilesExtensionsList?: string): Promise<FilesQueryResult> => {
+  public getListItems = async (libraryName: string, folderPath?: string, acceptedFilesExtensionsList?: string, nextPageQueryStringParams?: string): Promise<FilesQueryResult> => {
     let filesQueryResult: FilesQueryResult = { items: [], nextHref: null };
     try {
       const oneDriveRootFolder = await this.getOneDriveRootFolderFullUrl();
       const encodedListUrl = encodeURIComponent(oneDriveRootFolder);
 
+      let queryStringParams = "";
       folderPath = folderPath ? folderPath : this.oneDriveRootFolderRelativeUrl;
       const encodedFolderPath = encodeURIComponent(folderPath);
 
-      const restApi: string = `${this.context.pageContext.web.absoluteUrl}/_api/SP.List.GetListDataAsStream?listFullUrl='${encodedListUrl}'&RootFolder=${encodedFolderPath}`;
+      if (nextPageQueryStringParams) {
+        // Remove start ? from the query params
+        if (nextPageQueryStringParams.charAt(0) === "?") {
+          nextPageQueryStringParams = nextPageQueryStringParams.substring(1);
+        }
+        queryStringParams = nextPageQueryStringParams;
+      } else {
+        queryStringParams = `RootFolder=${encodedFolderPath}`;
+      }
 
+      const restApi = `${this.context.pageContext.web.absoluteUrl}/_api/SP.List.GetListDataAsStream?listFullUrl='${encodedListUrl}'&${queryStringParams}`;
       filesQueryResult = await this._getListDataAsStream(restApi, null, acceptedFilesExtensionsList);
     } catch (error) {
       filesQueryResult.items = null;
@@ -81,7 +91,7 @@ export class OneDriveService extends FileBrowserService {
       this.oneDriveRootFolderRelativeUrl = `${myDocumentsLibrary.ParentWebUrl}/${myDocumentsLibrary.Title}`;
       this.oneDriveRootFolderAbsoluteUrl = `${this.oneDrivePersonalUrl}${myDocumentsLibrary.Title}`;
     } catch (error) {
-      console.error(`[FileBrowserService.getOneDrivePersonalUrl] Err='${error.message}'`)
+      console.error(`[FileBrowserService.getOneDrivePersonalUrl] Err='${error.message}'`);
       this.oneDriveRootFolderAbsoluteUrl = null;
     }
     return this.oneDriveRootFolderAbsoluteUrl;
@@ -104,7 +114,7 @@ export class OneDriveService extends FileBrowserService {
   /**
    * Gets personal site path.
    */
-  protected getOneDrivePersonalUrl = async (): Promise<string> => {
+  private getOneDrivePersonalUrl = async (): Promise<string> => {
     try {
       // Return result if already obtained
       if (this.oneDrivePersonalUrl) {
@@ -125,7 +135,7 @@ export class OneDriveService extends FileBrowserService {
 
       this.oneDrivePersonalUrl = profileData.FollowPersonalSiteUrl;
     } catch (error) {
-      console.error(`[FileBrowserService.getOneDrivePersonalUrl] Err='${error.message}'`)
+      console.error(`[FileBrowserService.getOneDrivePersonalUrl] Err='${error.message}'`);
       this.oneDrivePersonalUrl = null;
     }
     return this.oneDrivePersonalUrl;