npm - @mikezimm/fps-core-v7 - Versions diffs - 1.0.44 → 1.0.46 - Mend

@mikezimm/fps-core-v7 1.0.44 → 1.0.46

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (136) hide show

package/lib/restAPIs/logging/saveErrorToLogOriginal.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"saveErrorToLogOriginal.d.ts","sourceRoot":"","sources":["../../../src/restAPIs/logging/saveErrorToLogOriginal.ts"],"names":[],"mappings":""}

package/lib/restAPIs/logging/saveErrorToLogOriginal.js ADDED Viewed

@@ -0,0 +1,45 @@
+// // import { IHelpfullOutput, IHelpfullInput } from '@mikezimm/fps-core-v7/lib/logic/Errors/friendly';
+// // import { getUrlVarsAsStrings, getCurrentPageLink } from '@mikezimm/fps-core-v7/lib/logic/Links/UrlFunctions';
+// // import { saveThisLogItem } from '@mikezimm/fps-pnp2/lib/services/sp/logging/saveThisLogItem';
+// import { getThisFPSDigestValueFromUrl } from "../../components/molecules/SpHttp/digestValues/fromUrl/getThisFPSDigestValueFromUrl";
+// import { doSpJsFetchOrPost } from "../../components/molecules/SpHttp/doSpJsFetch";
+// import { IHelpfullInput, IHelpfullOutput } from "../../logic/Errors/friendly";
+// import { getCurrentPageLink, getUrlVarsAsStrings } from "../../logic/Links/UrlFunctions";
+// import { AnalyticsWebAbsolute, ErrorLog } from "./interfaces/constants";
+// /**
+//  *
+//  * @param errorInfo
+//  * @param errorInput
+//  */
+// export async function saveErrorToLogX(errorInfo: IHelpfullOutput, errorInput: IHelpfullInput) : Promise<void> {
+//   //Return if you are not supposed to log an error
+//   if ( errorInput.logErrors !== true ) { return ; }
+//   // https://github.com/mikezimm/fps-library-v2/issues/15
+//   if ( !errorInfo ) { return ; }
+//   const muteConsole = true;
+//   const { traceString, e, alertMe, consoleLog, logErrors } = errorInput;
+//   let trace: string[] = traceString ? traceString.split('|') : [];
+//   let getParams = JSON.stringify(getUrlVarsAsStrings());
+//   let parsedMessage = errorInfo.returnMess.split('-- FULL ERROR MESSAGE:');
+//   let zzzRichText1 = parsedMessage.length > 0 ? parsedMessage[0] : 'No friendly error';
+//   let zzzRichText2 = parsedMessage.length > 0 ? parsedMessage[1] : errorInfo.returnMess;
+//   let saveItem: any = {
+//     Title: trace[0],
+//     Result: trace[3] ? trace[3] : null,
+//     zzzText1: trace[4] ? trace[4] : null,
+//     zzzText2: trace[5] ? trace[5] : null,
+//     zzzText3: trace[6] ? trace[6] : null,
+//     zzzText6: typeof alertMe === 'string' ? alertMe : `${alertMe}`,
+//     zzzText7: typeof consoleLog === 'string' ? consoleLog : `${consoleLog}`,
+//     zzzNumber1: trace[7] ? trace[7] : null,
+//     zzzNumber2: trace[8] ? trace[8] : null,
+//     getParams: getParams,
+//     PageLink: getCurrentPageLink(),
+//     zzzRichText1: zzzRichText1,
+//     zzzRichText2: zzzRichText2,
+//   };
+//   let postAPI: string = `${AnalyticsWebAbsolute}/_api/web/lists/getbytitle('${ErrorLog}')/items`;
+//   const digestValue = await getThisFPSDigestValueFromUrl( AnalyticsWebAbsolute );
+//   const initialResult = await doSpJsFetchOrPost( postAPI, 'POST', digestValue, '', saveItem );
+// }
+//# sourceMappingURL=saveErrorToLogOriginal.js.map

package/lib/restAPIs/logging/saveErrorToLogOriginal.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"saveErrorToLogOriginal.js","sourceRoot":"","sources":["../../../src/restAPIs/logging/saveErrorToLogOriginal.ts"],"names":[],"mappings":"AACA,wGAAwG;AACxG,mHAAmH;AACnH,mGAAmG;AAEnG,sIAAsI;AACtI,qFAAqF;AACrF,iFAAiF;AACjF,4FAA4F;AAC5F,2EAA2E;AAE3E,MAAM;AACN,KAAK;AACL,sBAAsB;AACtB,uBAAuB;AACvB,MAAM;AAEN,kHAAkH;AAElH,qDAAqD;AACrD,sDAAsD;AAEtD,4DAA4D;AAC5D,mCAAmC;AAEnC,8BAA8B;AAC9B,2EAA2E;AAE3E,qEAAqE;AAErE,2DAA2D;AAC3D,8EAA8E;AAC9E,0FAA0F;AAC1F,2FAA2F;AAE3F,0BAA0B;AAC1B,uBAAuB;AAEvB,0CAA0C;AAE1C,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAE5C,sEAAsE;AACtE,+EAA+E;AAE/E,8CAA8C;AAC9C,8CAA8C;AAE9C,4BAA4B;AAC5B,sCAAsC;AACtC,kCAAkC;AAClC,kCAAkC;AAClC,OAAO;AAEP,oGAAoG;AAEpG,oFAAoF;AACpF,iGAAiG;AAEjG,IAAI"}

package/lib/restAPIs/sites/groups/getGroupMembersAPI.d.ts CHANGED Viewed

@@ -3,4 +3,7 @@ import { IFpsUsersReturn } from '../../../types/fps-returns/sites/users/IFpsUser
 export declare function checkCurrentUserInGroup(sourceProps: ISourceProps, GroupName: string, LoginName: string): Promise<IFpsUsersReturn>;
 export declare function getAllUsersInGroup(sourceProps: ISourceProps, GroupName: string): Promise<IFpsUsersReturn>;
 export declare function getGroupMembersAPI(sourceProps: ISourceProps, GroupName: string, alertMe: boolean | undefined, consoleLog: boolean | undefined): Promise<IFpsUsersReturn>;
+/**
+ * Original kept for now until this has been tested
+ */
 //# sourceMappingURL=getGroupMembersAPI.d.ts.map

package/lib/restAPIs/sites/groups/getGroupMembersAPI.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getGroupMembersAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getGroupMembersAPI.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAG5G,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AAEzF,wBAAsB,uBAAuB,CAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,eAAe,CAAC,CAKzI;AAED,wBAAsB,kBAAkB,CAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAK,OAAO,CAAC,eAAe,CAAC,CAIlH;AAED,wBAAsB,kBAAkB,CAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,~~CAgEjL~~"}
1	+ {"version":3,"file":"getGroupMembersAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getGroupMembersAPI.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAG5G,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AAEzF,wBAAsB,uBAAuB,CAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,eAAe,CAAC,CAKzI;AAED,wBAAsB,kBAAkB,CAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAK,OAAO,CAAC,eAAe,CAAC,CAIlH;AAED,wBAAsB,kBAAkB,CAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,CAyDjL;AAED;;GAEG"}

package/lib/restAPIs/sites/groups/getGroupMembersAPI.js CHANGED Viewed

@@ -1,8 +1,10 @@
-import { doSpJsFetchOrPost } from '../../../components/molecules/SpHttp/doSpJsFetch';
-import { startPerformOpV2, updatePerformanceEndV2 } from '../../../components/molecules/Performance/functions';
-import { checkItemsResults } from '../../../components/molecules/process-results/CheckItemsResults';
+import { doSpJsFetchOrPostAndCheck } from '../../../components/molecules/SpHttp/doSpJsFetch';
+// import { startPerformOpV2, updatePerformanceEndV2 } from '../../../components/molecules/Performance/functions';
+// import { checkItemsResults } from '../../../components/molecules/process-results/CheckItemsResults';
 import { check4This } from '../../../logic/Links/CheckSearch';
+// import { IPerformanceSettings } from '../../../components/molecules/Performance/IPerformanceSettings';
 import { createErrorFpsListReturn } from '../../../components/molecules/process-results/createErrorFpsListItemsReturn';
+// import { IPerformanceOp } from '../../../components/molecules/Performance/IPerformance';
 import { SourcePropsNoWebUrl } from '../../../components/molecules/source-props/ISourceProps';
 import { getAbsoluteWebUrlFromSourceProps, } from '../../../logic/Strings/getAbssoluteWebUrlFromSourceProps';
 import { UserSelectsFull } from '../users/UserSelects';
