npm - @mikezimm/fps-core-v7 - Versions diffs - 1.0.107 → 1.0.109 - Mend

@mikezimm/fps-core-v7 1.0.107 → 1.0.109

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 (61) hide show

package/lib/PackageVersion.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PackageVersion.d.ts","sourceRoot":"","sources":["../src/PackageVersion.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iBAAiB,EAAE,MAAsB,CAAC;AACvD,eAAO,MAAM,oBAAoB,EAAE,MAAkB,CAAC;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAA8B,CAAC;AACvE,eAAO,MAAM,wBAAwB,EAAE,~~MAAmC~~,CAAC"}
1	+ {"version":3,"file":"PackageVersion.d.ts","sourceRoot":"","sources":["../src/PackageVersion.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iBAAiB,EAAE,MAAsB,CAAC;AACvD,eAAO,MAAM,oBAAoB,EAAE,MAAkB,CAAC;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAA8B,CAAC;AACvE,eAAO,MAAM,wBAAwB,EAAE,MAAoC,CAAC"}

package/lib/PackageVersion.js CHANGED Viewed

@@ -1,5 +1,5 @@
 export const PackageNameFpsCv7 = 'fps-core-v7';
-export const PackageVersionFpsCv7 = '1.0.107';
-export const PackageVersionLabelFpsCv7 = 'fps-core-v7@1.0.107';
-export const PackageVersionTimeFpsCv7 = '2/9/2025, 4:27:49 AM EST';
+export const PackageVersionFpsCv7 = '1.0.109';
+export const PackageVersionLabelFpsCv7 = 'fps-core-v7@1.0.109';
+export const PackageVersionTimeFpsCv7 = '2/10/2025, 1:59:27 AM EST';
 //# sourceMappingURL=PackageVersion.js.map

package/lib/PackageVersion.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PackageVersion.js","sourceRoot":"","sources":["../src/PackageVersion.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,iBAAiB,GAAW,aAAa,CAAC;AACvD,MAAM,CAAC,MAAM,oBAAoB,GAAW,SAAS,CAAC;AACtD,MAAM,CAAC,MAAM,yBAAyB,GAAW,qBAAqB,CAAC;AACvE,MAAM,CAAC,MAAM,wBAAwB,GAAW,~~0BAA0B~~,CAAC"}
1	+ {"version":3,"file":"PackageVersion.js","sourceRoot":"","sources":["../src/PackageVersion.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,iBAAiB,GAAW,aAAa,CAAC;AACvD,MAAM,CAAC,MAAM,oBAAoB,GAAW,SAAS,CAAC;AACtD,MAAM,CAAC,MAAM,yBAAyB,GAAW,qBAAqB,CAAC;AACvE,MAAM,CAAC,MAAM,wBAAwB,GAAW,2BAA2B,CAAC"}

package/lib/components/molecules/ModernPages/functions/getDocWikiAPI.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { ICanvasContentOptions } from "../Interfaces/IModernPage";
 import { ISourceProps } from "../../source-props/ISourceProps";
 import { IPagesContent } from "../../source-props/SitePages/IPagesContent";
-import { IFpsPageAsXMLReturn } from "../../../../restAPIs/lists/items/getFpsPageAsXmlAPI";
+import { IFpsPageAsXMLReturn } from "../../../../restAPIs/lists/items/getFpsPageAsSpecialAPI";
 /**
  * Replaces getDocWikiD
  *

package/lib/components/molecules/ModernPages/functions/getDocWikiAPI.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getDocWikiAPI.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/ModernPages/functions/getDocWikiAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAC3E,OAAO,EAAE,mBAAmB,~~EAAqC~~,MAAM,~~qDAAqD~~,CAAC;~~AAE7H~~;;;;;;;;;;;;;;;GAeG;AAEH,wBAAsB,aAAa,CACjC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,OAAO,EAC5G,QAAQ,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAmDlI"}
1	+ {"version":3,"file":"getDocWikiAPI.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/ModernPages/functions/getDocWikiAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAyC,MAAM,yDAAyD,CAAC;AAErI;;;;;;;;;;;;;;;GAeG;AAEH,wBAAsB,aAAa,CACjC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,OAAO,EAC5G,QAAQ,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAmDlI"}

package/lib/components/molecules/ModernPages/functions/getDocWikiAPI.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { getFpsPageAsXmlAPI } from "../../../../restAPIs/lists/items/getFpsPageAsXmlAPI";
+import { getFpsPageAsSpecialAPI } from "../../../../restAPIs/lists/items/getFpsPageAsSpecialAPI";
 /**
  * Replaces getDocWikiD
  *
@@ -29,7 +29,7 @@ export async function getDocWikiAPI(item, source, canvasOptions, showCanvasConte
         return errResult;
     }
     else {
-        const result = await getFpsPageAsXmlAPI(source, source.isModern === false ? false : true, itemId, true, true);
+        const result = await getFpsPageAsSpecialAPI(source, source.isModern === false ? false : true, itemId, 'FieldValuesAsHtml', true, true);
         if (result.status === 'Success') {
             const fetchedItem = result.item;
             //Added this to fit images into the current width or else the image is full size

package/lib/components/molecules/ModernPages/functions/getDocWikiAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getDocWikiAPI.js","sourceRoot":"","sources":["../../../../../src/components/molecules/ModernPages/functions/getDocWikiAPI.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,~~kBAAkB~~,EAAiB,MAAM,~~qDAAqD~~,CAAC;~~AAE7H~~;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAmB,EAAE,MAAoB,EAAE,aAAoC,EAAE,kBAA2B,EAC5G,QAAkG;;IAElG,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1G,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG;YAChB,UAAU,EAAE,0BAA0B;YACtC,cAAc,EAAE,2CAA2C;SAC5D,CAAC;QAEF,sIAAsI;QACtI,QAAQ,CAAC,SAA0B,EAAE,kBAAkB,CAAE,CAAC;QAE1D,OAAO,SAAgB,CAAC;KAEzB;SAAM;QAEL,MAAM,MAAM,GAAG,MAAM,~~kBAAkB~~,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;~~QAE9G~~,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE;YAC/B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAqB,CAAC;YACjD,gFAAgF;YAChF,IAAI,WAAW,CAAC,cAAc,EAAE;gBAAE,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,MAAA,aAAa,CAAC,YAAY,0CAAE,KAAK,GAAG,CAAC,CAAC;aAAE;YAClK,WAAW,CAAC,cAAc,GAAG,IAAI,CAAC,cAAqB,CAAC;YACxD,WAAW,CAAC,UAAU,GAAG,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YACnC,WAAW,CAAC,eAAe,GAAG,EAAE,CAAC;YAEjC,wGAAwG;YACxG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,OAA0B,EAAE,EAAE;gBACnD,IAAI,OAAO,KAAK,iBAAiB,EAAE;oBACjC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;iBACzC;qBACI,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,EAAE;oBAAE,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;iBAAE;qBAC7H;oBAAE,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;iBAAE;YAChD,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC;YAE1B,qHAAqH;YACrH,QAAQ,CAAC,WAAuC,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;SAE/E;aAAM;YACL,IAAI,CAAC,UAAU,GAAG,yBAAyB,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACvC,qHAAqH;YACrH,QAAQ,CAAC,IAAI,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;SAC5C;QACD,OAAO,MAAM,CAAC;KACf;AAEH,CAAC"}
1	+ {"version":3,"file":"getDocWikiAPI.js","sourceRoot":"","sources":["../../../../../src/components/molecules/ModernPages/functions/getDocWikiAPI.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,sBAAsB,EAAiB,MAAM,yDAAyD,CAAC;AAErI;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAmB,EAAE,MAAoB,EAAE,aAAoC,EAAE,kBAA2B,EAC5G,QAAkG;;IAElG,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1G,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG;YAChB,UAAU,EAAE,0BAA0B;YACtC,cAAc,EAAE,2CAA2C;SAC5D,CAAC;QAEF,sIAAsI;QACtI,QAAQ,CAAC,SAA0B,EAAE,kBAAkB,CAAE,CAAC;QAE1D,OAAO,SAAgB,CAAC;KAEzB;SAAM;QAEL,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEvI,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE;YAC/B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAqB,CAAC;YACjD,gFAAgF;YAChF,IAAI,WAAW,CAAC,cAAc,EAAE;gBAAE,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,MAAA,aAAa,CAAC,YAAY,0CAAE,KAAK,GAAG,CAAC,CAAC;aAAE;YAClK,WAAW,CAAC,cAAc,GAAG,IAAI,CAAC,cAAqB,CAAC;YACxD,WAAW,CAAC,UAAU,GAAG,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YACnC,WAAW,CAAC,eAAe,GAAG,EAAE,CAAC;YAEjC,wGAAwG;YACxG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,OAA0B,EAAE,EAAE;gBACnD,IAAI,OAAO,KAAK,iBAAiB,EAAE;oBACjC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;iBACzC;qBACI,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,EAAE;oBAAE,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;iBAAE;qBAC7H;oBAAE,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;iBAAE;YAChD,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC;YAE1B,qHAAqH;YACrH,QAAQ,CAAC,WAAuC,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;SAE/E;aAAM;YACL,IAAI,CAAC,UAAU,GAAG,yBAAyB,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACvC,qHAAqH;YACrH,QAAQ,CAAC,IAAI,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;SAC5C;QACD,OAAO,MAAM,CAAC;KACf;AAEH,CAAC"}

package/lib/restAPIs/lists/fields/getSourceFieldsAPI.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSourceFieldsAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/fields/getSourceFieldsAPI.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAA+C,MAAM,yDAAyD,CAAC;AACpI,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAKhG;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,~~EAAE~~,cAAc,GAAE,MAAW,GAAI,OAAO,CAAC,eAAe,CAAC,~~CAkC1L~~"}
1	+ {"version":3,"file":"getSourceFieldsAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/fields/getSourceFieldsAPI.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAA+C,MAAM,yDAAyD,CAAC;AACpI,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAKhG;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAChI,cAAc,GAAE,MAAW,GAAI,OAAO,CAAC,eAAe,CAAC,CA4CxD"}

package/lib/restAPIs/lists/fields/getSourceFieldsAPI.js CHANGED Viewed

@@ -18,7 +18,7 @@ export async function getSourceFieldsAPI(sourceProps, alertMe, consoleLog, field
     // const { performanceSettings } = sourceProps;
     // 2024-09-15:  Change to null as any to pass linting when migrating from fps-library-v2
     // const fetchOp = performanceSettings ? startPerformOpV2( performanceSettings ) : null as any;
-    const { listTitle, orderBy, restFilter, } = sourceProps;
+    const { listTitle, orderBy, orderBy2, restFilter, } = sourceProps;
     let { 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);
@@ -29,18 +29,28 @@ export async function getSourceFieldsAPI(sourceProps, alertMe, consoleLog, field
         const results = createErrorFpsListReturn(useUrl, listTitle);
         return results;
     }
+    let fetchAPI = `${useUrl}/_api/web/lists/getbytitle('${listTitle}')/fields?`;
     if (!selectThese || selectThese.length === 0)
         selectThese = ['*'];
-    let fetchAPI = `${useUrl}/_api/web/lists/getbytitle('${listTitle}')/fields?`;
     if (selectThese)
         fetchAPI += `&$select= ${selectThese.join(',')}`;
-    if (orderBy)
-        fetchAPI += `&$orderby=${orderBy}`;
-    if (restFilter)
-        fetchAPI += `&$filter= ${restFilter}`;
     const orderBys = [];
-    if (orderBy)
-        orderBys.push(`${orderBy.prop} ${orderBy.order}`);
+    /**
+     *  2025-02-09:  Updated the orderBy for when there is no orderBy.prop or .order
+     *    https://github.com/mikezimm/PageInfo/issues/178
+     */
+    if (orderBy && orderBy.prop)
+        orderBys.push(`${orderBy.prop} ${orderBy.order ? orderBy.order : 'asc'}`);
+    if (orderBy2 && orderBy2.prop)
+        orderBys.push(`${orderBy2.prop} ${orderBy2.order ? orderBy2.order : 'asc'}`);
+    if (orderBys.length > 0)
+        fetchAPI += `&$orderby=${orderBys.join(',')}`;
+    if (fieldNameTitle) {
+        const fieldFilter = `Title eq '${fieldNameTitle}' or InternalName eq '${fieldNameTitle}'`;
+        fetchAPI += `&$filter= ${fieldFilter}`;
+    }
+    else if (restFilter)
+        fetchAPI += `&$filter= ${restFilter}`;
     const result = await doSpHttpFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.fpsSpService, '', alertMe, consoleLog, fieldNameTitle ? 'field' : 'fields', false, null);
     if (check4This(`fpsShowFetchResults=true`) === true) {
         console.log(`fps-core-v7 COMPLETE: getSourceFieldsAPI ~ 47`, result);

package/lib/restAPIs/lists/fields/getSourceFieldsAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSourceFieldsAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/fields/getSourceFieldsAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAgB,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAEpI,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAE5G;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B,~~EAAE~~,iBAAyB,EAAE;~~IAE7J~~,+CAA+C;IAC/C,wFAAwF;IACxF,+FAA+F;IAE/F,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,GAAG,GAAG,WAAW,CAAC;~~IACxD~~,IAAI,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEnC,sIAAsI;IACtI,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IAEvE,IAAK,CAAC,MAAM,IAAI,CAAC,SAAS,EAAG;QAC3B,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAuB,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAC3G,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,SAAS,CAAG,CAAC;QAChF,OAAO,OAAO,CAAC;KAChB;IAED,IAAK,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAG,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC;IACtE,~~IAAI,QAAQ,GAAW,GAAG,MAAM,+BAA+B,SAAS,YAAY,CAAC;IACrF,~~IAAK,WAAW;QAAG,QAAQ,IAAI,aAAa,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;~~IACpE~~,IAAK,OAAO;QAAG,QAAQ,IAAI,~~aAAa~~,OAAO,EAAE,~~CAAC~~;~~IAClD~~,IAAK,~~UAAU~~;QAAG,QAAQ,IAAI,~~aAAa~~,~~UAAU~~,~~EAAE~~,CAAC~~;IAExD~~,~~MAAM~~,QAAQ,~~GAAa~~,EAAE,CAAC;~~IAC9B~~,IAAK,~~OAAO~~;QAAG,QAAQ,CAAC,IAAI,CAAE,~~GAAI~~,~~OAAO,~~CAAC,IAAK,~~IAAK~~,~~OAAO~~,CAAC,~~KAAM~~,EAAE,~~CAAE~~,~~CAAE~~;~~IAExE~~,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAEzK,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":"getSourceFieldsAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/fields/getSourceFieldsAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAgB,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAEpI,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAE5G;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B,EAChI,iBAAyB,EAAE;IAE3B,+CAA+C;IAC/C,wFAAwF;IACxF,+FAA+F;IAE/F,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,GAAG,GAAG,WAAW,CAAC;IAClE,IAAI,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEnC,sIAAsI;IACtI,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IAEvE,IAAK,CAAC,MAAM,IAAI,CAAC,SAAS,EAAG;QAC3B,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAuB,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAC3G,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,SAAS,CAAG,CAAC;QAChF,OAAO,OAAO,CAAC;KAChB;IAED,IAAI,QAAQ,GAAW,GAAG,MAAM,+BAA+B,SAAS,YAAY,CAAC;IAErF,IAAK,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAG,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC;IACtE,IAAK,WAAW;QAAG,QAAQ,IAAI,aAAa,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAEpE,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B;;;OAGG;IACH,IAAK,OAAO,IAAI,OAAO,CAAC,IAAI;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,OAAO,CAAC,IAAK,IAAK,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAM,EAAE,CAAE,CAAE;IAChH,IAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,QAAQ,CAAC,IAAK,IAAK,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,KAAO,EAAE,CAAE,CAAC;IACrH,IAAK,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,aAAc,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAE,EAAE,CAAC;IAE1E,IAAK,cAAc,EAAG;QACpB,MAAM,WAAW,GAAW,aAAa,cAAc,yBAAyB,cAAc,GAAG,CAAC;QAClG,QAAQ,IAAI,aAAa,WAAW,EAAE,CAAC;KACxC;SAAM,IAAK,UAAU;QAAG,QAAQ,IAAI,aAAa,UAAU,EAAE,CAAC;IAE/D,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAEzK,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/lists/items/IFieldValueExpandFormats.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+export type IFieldValueExpandFormats = 'FieldValuesAsHtml' | 'FieldValuesAsText' | 'AttachmentFiles';
+export declare const AllFieldValueFormats: IFieldValueExpandFormats[];
+//# sourceMappingURL=IFieldValueExpandFormats.d.ts.map

package/lib/restAPIs/lists/items/IFieldValueExpandFormats.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"IFieldValueExpandFormats.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/items/IFieldValueExpandFormats.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,wBAAwB,GAAG,mBAAmB,GAAG,mBAAmB,GAAG,iBAAiB,CAAC;AACrG,eAAO,MAAM,oBAAoB,EAAE,wBAAwB,EAA+C,CAAC"}

package/lib/restAPIs/lists/items/IFieldValueExpandFormats.js ADDED Viewed

@@ -0,0 +1,4 @@
+// https://github.com/fps-solutions/HubCon/issues/111
+// 2025-01-05:  added AttachmentFiles for fetching attachments
+export const AllFieldValueFormats = ['FieldValuesAsHtml', 'FieldValuesAsText'];
+//# sourceMappingURL=IFieldValueExpandFormats.js.map

package/lib/restAPIs/lists/items/IFieldValueExpandFormats.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"IFieldValueExpandFormats.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/items/IFieldValueExpandFormats.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,8DAA8D;AAG9D,MAAM,CAAC,MAAM,oBAAoB,GAA+B,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC"}

