@mikezimm/fps-library-v2 1.2.48 → 1.2.50

package/lib/components/molecules/SpHttp/HubsSubs/fetches/fetchMyHubsites.js

@@ -3,13 +3,64 @@ import { doSpJsFetch } from '../../doSpJsFetch';
 import { hubSelects } from '../interfaces/IFPSHubSiteDataDocsApi';
 import { startPerformOpV2, unifiedPerformanceEnd } from '../../../Performance/functions';
 import { checkItemsResults } from '../../../../../pnpjs/Common/CheckItemsResults';
-export async function fetchMyHubsites(webUrl, depth, departmentId) {
+/**
+ * fetchMyHubsites will fetch an array of the current site's hub associated sites.  Used in Pivot Tiles and Hub Connections.
+ * @param webUrl
+ * @param departmentId
+ * @returns
+ */
+// export type IFetchHubDepth = 'site' | 'web';
+// export async function fetchMyHubsites( webUrl: string, depth: IFetchHubDepth, departmentId: string ): Promise<IJSFetchReturn> {
+//   const performanceSettings: IPerformanceSettings = {  label: 'myHubs', updateMiliseconds: true, includeMsStr: true, op: 'fetch' };
+//   const fetchOp = performanceSettings ? startPerformOpV2( performanceSettings ) : null;
+//   const apiFetchAssociatedHubs: string = `${webUrl}/_api/search/query?querytext='DepartmentId=${departmentId} contentclass:sts_${depth} -SiteId:${departmentId}'&selectproperties='${hubSelects.join(',')}'&rowlimit=${depth==='site'?200:500}`;// 9 Works
+//   const resultHubSites: IJSFetchReturn = await doSpJsFetch( apiFetchAssociatedHubs );
+//   if ( resultHubSites.ok ) resultHubSites.items = cleanSearchedWebs( resultHubSites.items );
+//   let result : IJSFetchReturn = unifiedPerformanceEnd( resultHubSites as IFpsErrorObject, performanceSettings, fetchOp, 'fetch', 'items'  ) as IJSFetchReturn;
+//   result.fpsContentType = [ depth ];
+//   result = checkItemsResults( result as IFpsItemsReturn, `fps-library-v2: fetchMyHubsites ~ 30`, false, true ) as IJSFetchReturn;
+//   return resultHubSites;
+// }
+import { NonGroupGroupID } from '../functions/processHubSubResults';
+/**
+ * fetchMyHubsites imported from HubCon on 2024-07-29.
+ * @param webUrl
+ * @param depth  IFetchHubDepth = 'site' | 'web';
+ * @param departmentId
+ * @param filter  IHubFilterType = 'Associated' | 'Hubs' | 'Teams' | 'HubAndAssoc';
+ * @returns
+ */
+export async function fetchMyHubsites(webUrl, depth, departmentId, filter) {
     const performanceSettings = { label: 'myHubs', updateMiliseconds: true, includeMsStr: true, op: 'fetch' };
     const fetchOp = performanceSettings ? startPerformOpV2(performanceSettings) : null;
-    const apiFetchAssociatedHubs = `${webUrl}/_api/search/query?querytext='DepartmentId=${departmentId} contentclass:sts_${depth} -SiteId:${departmentId}'&selectproperties='${hubSelects.join(',')}'&rowlimit=${depth === 'site' ? 200 : 500}`; // 9 Works
-    const resultHubSites = await doSpJsFetch(apiFetchAssociatedHubs);
-    if (resultHubSites.ok)
+    const minSearch = `${webUrl}/_api/search/query?querytext='DepartmentId=`;
+    const minSelectRowLimit = `'&selectproperties='${hubSelects.join(',')}'&rowlimit=`;
+    // -SiteId:${departmentId}
+    let fetchAPIStr = ``;
+    // if ( filter === 'Associated' ) { fetchAPIStr = `${minSearch}${departmentId} contentclass:sts_${depth} -SiteId:${departmentId} ${ minSelectRowLimit }${depth==='site'?200:500}`; // 9 Works 
+    if (filter === 'Associated') {
+        fetchAPIStr = `${webUrl}/_api/search/query?querytext='DepartmentId=${departmentId} contentclass:sts_${depth} -SiteId:${departmentId}'&selectproperties='${hubSelects.join(',')}'&rowlimit=${depth === 'site' ? 200 : 500}`; // 9 Works 
+    }
+    if (filter === 'HubAndAssoc') {
+        fetchAPIStr = `${webUrl}/_api/search/query?querytext='DepartmentId=${departmentId} contentclass:sts_${depth}'&selectproperties='${hubSelects.join(',')}'&rowlimit=${depth === 'site' ? 200 : 500}`; // 9 Works 
+    }
+    if (filter === 'Hubs') {
+        fetchAPIStr = `${webUrl}/_api/search/query?querytext='DepartmentId=* contentclass:sts_site GroupId:"${NonGroupGroupID}" ${minSelectRowLimit}${500}`; // 9 Works
+    }
+    if (filter === 'Teams') {
+        fetchAPIStr = `${minSearch}* contentclass:sts_site -GroupId:"${NonGroupGroupID}" ${minSelectRowLimit}${500}`; // 9 Works
+    }
+    // fetchAPIStr = `${webUrl}/_api/search/query?querytext='DepartmentId=${departmentId} contentclass:sts_${depth} -SiteId:${departmentId}'&selectproperties='${hubSelects.join(',')}'&rowlimit=${depth==='site'?200:500}`;// 9 Works
+    // fetchAPIStr = `${minSearch}/${departmentId} contentclass:sts_${depth} -SiteId:${departmentId}'&selectproperties='${hubSelects.join(',')}'&rowlimit=${depth==='site'?200:500}`;// 9 Works
+    const resultHubSites = await doSpJsFetch(fetchAPIStr);
+    if (resultHubSites.ok) {
         resultHubSites.items = cleanSearchedWebs(resultHubSites.items);
+    }
+    if (filter === 'Hubs') {
+        resultHubSites.allHubs = resultHubSites.items.filter(item => item.DepartmentId.indexOf(item.SiteId) === 1);
+        //https://github.com/fps-solutions/HubCon/issues/23
+        resultHubSites.allHubs.sort((a, b) => a.Title.localeCompare(b.Title));
+    }
     let result = unifiedPerformanceEnd(resultHubSites, performanceSettings, fetchOp, 'fetch', 'items');
     result.fpsContentType = [depth];
     result = checkItemsResults(result, `fps-library-v2: fetchMyHubsites ~ 30`, false, true);

package/lib/components/molecules/SpHttp/HubsSubs/fetches/fetchMyHubsites.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchMyHubsites.js","sourceRoot":"","sources":["../../../../../../src/components/molecules/SpHttp/HubsSubs/fetches/fetchMyHubsites.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAkB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAElE,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEzF,OAAO,EAAmB,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAWnG,MAAM,CAAC,KAAK,UAAU,eAAe,CAAE,MAAc,EAAE,KAAqB,EAAE,YAAoB;IAEhG,MAAM,mBAAmB,GAAyB,EAAG,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;IACjI,MAAM,OAAO,GAAG,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,CAAE,mBAAmB,CAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAErF,MAAM,sBAAsB,GAAW,GAAG,MAAM,8CAA8C,YAAY,qBAAqB,KAAK,YAAY,YAAY,uBAAuB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,KAAK,KAAG,MAAM,CAAA,CAAC,CAAA,GAAG,CAAA,CAAC,CAAA,GAAG,EAAE,CAAC,CAAA,UAAU;IAExP,MAAM,cAAc,GAAmB,MAAM,WAAW,CAAE,sBAAsB,CAAE,CAAC;IAEnF,IAAK,cAAc,CAAC,EAAE;QAAG,cAAc,CAAC,KAAK,GAAG,iBAAiB,CAAE,cAAc,CAAC,KAAK,CAAE,CAAC;IAE1F,IAAI,MAAM,GAAoB,qBAAqB,CAAE,cAAiC,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAqB,CAAC;IAC5J,MAAM,CAAC,cAAc,GAAG,CAAE,KAAK,CAAE,CAAC;IAElC,MAAM,GAAG,iBAAiB,CAAE,MAAyB,EAAE,sCAAsC,EAAE,KAAK,EAAE,IAAI,CAAoB,CAAC;IAE/H,OAAO,cAAc,CAAC;AAExB,CAAC"}
+{"version":3,"file":"fetchMyHubsites.js","sourceRoot":"","sources":["../../../../../../src/components/molecules/SpHttp/HubsSubs/fetches/fetchMyHubsites.ts"],"names":[],"mappings":"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"}

package/lib/components/molecules/SpHttp/HubsSubs/getHubAssocSites.js

@@ -14,7 +14,7 @@ import { fetchMyHubsites } from './fetches/fetchMyHubsites';
  */
 export async function getHubAssocSites(departmentId, sourceProps, depth = 'site') {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let results = await fetchMyHubsites(sourceProps.absoluteWebUrl, depth, departmentId);
+    let results = await fetchMyHubsites(sourceProps.absoluteWebUrl, depth, departmentId, 'HubAndAssoc');
     return results;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     // return { ...EmptyStateSource as any, ...{ status: 'Unknown' } }

package/lib/components/molecules/SpHttp/HubsSubs/getHubAssocSites.js.map

@@ -1 +1 @@
-{"version":3,"file":"getHubAssocSites.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SpHttp/HubsSubs/getHubAssocSites.ts"],"names":[],"mappings":"AACA,2DAA2D;AAC3D,4EAA4E;AAC5E,gFAAgF;AAChF,yDAAyD;AACzD,wEAAwE;AACxE,gEAAgE;AAQhE,OAAO,EAAkB,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAW5E;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAE,YAAoB,EAAE,WAAyB,EAAE,QAAwB,MAAM;IAErH,8DAA8D;IAC9D,IAAI,OAAO,GAAwB,MAAM,eAAe,CAAE,WAAW,CAAC,cAAc,EAAE,KAAK,EAAE,YAAY,CAAW,CAAC;IAErH,OAAO,OAAO,CAAC;IAEf,8DAA8D;IAC9D,kEAAkE;AAGpE,CAAC"}
+{"version":3,"file":"getHubAssocSites.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SpHttp/HubsSubs/getHubAssocSites.ts"],"names":[],"mappings":"AACA,2DAA2D;AAC3D,4EAA4E;AAC5E,gFAAgF;AAChF,yDAAyD;AACzD,wEAAwE;AACxE,gEAAgE;AAQhE,OAAO,EAAkB,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAW5E;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAE,YAAoB,EAAE,WAAyB,EAAE,QAAwB,MAAM;IAErH,8DAA8D;IAC9D,IAAI,OAAO,GAAwB,MAAM,eAAe,CAAE,WAAW,CAAC,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,CAAS,CAAC;IAElI,OAAO,OAAO,CAAC;IAEf,8DAA8D;IAC9D,kEAAkE;AAGpE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikezimm/fps-library-v2",
-  "version": "1.2.48",
+  "version": "1.2.50",
   "description": "Library of reusable typescript/javascript functions, interfaces and constants",
   "license": "MIT",
   "main": "./lib/index.js",
@@ -42,7 +42,7 @@
     "@fluentui/react": "^7.199.1",
     "@microsoft/sp-property-pane": "^1.17.3",
     "@mikezimm/fps-pnp2": "^1.0.63",
-    "@mikezimm/fps-styles": "^1.0.65",
+    "@mikezimm/fps-styles": "^1.0.68",
     "@pnp/spfx-controls-react": "^3.12.0",
     "@pnp/spfx-property-controls": "^3.6.0",
     "react": "^17.0.1",