@@ -19,8 +21,6 @@ export async function getAllUsersInGroup(sourceProps, GroupName) {
 }
 export async function getGroupMembersAPI(sourceProps, GroupName, alertMe, consoleLog) {
     const { restFilter, digestValue = '', selectThese = UserSelectsFull } = sourceProps;
-    const performanceSettings = { label: GroupName, includeMsStr: true, updateMiliseconds: true, op: 'fetch' };
-    const fetchOp = performanceSettings ? startPerformOpV2(performanceSettings) : null;
     const useUrl = getAbsoluteWebUrlFromSourceProps(sourceProps);
     if (!useUrl) {
         // NO WebURL... Throw Alert
@@ -52,25 +52,72 @@ export async function getGroupMembersAPI(sourceProps, GroupName, alertMe, consol
     let fetchAPI = `${useUrl}/_api/web/sitegroups/getbyname('${GroupName}')/users?`;
     fetchAPI += `$select=${selectThese.join(',')}&`;
     fetchAPI += `$orderby=Title asc`;
-    // if ( restFilter ) fetchAPI+= `&$filter=${ encodeURIComponent(restFilter) }&`;
     if (restFilter)
         fetchAPI += `&$filter=${restFilter}&`;
-    const initialResult = await doSpJsFetchOrPost(fetchAPI, 'GET', digestValue, '', null);
-    initialResult.users = initialResult.items ? initialResult.items : [];
+    const result = await doSpJsFetchOrPostAndCheck(fetchAPI, 'GET', digestValue, '', alertMe, consoleLog, 'user', null);
+    // result.users = result.items ? result.items : [];
+    // result.fpsContentType = [ 'user' ];
+    result.unifiedPerformanceOps.fetch.label = `${GroupName} Users`;
+    // result.unifiedPerformanceOps.fetch.c = result.users.length;
     //  Add any required custom logic here
     //   if ( resultHubSites.ok ) {
     //     resultHubSites.items = cleanSearchedWebs( resultHubSites.items );
     //   }
-    const result = checkItemsResults(initialResult, `fps-core-v7: getGroupMembersAPI ~ 78`, alertMe, consoleLog);
-    result.fpsContentType = ['user'];
-    result.unifiedPerformanceOps.fetch = performanceSettings ?
-        updatePerformanceEndV2({ op: fetchOp, updateMiliseconds: performanceSettings.updateMiliseconds, count: result.items ? result.items.length : 0 })
-        : null; // 2024-09-29:  set null as any to pass build error.
-    result.fetchOp = result.unifiedPerformanceOps.fetch;
     if (check4This(`fpsShowFetchResults=true`) === true) {
         console.log(`fps-core-v7 COMPLETE: getGroupMembersAPI ~ 87`, result);
     }
     ;
     return result;
 }
+/**
+ * Original kept for now until this has been tested
+ */
+// export async function getGroupMembersAPI( sourceProps: ISourceProps, GroupName: string, alertMe: boolean | undefined, consoleLog: boolean | undefined, ): Promise<IFpsUsersReturn>  {
+//   const { restFilter, digestValue = '', selectThese = UserSelectsFull } = sourceProps;
+//   const performanceSettings: IPerformanceSettings = { label: GroupName, includeMsStr: true, updateMiliseconds: true, op: 'fetch' };
+//   const fetchOp = performanceSettings ? startPerformOpV2( performanceSettings ) : null;
+//   const useUrl: string = getAbsoluteWebUrlFromSourceProps( sourceProps );
+//   if ( !useUrl ) {
+//     // NO WebURL... Throw Alert
+//     if ( alertMe === true ) alert(`getGroupInfoAPI: ${SourcePropsNoWebUrl}`);
+//     const results: IFpsUsersReturn = createErrorFpsListReturn( useUrl, '' ) as IFpsUsersReturn;
+//     results.status = 'NoWeb';
+//     return results;
+//   }
+//   if ( !GroupName ) {
+//     // NO WebURL... Throw Alert
+//     if ( alertMe === true ) alert(`${''} SourceProps does NOT have an GroupName`);
+//     const results: IFpsUsersReturn = createErrorFpsListReturn( useUrl, '' ) as IFpsUsersReturn;
+//     results.statusText = 'No GroupName';
+//     results.status = 'NoGroup';
+//     return results;
+//   }
+//   /**
+//     SAMPLE Full SharePoint Items Rest call:
+//     https://example.sharepoint.com/sites/MySite/_api/web/sitegroups/getbyname('GroupName')/users?
+//         $select=Id,Title,EULAText,ExpandedField1/Id,ExpandedField1/Title,ExpandedField2/Id,ExpandedField2/Title&
+//         $expand=ExpandedField1,ExpandedField2&
+//         $filter=Title eq 'SomeTitle'&
+//         $orderby=Id desc
+//   */
+//   let fetchAPI: string = `${useUrl}/_api/web/sitegroups/getbyname('${GroupName}')/users?`;
+//   fetchAPI += `$select=${selectThese.join(',')}&`;
+//   fetchAPI += `$orderby=Title asc`;
+//   // if ( restFilter ) fetchAPI+= `&$filter=${ encodeURIComponent(restFilter) }&`;
+//   if ( restFilter ) fetchAPI+= `&$filter=${ restFilter }&`;
+//   const initialResult: IFpsUsersReturn = await doSpJsFetchOrPost( fetchAPI, 'GET', digestValue, '', null ) as unknown as IFpsUsersReturn;
+//   initialResult.users = initialResult.items ? initialResult.items : [];
+//   //  Add any required custom logic here
+//   //   if ( resultHubSites.ok ) {
+//   //     resultHubSites.items = cleanSearchedWebs( resultHubSites.items );
+//   //   }
+//   result.fpsContentType = [ 'user' ];
+//   const result : IFpsUsersReturn = checkItemsResults( initialResult, `fps-core-v7: getGroupMembersAPI ~ 78`, alertMe, consoleLog ) as IFpsUsersReturn;
+//   result.unifiedPerformanceOps.fetch = performanceSettings ?
+//     updatePerformanceEndV2( { op: fetchOp as IPerformanceOp, updateMiliseconds: performanceSettings.updateMiliseconds, count: result.items ? result.items.length : 0 })
+//     : null as any;  // 2024-09-29:  set null as any to pass build error.
+//   result.fetchOp = result.unifiedPerformanceOps.fetch;
+//   if ( check4This( `fpsShowFetchResults=true` ) === true ) { console.log( `fps-core-v7 COMPLETE: getGroupMembersAPI ~ 87`, result ) };
+//   return result;
+// }
 //# sourceMappingURL=getGroupMembersAPI.js.map

package/lib/restAPIs/sites/groups/getGroupMembersAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getGroupMembersAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getGroupMembersAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,~~iBAAiB~~,EAAE,MAAM,kDAAkD,CAAC;~~AACrF~~,~~OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC~~;~~AAC/G~~,~~OAAO,EAAE,iBAAiB,EAAE,MAAM,iEAAiE,CAAC~~;~~AACpG~~,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;~~AAE9D~~,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;~~AAEvH~~,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,gCAAgC,GAAG,MAAM,0DAA0D,CAAC;AAC7G,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAE,WAAyB,EAAE,SAAiB,EAAE,SAAiB;IAC5G,kIAAkI;IAClI,0GAA0G;IAC1G,MAAM,OAAO,GAAoB,MAAM,kBAAkB,CAAE,EAAE,GAAG,WAAW,EAAE,GAAG,EAAE,UAAU,EAAE,aAAa,SAAS,GAAG,EAAC,EAAC,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IACpJ,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAE,WAAyB,EAAE,SAAiB;IACpF,kIAAkI;IAClI,MAAM,OAAO,GAAoB,MAAM,kBAAkB,CAAE,EAAE,GAAG,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IACxH,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAE,WAAyB,EAAE,SAAiB,EAAE,OAA4B,EAAE,UAA+B;IAEnJ,MAAM,EAAE,UAAU,EAAE,WAAW,GAAG,EAAE,EAAE,WAAW,GAAG,eAAe,EAAE,GAAG,WAAW,CAAC;~~IACpF~~,MAAM,~~mBAAmB,GAAyB,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,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,MAAM,~~GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IAEvE,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,oBAAoB,mBAAmB,EAAE,CAAC,CAAC;QACzE,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAqB,CAAC;QAC3F,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC;QACzB,OAAO,OAAO,CAAC;KAChB;IAED,IAAK,CAAC,SAAS,EAAG;QAChB,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,EAAE,yCAAyC,CAAC,CAAC;QAC9E,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAqB,CAAC;QAC3F,OAAO,CAAC,UAAU,GAAG,cAAc,CAAC;QACpC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;QAE3B,OAAO,OAAO,CAAC;KAChB;IAED;;;;;;;;;MASE;IAEF,IAAI,QAAQ,GAAW,GAAG,MAAM,mCAAmC,SAAS,WAAW,CAAC;IACxF,QAAQ,IAAI,WAAW,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAChD,QAAQ,IAAI,oBAAoB,CAAC;IAEjC,~~gFAAgF;IAChF,~~IAAK,UAAU;QAAG,QAAQ,IAAG,YAAa,UAAW,GAAG,CAAC;IAEzD,MAAM,~~aAAa~~,GAAoB,MAAM,~~iBAAiB~~,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,~~IAAI~~,~~CAAgC~~,~~CAAC;IACvI~~,~~aAAa~~,~~CAAC~~,~~KAAK~~,~~GAAG~~,~~aAAa~~,CAAC,~~KAAK~~,~~CAAC~~,~~CAAC~~,CAAC,~~aAAa~~,CAAC,KAAK,CAAC,~~CAAC~~,~~CAAC~~,~~EAAE~~,CAAC;~~IACrE~~,sCAAsC;IACtC,+BAA+B;IAC/B,wEAAwE;IACxE,MAAM;IAEN,~~MAAM~~,~~MAAM~~,~~GAAqB~~,~~iBAAiB~~,CAAE,~~aAAa~~,~~EAAE~~,~~sCAAsC~~,~~EAAE,~~OAAO,~~EAAE,UAAU,CAAqB,~~CAAC~~;IACpJ~~,~~MAAM,CAAC,cAAc,~~GAAG,CAAE,MAAM,CAAE,~~CAAC~~;~~IAEnC~~,~~MAAM,~~CAAC,~~qBAAqB~~,~~CAAC~~,~~KAAK,GAAG,mBAAmB,~~CAAC,CAAC;~~QACxD~~,~~sBAAsB~~,~~CAAE~~,~~EAAE~~,~~EAAE~~,~~EAAE~~,~~OAAyB~~,~~EAAE~~,~~iBAAiB~~,~~EAAE~~,~~mBAAmB~~,~~CAAC~~,~~iBAAiB,EAAE,KAAK,EAAE,~~MAAM,~~CAAC~~,~~KAAK~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~MAAM~~,~~CAAC~~,~~KAAK,CAAC,~~MAAM,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~EAAE~~,~~CAAC~~;~~QACnK~~,~~CAAC,CAAC,IAAW,CAAC,CAAE,oDAAoD~~;~~IAEtE~~,~~MAAM,CAAC,~~OAAO,~~GAAG~~,~~MAAM~~,~~CAAC~~,~~qBAAqB~~,~~CAAC~~,~~KAAK~~,~~CAAC~~;~~IAEpD~~,~~IAAK~~,~~UAAU~~,~~CAAE~~,~~0BAA0B~~,~~CAAE~~,~~KAAK,IAAI,EAAG~~;~~QAAE,OAAO,CAAC,GAAG,CAAE~~,+~~CAA~~+C,~~EAAE~~,~~MAAM~~,~~CAAE,CAAA~~;~~KAAE;IAAA~~,~~CAAC~~;~~IAEpI~~,~~OAAO,MAAM,CAAC~~;~~AAEhB~~,~~CAAC~~"}
1	+ {"version":3,"file":"getGroupMembersAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getGroupMembersAPI.ts"],"names":[],"mappings":"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"}

package/lib/restAPIs/sites/groups/getWebAssociatedGroupAPI.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getWebAssociatedGroupAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getWebAssociatedGroupAPI.ts"],"names":[],"mappings":"~~AAOA~~,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAE5G,OAAO,EAAE,oBAAoB,EAAE,MAAM,uDAAuD,CAAC;AAE7F,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAC;AAEpH,wBAAsB,4BAA4B,CAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,0BAA0B,CAAC,~~CAuBxM~~;AAED,wBAAsB,wBAAwB,CAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,~~CAmDtN~~"}
1	+ {"version":3,"file":"getWebAssociatedGroupAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getWebAssociatedGroupAPI.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAE5G,OAAO,EAAE,oBAAoB,EAAE,MAAM,uDAAuD,CAAC;AAE7F,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAC;AAEpH,wBAAsB,4BAA4B,CAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,0BAA0B,CAAC,CAqBxM;AAED,wBAAsB,wBAAwB,CAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,CAwCtN"}

package/lib/restAPIs/sites/groups/getWebAssociatedGroupAPI.js CHANGED Viewed

@@ -1,6 +1,5 @@
-import { doSpJsFetchOrPost } from '../../../components/molecules/SpHttp/doSpJsFetch';
+import { doSpJsFetchOrPostAndCheck } from '../../../components/molecules/SpHttp/doSpJsFetch';
 import { startPerformOpV2, updatePerformanceEndV2 } from '../../../components/molecules/Performance/functions';
-import { checkItemsResults } from '../../../components/molecules/process-results/CheckItemsResults';
 import { check4This } from '../../../logic/Links/CheckSearch';
 import { createErrorFpsListReturn } from '../../../components/molecules/process-results/createErrorFpsListItemsReturn';
 import { SourcePropsNoWebUrl } from '../../../components/molecules/source-props/ISourceProps';
@@ -15,15 +14,11 @@ export async function getWebAllAssociatedGroupsAPI(sourceProps, digestValue, ale
     result.owners = allReturns[0];
     result.members = allReturns[1];
     result.visitors = allReturns[2];
-    if (!result.unifiedPerformanceOps)
-        result.unifiedPerformanceOps = {};
     result.unifiedPerformanceOps.fetch = updatePerformanceEndV2({ op: fetchOp, updateMiliseconds: performanceSettings.updateMiliseconds, count: result.items ? result.items.length : 0 });
     result.fetchOp = result.unifiedPerformanceOps.fetch;
     return result;
 }
 export async function getWebAssociatedGroupAPI(sourceProps, group, digestValue, alertMe, consoleLog) {
-    const performanceSettings = { label: `AssocGroups`, includeMsStr: true, updateMiliseconds: true, op: 'fetch' };
-    const fetchOp = startPerformOpV2(performanceSettings); // 2024-09-29:  set null as any to pass build error.
     // 2024-12-05:  Added this because some places like PivotTiles had absoluteWebUrl in webUrl prop... so just taking care of differences
     const useUrl = getAbsoluteWebUrlFromSourceProps(sourceProps);
     if (!useUrl) {
@@ -42,25 +37,57 @@ export async function getWebAssociatedGroupAPI(sourceProps, group, digestValue,
     const { selectThese, } = sourceProps;
     let fetchAPI = `${useUrl}/_api/web/associated${group}group?`;
     fetchAPI += `$select=${selectThese && selectThese.length > 0 ? selectThese.join(',') : 'Title,Id'}&`;
-    const initialResult = await doSpJsFetchOrPost(fetchAPI, 'GET', digestValue, '', null);
+    const result = await doSpJsFetchOrPostAndCheck(fetchAPI, 'GET', digestValue, '', alertMe, consoleLog, 'group', null);
     //  Add any required custom logic here
     //   if ( resultHubSites.ok ) {
     //     resultHubSites.items = cleanSearchedWebs( resultHubSites.items );
     //   }
-    const result = checkItemsResults(initialResult, `fps-core-v7: getWebAssociatedGroupAPI ~ 72`, alertMe, consoleLog);
-    result.fpsContentType = ['group'];
-    // 2024-12-06:  As of now, the Group is returned on the 'items' property here but it's actually a single item.
-    let itemX = result.item ? result.item : result.items ? result.items : undefined;
-    result.group = itemX;
-    if (!result.unifiedPerformanceOps)
-        result.unifiedPerformanceOps = {};
-    result.unifiedPerformanceOps.fetch = performanceSettings ?
-        updatePerformanceEndV2({ op: fetchOp, updateMiliseconds: performanceSettings.updateMiliseconds, count: result.items ? result.items.length : 0 }) : null;
-    result.fetchOp = result.unifiedPerformanceOps.fetch;
+    // let itemX = result.item ? result.item : result.items ? result.items : undefined;
+    // result.group = itemX;
+    // result.fpsContentType = [ 'group' ];
+    result.unifiedPerformanceOps.fetch.label = `AssocGroups: ${group}`;
+    // result.unifiedPerformanceOps.fetch.c = 1;
     if (check4This(`fpsShowFetchResults=true`) === true) {
         console.log(`fps-core-v7 COMPLETE: getWebAssociatedGroupAPI ~ 86`, result);
     }
     ;
     return result;
 }
+// export async function getWebAssociatedGroupAPI( sourceProps: ISourceProps, group: IAssociatedGroupType, digestValue: string, alertMe: boolean | undefined, consoleLog: boolean | undefined, ): Promise<IFpsGroupReturn>  {
+//   const performanceSettings: IPerformanceSettings = { label: `AssocGroups`, includeMsStr: true, updateMiliseconds: true, op: 'fetch' };
+//   const fetchOp: IPerformanceOp = startPerformOpV2( performanceSettings ) as IPerformanceOp;  // 2024-09-29:  set null as any to pass build error.
+//   // 2024-12-05:  Added this because some places like PivotTiles had absoluteWebUrl in webUrl prop... so just taking care of differences
+//   const useUrl: string = getAbsoluteWebUrlFromSourceProps( sourceProps );
+//   if ( !useUrl ) {
+//     // NO WebURL... Throw Alert
+//     if ( alertMe === true ) alert(`getWebAssociatedGroupAPI: ${SourcePropsNoWebUrl}`);
+//     const results: IFpsGroupReturn = createErrorFpsListReturn( useUrl, '' ) as IFpsGroupReturn;
+//     return results;
+//   }
+//   /**
+//     SAMPLE Full SharePoint Items Rest call:
+//       ``${this.props.SettingsSource.useUrl}/
+//       _api/web/associatedownergroup?
+//       $select=Title,Id`;
+//   */
+//   const { selectThese, } = sourceProps;
+//   let fetchAPI: string = `${useUrl}/_api/web/associated${group}group?`;
+//   fetchAPI+= `$select=${ selectThese && selectThese.length > 0 ? selectThese.join(',') : 'Title,Id' }&`;
+//   const initialResult = await doSpJsFetchOrPost( fetchAPI, 'GET', digestValue, '', null );
+//   //  Add any required custom logic here
+//   //   if ( resultHubSites.ok ) {
+//   //     resultHubSites.items = cleanSearchedWebs( resultHubSites.items );
+//   //   }
+//   const result : IFpsGroupReturn = checkItemsResults( initialResult as IFpsItemsReturn, `fps-core-v7: getWebAssociatedGroupAPI ~ 72`, alertMe, consoleLog ) as IFpsGroupReturn;
+//   result.fpsContentType = [ 'group' ];
+//   // 2024-12-06:  As of now, the Group is returned on the 'items' property here but it's actually a single item.
+//   let itemX = result.item ? result.item : result.items ? result.items : undefined;
+//   result.group = itemX;
+//   if ( !result.unifiedPerformanceOps ) result.unifiedPerformanceOps = {}
+//   result.unifiedPerformanceOps.fetch = performanceSettings ?
+//     updatePerformanceEndV2( { op: fetchOp, updateMiliseconds: performanceSettings.updateMiliseconds, count: result.items ? result.items.length : 0 })  : null as any;
+//   result.fetchOp = result.unifiedPerformanceOps.fetch;
+//   if ( check4This( `fpsShowFetchResults=true` ) === true ) { console.log( `fps-core-v7 COMPLETE: getWebAssociatedGroupAPI ~ 86`, result ) };
+//   return result;
+// }
 //# sourceMappingURL=getWebAssociatedGroupAPI.js.map

package/lib/restAPIs/sites/groups/getWebAssociatedGroupAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getWebAssociatedGroupAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getWebAssociatedGroupAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,~~iBAAiB~~,EAAE,MAAM,kDAAkD,CAAC;~~AACrF~~,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC/G,OAAO,EAAE,~~iBAAiB,EAAmB,MAAM,iEAAiE,CAAC;AACrH,OAAO,EAAE,~~UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AAEvH,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAE5G,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAG7F,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAE,WAAyB,EAAE,WAAmB,EAAE,OAA4B,EAAE,UAA+B;IAE/J,MAAM,mBAAmB,GAAyB,EAAE,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;IACrI,MAAM,OAAO,GAAmB,gBAAgB,CAAE,mBAAmB,CAAoB,CAAC,CAAE,oDAAoD;IAEhJ,MAAM,UAAU,GAAsB,MAAM,OAAO,CAAC,GAAG,CACrD,CAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAE,CAAC,GAAG,CAAE,CAAE,KAA2B,EAAE,GAAW,EAAG,EAAE,GAAG,OAAO,wBAAwB,CAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,CAAE,CAAA,CAAC,CAAC,CAAE,CACpL,CAAC;IAEF,MAAM,MAAM,GAA+B,sBAAsB,CAAE,UAAU,CAAC,CAAC,CAAC,CAAE,UAA0B,CAAY,EAAG,KAAK,CAA2C,CAAC;IAC5K,MAAM,CAAC,KAAK,GAAG,UAAU,CAAC;IAC1B,MAAM,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,CAAC,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAEhC,~~IAAK,CAAC,~~MAAM,CAAC,qBAAqB~~;QAAG~~,~~MAAM,~~CAAC,~~qBAAqB,GAAG,EAAE,CAAA;IAEtE,MAAM,CAAC,qBAAqB,CAAC,~~KAAK,GAAG,sBAAsB,CAAE,EAAE,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAmB,CAAC;IAEzM,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC;IAEpD,OAAO,MAAM,CAAC;AAEhB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAE,WAAyB,EAAE,KAA2B,EAAE,WAAmB,EAAE,OAA4B,EAAE,UAA+B;IAExL,~~MAAM,mBAAmB,GAAyB,EAAE,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;IACrI,MAAM,OAAO,GAAmB,gBAAgB,CAAE,mBAAmB,CAAoB,CAAC,CAAE,oDAAoD;IAEhJ,~~sIAAsI;IACtI,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IAEvE,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,6BAA6B,mBAAmB,EAAE,CAAC,CAAC;QAClF,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAqB,CAAC;QAC3F,OAAO,OAAO,CAAC;KAChB;IAED;;;;;MAKE;IACF,MAAM,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAErC,IAAI,QAAQ,GAAW,GAAG,MAAM,uBAAuB,KAAK,QAAQ,CAAC;IACrE,QAAQ,IAAG,WAAY,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAW,GAAG,CAAC;IAEtG,MAAM,~~aAAa~~,~~GAAG~~,MAAM,~~iBAAiB~~,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,~~CAAE~~,CAAC;~~IAExF~~,sCAAsC;IACtC,+BAA+B;IAC/B,wEAAwE;IACxE,MAAM;IAEN,~~MAAM,MAAM,GAAqB,iBAAiB,CAAE,aAAgC,EAAE,4CAA4C,EAAE,OAAO,EAAE,UAAU,CAAqB,CAAC~~;~~IAC7K~~,~~MAAM,CAAC,cAAc,GAAG,CAAE,OAAO,CAAE,CAAC~~;~~IAEpC~~,~~8GAA8G~~;~~IAC9G~~,~~IAAI,KAAK,GAAG,~~MAAM,CAAC,~~IAAI~~,CAAC,~~CAAC~~,CAAC,~~MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,~~KAAK,~~CAAC~~,~~CAAC~~,~~CAAC,MAAM,CAAC,~~KAAK,~~CAAC~~,CAAC~~,CAAC,SAAS,CAAC~~;~~IAChF~~,~~MAAM,CAAC,KAAK,GAAG,KAAK,CAAC~~;~~IAErB~~,IAAK,~~CAAC~~,~~MAAM~~,~~CAAC~~,~~qBAAqB;QAAG~~,~~MAAM~~,~~CAAC~~,~~qBAAqB,GAAG,EAAE,CAAA~~;~~IAEtE~~,~~MAAM~~,CAAC,~~qBAAqB,CAAC,KAAK,~~GAAG,~~mBAAmB,CAAC,CAAC;QACxD,sBAAsB,~~CAAE,~~EAAE~~,EAAE,~~EAAE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,iBAAiB,EAAE,KAAK,EAAE,~~MAAM,~~CAAC~~,~~KAAK~~,CAAC,~~CAAC~~,~~CAAC,~~MAAM,CAAC,~~KAAK,~~CAAC,~~MAAM~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~CAAC~~,~~EAAE~~,~~CAAC~~,~~CAAE~~,~~CAAC~~,~~CAAC,IAAW,CAAC~~;~~IAEnK~~,MAAM,~~CAAC~~,~~OAAO~~,~~GAAG~~,~~MAAM~~,~~CAAC~~,~~qBAAqB~~,~~CAAC~~,~~KAAK~~,~~CAAC~~;~~IAEpD~~,~~IAAK~~,~~UAAU~~,~~CAAE~~,~~0BAA0B~~,~~CAAE~~,~~KAAK~~,~~IAAI~~,~~EAAG~~;~~QAAE~~,~~OAAO~~,~~CAAC,GAAG,CAAE,qDAAqD,EAAE,MAAM,CAAE,CAAA~~;~~KAAE~~;~~IAAA~~,~~CAAC~~;~~IAE1I~~,~~OAAO~~,~~MAAM,CAAC~~;~~AAEhB~~,~~CAAC~~"}
1	+ {"version":3,"file":"getWebAssociatedGroupAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getWebAssociatedGroupAPI.ts"],"names":[],"mappings":"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"}

package/lib/restAPIs/sites/groups/getWebGroupInfoAPI.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getWebGroupInfoAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getWebGroupInfoAPI.ts"],"names":[],"mappings":"~~AAOA~~,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAI5G,OAAO,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;~~AAGzF~~,wBAAsB,kBAAkB,CAAE,WAAW,EAAE,YAAY,EAAE,WAAW,oBAAK,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,gBAAgB,CAAC,~~CAkDjL~~"}
1	+ {"version":3,"file":"getWebGroupInfoAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getWebGroupInfoAPI.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAI5G,OAAO,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AAIzF,wBAAsB,kBAAkB,CAAE,WAAW,EAAE,YAAY,EAAE,WAAW,oBAAK,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,gBAAgB,CAAC,CAgDjL"}

package/lib/restAPIs/sites/groups/getWebGroupInfoAPI.js CHANGED Viewed

@@ -1,12 +1,12 @@
-import { doSpJsFetchOrPost } from '../../../components/molecules/SpHttp/doSpJsFetch';
-import { startPerformOpV2, updatePerformanceEndV2 } from '../../../components/molecules/Performance/functions';
-import { checkItemsResults, } from '../../../components/molecules/process-results/CheckItemsResults';
+import { doSpJsFetchOrPostAndCheck } from '../../../components/molecules/SpHttp/doSpJsFetch';
+import { startPerformOpV2, } from '../../../components/molecules/Performance/functions';
 import { check4This } from '../../../logic/Links/CheckSearch';
 import { createErrorFpsListReturn } from '../../../components/molecules/process-results/createErrorFpsListItemsReturn';
 import { SourcePropsNoWebUrl } from '../../../components/molecules/source-props/ISourceProps';
 import { getAbsoluteWebUrlFromSourceProps, } from '../../../logic/Strings/getAbssoluteWebUrlFromSourceProps';
 import { getExpandColumns } from '../../../components/molecules/source-props/Lists/getVX/getExpandV2';
 import { GroupSelectsWithOwner } from './GroupSelects';
+import { getCollectionUrl } from '../../../logic/Links/getSPOUrl';
 export async function getWebGroupInfoAPI(sourceProps, digestValue = '', alertMe, consoleLog) {
     const { restFilter, selectThese = GroupSelectsWithOwner, } = sourceProps;
     const performanceSettings = { label: `SiteGroups`, includeMsStr: true, updateMiliseconds: true, op: 'fetch' };
@@ -34,19 +34,15 @@ export async function getWebGroupInfoAPI(sourceProps, digestValue = '', alertMe,
         fetchAPI += `$expand=${expandThese.join(',')}&`;
     if (restFilter)
         fetchAPI += `$filter=${restFilter}`;
-    const initialResult = await doSpJsFetchOrPost(fetchAPI, 'GET', digestValue, '', null);
-    initialResult.groups = initialResult.items ? initialResult.items : [];
+    const result = await doSpJsFetchOrPostAndCheck(fetchAPI, 'GET', digestValue, '', alertMe, consoleLog, 'group', null);
+    // result.groups = result.items ? result.items : [];
+    // result.fpsContentType = [ 'group' ];
+    result.unifiedPerformanceOps.fetch.label = `${getCollectionUrl(useUrl)} Groups`;
+    // result.unifiedPerformanceOps.fetch.c = result.groups.length;
     //  Add any required custom logic here
     //   if ( resultHubSites.ok ) {
     //     resultHubSites.items = cleanSearchedWebs( resultHubSites.items );
     //   }
-    const result = checkItemsResults(initialResult, `fps-core-v7: getWebGroupInfoAPI ~ 53`, alertMe, consoleLog);
-    result.fpsContentType = ['group'];
-    if (!result.unifiedPerformanceOps)
-        result.unifiedPerformanceOps = {};
-    result.unifiedPerformanceOps.fetch = performanceSettings ?
-        updatePerformanceEndV2({ op: fetchOp, updateMiliseconds: performanceSettings.updateMiliseconds, count: result.items ? result.items.length : 0 }) : null;
-    result.fetchOp = result.unifiedPerformanceOps.fetch;
     if (check4This(`fpsShowFetchResults=true`) === true) {
         console.log(`fps-core-v7 COMPLETE: getWebGroupInfoAPI ~ 61`, result);
     }

package/lib/restAPIs/sites/groups/getWebGroupInfoAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getWebGroupInfoAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getWebGroupInfoAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,~~iBAAiB~~,EAAE,MAAM,kDAAkD,CAAC;~~AACrF~~,OAAO,EAAE,gBAAgB,~~EAAE~~,~~sBAAsB,EAAE,~~MAAM,qDAAqD,CAAC;~~AAC/G~~,OAAO,EAAE,~~iBAAiB,GAAG,MAAM,iEAAiE,CAAC;AACrG,OAAO,EAAE,~~UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AAEvH,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,gCAAgC,GAAG,MAAM,0DAA0D,CAAC;AAC7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,oEAAoE,CAAC;AACtG,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;~~AAIvD~~,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAE,WAAyB,EAAE,WAAW,GAAG,EAAE,EAAE,OAA4B,EAAE,UAA+B;IAElJ,MAAM,EAAE,UAAU,EAAE,WAAW,GAAG,qBAAqB,GAAG,GAAG,WAAW,CAAC;IACzE,MAAM,mBAAmB,GAAyB,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;IACpI,MAAM,OAAO,GAAmB,gBAAgB,CAAE,mBAAmB,CAAoB,CAAC,CAAE,oDAAoD;IAEhJ,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IAEvE,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,oBAAoB,mBAAmB,EAAE,CAAC,CAAC;QACzE,MAAM,OAAO,GAAqB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAsB,CAAC;QAC7F,OAAO,OAAO,CAAC;KAChB;IAED;;;;;;MAME;IAEF,IAAI,QAAQ,GAAW,GAAG,MAAM,uBAAuB,CAAC;IACxD,QAAQ,IAAI,qBAAqB,CAAC;IAClC,QAAQ,IAAG,WAAY,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,yBAAyB,GAAG,CAAC;IAErG,MAAM,WAAW,GAAa,gBAAgB,CAAE,WAAW,CAAE,CAAC;IAC9D,IAAK,WAAW,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,WAAY,WAAW,CAAC,IAAI,CAAC,GAAG,CAAE,GAAG,CAAC;IAC/E,IAAK,UAAU;QAAG,QAAQ,IAAG,WAAY,UAAW,EAAE,CAAC;IAEvD,MAAM,~~aAAa~~,~~GAAG~~,MAAM,~~iBAAiB~~,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,CAAiC,CAAC;~~IACvH~~,~~aAAa~~,~~CAAC~~,MAAM,~~GAAG~~,~~aAAa~~,CAAC,KAAK,CAAC,~~CAAC~~,~~CAAC~~,~~aAAa~~,~~CAAC~~,~~KAAK,~~CAAC,~~CAAC~~,CAAC,~~EAAE~~,CAAC;~~IACtE~~,sCAAsC;IACtC,+BAA+B;IAC/B,wEAAwE;IACxE,MAAM;~~IAEN~~,~~MAAM,MAAM,GAAsB,iBAAiB,CAAE,aAAa,EAAE,sCAAsC,EAAE,OAAO,EAAE,UAAU,CAAsB,CAAC;IACtJ,MAAM,CAAC,cAAc,GAAG,CAAE,OAAO,CAAE,CAAC;IACpC,~~IAAK,CAAC,MAAM,CAAC,qBAAqB;QAAG,MAAM,CAAC,qBAAqB,GAAG,EAAE,CAAA;IACtE,MAAM,CAAC,qBAAqB,CAAC,KAAK,GAAG,mBAAmB,CAAC,CAAC;QACxD,sBAAsB,CAAE,EAAE,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAE,CAAC,CAAC,IAAW,CAAC;IAEnK,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC;IAEpD,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,+CAA+C,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAEpI,OAAO,MAAM,CAAC;AAEhB,CAAC"}
1	+ {"version":3,"file":"getWebGroupInfoAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getWebGroupInfoAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAC7F,OAAO,EAAE,gBAAgB,GAAG,MAAM,qDAAqD,CAAC;AACxF,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AAEvH,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,gCAAgC,GAAG,MAAM,0DAA0D,CAAC;AAC7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,oEAAoE,CAAC;AACtG,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAGlE,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAE,WAAyB,EAAE,WAAW,GAAG,EAAE,EAAE,OAA4B,EAAE,UAA+B;IAElJ,MAAM,EAAE,UAAU,EAAE,WAAW,GAAG,qBAAqB,GAAG,GAAG,WAAW,CAAC;IACzE,MAAM,mBAAmB,GAAyB,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;IACpI,MAAM,OAAO,GAAmB,gBAAgB,CAAE,mBAAmB,CAAoB,CAAC,CAAE,oDAAoD;IAEhJ,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IAEvE,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,oBAAoB,mBAAmB,EAAE,CAAC,CAAC;QACzE,MAAM,OAAO,GAAqB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAsB,CAAC;QAC7F,OAAO,OAAO,CAAC;KAChB;IAED;;;;;;MAME;IAEF,IAAI,QAAQ,GAAW,GAAG,MAAM,uBAAuB,CAAC;IACxD,QAAQ,IAAI,qBAAqB,CAAC;IAClC,QAAQ,IAAG,WAAY,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,yBAAyB,GAAG,CAAC;IAErG,MAAM,WAAW,GAAa,gBAAgB,CAAE,WAAW,CAAE,CAAC;IAC9D,IAAK,WAAW,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,WAAY,WAAW,CAAC,IAAI,CAAC,GAAG,CAAE,GAAG,CAAC;IAC/E,IAAK,UAAU;QAAG,QAAQ,IAAG,WAAY,UAAW,EAAE,CAAC;IAEvD,MAAM,MAAM,GAAoB,MAAM,yBAAyB,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAC,IAAI,CAAiC,CAAC;IAEtK,oDAAoD;IACpD,uCAAuC;IACvC,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC;IAChF,+DAA+D;IAE/D,sCAAsC;IACtC,+BAA+B;IAC/B,wEAAwE;IACxE,MAAM;IAGN,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,+CAA+C,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAEpI,OAAO,MAAM,CAAC;AAEhB,CAAC"}

package/lib/restAPIs/sites/groups/getWebGroupInfoBatchAPI.js CHANGED Viewed

@@ -17,7 +17,7 @@ export async function getWebGroupInfoBatchAPI(sourceProps, filterBatches, alertM
     initialResult.groups = allGroups;
     const result = checkItemsResults(initialResult, `fps-core-v7: getWebGroupInfoBatchAPI ~ 33`, alertMe, consoleLog);
     if (!result.unifiedPerformanceOps)
-        result.unifiedPerformanceOps = {};
+        result.unifiedPerformanceOps = { fetch: {} };
     result.unifiedPerformanceOps.fetch = updatePerformanceEndV2({ op: fetchOp, updateMiliseconds: performanceSettings.updateMiliseconds, count: result.items ? result.items.length : 0 });
     result.fetchOp = result.unifiedPerformanceOps.fetch;
     if (check4This(`fpsShowFetchResults=true`) === true) {

package/lib/restAPIs/sites/groups/getWebGroupInfoBatchAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getWebGroupInfoBatchAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getWebGroupInfoBatchAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC/G,OAAO,EAAE,iBAAiB,GAAG,MAAM,iEAAiE,CAAC;AACrG,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAK9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,qFAAqF,CAAC;AAEhI,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAE,WAAyB,EAAE,aAAuB,EAAE,OAA4B,EAAE,UAA+B;IAE9J,MAAM,mBAAmB,GAAyB,EAAE,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;IACzI,MAAM,OAAO,GAAmB,gBAAgB,CAAE,mBAAmB,CAAoB,CAAC,CAAE,oDAAoD;IAEhJ,qGAAqG;IACrG,MAAM,kBAAkB,GAAG,MAAM,yBAAyB,CAAE,WAAW,CAAE,CAAC;IAE1E,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,aAAa,CAAC,GAAG,CAAE,CAAE,MAAc,EAAE,GAAW,EAAG,EAAE;QACnD,OAAO,kBAAkB,CAAE,EAAE,GAAG,kBAAkB,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,kBAAkB,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,CAAE,CAAA;IAAC,CAAC,CAClI,CACF,CAAC;IAEF,MAAM,SAAS,GAAqB,EAAE,CAAC;IACvC,UAAU,CAAC,GAAG,CAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,IAAI,CAAE,GAAG,OAAO,CAAC,MAAM,CAAE,CAAA,CAAC,CAAC,CAAC,CAAC;IAEpE,MAAM,aAAa,GAAqB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAE,UAAU,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC;IACpF,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC;IAEjC,MAAM,MAAM,GAAsB,iBAAiB,CAAE,aAAa,EAAE,2CAA2C,EAAE,OAAO,EAAE,UAAU,CAAsB,CAAC;IAE3J,IAAK,CAAC,MAAM,CAAC,qBAAqB;QAAG,MAAM,CAAC,qBAAqB,GAAG,EAAE,CAAA;~~IACpE~~,MAAM,CAAC,qBAAqB,CAAC,KAAK,GAAG,sBAAsB,CAAE,EAAE,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAmB,CAAC;IAE3M,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC;IAEpD,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,oDAAoD,EAAE,MAAM,CAAE,CAAA;KAAE;IAExI,OAAO,MAAM,CAAC;AAEhB,CAAC"}
1	+ {"version":3,"file":"getWebGroupInfoBatchAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getWebGroupInfoBatchAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC/G,OAAO,EAAE,iBAAiB,GAAG,MAAM,iEAAiE,CAAC;AACrG,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAK9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,qFAAqF,CAAC;AAEhI,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAE,WAAyB,EAAE,aAAuB,EAAE,OAA4B,EAAE,UAA+B;IAE9J,MAAM,mBAAmB,GAAyB,EAAE,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;IACzI,MAAM,OAAO,GAAmB,gBAAgB,CAAE,mBAAmB,CAAoB,CAAC,CAAE,oDAAoD;IAEhJ,qGAAqG;IACrG,MAAM,kBAAkB,GAAG,MAAM,yBAAyB,CAAE,WAAW,CAAE,CAAC;IAE1E,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,aAAa,CAAC,GAAG,CAAE,CAAE,MAAc,EAAE,GAAW,EAAG,EAAE;QACnD,OAAO,kBAAkB,CAAE,EAAE,GAAG,kBAAkB,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,kBAAkB,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,CAAE,CAAA;IAAC,CAAC,CAClI,CACF,CAAC;IAEF,MAAM,SAAS,GAAqB,EAAE,CAAC;IACvC,UAAU,CAAC,GAAG,CAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,IAAI,CAAE,GAAG,OAAO,CAAC,MAAM,CAAE,CAAA,CAAC,CAAC,CAAC,CAAC;IAEpE,MAAM,aAAa,GAAqB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAE,UAAU,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC;IACpF,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC;IAEjC,MAAM,MAAM,GAAsB,iBAAiB,CAAE,aAAa,EAAE,2CAA2C,EAAE,OAAO,EAAE,UAAU,CAAsB,CAAC;IAE3J,IAAK,CAAC,MAAM,CAAC,qBAAqB;QAAG,MAAM,CAAC,qBAAqB,GAAG,EAAE,KAAK,EAAE,EAAoB,EAAE,CAAA;IACjG,MAAM,CAAC,qBAAqB,CAAC,KAAK,GAAG,sBAAsB,CAAE,EAAE,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAmB,CAAC;IAE3M,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC;IAEpD,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,oDAAoD,EAAE,MAAM,CAAE,CAAA;KAAE;IAExI,OAAO,MAAM,CAAC;AAEhB,CAAC"}

package/lib/restAPIs/sites/sites/getSiteAPI.d.ts CHANGED Viewed

@@ -3,6 +3,6 @@ import { IFpsSiteReturn, IFpsWebReturn, IFpsWebsReturn } from '../../../types/fp
 export declare function createEmptyFpsSiteReturn(): IFpsSiteReturn;
 export declare function getSubsitesAPI(sourceProps: ISourceProps, alertMe: boolean | undefined, consoleLog: boolean | undefined): Promise<IFpsWebsReturn>;
 export declare function getWebAPI(sourceProps: ISourceProps, alertMe: boolean | undefined, consoleLog: boolean | undefined): Promise<IFpsWebReturn>;
-export type IGetSiteAPIType = 'Site' | 'Web' | 'Subsites';
+export type IGetSiteAPIType = 'site' | 'web' | 'subsites';
 export declare function getSiteAPI(sourceProps: ISourceProps, apiType: IGetSiteAPIType | undefined, alertMe: boolean | undefined, consoleLog: boolean | undefined): Promise<IFpsSiteReturn>;
 //# sourceMappingURL=getSiteAPI.d.ts.map

package/lib/restAPIs/sites/sites/getSiteAPI.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSiteAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getSiteAPI.ts"],"names":[],"mappings":"~~AAOA~~,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAI5G,OAAO,EAAgB,cAAc,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iDAAiD,CAAC;AAG9H,wBAAgB,wBAAwB,IAAI,cAAc,CAMzD;AAED,wBAAsB,cAAc,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,cAAc,CAAC,CAGzJ;AAED,wBAAsB,SAAS,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,aAAa,CAAC,CAGnJ;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,KAAK,GAAG,UAAU,CAAC;AAE1D,wBAAsB,UAAU,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,6BAA0B,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,cAAc,CAAC,~~CA4DxL~~"}
1	+ {"version":3,"file":"getSiteAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getSiteAPI.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAI5G,OAAO,EAAgB,cAAc,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iDAAiD,CAAC;AAG9H,wBAAgB,wBAAwB,IAAI,cAAc,CAMzD;AAED,wBAAsB,cAAc,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,cAAc,CAAC,CAGzJ;AAED,wBAAsB,SAAS,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,aAAa,CAAC,CAGnJ;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,KAAK,GAAG,UAAU,CAAC;AAE1D,wBAAsB,UAAU,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,6BAA0B,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,cAAc,CAAC,CAuDxL"}

package/lib/restAPIs/sites/sites/getSiteAPI.js CHANGED Viewed

@@ -1,6 +1,5 @@
-import { doSpJsFetchOrPost } from '../../../components/molecules/SpHttp/doSpJsFetch';
-import { startPerformOpV2, updatePerformanceEndV2 } from '../../../components/molecules/Performance/functions';
-import { checkItemsResults } from '../../../components/molecules/process-results/CheckItemsResults';
+import { doSpJsFetchOrPostAndCheck } from '../../../components/molecules/SpHttp/doSpJsFetch';
+import { startPerformOpV2 } from '../../../components/molecules/Performance/functions';
 import { check4This } from '../../../logic/Links/CheckSearch';
 import { SourcePropsNoWebUrl } from '../../../components/molecules/source-props/ISourceProps';
 import { getCollectionUrl } from '../../../logic/Links/getSPOUrl';
@@ -15,14 +14,14 @@ export function createEmptyFpsSiteReturn() {
     return results;
 }
 export async function getSubsitesAPI(sourceProps, alertMe, consoleLog) {
-    const results = await getSiteAPI(sourceProps, 'Subsites', alertMe, consoleLog);
+    const results = await getSiteAPI(sourceProps, 'subsites', alertMe, consoleLog);
     return results;
 }
 export async function getWebAPI(sourceProps, alertMe, consoleLog) {
-    const results = await getSiteAPI(sourceProps, 'Web', alertMe, consoleLog);
+    const results = await getSiteAPI(sourceProps, 'web', alertMe, consoleLog);
     return results;
 }
-export async function getSiteAPI(sourceProps, apiType = 'Site', alertMe, consoleLog) {
+export async function getSiteAPI(sourceProps, apiType = 'site', alertMe, consoleLog) {
     const { selectThese, } = sourceProps;
     // 2024-12-05:  Added this because some places like PivotTiles had absoluteWebUrl in webUrl prop... so just taking care of differences
     const useUrl = getAbsoluteWebUrlFromSourceProps(sourceProps);
@@ -42,32 +41,30 @@ export async function getSiteAPI(sourceProps, apiType = 'Site', alertMe, console
       https://example.sharepoint.com/sites/MySite/_api/[ site | web | web/webs ]?
           $select=Id,Title
     */
-    let fetchAPI = `${useUrl}/_api/${apiType === 'Subsites' ? `web/webs` : apiType}?}`;
+    let fetchAPI = `${useUrl}/_api/${apiType === 'subsites' ? `web/webs` : apiType}?}`;
     fetchAPI += `$select=${selectThese && selectThese.length > 0 ? selectThese.join(',') : MinUserSelect.join(',')}&`;
-    const initialResult = await doSpJsFetchOrPost(fetchAPI, 'GET', sourceProps.digestValue, '', null);
+    // const result: IFpsSiteReturn = await doSpJsFetchOrPost(fetchAPI, 'GET', sourceProps.digestValue as '', '', null ) as unknown as IFpsSiteReturn;
+    const result = await doSpJsFetchOrPostAndCheck(fetchAPI, 'GET', '', '', alertMe, consoleLog, apiType, null);
     let count = 0;
-    if (apiType === 'Site') {
-        initialResult.site = initialResult.item ? initialResult.item : {};
-        count = initialResult.status === 'Success' ? 1 : 0;
+    if (apiType === 'site') {
+        result.site = result.item ? result.item : {};
+        count = result.status === 'Success' ? 1 : 0;
     }
-    else if (apiType === 'Web') {
-        initialResult[`web`] = initialResult.item ? initialResult.item : {};
-        count = initialResult.status === 'Success' ? 1 : 0;
+    else if (apiType === 'web') {
+        result[`web`] = result.item ? result.item : {};
+        count = result.status === 'Success' ? 1 : 0;
     }
-    else if (apiType === 'Subsites') {
-        initialResult[`webs`] = initialResult.items ? initialResult.items : [];
-        count = initialResult.status === 'Success' && initialResult.items ? initialResult.items.length : 0;
+    else if (apiType === 'subsites') {
+        result[`webs`] = result.items ? result.items : [];
+        count = result.status === 'Success' && result.items ? result.items.length : 0;
     }
     // initialResult.users.map( user => {
     //   if (!user.LoginName && user.Name) { user.LoginName = user.Name; }
     //   if (!user.Email && user.EMail) { user.Email = user.EMail; }
     // });
-    const result = checkItemsResults(initialResult, `fps-core-v7: getSiteAPI ~ 24`, alertMe, consoleLog);
-    result.fpsContentType = [`${apiType === 'Subsites' ? 'web' : apiType.toLowerCase()}`];
-    result.unifiedPerformanceOps.fetch = performanceSettings ?
-        updatePerformanceEndV2({ op: fetchOp, updateMiliseconds: performanceSettings.updateMiliseconds, count: count })
-        : null; // 2024-09-29:  set null as any to pass build error.
-    result.fetchOp = result.unifiedPerformanceOps.fetch;
+    // result.fpsContentType = [ `${ apiType === 'subsites' ? 'web' :  apiType.toLowerCase()}` as 'web' ];
+    // result.unifiedPerformanceOps.fetch.label = `getSiteAPI: ${apiType}`;
+    result.unifiedPerformanceOps.fetch.c = count;
     if (check4This(`fpsShowFetchResults=true`) === true) {
         console.log(`fps-core-v7 COMPLETE: getSiteAPI ~ 53`, result);
     }

package/lib/restAPIs/sites/sites/getSiteAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSiteAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getSiteAPI.ts"],"names":[],"mappings":"AACA,OAAO,~~EAAE~~,~~iBAAiB~~,EAAE,MAAM,kDAAkD,CAAC;~~AACrF~~,OAAO,EAAE,gBAAgB,EAAE,~~sBAAsB,EAAE,~~MAAM,qDAAqD,CAAC;~~AAC/G~~,OAAO,EAAE,~~iBAAiB,EAAE,MAAM,iEAAiE,CAAC;AACpG,OAAO,EAAE,~~UAAU,EAAE,MAAM,kCAAkC,CAAC;~~AAG9D~~,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAC5G,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAElF,OAAO,EAAE,yBAAyB,EAAE,MAAM,yEAAyE,CAAC;AAEpH,MAAM,UAAU,wBAAwB;IACtC,MAAM,OAAO,GAAmB,yBAAyB,EAAoB,CAAC;IAC9E,OAAO,CAAC,IAAI,GAAG,EAAkB,CAAC;IAClC,OAAO,CAAE,KAAe,CAAC,GAAG,EAAkB,CAAC;IAC/C,OAAO,CAAE,MAAiB,CAAC,GAAG,EAAW,CAAC;IAC1C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B;IAC5H,MAAM,OAAO,GAAmB,MAAM,UAAU,CAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,CAA+B,CAAC;IAC9H,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B;IACvH,MAAM,OAAO,GAAkB,MAAM,UAAU,CAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,CAA8B,CAAC;IACvH,OAAO,OAAO,CAAC;AACjB,CAAC;AAID,MAAM,CAAC,KAAK,UAAU,UAAU,CAAE,WAAyB,EAAE,UAA2B,MAAM,EAAE,OAA4B,EAAE,UAA+B;IAE3J,MAAM,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAErC,sIAAsI;IACtI,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IACvE,MAAM,cAAc,GAAW,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAExD,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,eAAe,mBAAmB,EAAE,CAAC,CAAC;QACpE,MAAM,OAAO,GAAmB,wBAAwB,EAAG,CAAC;QAC5D,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC;QACzB,OAAO,OAAO,CAAC;KAChB;IAED,MAAM,mBAAmB,GAAyB,EAAE,KAAK,EAAE,GAAG,OAAO,IAAI,cAAc,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;IACtJ,MAAM,OAAO,GAAG,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,CAAE,mBAAmB,CAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAErF;;;;MAIE;IAEF,IAAI,QAAQ,GAAW,GAAG,MAAM,SAAU,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC;IAC5F,QAAQ,IAAG,WAAY,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAE,GAAG,CAAC;IAEnH,MAAM,~~aAAa~~,GAAmB,MAAM,~~iBAAiB~~,CAAC,QAAQ,EAAE,KAAK,EAAE,~~WAAW~~,~~CAAC~~,~~WAAiB~~,EAAE,EAAE,EAAE,IAAI,CAA+B,CAAC;~~IACtJ~~,IAAI,KAAK,GAAW,CAAC,CAAC;IACtB,IAAK,OAAO,KAAK,MAAM,EAAG;QACxB,~~aAAa~~,CAAC,IAAI,GAAG,~~aAAa~~,CAAC,IAAI,CAAC,CAAC,CAAC,~~aAAa~~,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;~~QAClE~~,KAAK,GAAG,~~aAAa~~,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;~~KACpD~~;SAAM,IAAK,OAAO,KAAK,KAAK,EAAG;QAC9B,~~aAAa~~,CAAG,KAAe,CAAC,GAAG,~~aAAa~~,CAAC,IAAI,CAAC,CAAC,CAAC,~~aAAa~~,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;~~QAChF~~,KAAK,GAAG,~~aAAa~~,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;~~KACpD~~;SAAM,IAAK,OAAO,KAAK,UAAU,EAAG;QACnC,~~aAAa~~,CAAG,MAAiB,CAAE,GAAG,~~aAAa~~,CAAC,KAAK,CAAC,CAAC,CAAC,~~aAAa~~,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;~~QACrF~~,KAAK,GAAG,~~aAAa~~,CAAC,MAAM,KAAK,SAAS,IAAI,~~aAAa~~,CAAC,KAAK,CAAC,CAAC,CAAC,~~aAAa~~,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;~~KACpG~~;IAED,qCAAqC;IACrC,sEAAsE;IACtE,gEAAgE;IAChE,MAAM;IAEN,~~MAAM,MAAM,GAAmB,iBAAiB,CAAE,aAAa,EAAE,8BAA8B,EAAE,OAAO,EAAE,UAAU,CAAoB,CAAC~~;~~IACzI~~,~~MAAM,CAAC,cAAc,GAAG,CAAE,GAAI,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAE,OAAO,CAAC,WAAW,EAAE,EAAW,CAAE,CAAC~~;~~IAGnG~~,MAAM,CAAC,qBAAqB,CAAC,KAAK,~~GAAG,mBAAmB,~~CAAC,CAAC~~;QACxD~~,~~sBAAsB,CAAE,EAAE,EAAE,EAAE,OAAyB,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,iBAAiB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QAClI,CAAC,CAAC,IAAW,CAAC,CAAE,oDAAoD;IAEtE,MAAM,CAAC,OAAO,~~GAAG,~~MAAM,CAAC,qBAAqB,CAAC,~~KAAK,CAAC;~~IAEpD~~,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,uCAAuC,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAE5H,OAAO,MAAM,CAAC;AAEhB,CAAC"}
1	+ {"version":3,"file":"getSiteAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getSiteAPI.ts"],"names":[],"mappings":"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"}

package/lib/restAPIs/sites/users/getSiteUsersAPI.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSiteUsersAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/users/getSiteUsersAPI.ts"],"names":[],"mappings":"~~AAOA~~,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAG5G,OAAO,EAAE,eAAe,EAAG,MAAM,wDAAwD,CAAC;AAI1F,wBAAsB,gBAAgB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,~~CAI5J~~;AAED,wBAAsB,eAAe,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,~~CA+D3J~~"}
1	+ {"version":3,"file":"getSiteUsersAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/users/getSiteUsersAPI.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAG5G,OAAO,EAAE,eAAe,EAAG,MAAM,wDAAwD,CAAC;AAI1F,wBAAsB,gBAAgB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,CAK5J;AAED,wBAAsB,eAAe,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,CAqD3J"}

package/lib/restAPIs/sites/users/getSiteUsersAPI.js CHANGED Viewed

@@ -1,6 +1,4 @@
-import { doSpJsFetchOrPost } from '../../../components/molecules/SpHttp/doSpJsFetch';
-import { startPerformOpV2, updatePerformanceEndV2 } from '../../../components/molecules/Performance/functions';
-import { checkItemsResults } from '../../../components/molecules/process-results/CheckItemsResults';
+import { doSpJsFetchOrPostAndCheck } from '../../../components/molecules/SpHttp/doSpJsFetch';
 import { check4This } from '../../../logic/Links/CheckSearch';
 import { SourcePropsNoWebUrl } from '../../../components/molecules/source-props/ISourceProps';
 import { getCollectionUrl } from '../../../logic/Links/getSPOUrl';
@@ -10,6 +8,7 @@ import { MinUserSelect } from '../../../types/fps-returns/sites/users/UserSelect
 export async function getSiteAdminsAPI(sourceProps, alertMe, consoleLog) {
     const restFilter = 'IsSiteAdmin eq true';
     const results = await getSiteUsersAPI({ ...sourceProps, ...{ restFilter: restFilter } }, alertMe, consoleLog);
+    results.unifiedPerformanceOps.fetch.label.replace('users', 'admins');
     return results;
 }
 export async function getSiteUsersAPI(sourceProps, alertMe, consoleLog) {
@@ -25,8 +24,6 @@ export async function getSiteUsersAPI(sourceProps, alertMe, consoleLog) {
         results.status = 'NoWeb';
         return results;
     }
-    const performanceSettings = { label: `users-${collectionName}`, includeMsStr: true, updateMiliseconds: true, op: 'fetch' };
-    const fetchOp = performanceSettings ? startPerformOpV2(performanceSettings) : null;
     /**
       SAMPLE Full SharePoint Items Rest call:
@@ -46,18 +43,15 @@ export async function getSiteUsersAPI(sourceProps, alertMe, consoleLog) {
      */
     if (restFilter)
         fetchAPI += `$filter=${restFilter}&`;
-    const initialResult = await doSpJsFetchOrPost(fetchAPI, 'GET', sourceProps.digestValue, '', null);
-    initialResult.users = initialResult.items ? initialResult.items : [];
+    const result = await doSpJsFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.digestValue, '', alertMe, consoleLog, 'user', null);
+    // result.users = result.items ? result.items : [];
+    // result.fpsContentType = [ 'user' ];
+    result.unifiedPerformanceOps.fetch.label = `users-${collectionName}`;
+    // result.unifiedPerformanceOps.fetch.c = result.users.length;
     // initialResult.users.map( user => {
     //   if (!user.LoginName && user.Name) { user.LoginName = user.Name; }
     //   if (!user.Email && user.EMail) { user.Email = user.EMail; }
     // });
-    const result = checkItemsResults(initialResult, `fps-core-v7: getSiteUsersAPI ~ 71`, alertMe, consoleLog);
-    result.fpsContentType = ['user'];
-    result.unifiedPerformanceOps.fetch = performanceSettings ?
-        updatePerformanceEndV2({ op: fetchOp, updateMiliseconds: performanceSettings.updateMiliseconds, count: result.items ? result.items.length : 0 })
-        : null; // 2024-09-29:  set null as any to pass build error.
-    result.fetchOp = result.unifiedPerformanceOps.fetch;
     if (check4This(`fpsShowFetchResults=true`) === true) {
         console.log(`fps-core-v7 COMPLETE: getSiteUsersAPI ~ 80`, result);
     }

package/lib/restAPIs/sites/users/getSiteUsersAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSiteUsersAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/users/getSiteUsersAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,~~iBAAiB~~,EAAE,MAAM,kDAAkD,CAAC;~~AACrF~~,OAAO,EAAE,~~gBAAgB,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC/G,OAAO,EAAE,iBAAiB,EAAE,MAAM,iEAAiE,CAAC;AACpG,OAAO,EAAE,~~UAAU,EAAE,MAAM,kCAAkC,CAAC;~~AAG9D~~,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAE5G,OAAO,EAAE,yBAAyB,EAAE,MAAM,yEAAyE,CAAC;AACpH,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAElF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B;IAC9H,MAAM,UAAU,GAAG,qBAAqB,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,eAAe,CAAE,EAAE,GAAG,WAAW,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,EAAC,EAAE,OAAO,EAAE,UAAU,CAAE,CAAC;IAC/G,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B;IAE7H,MAAM,EAAE,UAAU,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEjD,sIAAsI;IACtI,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IACvE,MAAM,cAAc,GAAW,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAExD,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,oBAAoB,mBAAmB,EAAE,CAAC,CAAC;QACzE,MAAM,OAAO,GAAoB,yBAAyB,CAAE,MAAM,CAAG,CAAC;QACtE,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC;QACzB,OAAO,OAAO,CAAC;KAChB;IAED,MAAM,mBAAmB,GAAyB,EAAE,KAAK,EAAE,SAAS,cAAc,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;IACjJ,MAAM,OAAO,GAAG,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,CAAE,mBAAmB,CAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAErF;;;;;;;;;MASE;IAEF,IAAI,QAAQ,GAAW,GAAG,MAAM,sBAAsB,CAAC,CAAC,sCAAsC;IAC9F,QAAQ,IAAG,WAAY,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAE,GAAG,CAAC;IAEnH;;;;OAIG;IACH,IAAK,UAAU;QAAG,QAAQ,IAAG,WAAY,UAAW,GAAG,CAAC;IAExD,MAAM,~~aAAa~~,GAAoB,MAAM,~~iBAAiB~~,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,WAAiB,EAAE,EAAE,~~EAAE~~,~~IAAI~~,~~CAAgC~~,~~CAAC;IAExJ~~,~~aAAa,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,~~EAAE,~~CAAC;IAErE,qCAAqC;IACrC,sEAAsE;IACtE,gEAAgE;IAChE,~~MAAM~~;IAGN~~,~~MAAM,MAAM,GAAoB,iBAAiB,CAAE,aAAa,~~EAAE,~~mCAAmC~~,~~EAAE~~,~~OAAO,EAAE,UAAU,CAAqB,~~CAAC;~~IAChJ~~,~~MAAM~~,~~CAAC,cAAc,GAAG,CAAE,MAAM,CAAE,CAAC~~;~~IAEnC~~,MAAM,CAAC,qBAAqB,CAAC,KAAK,~~GAAG,mBAAmB,~~CAAC,~~CAAC;QACxD,sBAAsB,CAAE,EAAE,EAAE,EAAE,OAAyB,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,iBAAiB,EAAE,~~KAAK,~~EAAE~~,~~MAAM~~,~~CAAC~~,~~KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,~~EAAE,CAAC;~~QACnK~~,~~CAAC~~,~~CAAC~~,~~IAAW~~,~~CAAC,CAAE,oDAAoD~~;~~IAEtE~~,MAAM~~,CAAC,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC~~;~~IAEpD~~,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,4CAA4C,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAEjI,OAAO,MAAM,CAAC;AAEhB,CAAC"}
1	+ {"version":3,"file":"getSiteUsersAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/users/getSiteUsersAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAE5G,OAAO,EAAE,yBAAyB,EAAE,MAAM,yEAAyE,CAAC;AACpH,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAElF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B;IAC9H,MAAM,UAAU,GAAG,qBAAqB,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,eAAe,CAAE,EAAE,GAAG,WAAW,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,EAAC,EAAE,OAAO,EAAE,UAAU,CAAE,CAAC;IAC/G,OAAO,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACrE,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B;IAE7H,MAAM,EAAE,UAAU,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEjD,sIAAsI;IACtI,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IACvE,MAAM,cAAc,GAAW,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAExD,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,oBAAoB,mBAAmB,EAAE,CAAC,CAAC;QACzE,MAAM,OAAO,GAAoB,yBAAyB,CAAE,MAAM,CAAG,CAAC;QACtE,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC;QACzB,OAAO,OAAO,CAAC;KAChB;IAED;;;;;;;;;MASE;IAEF,IAAI,QAAQ,GAAW,GAAG,MAAM,sBAAsB,CAAC,CAAC,sCAAsC;IAC9F,QAAQ,IAAG,WAAY,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAE,GAAG,CAAC;IAEnH;;;;OAIG;IACH,IAAK,UAAU;QAAG,QAAQ,IAAG,WAAY,UAAW,GAAG,CAAC;IAExD,MAAM,MAAM,GAAoB,MAAM,yBAAyB,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,WAAiB,EAAE,EAAE,EAAG,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAgC,CAAC;IAEvL,mDAAmD;IACnD,sCAAsC;IACtC,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,cAAc,EAAE,CAAC;IACrE,8DAA8D;IAE9D,qCAAqC;IACrC,sEAAsE;IACtE,gEAAgE;IAChE,MAAM;IAEN,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,4CAA4C,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAEjI,OAAO,MAAM,CAAC;AAEhB,CAAC"}