package/lib/restAPIs/lists/items/{getFpsPageAsXmlAPI.d.ts → getFpsPageAsSpecialAPI.d.ts} RENAMED Viewed

@@ -4,6 +4,7 @@
 import { ISourceProps } from '../../../components/molecules/source-props/ISourceProps';
 import { IFpsItemsReturn } from '../../../components/molecules/process-results/IFpsItemsReturn';
 import { ISimpleLink } from '../../../logic/Links/interfaces/ISimpleLink';
+import { IFieldValueExpandFormats } from './IFieldValueExpandFormats';
 export interface IFpsPageAsXML extends Partial<any> {
     CanvasContent1?: string;
     LayoutsWebpartsContent?: string;
@@ -18,7 +19,7 @@ export interface IFpsPageAsXMLReturn extends IFpsItemsReturn {
     item?: IFpsPageAsXML;
 }
 /**
- * getFpsPageAsXmlAPI gets the HTML for a sharepoint site page.
+ * getFpsPageAsXmlAPI/ getFpsPageAsSpecialAPI gets the HTML for a sharepoint site page.
  *
  * import { getFpsPageAsXmlAPI, getDocWikiAPI } from "@mikezimm/fps-core-v7/lib/restAPIs/lists/items/getFpsPageAsXmlAPI";
  *
@@ -30,5 +31,5 @@ export interface IFpsPageAsXMLReturn extends IFpsItemsReturn {
  * @param ItemId  -- Per testing, can only be used on getById endPoint so it's required
  * @returns
  */
-export declare function getFpsPageAsXmlAPI(sourceProps: ISourceProps, isModern: boolean, Id: number, alertMe: boolean | undefined, consoleLog: boolean | undefined): Promise<IFpsPageAsXMLReturn>;
-//# sourceMappingURL=getFpsPageAsXmlAPI.d.ts.map
+export declare function getFpsPageAsSpecialAPI(sourceProps: ISourceProps, isModern: boolean, Id: number, format: IFieldValueExpandFormats, alertMe: boolean | undefined, consoleLog: boolean | undefined): Promise<IFpsPageAsXMLReturn>;
+//# sourceMappingURL=getFpsPageAsSpecialAPI.d.ts.map

package/lib/restAPIs/lists/items/getFpsPageAsSpecialAPI.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"getFpsPageAsSpecialAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/items/getFpsPageAsSpecialAPI.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAA+C,MAAM,yDAAyD,CAAC;AACpI,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAMhG,OAAO,EAAE,WAAW,EAAE,MAAM,6CAA6C,CAAC;AAC1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,MAAM,WAAW,aAAc,SAAQ,OAAO,CAAC,GAAG,CAAC;IACjD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IAC1D,IAAI,CAAC,EAAE,aAAa,CAAC;CACtB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,wBAAwB,EAC1F,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,mBAAmB,CAAC,CA4D/F"}

package/lib/restAPIs/lists/items/{getFpsPageAsXmlAPI.js → getFpsPageAsSpecialAPI.js} RENAMED Viewed

@@ -8,7 +8,7 @@ import { createErrorFpsListReturn } from '../../../components/molecules/process-
 import { getAbsoluteWebUrlFromSourceProps } from '../../../logic/Strings/getAbssoluteWebUrlFromSourceProps';
 import { getExpandColumns } from '../../../components/molecules/source-props/Lists/getVX/getExpandV2';
 /**
- * getFpsPageAsXmlAPI gets the HTML for a sharepoint site page.
+ * getFpsPageAsXmlAPI/ getFpsPageAsSpecialAPI gets the HTML for a sharepoint site page.
  *
  * import { getFpsPageAsXmlAPI, getDocWikiAPI } from "@mikezimm/fps-core-v7/lib/restAPIs/lists/items/getFpsPageAsXmlAPI";
  *
@@ -20,7 +20,7 @@ import { getExpandColumns } from '../../../components/molecules/source-props/Lis
  * @param ItemId  -- Per testing, can only be used on getById endPoint so it's required
  * @returns
  */
-export async function getFpsPageAsXmlAPI(sourceProps, isModern, Id, alertMe, consoleLog) {
+export async function getFpsPageAsSpecialAPI(sourceProps, isModern, Id, format, alertMe, consoleLog) {
     const { listTitle, } = 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);
@@ -59,7 +59,7 @@ export async function getFpsPageAsXmlAPI(sourceProps, isModern, Id, alertMe, con
      * https://github.com/fps-solutions/HubCon/issues/119
      *  Had HubConn issues with errors fetching.  Compared to PnpJS function and made these modifications to simplify
      */
-    fetchAPI += `/getById(${Id})/FieldValuesAsHtml?`;
+    fetchAPI += `/getById(${Id})/${format}?`;
     fetchAPI += `$select=${selectThese.join(',')}`;
     // https://github.com/fps-solutions/HubCon/issues/111
     let useExpands = getExpandColumns(selectThese);
@@ -72,4 +72,4 @@ export async function getFpsPageAsXmlAPI(sourceProps, isModern, Id, alertMe, con
     ;
     return result;
 }
-//# sourceMappingURL=getFpsPageAsXmlAPI.js.map
+//# sourceMappingURL=getFpsPageAsSpecialAPI.js.map

package/lib/restAPIs/lists/items/getFpsPageAsSpecialAPI.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"getFpsPageAsSpecialAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/items/getFpsPageAsSpecialAPI.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAgB,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC,CAAC,iBAAiB;AAEtJ,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAC5G,OAAO,EAAE,gBAAgB,EAAE,MAAM,oEAAoE,CAAC;AAmBtG;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,WAAyB,EAAE,QAAiB,EAAE,EAAU,EAAE,MAAgC,EAC1F,OAA4B,EAAE,UAA+B;IAE7D,MAAM,EAAE,SAAS,GAAG,GAAG,WAAW,CAAC;IAEnC,sIAAsI;IACtI,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IACvE,IAAI,QAAQ,GAAW,GAAG,MAAM,+BAA+B,SAAS,UAAU,CAAC;IAEnF,IAAK,CAAC,MAAM,IAAI,CAAC,SAAS,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,SAAS,EAAG;QACxE,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAuB,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAC3G,MAAM,OAAO,GAAwB,wBAAwB,CAAE,MAAM,EAAE,SAAS,CAAG,CAAC;QACpF,IAAK,EAAE,GAAG,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,SAAS,EAAG;YAC/C,OAAO,CAAC,UAAU,GAAG,0BAA0B,CAAC;YAChD,IAAK,OAAO,CAAC,SAAS;gBAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,GAAI,OAAO,CAAC,UAAU,CAAC;SAC3E;QACD,OAAO,OAAO,CAAC;KAChB;IAED;;;;;;;;;MASE;IAEF;;;;;;OAMG;IACH,MAAM,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC,CAAC,6EAA6E;IAE1G;;;OAGG;IACH,QAAQ,IAAI,YAAY,EAAE,KAAK,MAAM,GAAG,CAAC;IAEzC,QAAQ,IAAG,WAAY,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAE/C,qDAAqD;IACrD,IAAI,UAAU,GAAa,gBAAgB,CAAE,WAAuB,CAAE,CAAC;IAEvE,QAAQ,IAAI,YAAY,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAE/C,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAE5I,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,GAAG,kBAAkB,SAAS,IAAI,EAAE,EAAE,CAAC;IAE/E,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"}

package/lib/restAPIs/lists/items/getSourceItemsAPI.d.ts CHANGED Viewed

@@ -3,10 +3,9 @@
  */
 import { ISourceProps } from '../../../components/molecules/source-props/ISourceProps';
 import { IFpsItemsReturn } from '../../../components/molecules/process-results/IFpsItemsReturn';
+import { IFieldValueExpandFormats } from './IFieldValueExpandFormats';
 export declare const UniquePermsFilter = "HasUniqueRoleAssignments eq true";
 export declare const UniquePermsHiddenFilter: string;
-export type IFieldValueExpandFormats = 'FieldValuesAsHtml' | 'FieldValuesAsText' | 'AttachmentFiles';
-export declare const AllFieldValueFormats: IFieldValueExpandFormats[];
 /**
  * 2024-12-23:  This may need to be refactored to NOT parse and stringify sourceProps because it now has fpsSpService
  * @param sourceProps

package/lib/restAPIs/lists/items/getSourceItemsAPI.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSourceItemsAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/items/getSourceItemsAPI.ts"],"names":[],"mappings":"AACA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAA+C,MAAM,yDAAyD,CAAC;AACpI,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;~~AAShG~~,~~eAAO~~,~~MAAM~~,~~iBAAiB~~,~~qCAAqC~~,~~CAAC;AACpE,eAAO,~~MAAM,~~uBAAuB~~,~~QAAgD,~~CAAC;~~AAIrF~~,~~MAAM~~,MAAM,~~wBAAwB~~,~~GAAG~~,~~mBAAmB,GAAG,mBAAmB,GAAG,iBAAiB,~~CAAC;~~AACrG~~,eAAO,MAAM,~~oBAAoB~~,~~EAAE~~,~~wBAAwB,EAAkD,~~CAAC;~~AAE9G~~;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,aAAa,GAAE,wBAAwB,EAAO,GAAK,OAAO,CAAC,eAAe,CAAC,CASnP;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,iBAAiB,CAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,aAAa,GAAE,wBAAwB,EAAO,EAAE,MAAM,GAAE,MAAW,GAAK,OAAO,CAAC,eAAe,CAAC,~~CA6EvP~~"}
1	+ {"version":3,"file":"getSourceItemsAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/items/getSourceItemsAPI.ts"],"names":[],"mappings":"AACA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAA+C,MAAM,yDAAyD,CAAC;AACpI,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAQhG,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,eAAO,MAAM,iBAAiB,qCAAqC,CAAC;AACpE,eAAO,MAAM,uBAAuB,QAAgD,CAAC;AAErF;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,aAAa,GAAE,wBAAwB,EAAO,GAAK,OAAO,CAAC,eAAe,CAAC,CASnP;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,iBAAiB,CAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,aAAa,GAAE,wBAAwB,EAAO,EAAE,MAAM,GAAE,MAAW,GAAK,OAAO,CAAC,eAAe,CAAC,CAiFvP"}

package/lib/restAPIs/lists/items/getSourceItemsAPI.js CHANGED Viewed

@@ -11,7 +11,6 @@ import { clonePropsWithFpsSpService } from '../../../components/molecules/source
 import { getExpandColumns } from '../../../components/molecules/source-props/Lists/getVX/getExpandV2';
 export const UniquePermsFilter = 'HasUniqueRoleAssignments eq true';
 export const UniquePermsHiddenFilter = `${UniquePermsFilter}  and Hidden eq false`;
-export const AllFieldValueFormats = ['FieldValuesAsHtml', 'FieldValuesAsText'];
 /**
  * 2024-12-23:  This may need to be refactored to NOT parse and stringify sourceProps because it now has fpsSpService
  * @param sourceProps
@@ -82,7 +81,7 @@ export async function getSourceItemsAPI(sourceProps, autoExapnd, alertMe, consol
         fetchAPI += `?`;
     }
     if (selectThese && selectThese.length > 0)
-        fetchAPI += `$select=${selectThese.join(',')}&`;
+        fetchAPI += `&$select=${selectThese.join(',')}`;
     // https://github.com/fps-solutions/HubCon/issues/111
     let useExpands = expandFormats && expandFormats.length > 0 ? expandFormats : [];
     if (autoExapnd === false && expandThese && expandThese.length > 0)
@@ -91,22 +90,26 @@ export async function getSourceItemsAPI(sourceProps, autoExapnd, alertMe, consol
         useExpands = getExpandColumns(selectThese);
     }
     if (useExpands.length > 0)
-        fetchAPI += `$expand=${useExpands.join(',')}&`;
+        fetchAPI += `&$expand=${useExpands.join(',')}`;
     // 2024-12-05:  Added getTodayRestFilter from fps-Pnp2 fetchAnyItems
     if (restFilter && ItemId < 0)
-        fetchAPI += `$filter=${getTodayRestFilter(restFilter)}&`;
+        fetchAPI += `&$filter=${getTodayRestFilter(restFilter)}`;
     const orderBys = [];
-    if (orderBy)
-        orderBys.push(`${orderBy.prop} ${orderBy.order}`);
-    if (orderBy2)
-        orderBys.push(`${orderBy2.prop} ${orderBy2.order}`);
+    /**
+     *  2025-02-09:  Updated the orderBy for when there is no orderBy.prop or .order
+     *    https://github.com/mikezimm/PageInfo/issues/178
+     */
+    if (orderBy && orderBy.prop)
+        orderBys.push(`${orderBy.prop} ${orderBy.order ? orderBy.order : 'asc'}`);
+    if (orderBy2 && orderBy2.prop)
+        orderBys.push(`${orderBy2.prop} ${orderBy2.order ? orderBy2.order : 'asc'}`);
     if (orderBys.length > 0)
-        fetchAPI += `$orderby=${orderBys.join(',')}&`;
+        fetchAPI += `&$orderby=${orderBys.join(',')}`;
     // 2024-12-05:  changed to fetchCount > 0 because it was doing top=null which caused an error
     if (fetchCount > 0)
-        fetchAPI += `$top=${fetchCount}&`;
+        fetchAPI += `&$top=${fetchCount}`;
     if (skip)
-        fetchAPI += `$skip=${skip}&`;
+        fetchAPI += `&$skip=${skip}`;
     const result = await doSpHttpFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.fpsSpService, '', alertMe, consoleLog, 'item', false, null);
     //  Add any required custom logic here
     //   if ( resultHubSites.ok ) {

