moving method to get web info into SPSitesService

Author: AJIXuMuK

src/controls/sitePicker/ISitePicker.ts

@@ -1,29 +1,5 @@
 import { BaseComponentContext } from '@microsoft/sp-component-base';
-
-export interface ISite {
-  /**
-   * ID of the site
-   */
-  id?: string;
-  /**
-   * Title
-   */
-  title?: string;
-  /**
-  * Base URL
-  */
-  url?: string;
-
-  /**
-   * ID of the web
-   */
-  webId?: string;
-
-  /**
-   * ID of the hub site
-   */
-  hubSiteId?: string;
-}
+import { ISite } from '../../services/SPSitesService';
 
 export interface ISitePickerProps {
   /**

src/controls/sitePicker/SitePicker.tsx

@@ -10,8 +10,8 @@ import * as React from 'react';
 
 import * as telemetry from '../../common/telemetry';
 import { toRelativeUrl } from '../../common/utilities/GeneralHelper';
-import { getAllSites, getHubSites } from '../../services/SPSitesService';
-import { ISite, ISitePickerProps } from './ISitePicker';
+import { getAllSites, getHubSites, ISite } from '../../services/SPSitesService';
+import { ISitePickerProps } from './ISitePicker';
 
 const styles = mergeStyleSets({
   loadingSpinnerContainer: {

src/services/FilesSearchService.ts

@@ -1,9 +1,10 @@
 import { BaseComponentContext } from '@microsoft/sp-component-base';
 import { SPHttpClient, HttpClientResponse } from "@microsoft/sp-http";
-import { ISearchResult, BingQuerySearchParams, IRecentFile, ISiteWebInfo } from "./FilesSearchService.types";
+import { ISearchResult, BingQuerySearchParams, IRecentFile } 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';
+import { getSiteWebInfo } from './SPSitesService';
 
 /**
  * Maximum file size when searching
@@ -56,7 +57,7 @@ export class FilesSearchService {
       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);
+        const siteinfo = await getSiteWebInfo(this.context, this.siteAbsoluteUrl);
         webId = siteinfo.webId;
         siteId = siteinfo.siteId;
       }
@@ -296,21 +297,4 @@ 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,9 +68,3 @@ export interface Thumbnail {
   width: number;
   height: number;
 }
-
-export interface ISiteWebInfo {
-  title: string,
-  webId: string,
-  siteId: string
-}

src/services/SPSitesService.ts

@@ -1,7 +1,37 @@
 import { BaseComponentContext } from '@microsoft/sp-component-base';
-import { ISite } from '../controls/sitePicker/ISitePicker';
 import { SPHttpClient } from '@microsoft/sp-http';
 
+export interface ISite {
+  /**
+   * ID of the site
+   */
+  id?: string;
+  /**
+   * Title
+   */
+  title?: string;
+  /**
+  * Base URL
+  */
+  url?: string;
+
+  /**
+   * ID of the web
+   */
+  webId?: string;
+
+  /**
+   * ID of the hub site
+   */
+  hubSiteId?: string;
+}
+
+export interface ISiteWebInfo {
+  title: string,
+  webId: string,
+  siteId: string
+}
+
 const getAllSitesInternal = async (ctx: BaseComponentContext, queryText: string, trimDuplicates: boolean): Promise<ISite[]> => {
   let startRow = 0;
   const rowLimit = 500;
@@ -113,3 +143,21 @@ export const getHubSites = async (ctx: BaseComponentContext): Promise<ISite[]> =
 
   return hubSites;
 };
+
+export const getSiteWebInfo = async (ctx: BaseComponentContext, webUrl: string): Promise<ISiteWebInfo> => {
+  const webInfo = await ctx.spHttpClient.get(`${webUrl}/_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 ctx.spHttpClient.get(`${webUrl}/_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
+  };
+}