File picker site web support

src/controls/filePicker/FilePicker.tsx

@@ -67,7 +67,8 @@ export class FilePicker extends React.Component<
     );
     this.fileSearchService = new FilesSearchService(
       props.context,
-      this.props.bingAPIKey
+      this.props.bingAPIKey,
+      this.props.webAbsoluteUrl
     );
 
     this.state = {

src/services/FilesSearchService.ts

@@ -1,6 +1,6 @@
 import { BaseComponentContext } from '@microsoft/sp-component-base';
 import { SPHttpClient, HttpClientResponse } from "@microsoft/sp-http";
-import { ISearchResult, BingQuerySearchParams, IRecentFile } from "./FilesSearchService.types";
+import { ISearchResult, BingQuerySearchParams, IRecentFile, ISiteWebInfo } from "./FilesSearchService.types";
 import { find } from "office-ui-fabric-react/lib/Utilities";
 import { GeneralHelper } from "../common/utilities/GeneralHelper";
 import type { IBingSearchResult } from '../controls/filePicker/WebSearchTab/IBingSearchResult';
@@ -18,10 +18,12 @@ const MAXRESULTS = 100;
 export class FilesSearchService {
   private context: BaseComponentContext;
   private bingAPIKey: string;
+  private siteAbsoluteUrl: string;
 
-  constructor(context: BaseComponentContext, bingAPIKey: string) {
+  constructor(context: BaseComponentContext, bingAPIKey: string, siteAbsoluteUrl?: string) {
     this.context = context;
     this.bingAPIKey = bingAPIKey;
+    this.siteAbsoluteUrl = siteAbsoluteUrl || context.pageContext.web.absoluteUrl
   }
 
   /**
@@ -51,8 +53,13 @@ export class FilesSearchService {
    */
   public executeRecentSearch = async (accepts?: string[]): Promise<IRecentFile[] | undefined> => {
     try {
-      const webId = this.context.pageContext.web.id.toString();
-      const siteId = this.context.pageContext.site.id.toString();
+      let webId = this.context.pageContext.web.id.toString();
+      let siteId = this.context.pageContext.site.id.toString();
+      if (this.siteAbsoluteUrl !== this.context.pageContext.web.absoluteUrl) {
+        const siteinfo = await this.getSiteInfos(this.siteAbsoluteUrl);
+        webId = siteinfo.webId;
+        siteId = siteinfo.siteId;
+      }
       const fileFilter = this._getFileFilter(accepts);
 
       const queryTemplate: string = `((SiteID:${siteId} OR SiteID: {${siteId}}) AND (WebId: ${webId} OR WebId: {${webId}})) AND LastModifiedTime < {Today} AND -Title:OneNote_DeletedPages AND -Title:OneNote_RecycleBin${fileFilter}`;
@@ -96,7 +103,7 @@ export class FilesSearchService {
           ]
         }
       };
-      const searchApi = `${this.context.pageContext.web.absoluteUrl}/_api/search/postquery`;
+      const searchApi = `${this.siteAbsoluteUrl}/_api/search/postquery`;
 
       const recentSearchDataResult = await this.context.spHttpClient.post(searchApi, SPHttpClient.configurations.v1, {
         headers: {
@@ -289,4 +296,21 @@ export class FilesSearchService {
     const splitUrl = url.split('/');
     return splitUrl[0];
   }
+  private getSiteInfos = async (absUrl: string): Promise<ISiteWebInfo> => {
+    const webInfo = await this.context.spHttpClient.get(absUrl + '/_api/web?$select=id,Title', SPHttpClient.configurations.v1);
+    if (!webInfo || !webInfo.ok) {
+      throw new Error(`[FileBrowser.getWebInfo]: Something went wrong when executing request. Status='${webInfo.statusText}'`);
+    }
+    const siteInfo = await this.context.spHttpClient.get(absUrl + '/_api/site?$select=id', SPHttpClient.configurations.v1);
+    if (!siteInfo || !siteInfo.ok) {
+      throw new Error(`[FileBrowser.getWebInfo]: Something went wrong when executing request. Status='${webInfo.statusText}'`);
+    }
+    const webInfoResult = await webInfo.json();
+    const siteInfoResult = await siteInfo.json();
+    return ({
+      title: webInfoResult.Title,
+      webId: webInfoResult.Id,
+      siteId: siteInfoResult.Id
+    })
+  }
 }

src/services/FilesSearchService.types.ts

@@ -68,3 +68,9 @@ export interface Thumbnail {
   width: number;
   height: number;
 }
+
+export interface ISiteWebInfo {
+  title: string,
+  webId: string,
+  siteId: string
+}

src/webparts/controlsTest/components/ControlsTest.tsx

@@ -1702,8 +1702,8 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
           />
           <FilePicker
             bingAPIKey="<BING API KEY>"
-            webAbsoluteUrl="https://aterentiev.sharepoint.com/sites/SPFxinTeamsDemo"
-            defaultFolderAbsolutePath={"https://aterentiev.sharepoint.com/sites/SPFxinTeamsDemo/Shared%20Documents/General"}
+            //webAbsoluteUrl="https://023xn.sharepoint.com/sites/test1"
+            //defaultFolderAbsolutePath={"https://aterentiev.sharepoint.com/sites/SPFxinTeamsDemo/Shared%20Documents/General"}
             //accepts={[".gif", ".jpg", ".jpeg", ".bmp", ".dib", ".tif", ".tiff", ".ico", ".png", ".jxr", ".svg"]}
             buttonLabel="Add File"
             buttonIconProps={{ iconName: 'Add', styles: { root: { fontSize: 42 } } }}