package/lib/restAPIs/lists/items/getSourceItemsAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSourceItemsAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/items/getSourceItemsAPI.ts"],"names":[],"mappings":"AACA;;GAEG;AAEH,OAAO,EAAgB,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC,CAAC,iBAAiB;AAEtJ,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAC5G,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,2EAA2E,CAAC;AACvH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oEAAoE,CAAC;~~AAEtG~~,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAI,iBAAkB,uBAAuB,CAAC;~~AAKrF,MAAM,CAAC,MAAM,oBAAoB,GAA+B,CAAE,mBAAmB,EAAG,mBAAmB,CAAE,CAAC;AAE9G~~;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,kCAAkC,CAAE,WAAyB,EAAE,UAAmB,EAAE,OAA4B,EAAE,UAA+B,EAAE,gBAA4C,EAAE;IACrN,mFAAmF;IAEnF,MAAM,cAAc,GAAiB,0BAA0B,CAAC,WAAW,CAAC,CAAC;IAE7E,cAAc,CAAC,UAAU,GAAG,GAAI,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,EAAG,EAAE,CAAC;IAC9F,cAAc,CAAC,UAAU,IAAI,GAAI,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAG,GAAG,uBAAuB,EAAE,CAAC;IACvG,MAAM,OAAO,GAAoB,MAAM,iBAAiB,CAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,CAAE,CAAC;IACxH,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAE,WAAyB,EAAE,UAAmB,EAAE,OAA4B,EAAE,UAA+B,EAAE,gBAA4C,EAAE,EAAE,SAAiB,CAAC,CAAC;IAEzN,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAE7G,sIAAsI;IACtI,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IACvE,IAAI,QAAQ,GAAW,GAAG,MAAM,+BAA+B,SAAS,UAAU,CAAC;IAEnF,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,SAAS,IAAI,mBAAmB,EAAE,CAAC,CAAC;QACrE,OAAO,wBAAwB,CAAE,MAAM,EAAE,SAAS,CAAC,CAAC;KACrD;IAED,IAAK,CAAC,SAAS,EAAG;QAChB,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,EAAE,IAAI,sBAAsB,EAAE,CAAC,CAAC;QACjE,OAAO,wBAAwB,CAAE,MAAM,EAAE,SAAS,CAAC,CAAC;KACrD;IAED,mEAAmE;IACnE,gEAAgE;IAEhE;;;;;;;;;MASE;IAEF,qDAAqD;IACrD,IAAK,MAAM,GAAG,CAAC,CAAC,EAAG,EAAE,2BAA2B;QAC9C,QAAQ,IAAI,YAAY,MAAM,IAAI,CAAA;KACnC;SAAM;QAAE,QAAQ,IAAI,GAAG,CAAC;KAAE;IAE3B,IAAK,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,~~WAAY~~,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,~~GAAG~~,CAAC;IAE7F,qDAAqD;IACrD,IAAI,UAAU,GAAa,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1F,IAAK,UAAU,KAAK,KAAK,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC;QAAG,UAAU,GAAG,WAAW,CAAC;IAC9F,IAAK,UAAU,KAAK,KAAK,EAAG;QAC1B,UAAU,GAAG,gBAAgB,CAAE,WAAuB,CAAE,CAAC;KAC1D;IACD,IAAK,UAAU,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAI,~~WAAW~~,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,~~GAAG~~,CAAC;IAE5E,oEAAoE;IACpE,IAAK,UAAU,IAAI,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,~~WAAY~~,kBAAkB,CAAC,UAAU,CAAE,~~GAAG~~,CAAC;IAE1F,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAK,OAAO;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,OAAO,CAAC,IAAK,IAAK,OAAO,CAAC,KAAM,EAAE,CAAE,CAAE;~~IACxE~~,IAAK,QAAQ;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,QAAQ,CAAC,IAAK,IAAK,QAAQ,CAAC,~~KAAM~~,EAAE,CAAE,CAAC;~~IAC1E~~,IAAK,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,~~YAAa~~,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAE,~~GAAG~~,CAAC;IAE1E,6FAA6F;IAC7F,IAAK,UAAU,GAAG,CAAC;QAAG,QAAQ,IAAG,~~QAAS~~,UAAW,~~GAAG~~,CAAC;IACzD,IAAK,IAAI;QAAG,QAAQ,IAAG,~~SAAU~~,IAAK,~~GAAG~~,CAAC;IAE1C,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAE5I,sCAAsC;IACtC,+BAA+B;IAC/B,wEAAwE;IACxE,MAAM;IACN,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,GAAG,QAAQ,SAAS,EAAE,CAAC;IAC/D,iGAAiG;IAEjG,+FAA+F;IAC/F,4FAA4F;IAE5F,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,8CAA8C,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAEnI,OAAO,MAAM,CAAC;AAEhB,CAAC"}
1	+ {"version":3,"file":"getSourceItemsAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/items/getSourceItemsAPI.ts"],"names":[],"mappings":"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"}

package/lib/restAPIs/lists/lists/getSourceListsAPI.d.ts CHANGED Viewed

@@ -3,14 +3,5 @@ import { IFpsItemsReturn } from '../../../components/molecules/process-results/I
 import { IAnyListLib } from '../../../components/molecules/AnyContent/IAnyListLib';
 export declare function fetchSourceListsAPID(sourceProps: ISourceProps, alertMe: boolean | undefined, consoleLog: boolean | undefined): Promise<IFpsItemsReturn>;
 export declare const MinListLibSelects: (keyof IAnyListLib)[];
-/**
- * This is a simple guid checker assuming if it is a guid, it's not manually typed in so it should work.
- *  It's also NOT checking if the string meets any criteria other than it has at least one character...
- *    aka any character makes it a title if it's not a guid
- *  If you need 100% compliance checking for proper guid syntax, use src\logic\Strings\guids
- * @param str
- * @returns
- */
-export declare function isStringGuidOrTitle(str: string): 'guid' | 'title' | 'none';
 export declare function getSourceListsAPI(sourceProps: ISourceProps, alertMe: boolean | undefined, consoleLog: boolean | undefined): Promise<IFpsItemsReturn>;
 //# sourceMappingURL=getSourceListsAPI.d.ts.map

package/lib/restAPIs/lists/lists/getSourceListsAPI.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSourceListsAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/lists/getSourceListsAPI.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAKhG,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;~~AAKnF~~,wBAAsB,oBAAoB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,CAGhK;AAED,eAAO,MAAM,iBAAiB,EAAE,CAAC,MAAM,WAAW,CAAC,EAA4E,CAAA;AAE/H~~;;;;;;;GAOG;AACH~~,~~wBAAgB,mBAAmB,CAAE,GAAG,EAAE,MAAM,GAAI,MAAM,GAAG,OAAO,GAAG,MAAM,CAI5E;AAED,~~wBAAsB,iBAAiB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,CA2E7J"}
1	+ {"version":3,"file":"getSourceListsAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/lists/getSourceListsAPI.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAKhG,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AAMnF,wBAAsB,oBAAoB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,CAGhK;AAED,eAAO,MAAM,iBAAiB,EAAE,CAAC,MAAM,WAAW,CAAC,EAA4E,CAAA;AAE/H,wBAAsB,iBAAiB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,CA2E7J"}

package/lib/restAPIs/lists/lists/getSourceListsAPI.js CHANGED Viewed

@@ -4,26 +4,13 @@ import { check4This } from '../../../logic/Links/CheckSearch';
 import { createErrorFpsListReturn } from '../../../components/molecules/process-results/createErrorFpsListItemsReturn';
 import { getAbsoluteWebUrlFromSourceProps } from '../../../logic/Strings/getAbssoluteWebUrlFromSourceProps';
 import { getExpandColumns } from '../../../components/molecules/source-props/Lists/getVX/getExpandV2';
+import { isStringGuidOrTitle } from './isStringGuidOrTitle';
 // Renamed from fetch to get - just for backwards compatibility
 export async function fetchSourceListsAPID(sourceProps, alertMe, consoleLog) {
     const results = await getSourceListsAPI(sourceProps, alertMe, consoleLog);
     return results;
 }
 export const MinListLibSelects = ['Title', 'RootFolder/ServerRelativeUrl', 'ParentWebUrl', 'BaseType'];
-/**
- * This is a simple guid checker assuming if it is a guid, it's not manually typed in so it should work.
- *  It's also NOT checking if the string meets any criteria other than it has at least one character...
- *    aka any character makes it a title if it's not a guid
- *  If you need 100% compliance checking for proper guid syntax, use src\logic\Strings\guids
- * @param str
- * @returns
- */
-export function isStringGuidOrTitle(str) {
-    if (!str || typeof str !== 'string')
-        return 'none';
-    const guidRegex = /^\{?[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\}?$/i;
-    return guidRegex.test(str) ? 'guid' : 'title';
-}
 export async function getSourceListsAPI(sourceProps, alertMe, consoleLog) {
     // const { performanceSettings } = sourceProps;
     // 2024-09-15:  Change to null as any to pass linting when migrating from fps-library-v2
@@ -57,12 +44,12 @@ export async function getSourceListsAPI(sourceProps, alertMe, consoleLog) {
         titleType === 'title' ? `/getByTitle('${listTitle}')?` : '?';
     fetchAPI += `${selectorString} `;
     if (selectThese && selectThese.length > 0)
-        fetchAPI += `$select=${selectThese && selectThese.length > 0 ? selectThese.join(',') : 'Title,Id,RootFolder/ServerRelativeUrl'}&`;
+        fetchAPI += `&$select=${selectThese && selectThese.length > 0 ? selectThese.join(',') : 'Title,Id,RootFolder/ServerRelativeUrl'}`;
     let useExpands = expandThese && expandThese.length > 0 ? expandThese : getExpandColumns(selectThese);
     if (useExpands && useExpands.length > 0)
-        fetchAPI += `$expand=${useExpands ? useExpands.join(',') : 'RootFolder'}&`;
+        fetchAPI += `&$expand=${useExpands ? useExpands.join(',') : 'RootFolder'}`;
     if (restFilter)
-        fetchAPI += `$filter=${restFilter}&`;
+        fetchAPI += `&$filter=${restFilter}`;
     const orderBys = [];
     if (orderBy)
         orderBys.push(`${orderBy.prop} ${orderBy.order}`);

package/lib/restAPIs/lists/lists/getSourceListsAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSourceListsAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/lists/getSourceListsAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAE5G,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAC5G,OAAO,EAAE,gBAAgB,EAAE,MAAM,oEAAoE,CAAC;~~AAKtG~~,+DAA+D;AAC/D,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B;IAClI,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAE,WAAW,EAAE,OAAO,EAAE,UAAU,CAAG,CAAC;IAC7E,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAA0B,CAAE,OAAO,EAAE,8BAA8B,EAAE,cAAc,EAAE,UAAU,CAAE,CAAA;AAE/H~~;;;;;;;GAOG;AACH~~,MAAM,~~UAAU,mBAAmB,CAAE,GAAW;IAC9C,IAAK,~~CAAC,~~GAAG,IAAI,OAAO,GAAG,~~KAAK,~~QAAQ;QAAG,OAAO,MAAM,CAAC;IACrD,MAAM,SAAS,GAAG,uEAAuE,CAAC;IAC1F,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;AAChD,CAAC;AAED,MAAM,CAAC,KAAK,~~UAAU,iBAAiB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B;IAE/H,+CAA+C;IAC/C,wFAAwF;IACxF,+FAA+F;IAE/F,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC;IAEjF,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,GAAG,mBAAmB,EAAE,CAAC,CAAC;QACxD,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAG,CAAC;QACzE,OAAO,OAAO,CAAC;KAChB;IAED;;;;;;;MAOE;IAGF,IAAI,QAAQ,GAAW,GAAG,MAAM,iBAAiB,CAAC;IAElD;;;;OAIG;IACH,MAAM,SAAS,GAAG,mBAAmB,CAAE,SAAS,CAAE,CAAC;IACnD,MAAM,cAAc,GAClB,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,aAAa,SAAS,KAAK,CAAC,CAAC;QACpD,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,gBAAgB,SAAS,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;IAE/D,QAAQ,IAAI,GAAI,cAAc,GAAG,CAAC;IAElC,IAAK,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,~~WAAY~~,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,uCAAwC,~~GAAG~~,CAAC;IAChL,IAAI,UAAU,GAAa,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAE,WAAuB,CAAE,CAAC;IAC7H,IAAK,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,~~WAAY~~,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAa,~~GAAG~~,CAAC;IAEvH,IAAK,UAAU;QAAG,QAAQ,IAAG,~~WAAY~~,UAAW,~~GAAG~~,CAAC;IAExD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAK,OAAO;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,OAAO,CAAC,IAAK,IAAK,OAAO,CAAC,KAAM,EAAE,CAAE,CAAE;IAExE,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAE5I,sCAAsC;IACtC,+BAA+B;IAC/B,wEAAwE;IACxE,MAAM;IAEN,mIAAmI;IACnI,iGAAiG;IAEjG,+FAA+F;IAC/F,4FAA4F;IAE5F,6DAA6D;IAC7D,4IAA4I;IAE5I,uDAAuD;IAEvD,sHAAsH;IAEtH,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,gDAAgD,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAErI,OAAO,MAAM,CAAC;AAEhB,CAAC"}
1	+ {"version":3,"file":"getSourceListsAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/lists/getSourceListsAPI.ts"],"names":[],"mappings":"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"}

package/lib/restAPIs/lists/lists/isStringGuidOrTitle.d.ts ADDED Viewed

@@ -0,0 +1,10 @@
+/**
+ * This is a simple guid checker assuming if it is a guid, it's not manually typed in so it should work.
+ *  It's also NOT checking if the string meets any criteria other than it has at least one character...
+ *    aka any character makes it a title if it's not a guid
+ *  If you need 100% compliance checking for proper guid syntax, use src\logic\Strings\guids
+ * @param str
+ * @returns
+ */
+export declare function isStringGuidOrTitle(str: string): 'guid' | 'title' | 'none';
+//# sourceMappingURL=isStringGuidOrTitle.d.ts.map

package/lib/restAPIs/lists/lists/isStringGuidOrTitle.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"isStringGuidOrTitle.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/lists/isStringGuidOrTitle.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAI1E"}

package/lib/restAPIs/lists/lists/isStringGuidOrTitle.js ADDED Viewed

@@ -0,0 +1,15 @@
+/**
+ * This is a simple guid checker assuming if it is a guid, it's not manually typed in so it should work.
+ *  It's also NOT checking if the string meets any criteria other than it has at least one character...
+ *    aka any character makes it a title if it's not a guid
+ *  If you need 100% compliance checking for proper guid syntax, use src\logic\Strings\guids
+ * @param str
+ * @returns
+ */
+export function isStringGuidOrTitle(str) {
+    if (!str || typeof str !== 'string')
+        return 'none';
+    const guidRegex = /^\{?[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\}?$/i;
+    return guidRegex.test(str) ? 'guid' : 'title';
+}
+//# sourceMappingURL=isStringGuidOrTitle.js.map

package/lib/restAPIs/lists/lists/isStringGuidOrTitle.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"isStringGuidOrTitle.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/lists/isStringGuidOrTitle.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC;IACnD,MAAM,SAAS,GAAG,uEAAuE,CAAC;IAC1F,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;AAChD,CAAC"}

package/lib/restAPIs/lists/types/getSourceContentTypesAPI.js CHANGED Viewed

@@ -45,7 +45,7 @@ export async function getSourceContentTypesAPI(sourceProps, alertMe, consoleLog,
         orderBys.push(`${orderBy.prop} ${orderBy.order}`);
     const result = await doSpHttpFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.fpsSpService, '', alertMe, consoleLog, contentTypeId ? 'type' : 'types', false, null);
     if (check4This(`fpsShowFetchResults=true`) === true) {
-        console.log(`fps-core-v7 COMPLETE: getSourceViewsAPI ~ 47`, result);
+        console.log(`fps-core-v7 COMPLETE: getSourceContentTypesAPI ~ 47`, result);
     }
     ;
     return result;

package/lib/restAPIs/lists/types/getSourceContentTypesAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSourceContentTypesAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/types/getSourceContentTypesAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAE5G,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAE5G;;;;;;;;;;GAUG;AAEH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B,EAAE,gBAAwB,EAAE;IAElK,+CAA+C;IAC/C,wFAAwF;IACxF,+FAA+F;IAE/F,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,GAAG,GAAG,WAAW,CAAC;IACxD,IAAI,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEnC,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,GAAG,mBAAmB,EAAE,CAAC,CAAC;QACxD,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,SAAS,CAAG,CAAC;QAChF,OAAO,OAAO,CAAC;KAChB;IAED,IAAK,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAG,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC;IAEtE,IAAI,QAAQ,GAAW,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,+BAA+B,SAAS,iBAAiB,CAAC,CAAC,CAAC,GAAG,MAAM,wBAAwB,CAAC;IAE1I,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,QAAQ,aAAa,aAAa,KAAK;QACnE,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC;IAEnB,IAAK,WAAW;QAAG,QAAQ,IAAI,aAAa,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACpE,IAAK,CAAC,aAAa,IAAI,OAAO;QAAG,QAAQ,IAAI,aAAa,OAAO,EAAE,CAAC;IACpE,IAAK,CAAC,aAAa,IAAI,UAAU;QAAG,QAAQ,IAAI,aAAa,UAAU,EAAE,CAAC;IAE1E,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAK,OAAO;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,OAAO,CAAC,IAAK,IAAK,OAAO,CAAC,KAAM,EAAE,CAAE,CAAE;IAExE,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAEtK,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,~~8CAA8C~~,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;~~IAEnI~~,OAAO,MAAM,CAAC;AAEhB,CAAC"}
1	+ {"version":3,"file":"getSourceContentTypesAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/types/getSourceContentTypesAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAE5G,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAE5G;;;;;;;;;;GAUG;AAEH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B,EAAE,gBAAwB,EAAE;IAElK,+CAA+C;IAC/C,wFAAwF;IACxF,+FAA+F;IAE/F,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,GAAG,GAAG,WAAW,CAAC;IACxD,IAAI,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEnC,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,GAAG,mBAAmB,EAAE,CAAC,CAAC;QACxD,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,SAAS,CAAG,CAAC;QAChF,OAAO,OAAO,CAAC;KAChB;IAED,IAAK,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAG,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC;IAEtE,IAAI,QAAQ,GAAW,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,+BAA+B,SAAS,iBAAiB,CAAC,CAAC,CAAC,GAAG,MAAM,wBAAwB,CAAC;IAE1I,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,QAAQ,aAAa,aAAa,KAAK;QACnE,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC;IAEnB,IAAK,WAAW;QAAG,QAAQ,IAAI,aAAa,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACpE,IAAK,CAAC,aAAa,IAAI,OAAO;QAAG,QAAQ,IAAI,aAAa,OAAO,EAAE,CAAC;IACpE,IAAK,CAAC,aAAa,IAAI,UAAU;QAAG,QAAQ,IAAI,aAAa,UAAU,EAAE,CAAC;IAE1E,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAK,OAAO;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,OAAO,CAAC,IAAK,IAAK,OAAO,CAAC,KAAM,EAAE,CAAE,CAAE;IAExE,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAEtK,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"}

package/lib/restAPIs/lists/views/getSourceViewsAPI.d.ts CHANGED Viewed

@@ -4,6 +4,9 @@ import { IFpsItemsReturn } from '../../../components/molecules/process-results/I
  * getSourceViewsAPI will get all the views information for a list
  *    import { getSourceViewsAPI, getSourceViewByTitleOrIdAPI } from '@mikezimm/fps-core-v7/lib/restAPIs/lists/views/getSourceViewsAPI';
  *
+ * Tip:  Use isStringGuidOrTitle to test if it's a guid or title
+ *    import { isStringGuidOrTitle } from '@mikezimm/fps-core-v7/lib/restAPIs/lists/isStringGuidOrTitle';
+ *
  *    Replaces fetchFieldsD from pnp2
  *
  * @param sourceProps

package/lib/restAPIs/lists/views/getSourceViewsAPI.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSourceViewsAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/views/getSourceViewsAPI.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAA+C,MAAM,yDAAyD,CAAC;AACpI,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;~~AAKhG;;;;;;;;;;GAUG~~;AAEH,wBAAsB,iBAAiB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,aAAa,GAAE,MAAW,GAAI,OAAO,CAAC,eAAe,CAAC,~~CAkCxL~~"}
1	+ {"version":3,"file":"getSourceViewsAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/views/getSourceViewsAPI.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAA+C,MAAM,yDAAyD,CAAC;AACpI,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAMhG;;;;;;;;;;;;;GAaG;AAEH,wBAAsB,iBAAiB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,aAAa,GAAE,MAAW,GAAI,OAAO,CAAC,eAAe,CAAC,CA0ExL"}

package/lib/restAPIs/lists/views/getSourceViewsAPI.js CHANGED Viewed

@@ -3,10 +3,14 @@ import { SourcePropsNoListTitle, SourcePropsNoWebUrl } from '../../../components
 import { check4This } from '../../../logic/Links/CheckSearch';
 import { createErrorFpsListReturn } from '../../../components/molecules/process-results/createErrorFpsListItemsReturn';
 import { getAbsoluteWebUrlFromSourceProps } from '../../../logic/Strings/getAbssoluteWebUrlFromSourceProps';
+import { isStringGuidOrTitle } from '../lists/isStringGuidOrTitle';
 /**
  * getSourceViewsAPI will get all the views information for a list
  *    import { getSourceViewsAPI, getSourceViewByTitleOrIdAPI } from '@mikezimm/fps-core-v7/lib/restAPIs/lists/views/getSourceViewsAPI';
  *
+ * Tip:  Use isStringGuidOrTitle to test if it's a guid or title
+ *    import { isStringGuidOrTitle } from '@mikezimm/fps-core-v7/lib/restAPIs/lists/isStringGuidOrTitle';
+ *
  *    Replaces fetchFieldsD from pnp2
  *
  * @param sourceProps
@@ -18,7 +22,7 @@ export async function getSourceViewsAPI(sourceProps, alertMe, consoleLog, viewTi
     // const { performanceSettings } = sourceProps;
     // 2024-09-15:  Change to null as any to pass linting when migrating from fps-library-v2
     // const fetchOp = performanceSettings ? startPerformOpV2( performanceSettings ) : null as any;
-    const { listTitle, orderBy, restFilter, } = sourceProps;
+    const { listTitle, orderBy, orderBy2, restFilter, } = sourceProps;
     let { 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);
@@ -31,16 +35,56 @@ export async function getSourceViewsAPI(sourceProps, alertMe, consoleLog, viewTi
     }
     if (!selectThese || selectThese.length === 0)
         selectThese = ['*'];
-    let fetchAPI = `${useUrl}/_api/web/lists/getbytitle('${listTitle}')/views?`;
+    let fetchAPI = `${useUrl}/_api/web/lists`;
+    /**
+     * Added this logic for detecting correct selector for:
+     *    https://github.com/mikezimm/drilldown7/issues/467
+     *    https://github.com/mikezimm/drilldown7/issues/468
+     */
+    const listTitleType = isStringGuidOrTitle(listTitle);
+    const viewTitleType = isStringGuidOrTitle(viewTitleOrId);
+    let selectorString = listTitleType === 'guid' ? `/getById('${listTitle}')/views` :
+        listTitleType === 'title' ? `/getByTitle('${listTitle}')/views` : '/views';
+    if (!viewTitleOrId) {
+        selectorString += '?';
+    }
+    else if (viewTitleType === 'guid') {
+        selectorString += `/getById(${viewTitleOrId})?`;
+    }
+    else if (viewTitleType === 'title') {
+        selectorString += `/getByTitle(${viewTitleOrId})?`;
+    }
+    else {
+        selectorString += '?';
+    }
+    fetchAPI += `${selectorString} `;
+    // let fetchAPI: string = `${useUrl}/_api/web/lists/getbytitle('${listTitle}')/views?`;
     if (selectThese)
         fetchAPI += `&$select= ${selectThese.join(',')}`;
-    if (orderBy)
-        fetchAPI += `&$orderby=${orderBy}`;
-    if (restFilter)
-        fetchAPI += `&$filter= ${restFilter}`;
     const orderBys = [];
-    if (orderBy)
-        orderBys.push(`${orderBy.prop} ${orderBy.order}`);
+    /**
+     *  2025-02-09:  Updated the orderBy for when there is no orderBy.prop or .order
+     *    https://github.com/mikezimm/PageInfo/issues/178
+     */
+    if (orderBy && orderBy.prop)
+        orderBys.push(`${orderBy.prop} ${orderBy.order ? orderBy.order : 'asc'}`);
+    if (orderBy2 && orderBy2.prop)
+        orderBys.push(`${orderBy2.prop} ${orderBy2.order ? orderBy2.order : 'asc'}`);
+    if (orderBys.length > 0)
+        fetchAPI += `&$orderby=${orderBys.join(',')}`;
+    if (viewTitleOrId) {
+        /**
+         * In SharePoint REST API queries, GUIDs must be explicitly cast as guid'xxxxx' because SharePoint needs to differentiate them from string values.
+              Why?
+              Type Enforcement: The Id field in SharePoint Views is of type Guid, not a string or integer. Unlike string fields (which use single quotes 'value'), GUID fields require the guid'...' format.
+              Syntax Requirement: SharePoint's OData implementation requires proper type casting for non-string values. If you don't include guid'...', SharePoint will treat it as an invalid filter type.
+         */
+        const fieldFilter = `Title eq '${viewTitleOrId}' or Id eq guid'${viewTitleOrId}'`;
+        fetchAPI += `&$filter= ${fieldFilter}`;
+    }
+    else if (restFilter)
+        fetchAPI += `&$filter= ${restFilter}`;
     const result = await doSpHttpFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.fpsSpService, '', alertMe, consoleLog, viewTitleOrId ? 'view' : 'views', false, null);
     if (check4This(`fpsShowFetchResults=true`) === true) {
         console.log(`fps-core-v7 COMPLETE: getSourceViewsAPI ~ 47`, result);

package/lib/restAPIs/lists/views/getSourceViewsAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSourceViewsAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/views/getSourceViewsAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAgB,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAEpI,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;~~AAE5G;;;;;;;;;;GAUG~~;AAEH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B,EAAE,gBAAwB,EAAE;IAE3J,+CAA+C;IAC/C,wFAAwF;IACxF,+FAA+F;IAE/F,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,GAAG,GAAG,WAAW,CAAC;~~IACxD~~,IAAI,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEnC,sIAAsI;IACtI,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IAEvE,IAAK,CAAC,MAAM,IAAI,CAAC,SAAS,EAAG;QAC3B,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAuB,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAC3G,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,SAAS,CAAG,CAAC;QAChF,OAAO,OAAO,CAAC;KAChB;IAED,IAAK,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAG,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC;~~IACtE~~,IAAI,QAAQ,GAAW,GAAG,MAAM~~,+BAA+B~~,SAAS,~~WAAW~~,CAAC;~~IACpF~~,~~IAAK~~,~~WAAW;QAAG~~,~~QAAQ~~,~~IAAI~~,aAAa,~~WAAW~~,CAAC,IAAI,CAAC,~~GAAG~~,CAAC,~~EAAE~~,CAAC;~~IACpE~~,~~IAAK~~,OAAO~~;QAAG~~,QAAQ,IAAI,aAAa,OAAO,~~EAAE~~,CAAC;~~IAClD~~,IAAK,~~UAAU~~;QAAG,QAAQ,IAAI,aAAa,~~UAAU~~,EAAE,CAAC;~~IAExD~~,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAK,OAAO;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,OAAO,CAAC,IAAK,IAAK,OAAO,CAAC,KAAM,EAAE,CAAE,CAAE;~~IAExE~~,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAEtK,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,8CAA8C,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAEnI,OAAO,MAAM,CAAC;AAEhB,CAAC"}
1	+ {"version":3,"file":"getSourceViewsAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/views/getSourceViewsAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAgB,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAEpI,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAC5G,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE;;;;;;;;;;;;;GAaG;AAEH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B,EAAE,gBAAwB,EAAE;IAE3J,+CAA+C;IAC/C,wFAAwF;IACxF,+FAA+F;IAE/F,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,GAAG,GAAG,WAAW,CAAC;IAClE,IAAI,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEnC,sIAAsI;IACtI,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IAEvE,IAAK,CAAC,MAAM,IAAI,CAAC,SAAS,EAAG;QAC3B,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAuB,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAC3G,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,SAAS,CAAG,CAAC;QAChF,OAAO,OAAO,CAAC;KAChB;IAED,IAAK,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAG,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC;IAGtE,IAAI,QAAQ,GAAW,GAAG,MAAM,iBAAiB,CAAC;IAElD;;;;OAIG;IACH,MAAM,aAAa,GAAG,mBAAmB,CAAE,SAAS,CAAE,CAAC;IACvD,MAAM,aAAa,GAAG,mBAAmB,CAAE,aAAa,CAAE,CAAC;IAC3D,IAAI,cAAc,GAChB,aAAa,KAAK,MAAM,CAAC,CAAC,CAAC,aAAa,SAAS,UAAU,CAAC,CAAC;QAC7D,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,gBAAgB,SAAS,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;IAE7E,IAAK,CAAC,aAAa,EAAI;QAAE,cAAc,IAAI,GAAG,CAAA;KAAE;SAC3C,IAAK,aAAa,KAAK,MAAM,EAAG;QACnC,cAAc,IAAI,YAAY,aAAa,IAAI,CAAC;KACjD;SAAM,IAAK,aAAa,KAAK,OAAO,EAAG;QACtC,cAAc,IAAI,eAAe,aAAa,IAAI,CAAC;KACpD;SAAM;QAAE,cAAc,IAAI,GAAG,CAAA;KAAG;IAEjC,QAAQ,IAAI,GAAI,cAAc,GAAG,CAAC;IAElC,uFAAuF;IACvF,IAAK,WAAW;QAAG,QAAQ,IAAI,aAAa,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAEpE,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B;;;OAGG;IACH,IAAK,OAAO,IAAI,OAAO,CAAC,IAAI;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,OAAO,CAAC,IAAK,IAAK,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAM,EAAE,CAAE,CAAE;IAChH,IAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,QAAQ,CAAC,IAAK,IAAK,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,KAAO,EAAE,CAAE,CAAC;IACrH,IAAK,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,aAAc,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAE,EAAE,CAAC;IAE1E,IAAK,aAAa,EAAG;QACnB;;;;;;WAMG;QACH,MAAM,WAAW,GAAW,aAAa,aAAa,mBAAmB,aAAa,GAAG,CAAC;QAC1F,QAAQ,IAAI,aAAa,WAAW,EAAE,CAAC;KACxC;SAAM,IAAK,UAAU;QAAG,QAAQ,IAAI,aAAa,UAAU,EAAE,CAAC;IAE/D,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAEtK,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,8CAA8C,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAEnI,OAAO,MAAM,CAAC;AAEhB,CAAC"}

package/lib/restAPIs/sites/HubsSubs/fetches/fetchMyHubsites.d.ts CHANGED Viewed

@@ -11,7 +11,7 @@ import { IJSFetchReturn } from '../../../../components/molecules/SpHttp/interfac
 import { IFPSWebsWithLogo } from '../interfaces/IFPSHubSiteDataDocsApi';
 import { IFpsSpHttpServiceMIN } from '../../../../components/molecules/SpHttp/Sp/IFpsSpHttpServiceMIN';
 export type IFetchHubDepth = 'site' | 'web';
-export type IHubFilterType = 'Associated' | 'Hubs' | 'Teams' | 'HubAndAssoc';
+export type IHubFilterType = 'Associated' | 'Hubs' | 'Teams' | 'HubAndAssoc' | 'NonGroups';
 export interface IFetchHubsReturn extends IJSFetchReturn {
     allHubs?: IFPSWebsWithLogo[];
 }
@@ -23,5 +23,5 @@ export interface IFetchHubsReturn extends IJSFetchReturn {
  * @param filter  IHubFilterType = 'Associated' | 'Hubs' | 'Teams' | 'HubAndAssoc';
  * @returns
  */
-export declare function fetchMyHubsites(fpsSpService: IFpsSpHttpServiceMIN, webUrl: string, depth: IFetchHubDepth, departmentId: string, filter: IHubFilterType): Promise<IFetchHubsReturn>;
+export declare function fetchMyHubsites(fpsSpService: IFpsSpHttpServiceMIN, webUrl: string, depth: IFetchHubDepth, departmentId: string, filter: IHubFilterType, maxRows?: number): Promise<IFetchHubsReturn>;
 //# sourceMappingURL=fetchMyHubsites.d.ts.map

package/lib/restAPIs/sites/HubsSubs/fetches/fetchMyHubsites.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fetchMyHubsites.d.ts","sourceRoot":"","sources":["../../../../../src/restAPIs/sites/HubsSubs/fetches/fetchMyHubsites.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAkBH,OAAO,EAAE,cAAc,EAAE,MAAM,mEAAmE,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAc,MAAM,sCAAsC,CAAC;AAwCpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iEAAiE,CAAC;AAGvG,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,KAAK,CAAC;AAE5C,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,aAAa,~~CAAE~~;~~AAE9E~~,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACtD,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC9B;AAED;;;;;;;GAOG;AAEH,wBAAsB,eAAe,CAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAI,OAAO,CAAC,gBAAgB,CAAC,~~CA8C1L~~"}
1	+ {"version":3,"file":"fetchMyHubsites.d.ts","sourceRoot":"","sources":["../../../../../src/restAPIs/sites/HubsSubs/fetches/fetchMyHubsites.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAkBH,OAAO,EAAE,cAAc,EAAE,MAAM,mEAAmE,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAc,MAAM,sCAAsC,CAAC;AAwCpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iEAAiE,CAAC;AAGvG,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,KAAK,CAAC;AAE5C,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,aAAa,GAAG,WAAW,CAAC;AAE3F,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACtD,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC9B;AAED;;;;;;;GAOG;AAEH,wBAAsB,eAAe,CAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAE,MAAY,GAAI,OAAO,CAAC,gBAAgB,CAAC,CA0DjN"}

package/lib/restAPIs/sites/HubsSubs/fetches/fetchMyHubsites.js CHANGED Viewed

@@ -38,7 +38,7 @@ import { NonGroupGroupID } from '../functions/processHubSubResults';
  * @param filter  IHubFilterType = 'Associated' | 'Hubs' | 'Teams' | 'HubAndAssoc';
  * @returns
  */
-export async function fetchMyHubsites(fpsSpService, webUrl, depth, departmentId, filter) {
+export async function fetchMyHubsites(fpsSpService, webUrl, depth, departmentId, filter, maxRows = 500) {
     const performanceSettings = { label: 'myHubs', updateMiliseconds: true, includeMsStr: true, op: 'fetch' };
     const fetchOp = performanceSettings ? startPerformOpV2(performanceSettings) : null;
     const minSearch = `${webUrl}/_api/search/query?querytext='DepartmentId=`;
@@ -49,16 +49,21 @@ export async function fetchMyHubsites(fpsSpService, webUrl, depth, 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 = `${minSearch}${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' ? maxRows : maxRows * 2}`; // 9 Works
     }
     if (filter === 'HubAndAssoc') {
-        fetchAPIStr = `${minSearch}${departmentId} contentclass:sts_${depth}'&selectproperties='${hubSelects.join(',')}'&rowlimit=${depth === 'site' ? 200 : 500}`; // 9 Works
+        fetchAPIStr = `${minSearch}${departmentId} contentclass:sts_${depth}'&selectproperties='${hubSelects.join(',')}'&rowlimit=${depth === 'site' ? maxRows : maxRows * 2}`; // 9 Works
+        // https://github.com/fps-solutions/HubCon/issues/133
     }
     if (filter === 'Hubs') {
-        fetchAPIStr = `${minSearch}* contentclass:sts_site GroupId:"${NonGroupGroupID}" ${minSelectRowLimit}${500}`; // 9 Works
+        fetchAPIStr = `${minSearch}* contentclass:sts_site ${minSelectRowLimit}${maxRows}`; // 9 Works
+        // https://github.com/fps-solutions/HubCon/issues/133
+    }
+    if (filter === 'NonGroups') {
+        fetchAPIStr = `${minSearch}* contentclass:sts_site (GroupId:"${NonGroupGroupID}" OR NOT GroupId:*)" ${minSelectRowLimit}${maxRows}`; // 9 Works
     }
     if (filter === 'Teams') {
-        fetchAPIStr = `${minSearch}* contentclass:sts_site -GroupId:"${NonGroupGroupID}" ${minSelectRowLimit}${500}`; // 9 Works
+        fetchAPIStr = `${minSearch}* contentclass:sts_site -GroupId:"${NonGroupGroupID}" ${minSelectRowLimit}${maxRows}`; // 9 Works
         // } if ( filter === 'AllChildSubs' ) { fetchAPIStr = `${minSearch}* contentclass:sts_site -GroupId:"${NonGroupGroupID}" ${ minSelectRowLimit }${500}`;// 9 Works
         // } if ( filter === 'DirectChildren' ) { fetchAPIStr = `${minSearch}* contentclass:sts_site -GroupId:"${NonGroupGroupID}" ${ minSelectRowLimit }${500}`;// 9 Works
     }

package/lib/restAPIs/sites/HubsSubs/fetches/fetchMyHubsites.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fetchMyHubsites.js","sourceRoot":"","sources":["../../../../../src/restAPIs/sites/HubsSubs/fetches/fetchMyHubsites.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAiBH,OAAO,EAAE,2BAA2B,EAAE,MAAM,0DAA0D,CAAC;AAEvG,OAAO,EAAoB,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAEpF,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAKjH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kFAAkF,CAAC;AAGrH;;;;;GAKG;AAEH,+CAA+C;AAE/C,kIAAkI;AAElI,sIAAsI;AACtI,0FAA0F;AAE1F,6PAA6P;AAE7P,wFAAwF;AAExF,+FAA+F;AAE/F,iKAAiK;AACjK,uCAAuC;AAEvC,oIAAoI;AAEpI,2BAA2B;AAE3B,IAAI;AAEJ,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAYpE;;;;;;;GAOG;AAEH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAE,YAAkC,EAAE,MAAc,EAAE,KAAqB,EAAE,YAAoB,EAAE,MAAsB;~~IAE5J~~,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,SAAS,GAAY,GAAG,MAAM,6CAA6C,CAAC;IAClF,MAAM,iBAAiB,GAAW,uBAAuB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC;IAE3F,gEAAgE;IAChE,oEAAoE;IAEpE,0BAA0B;IAC1B,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,6LAA6L;IAC7L,IAAK,MAAM,KAAK,YAAY,EAAG;~~QAAE~~,WAAW,GAAG,GAAG,SAAS,GAAG,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,CAAC,UAAU;~~KACxN~~;IAAC,IAAK,MAAM,KAAK,aAAa,EAAG;~~QAAE~~,WAAW,GAAG,GAAG,SAAS,GAAG,YAAY,qBAAqB,KAAK,uBAAuB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,KAAK,KAAG,MAAM,CAAA,CAAC,CAAA,~~GAAG~~,CAAA,CAAC,CAAA,~~GAAG~~,EAAE,CAAC,CAAC,UAAU;~~KACnM~~;IAAC,IAAK,MAAM,KAAK,MAAM,EAAG;~~QAAE~~,WAAW,GAAG,GAAG,SAAS,~~oCAAoC~~,eAAe,~~KAAM~~,iBAAkB,GAAG,~~GAAG~~,EAAE,CAAC,CAAA,UAAU;~~KACpJ~~;IAAC,IAAK,MAAM,KAAK,OAAO,EAAG;~~QAAE~~,WAAW,GAAG,GAAG,SAAS,qCAAqC,eAAe,KAAM,iBAAkB,GAAG,~~GAAG~~,EAAE,CAAC,CAAA,UAAU;~~QACvJ~~,iKAAiK;QACjK,mKAAmK;KAClK;IAED,kOAAkO;IAClO,2LAA2L;IAG3L,MAAM,cAAc,GAAqB,MAAM,2BAA2B,CAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAsB,CAAC;IAEtK,mIAAmI;IACrI,6BAA6B;IAC7B,sEAAsE;IACtE,IAAI;IAEJ,IAAK,MAAM,KAAK,MAAM,EAAG;QACvB,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,MAAM,CAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAE,IAAI,CAAC,MAAM,CAAE,KAAK,CAAC,CAAE,CAAC;QAC/G,mDAAmD;QACnD,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;KACvE;IAED,IAAI,MAAM,GAAoB,qBAAqB,CAAE,cAAiC,EAAE,mBAAmB,EAAE,OAAyB,EAAE,OAAO,EAAE,OAAO,CAAqB,CAAC;IAC9K,MAAM,CAAC,cAAc,GAAG,CAAE,KAAK,CAAE,CAAC;IAElC,MAAM,GAAG,iBAAiB,CAAE,YAAY,EAAE,MAAyB,EAAE,sCAAsC,EAAE,KAAK,EAAE,IAAI,CAAoB,CAAC;IAE7I,OAAO,cAAc,CAAC;AAExB,CAAC"}
1	+ {"version":3,"file":"fetchMyHubsites.js","sourceRoot":"","sources":["../../../../../src/restAPIs/sites/HubsSubs/fetches/fetchMyHubsites.ts"],"names":[],"mappings":"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"}

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

@@ -50,10 +50,10 @@ 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`;
+    fetchAPI += `&$select=${selectThese.join(',')}`;
+    fetchAPI += `&$orderby=Title asc`;
     if (restFilter)
-        fetchAPI += `&$filter=${restFilter}&`;
+        fetchAPI += `&$filter=${restFilter}`;
     const result = await doSpHttpFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.fpsSpService, '', alertMe, consoleLog, 'users', false, null);
     // result.users = result.items ? result.items : [];
     // result.fpsContentType = [ 'user' ];

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,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,kHAAkH;AAClH,uGAAuG;AACvG,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,yGAAyG;AACzG,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,2FAA2F;AAC3F,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,GAAG,WAAW,CAAC;IAElE,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~~,IAAK,UAAU;QAAG,QAAQ,IAAG,YAAa,UAAW,~~GAAG~~,CAAC;~~IAEzD~~,MAAM,MAAM,GAAoB,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAG,KAAK,EAAE,IAAI,CAAgC,CAAC;IAE7L,mDAAmD;IACnD,sCAAsC;IACtC,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,SAAS,QAAQ,CAAC;IAChE,8DAA8D;IAE9D,sCAAsC;IACtC,+BAA+B;IAC/B,wEAAwE;IACxE,MAAM;IAEN,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;AAED;;GAEG;AACH,wLAAwL;AAExL,yFAAyF;AACzF,sIAAsI;AACtI,0FAA0F;AAE1F,4EAA4E;AAE5E,qBAAqB;AACrB,kCAAkC;AAClC,gFAAgF;AAChF,kGAAkG;AAClG,gCAAgC;AAChC,sBAAsB;AACtB,MAAM;AAEN,wBAAwB;AACxB,kCAAkC;AAClC,qFAAqF;AACrF,kGAAkG;AAClG,2CAA2C;AAC3C,kCAAkC;AAElC,sBAAsB;AACtB,MAAM;AAEN,QAAQ;AACR,8CAA8C;AAE9C,oGAAoG;AACpG,mHAAmH;AACnH,iDAAiD;AACjD,wCAAwC;AACxC,2BAA2B;AAE3B,OAAO;AAEP,6FAA6F;AAC7F,qDAAqD;AACrD,sCAAsC;AAEtC,qFAAqF;AACrF,8DAA8D;AAE9D,4IAA4I;AAC5I,0EAA0E;AAC1E,2CAA2C;AAC3C,oCAAoC;AACpC,6EAA6E;AAC7E,WAAW;AACX,wCAAwC;AAExC,yJAAyJ;AAEzJ,+DAA+D;AAC/D,0KAA0K;AAC1K,2EAA2E;AAE3E,yDAAyD;AAEzD,yIAAyI;AAEzI,mBAAmB;AAEnB,IAAI"}
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.js CHANGED Viewed

@@ -36,7 +36,7 @@ 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'}&`;
+    fetchAPI += `&$select=${selectThese && selectThese.length > 0 ? selectThese.join(',') : 'Title,Id'}`;
     const result = await doSpHttpFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.fpsSpService, '', alertMe, consoleLog, 'group', false, null);
     //  Add any required custom logic here
     //   if ( resultHubSites.ok ) {

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,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC/G,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,gEAAgE,CAAC;AAGxG,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,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,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,MAAM,GAAqB,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAqB,CAAC;IAElL,sCAAsC;IACtC,+BAA+B;IAC/B,wEAAwE;IACxE,MAAM;IAEN,mFAAmF;IACnF,wBAAwB;IACxB,uCAAuC;IACvC,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,GAAG,gBAAgB,KAAK,EAAE,CAAC;IACnE,4CAA4C;IAE5C,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;AAID,6NAA6N;AAE7N,0IAA0I;AAC1I,qJAAqJ;AAErJ,2IAA2I;AAC3I,4EAA4E;AAE5E,qBAAqB;AACrB,kCAAkC;AAClC,yFAAyF;AACzF,kGAAkG;AAClG,sBAAsB;AACtB,MAAM;AAEN,QAAQ;AACR,8CAA8C;AAC9C,+CAA+C;AAC/C,uCAAuC;AACvC,2BAA2B;AAC3B,OAAO;AACP,0CAA0C;AAE1C,0EAA0E;AAC1E,2GAA2G;AAE3G,6FAA6F;AAE7F,2CAA2C;AAC3C,oCAAoC;AACpC,6EAA6E;AAC7E,WAAW;AAEX,kLAAkL;AAClL,yCAAyC;AAEzC,mHAAmH;AACnH,qFAAqF;AACrF,0BAA0B;AAE1B,2EAA2E;AAE3E,+DAA+D;AAC/D,wKAAwK;AAExK,yDAAyD;AAEzD,+IAA+I;AAE/I,mBAAmB;AAEnB,IAAI"}
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.js CHANGED Viewed

@@ -26,13 +26,13 @@ export async function getWebGroupInfoAPI(sourceProps, alertMe, consoleLog) {
         $select=Title,Id`;
     */
     let fetchAPI = `${useUrl}/_api/web/sitegroups?`;
-    fetchAPI += `$orderby=Title asc&`;
-    fetchAPI += `$select=${selectThese.length > 0 ? selectThese.join(',') : 'Title,Id,PrincipalType,'}&`;
+    fetchAPI += `&$orderby=Title asc`;
+    fetchAPI += `&$select=${selectThese.length > 0 ? selectThese.join(',') : 'Title,Id,PrincipalType,'}`;
     const expandThese = getExpandColumns(selectThese);
     if (expandThese.length > 0)
-        fetchAPI += `$expand=${expandThese.join(',')}&`;
+        fetchAPI += `&$expand=${expandThese.join(',')}`;
     if (restFilter)
-        fetchAPI += `$filter=${restFilter}`;
+        fetchAPI += `&$filter=${restFilter}`;
     const result = await doSpHttpFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.fpsSpService, '', alertMe, consoleLog, 'groups', false, null);
     // result.groups = result.items ? result.items : [];
     // result.fpsContentType = [ 'group' ];

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,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,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,OAA4B,EAAE,UAA+B;IAEhI,MAAM,EAAE,UAAU,EAAE,WAAW,GAAG,qBAAqB,GAAG,GAAG,WAAW,CAAC;IACzE,uIAAuI;IACvI,mJAAmJ;IAEnJ,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,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAiC,CAAC;IAE9L,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"}
1	+ {"version":3,"file":"getWebGroupInfoAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/groups/getWebGroupInfoAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,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,OAA4B,EAAE,UAA+B;IAEhI,MAAM,EAAE,UAAU,EAAE,WAAW,GAAG,qBAAqB,GAAG,GAAG,WAAW,CAAC;IACzE,uIAAuI;IACvI,mJAAmJ;IAEnJ,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,YAAa,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,yBAAyB,EAAE,CAAC;IAErG,MAAM,WAAW,GAAa,gBAAgB,CAAE,WAAW,CAAE,CAAC;IAC9D,IAAK,WAAW,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,YAAa,WAAW,CAAC,IAAI,CAAC,GAAG,CAAE,EAAE,CAAC;IAC/E,IAAK,UAAU;QAAG,QAAQ,IAAG,YAAa,UAAW,EAAE,CAAC;IAExD,MAAM,MAAM,GAAoB,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAiC,CAAC;IAE9L,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/nav/getOrAddWebNavAPI.js CHANGED Viewed

@@ -52,7 +52,7 @@ export async function getOrAddWebNavAPI(sourceProps, method, location, alertMe,
         delete body.Id;
     fetchAPI += `?`;
     if (method === 'GET') {
-        fetchAPI += `$orderby=Title asc`;
+        fetchAPI += `&$orderby=Title asc`;
         fetchAPI += `&$select=${selectThese.length > 0 ? selectThese.join(',') : '*'}`;
         // As of 2024-12-29:  Navigation does not currently have any expandable properties
         // const expandThese: string[] = getExpandColumns( selectThese );

package/lib/restAPIs/sites/nav/getOrAddWebNavAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getOrAddWebNavAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/nav/getOrAddWebNavAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,gCAAgC,GAAG,MAAM,0DAA0D,CAAC;AAE7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAKlE;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAE,WAAyB,EAAE,MAA2B,EAC7F,QAAqB,EAAE,OAA4B,EAAE,UAA+B,EACpF,IAA4B,EAAE,eAAuB,CAAC,CAAC;IAEvD,MAAM,EAAE,UAAU,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,WAAW,CAAC;IACrD,IAAI,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IAErE,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,sBAAsB,mBAAmB,EAAE,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAuB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAwB,CAAC;QACjG,OAAO,OAAO,CAAC;KAChB;IAED;;;;;;MAME;IAEF,gGAAgG;IAChG,IAAI,QAAQ,GAAW,GAAG,MAAM,wBAAyB,QAAQ,IAAI,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,kBAAmB,EAAE,CAAC;IAE3H,IAAK,YAAY,GAAG,CAAC,CAAC,EAAG;QAAE,QAAQ,IAAI,IAAI,YAAY,YAAY,CAAC;KAAE;IAEtE,IAAK,IAAI,IAAI,IAAI,CAAC,EAAE,EAAG;QAAE,QAAQ,IAAI,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC;KAAE;IAEtD,sHAAsH;IACtH,IAAK,IAAI,IAAI,IAAI,CAAC,EAAE;QAAG,OAAQ,IAAY,CAAC,EAAE,CAAC;IAE/C,QAAQ,IAAI,GAAG,CAAC;IAEhB,IAAK,MAAM,KAAK,KAAK,EAAG;QACtB,QAAQ,IAAI,~~oBAAoB~~,CAAC;~~QACjC~~,QAAQ,IAAG,YAAa,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QAE/E,kFAAkF;QAClF,iEAAiE;QACjE,kFAAkF;QAClF,IAAK,UAAU;YAAG,QAAQ,IAAG,YAAa,UAAW,EAAE,CAAC;KACzD;IAED,MAAM,MAAM,GAAuB,MAAM,2BAA2B,CAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAG,KAAK,EAAE,IAAI,CAAwB,CAAE;IAE5L,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAK,QAAS,KAAK,CAAC;IAE1F,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,8CAA8C,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAEnI,OAAO,MAAM,CAAE;AAEjB,CAAC"}
1	+ {"version":3,"file":"getOrAddWebNavAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/nav/getOrAddWebNavAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,gCAAgC,GAAG,MAAM,0DAA0D,CAAC;AAE7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAKlE;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAE,WAAyB,EAAE,MAA2B,EAC7F,QAAqB,EAAE,OAA4B,EAAE,UAA+B,EACpF,IAA4B,EAAE,eAAuB,CAAC,CAAC;IAEvD,MAAM,EAAE,UAAU,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,WAAW,CAAC;IACrD,IAAI,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IAErE,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,sBAAsB,mBAAmB,EAAE,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAuB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAwB,CAAC;QACjG,OAAO,OAAO,CAAC;KAChB;IAED;;;;;;MAME;IAEF,gGAAgG;IAChG,IAAI,QAAQ,GAAW,GAAG,MAAM,wBAAyB,QAAQ,IAAI,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,kBAAmB,EAAE,CAAC;IAE3H,IAAK,YAAY,GAAG,CAAC,CAAC,EAAG;QAAE,QAAQ,IAAI,IAAI,YAAY,YAAY,CAAC;KAAE;IAEtE,IAAK,IAAI,IAAI,IAAI,CAAC,EAAE,EAAG;QAAE,QAAQ,IAAI,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC;KAAE;IAEtD,sHAAsH;IACtH,IAAK,IAAI,IAAI,IAAI,CAAC,EAAE;QAAG,OAAQ,IAAY,CAAC,EAAE,CAAC;IAE/C,QAAQ,IAAI,GAAG,CAAC;IAEhB,IAAK,MAAM,KAAK,KAAK,EAAG;QACtB,QAAQ,IAAI,qBAAqB,CAAC;QAClC,QAAQ,IAAG,YAAa,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QAE/E,kFAAkF;QAClF,iEAAiE;QACjE,kFAAkF;QAClF,IAAK,UAAU;YAAG,QAAQ,IAAG,YAAa,UAAW,EAAE,CAAC;KACzD;IAED,MAAM,MAAM,GAAuB,MAAM,2BAA2B,CAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAG,KAAK,EAAE,IAAI,CAAwB,CAAE;IAE5L,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAK,QAAS,KAAK,CAAC;IAE1F,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,8CAA8C,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAEnI,OAAO,MAAM,CAAE;AAEjB,CAAC"}

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

	@@ -1 +1 @@
1	- {"version":3,"file":"getClientSideWebParts.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getClientSideWebParts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAKhG;;;;;;;;;;GAUG;AACH,wBAAsB,qBAAqB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,SAAS,GAAE,MAAW,GAAI,OAAO,CAAC,eAAe,CAAC,~~CA+BxL~~"}
1	+ {"version":3,"file":"getClientSideWebParts.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getClientSideWebParts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAKhG;;;;;;;;;;GAUG;AACH,wBAAsB,qBAAqB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,SAAS,GAAE,MAAW,GAAI,OAAO,CAAC,eAAe,CAAC,CAwCxL"}

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

@@ -15,7 +15,7 @@ import { getSiteCollectionUrlFromLink } from '../../../logic/Strings/getSiteColl
  * @returns
  */
 export async function getClientSideWebParts(sourceProps, alertMe, consoleLog, webpartId = '') {
-    const { orderBy, restFilter, } = sourceProps;
+    const { orderBy, orderBy2, restFilter, } = sourceProps;
     let { 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 = getSiteCollectionUrlFromLink(sourceProps.absoluteWebUrl ? sourceProps.absoluteWebUrl : sourceProps.webUrl ? sourceProps.webUrl : '');
@@ -31,17 +31,25 @@ export async function getClientSideWebParts(sourceProps, alertMe, consoleLog, we
     let fetchAPI = `${useUrl}/_api/web/GetClientSideWebParts?`;
     if (selectThese)
         fetchAPI += `&$select= ${selectThese.join(',')}`;
-    if (orderBy)
-        fetchAPI += `&$orderby=${orderBy}`;
+    const orderBys = [];
+    /**
+     *  2025-02-09:  Updated the orderBy for when there is no orderBy.prop or .order
+     *    https://github.com/mikezimm/PageInfo/issues/178
+     */
+    if (orderBy && orderBy.prop)
+        orderBys.push(`${orderBy.prop} ${orderBy.order ? orderBy.order : 'asc'}`);
+    if (orderBy2 && orderBy2.prop)
+        orderBys.push(`${orderBy2.prop} ${orderBy2.order ? orderBy2.order : 'asc'}`);
+    if (orderBys.length > 0)
+        fetchAPI += `&$orderby=${orderBys.join(',')}`;
+    if (restFilter)
+        fetchAPI += `&$filter= ${restFilter}`;
     if (webpartId) {
         fetchAPI += `&$filter=Id eq '${webpartId}'`;
     }
     else if (restFilter) {
         fetchAPI += `&$filter= ${restFilter}`;
     }
-    const orderBys = [];
-    if (orderBy)
-        orderBys.push(`${orderBy.prop} ${orderBy.order}`);
     const result = await doSpHttpFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.fpsSpService, '', alertMe, consoleLog, webpartId ? 'webpart' : 'webparts', false, null);
     if (check4This(`fpsShowFetchResults=true`) === true) {
         console.log(`fps-core-v7 COMPLETE: getClientSideWebParts ~ 49`, result);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"getClientSideWebParts.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getClientSideWebParts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAE5G,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AAEnG;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B,EAAE,YAAoB,EAAE;IAE3J,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,GAAG,WAAW,CAAC;~~IAC7C~~,IAAI,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEnC,sIAAsI;IACtI,MAAM,MAAM,GAAW,4BAA4B,CAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAC;IAE9J,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,mBAAmB,EAAE,CAAC,CAAC;QACxD,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAG,CAAC;QACzE,OAAO,OAAO,CAAC;KAChB;IAED,IAAK,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAG,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC;IACtE,IAAI,QAAQ,GAAW,GAAG,MAAM,kCAAkC,CAAC;IACnE,IAAK,WAAW;QAAG,QAAQ,IAAI,aAAa,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;~~IACpE~~,IAAK,OAAO;QAAG,QAAQ,IAAI,~~aAAa~~,OAAO,EAAE,~~CAAC~~;~~IAClD~~,IAAK,~~SAAS~~,~~EAAG~~;~~QAAE~~,QAAQ,IAAI,~~mBAAmB~~,~~SAAS~~,~~GAAG~~,CAAC~~;KAAE;SAC5D~~,IAAK,~~UAAU~~,~~EAAG;QAAE~~,QAAQ,~~IAAI~~,~~aAAa~~,~~UAAU~~,EAAE,CAAC;~~KAAE;IAEjE~~,MAAM,QAAQ,~~GAAa~~,EAAE,CAAC;~~IAC9B~~,IAAK,~~OAAO~~;QAAG,QAAQ,CAAC,IAAI,~~CAAE~~,~~GAAI~~,~~OAAO~~,CAAC,IAAK,~~IAAK~~,~~OAAO~~,~~CAAC~~,~~KAAM~~,EAAE,~~CAAE,CAAE~~;~~IAExE~~,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAExK,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,kDAAkD,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAEvI,OAAO,MAAM,CAAC;AAEhB,CAAC"}
1	+ {"version":3,"file":"getClientSideWebParts.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getClientSideWebParts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAE5G,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AAEnG;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B,EAAE,YAAoB,EAAE;IAE3J,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,GAAG,GAAG,WAAW,CAAC;IACvD,IAAI,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEnC,sIAAsI;IACtI,MAAM,MAAM,GAAW,4BAA4B,CAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAC;IAE9J,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,mBAAmB,EAAE,CAAC,CAAC;QACxD,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAG,CAAC;QACzE,OAAO,OAAO,CAAC;KAChB;IAED,IAAK,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAG,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC;IACtE,IAAI,QAAQ,GAAW,GAAG,MAAM,kCAAkC,CAAC;IACnE,IAAK,WAAW;QAAG,QAAQ,IAAI,aAAa,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAEpE,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B;;;OAGG;IACH,IAAK,OAAO,IAAI,OAAO,CAAC,IAAI;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,OAAO,CAAC,IAAK,IAAK,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAM,EAAE,CAAE,CAAE;IAChH,IAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,QAAQ,CAAC,IAAK,IAAK,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,KAAO,EAAE,CAAE,CAAC;IACrH,IAAK,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,aAAc,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAE,EAAE,CAAC;IAE1E,IAAK,UAAU;QAAG,QAAQ,IAAI,aAAa,UAAU,EAAE,CAAC;IAExD,IAAK,SAAS,EAAG;QAAE,QAAQ,IAAI,mBAAmB,SAAS,GAAG,CAAC;KAAE;SAC5D,IAAK,UAAU,EAAG;QAAE,QAAQ,IAAI,aAAa,UAAU,EAAE,CAAC;KAAE;IAGjE,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAExK,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI,EAAG;QAAE,OAAO,CAAC,GAAG,CAAE,kDAAkD,EAAE,MAAM,CAAE,CAAA;KAAE;IAAA,CAAC;IAEvI,OAAO,MAAM,CAAC;AAEhB,CAAC"}

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

@@ -54,7 +54,7 @@ export async function getSiteAPI(sourceProps, apiType = 'site', alertMe, console
           $select=Id,Title
     */
     let fetchAPI = `${useUrl}/_api/${apiType === 'subsites' ? `web/webs` : apiType}?}`;
-    fetchAPI += `$select=${selectThese && selectThese.length > 0 ? selectThese.join(',') : MinUserSelect.join(',')}&`;
+    fetchAPI += `&$select=${selectThese && selectThese.length > 0 ? selectThese.join(',') : MinUserSelect.join(',')}`;
     // const result: IFpsSiteReturn = await doSpJsFetchOrPost(fetchAPI, 'GET', sourceProps.digestValue as '', '', null ) as unknown as IFpsSiteReturn;
     const result = await doSpHttpFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.fpsSpService, '', alertMe, consoleLog, apiType, false, null);
     let count = 0;

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,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,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;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;AAGD;;;;;;;;;;;;GAYG;AACH,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,yJAAyJ;IACzJ,wFAAwF;IAExF;;;;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,kJAAkJ;IAClJ,MAAM,MAAM,GAAmB,MAAM,2BAA2B,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,OAAgB,EAAE,KAAK,EAAE,IAAI,CAA+B,CAAC;IAClM,IAAI,KAAK,GAAW,CAAC,CAAC;IACtB,IAAK,OAAO,KAAK,MAAM,EAAG;QACxB,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7C,KAAK,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAC7C;SAAM,IAAK,OAAO,KAAK,KAAK,EAAG;QAC9B,MAAM,CAAG,KAAe,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,KAAK,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAC7C;SAAM,IAAK,OAAO,KAAK,UAAU,EAAG;QACnC,MAAM,CAAG,MAAiB,CAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,KAAK,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;KAC/E;IAED,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,GAAG,QAAQ,cAAc,EAAE,CAAC;IAEpE,qCAAqC;IACrC,sEAAsE;IACtE,gEAAgE;IAChE,MAAM;IAEN,sGAAsG;IACtG,uEAAuE;IACvE,gDAAgD;IAEhD,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/sites/getSiteFeaturesAPI.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getSiteFeaturesAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getSiteFeaturesAPI.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAKhG;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,SAAS,GAAE,MAAW,GAAI,OAAO,CAAC,eAAe,CAAC,~~CAmCrL~~"}
1	+ {"version":3,"file":"getSiteFeaturesAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getSiteFeaturesAPI.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAuB,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAKhG;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,SAAS,GAAE,MAAW,GAAI,OAAO,CAAC,eAAe,CAAC,CAyCrL"}

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

@@ -18,7 +18,7 @@ export async function getSiteFeaturesAPI(sourceProps, alertMe, consoleLog, featu
     // const { performanceSettings } = sourceProps;
     // 2024-09-15:  Change to null as any to pass linting when migrating from fps-library-v2
     // const fetchOp = performanceSettings ? startPerformOpV2( performanceSettings ) : null as any;
-    const { orderBy, restFilter, } = sourceProps;
+    const { orderBy, orderBy2, restFilter, } = sourceProps;
     let { 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 = getSiteCollectionUrlFromLink(sourceProps.absoluteWebUrl ? sourceProps.absoluteWebUrl : sourceProps.webUrl ? sourceProps.webUrl : '');
@@ -34,17 +34,23 @@ export async function getSiteFeaturesAPI(sourceProps, alertMe, consoleLog, featu
     let fetchAPI = `${useUrl}/_api/site/features?`;
     if (selectThese)
         fetchAPI += `&$select= ${selectThese.join(',')}`;
-    if (orderBy)
-        fetchAPI += `&$orderby=${orderBy}`;
+    const orderBys = [];
+    /**
+     *  2025-02-09:  Updated the orderBy for when there is no orderBy.prop or .order
+     *    https://github.com/mikezimm/PageInfo/issues/178
+     */
+    if (orderBy && orderBy.prop)
+        orderBys.push(`${orderBy.prop} ${orderBy.order ? orderBy.order : 'asc'}`);
+    if (orderBy2 && orderBy2.prop)
+        orderBys.push(`${orderBy2.prop} ${orderBy2.order ? orderBy2.order : 'asc'}`);
+    if (orderBys.length > 0)
+        fetchAPI += `&$orderby=${orderBys.join(',')}`;
     if (featureId) {
         fetchAPI += `&$filter=Id eq '${featureId}'`;
     }
     else if (restFilter) {
         fetchAPI += `&$filter= ${restFilter}`;
     }
-    const orderBys = [];
-    if (orderBy)
-        orderBys.push(`${orderBy.prop} ${orderBy.order}`);
     const result = await doSpHttpFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.fpsSpService, '', alertMe, consoleLog, featureId ? 'feature' : 'features', false, null);
     if (check4This(`fpsShowFetchResults=true`) === true) {
         console.log(`fps-core-v7 COMPLETE: getSiteFeaturesAPI ~ 53`, result);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"getSiteFeaturesAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getSiteFeaturesAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAE5G,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AAEnG;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B,EAAE,YAAoB,EAAE;IAExJ,+CAA+C;IAC/C,wFAAwF;IACxF,+FAA+F;IAE/F,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,GAAG,WAAW,CAAC;~~IAC7C~~,IAAI,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEnC,sIAAsI;IACtI,MAAM,MAAM,GAAW,4BAA4B,CAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAC;IAE9J,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,mBAAmB,EAAE,CAAC,CAAC;QACxD,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAG,CAAC;QACzE,OAAO,OAAO,CAAC;KAChB;IAED,IAAK,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAG,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC;IACtE,IAAI,QAAQ,GAAW,GAAG,MAAM,sBAAsB,CAAC;IACvD,IAAK,WAAW;QAAG,QAAQ,IAAI,aAAa,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;~~IACpE~~,IAAK,OAAO;QAAG,QAAQ,IAAI,~~aAAa~~,OAAO,EAAE,~~CAAC~~;~~IAClD~~,IAAK,~~SAAS~~,~~EAAG~~;~~QAAE~~,QAAQ,IAAI,~~mBAAmB~~,~~SAAS~~,~~GAAG~~,CAAC~~;KAAE;SAC5D~~,IAAK,~~UAAU~~,~~EAAG;QAAE~~,QAAQ,~~IAAI~~,~~aAAa~~,~~UAAU~~,EAAE,CAAC;~~KAAE;IAEjE~~,MAAM,QAAQ,~~GAAa~~,EAAE,CAAC;~~IAC9B~~,IAAK,~~OAAO~~;~~QAAG~~,QAAQ,~~CAAC,~~IAAI,~~CAAE~~,~~GAAI~~,~~OAAO~~,CAAC,IAAK,~~IAAK~~,~~OAAO~~,~~CAAC~~,~~KAAM~~,EAAE,~~CAAE,CAAE~~;~~IAExE~~,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAExK,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":"getSiteFeaturesAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/sites/getSiteFeaturesAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAgB,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAE5G,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AAEnG;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B,EAAE,YAAoB,EAAE;IAExJ,+CAA+C;IAC/C,wFAAwF;IACxF,+FAA+F;IAE/F,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,GAAG,GAAG,WAAW,CAAC;IACvD,IAAI,EAAE,WAAW,GAAG,GAAG,WAAW,CAAC;IAEnC,sIAAsI;IACtI,MAAM,MAAM,GAAW,4BAA4B,CAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAC;IAE9J,IAAK,CAAC,MAAM,EAAG;QACb,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,mBAAmB,EAAE,CAAC,CAAC;QACxD,MAAM,OAAO,GAAoB,wBAAwB,CAAE,MAAM,EAAE,EAAE,CAAG,CAAC;QACzE,OAAO,OAAO,CAAC;KAChB;IAED,IAAK,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAG,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC;IACtE,IAAI,QAAQ,GAAW,GAAG,MAAM,sBAAsB,CAAC;IACvD,IAAK,WAAW;QAAG,QAAQ,IAAI,aAAa,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAEpE,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B;;;OAGG;IACH,IAAK,OAAO,IAAI,OAAO,CAAC,IAAI;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,OAAO,CAAC,IAAK,IAAK,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAM,EAAE,CAAE,CAAE;IAChH,IAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI;QAAG,QAAQ,CAAC,IAAI,CAAE,GAAI,QAAQ,CAAC,IAAK,IAAK,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,KAAO,EAAE,CAAE,CAAC;IACrH,IAAK,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAG,QAAQ,IAAG,aAAc,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAE,EAAE,CAAC;IAE1E,IAAK,SAAS,EAAG;QAAE,QAAQ,IAAI,mBAAmB,SAAS,GAAG,CAAC;KAAE;SAC5D,IAAK,UAAU,EAAG;QAAE,QAAQ,IAAI,aAAa,UAAU,EAAE,CAAC;KAAE;IAEjE,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAExK,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/users/getSiteUsersAPI.js CHANGED Viewed

@@ -37,14 +37,14 @@ export async function getSiteUsersAPI(sourceProps, alertMe, consoleLog, size = '
     */
     let fetchAPI = `${useUrl}/_api/web/siteUsers?`; //$select=${UserGroupSelects.join(',')
-    fetchAPI += `$select=${selectThese && selectThese.length > 0 ? selectThese.join(',') : MinUserSelect.join(',')}&`;
+    fetchAPI += `&$select=${selectThese && selectThese.length > 0 ? selectThese.join(',') : MinUserSelect.join(',')}`;
     /**
      *   2024-12-06:  Discovered that encodeURIComponent is not required and can actually cause issues if
      *      you call it twice on the same string... then it will encode the encoded characters causing incorrect filter string.
      *      if ( restFilter ) fetchAPI+= `$filter=${ encodeURIComponent(restFilter) }&`; <<< BAD
      */
     if (restFilter)
-        fetchAPI += `$filter=${restFilter}&`;
+        fetchAPI += `&$filter=${restFilter}`;
     const result = await doSpHttpFetchOrPostAndCheck(fetchAPI, 'GET', sourceProps.fpsSpService, '', alertMe, consoleLog, 'users', false, null);
     // result.users = result.items ? result.items : [];
     // result.fpsContentType = [ 'user' ];

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,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,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;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,oEAAoE,CAAC;AACnG,OAAO,EAAE,qBAAqB,EAAE,MAAM,uDAAuD,CAAC;AAK9F,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAE,WAAyB,EAAE,OAA4B,EAAE,UAA+B,EAAE,IAAwB;IACxJ,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,EAAE,IAAI,CAAE,CAAC;IACrH,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,EAAE,OAA0B,GAAG;IAE5J,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,2BAA2B,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAG,OAAO,EAAE,UAAU,EAAE,OAAO,EAAG,KAAK,EAAE,IAAI,CAAgC,CAAC;IAE7L,mDAAmD;IACnD,sCAAsC;IACtC,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,cAAc,EAAE,CAAC;IACrE,8DAA8D;IAE9D;;OAEG;IACH,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAmB,EAAE,EAAE;QACtD,2IAA2I;QAC3I,MAAM,QAAQ,GAAG,GAAG,aAAa,oCAAqC,IAAI,IAAI,GAAI,gBAAgB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAE,IAAI,CAAC,SAAS,CAAG,EAAE,CAAC;QACvK,OAAO,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,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"}
1	+ {"version":3,"file":"getSiteUsersAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/sites/users/getSiteUsersAPI.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@mikezimm/fps-core-v7",
-  "version": "1.0.107",
+  "version": "1.0.109",
   "description": "Library of reusable core interfaces, types and constants migrated from fps-library-v2",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

package/lib/restAPIs/lists/items/getFpsPageAsXmlAPI.d.ts.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"file":"getFpsPageAsXmlAPI.d.ts","sourceRoot":"","sources":["../../../../src/restAPIs/lists/items/getFpsPageAsXmlAPI.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAA+C,MAAM,yDAAyD,CAAC;AACpI,OAAO,EAAE,eAAe,EAAE,MAAM,+DAA+D,CAAC;AAMhG,OAAO,EAAE,WAAW,EAAE,MAAM,6CAA6C,CAAC;AAE1E,MAAM,WAAW,aAAc,SAAQ,OAAO,CAAC,GAAG,CAAC;IACjD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IAC1D,IAAI,CAAC,EAAE,aAAa,CAAC;CACtB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EACxD,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,GAAK,OAAO,CAAC,mBAAmB,CAAC,CA4D/F"}

package/lib/restAPIs/lists/items/getFpsPageAsXmlAPI.js.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"file":"getFpsPageAsXmlAPI.js","sourceRoot":"","sources":["../../../../src/restAPIs/lists/items/getFpsPageAsXmlAPI.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAgB,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC,CAAC,iBAAiB;AAEtJ,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,wBAAwB,EAAE,MAAM,6EAA6E,CAAC;AACvH,OAAO,EAAE,gCAAgC,EAAE,MAAM,0DAA0D,CAAC;AAC5G,OAAO,EAAE,gBAAgB,EAAE,MAAM,oEAAoE,CAAC;AAkBtG;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAyB,EAAE,QAAiB,EAAE,EAAU,EACxD,OAA4B,EAAE,UAA+B;IAE7D,MAAM,EAAE,SAAS,GAAG,GAAG,WAAW,CAAC;IAEnC,sIAAsI;IACtI,MAAM,MAAM,GAAW,gCAAgC,CAAE,WAAW,CAAE,CAAC;IACvE,IAAI,QAAQ,GAAW,GAAG,MAAM,+BAA+B,SAAS,UAAU,CAAC;IAEnF,IAAK,CAAC,MAAM,IAAI,CAAC,SAAS,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,SAAS,EAAG;QACxE,2BAA2B;QAC3B,IAAK,OAAO,KAAK,IAAI;YAAG,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAuB,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAC3G,MAAM,OAAO,GAAwB,wBAAwB,CAAE,MAAM,EAAE,SAAS,CAAG,CAAC;QACpF,IAAK,EAAE,GAAG,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,SAAS,EAAG;YAC/C,OAAO,CAAC,UAAU,GAAG,0BAA0B,CAAC;YAChD,IAAK,OAAO,CAAC,SAAS;gBAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,GAAI,OAAO,CAAC,UAAU,CAAC;SAC3E;QACD,OAAO,OAAO,CAAC;KAChB;IAED;;;;;;;;;MASE;IAEF;;;;;;OAMG;IACH,MAAM,WAAW,GAAG,CAAE,GAAG,CAAE,CAAC,CAAC,6EAA6E;IAE1G;;;OAGG;IACH,QAAQ,IAAI,YAAY,EAAE,sBAAsB,CAAC;IAEjD,QAAQ,IAAG,WAAY,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAE/C,qDAAqD;IACrD,IAAI,UAAU,GAAa,gBAAgB,CAAE,WAAuB,CAAE,CAAC;IAEvE,QAAQ,IAAI,YAAY,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAE/C,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAE,CAAC;IAE5I,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,GAAG,kBAAkB,SAAS,IAAI,EAAE,EAAE,CAAC;IAE/E,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"}