@mikezimm/fps-library-v2 1.2.49 → 1.2.50

package/lib/components/molecules/Categories/Highlights/HighlightRegArrays.d.ts

@@ -0,0 +1,18 @@
+import { ICustomRegexSearch } from '../applyRegExpXSearchObject';
+/**
+ * Originally made for Hub Connections auto-filter buttons
+ * HighlightRegArrays will show all ICustomRegexSearch arrays and keys and highlight any matches if blueAllRegex === false.
+ * @param CustomSearch
+ * @param testString
+ * @param blueAllRegex
+ * @returns
+ */
+export declare function HighlightRegArrays(CustomSearch: ICustomRegexSearch, testString: string, blueAllRegex?: boolean): JSX.Element;
+export declare const RegexSiteInfo: JSX.Element;
+/**
+ * pass in extraInfo such as RegexSiteInfo above which is what we use in Hub Connections web part
+ * @param extraInfo
+ * @returns
+ */
+export declare function GeneralRegexInfo(extraInfo: JSX.Element, headingClass: string): JSX.Element;
+//# sourceMappingURL=HighlightRegArrays.d.ts.map

package/lib/components/molecules/Categories/Highlights/HighlightRegArrays.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"HighlightRegArrays.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/Categories/Highlights/HighlightRegArrays.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAKjE;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAE,YAAY,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,GAAE,OAAe,GAAI,GAAG,CAAC,OAAO,CAgCrI;AAED,eAAO,MAAM,aAAa,aAAgM,CAAC;AAE3N;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAE,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,GAAI,GAAG,CAAC,OAAO,CAQ5F"}

package/lib/components/molecules/Categories/Highlights/HighlightRegArrays.js

@@ -0,0 +1,58 @@
+import * as React from 'react';
+import { highlightStringBetweenB } from './highlightRegex';
+// 2024-07-29:  Migrated from HubCon only updating css require
+require('@mikezimm/fps-styles/dist/HighlightReg.css');
+/**
+ * Originally made for Hub Connections auto-filter buttons
+ * HighlightRegArrays will show all ICustomRegexSearch arrays and keys and highlight any matches if blueAllRegex === false.
+ * @param CustomSearch
+ * @param testString
+ * @param blueAllRegex
+ * @returns
+ */
+export function HighlightRegArrays(CustomSearch, testString, blueAllRegex = false) {
+    const MatchedRegex = [];
+    const CustomSearchElement = React.createElement("div", { className: 'regArrays' }, Object.keys(CustomSearch).map(key => {
+        return React.createElement("div", { key: key, className: 'ARegexCat' },
+            React.createElement("h2", null, key),
+            React.createElement("ul", null, CustomSearch[key].map(reg => {
+                const wasFound = testString.match(reg) ? true : false;
+                if (wasFound === true)
+                    MatchedRegex.push(reg);
+                const highlighted = wasFound === false ? highlightStringBetweenB(`${reg}`, false) : highlightStringBetweenB(`${reg}`, true);
+                // console.log( `render highlighted type = ${ typeof highlighted }`, `${reg}`);
+                return React.createElement("li", { className: blueAllRegex === true ? 'regHelp' : wasFound === true ? 'regMatch' : 'regNull', key: `${reg}` }, highlighted);
+            })));
+    }));
+    // eslint-disable-next-line @rushstack/security/no-unsafe-regexp
+    const combinedRegex = new RegExp(MatchedRegex.map(r => r.source).join('|'), 'g');
+    const stringToSearch = testString;
+    const matches = stringToSearch.match(combinedRegex);
+    console.log('HubCategories ~ render matches', matches);
+    return CustomSearchElement;
+}
+export const RegexSiteInfo = React.createElement("div", null,
+    "If a site/subsite",
+    `'`,
+    "s Title or Description has any of the words in ",
+    React.createElement("b", { style: { color: 'blue' } }, "blue"),
+    ", the site should show up in the Category Name at the top of each group.");
+/**
+ * pass in extraInfo such as RegexSiteInfo above which is what we use in Hub Connections web part
+ * @param extraInfo
+ * @returns
+ */
+export function GeneralRegexInfo(extraInfo, headingClass) {
+    return React.createElement("div", null,
+        React.createElement("div", { className: headingClass ? headingClass : 'secHeading' }, "The details:"),
+        React.createElement("div", null,
+            "We are using ",
+            React.createElement("a", { rel: "noreferrer", target: '_blank', href: 'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions' }, " Javascript Regular Expressions"),
+            " to determine the categories a site falls under."),
+        extraInfo,
+        React.createElement("div", null,
+            "Copy the Regular Expression to a tool like ",
+            React.createElement("a", { rel: "noreferrer", target: '_blank', href: 'https://regex101.com/' }, "Regex 101"),
+            " in order to test on some text."));
+}
+//# sourceMappingURL=HighlightRegArrays.js.map

package/lib/components/molecules/Categories/Highlights/HighlightRegArrays.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HighlightRegArrays.js","sourceRoot":"","sources":["../../../../../src/components/molecules/Categories/Highlights/HighlightRegArrays.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAG3D,8DAA8D;AAC9D,OAAO,CAAC,4CAA4C,CAAC,CAAC;AAEtD;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAE,YAAgC,EAAE,UAAkB,EAAE,eAAwB,KAAK;IAErH,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,mBAAmB,GAAgB,6BAAK,SAAS,EAAG,WAAW,IACjE,MAAM,CAAC,IAAI,CAAE,YAAY,CAAE,CAAC,GAAG,CAAE,GAAG,CAAC,EAAE;QACvC,OAAO,6BAAK,GAAG,EAAG,GAAG,EAAE,SAAS,EAAG,WAAW;YAC5C,gCAAO,GAAG,CAAO;YACjB,gCAEI,YAAY,CAAE,GAAG,CAAE,CAAC,GAAG,CAAE,GAAG,CAAC,EAAE;gBAC7B,MAAM,QAAQ,GAAY,UAAU,CAAC,KAAK,CAAE,GAAG,CAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;gBACjE,IAAK,QAAQ,KAAK,IAAI;oBAAG,YAAY,CAAC,IAAI,CAAE,GAAG,CAAE,CAAC;gBAClD,MAAM,WAAW,GAAG,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,uBAAuB,CAAE,GAAG,GAAG,EAAE,EAAE,KAAK,CAAE,CAAC,CAAC,CAAC,uBAAuB,CAAE,GAAG,GAAG,EAAE,EAAE,IAAI,CAAE,CAAC;gBAChI,+EAA+E;gBAC/E,OAAO,4BAAI,SAAS,EAAK,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EAAG,GAAG,EAAG,GAAG,GAAG,EAAE,IAAK,WAAW,CAAO,CAAA;YACjJ,CAAC,CAAC,CAED,CACD,CAAA;IACR,CAAC,CAAC,CAEE,CAAC;IAEP,gEAAgE;IAChE,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACjF,MAAM,cAAc,GAAG,UAAU,CAAC;IAClC,MAAM,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAEpD,OAAO,CAAC,GAAG,CAAE,gCAAgC,EAAE,OAAO,CAAE,CAAC;IAEzD,OAAO,mBAAmB,CAAC;AAE7B,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG;;IAAuB,GAAG;;IAAgD,2BAAG,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAU;+EAA8E,CAAC;AAE3N;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAE,SAAsB,EAAE,YAAoB;IAC5E,OAAO;QACH,6BAAK,SAAS,EAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,mBAAqB;QAChF;;YAAkB,2BAAG,GAAG,EAAC,YAAY,EAAC,MAAM,EAAC,QAAQ,EAAC,IAAI,EAAC,mFAAmF,sCAAoC;+DAAsD;QACtO,SAAS;QACX;;YAAgD,2BAAG,GAAG,EAAC,YAAY,EAAC,MAAM,EAAC,QAAQ,EAAC,IAAI,EAAC,uBAAuB,gBAAc;8CAAqC,CAC/J,CAAC;AAEX,CAAC"}

package/lib/components/molecules/Categories/Highlights/highlightRegex.d.ts

@@ -0,0 +1,2 @@
+export declare function highlightStringBetweenB(str: string, highlight: boolean): JSX.Element;
+//# sourceMappingURL=highlightRegex.d.ts.map

package/lib/components/molecules/Categories/Highlights/highlightRegex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"highlightRegex.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/Categories/Highlights/highlightRegex.tsx"],"names":[],"mappings":"AAIA,wBAAgB,uBAAuB,CAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAI,GAAG,CAAC,OAAO,CAQtF"}

package/lib/components/molecules/Categories/Highlights/highlightRegex.js

@@ -0,0 +1,12 @@
+import * as React from 'react';
+// 2024-07-29:  Migrated from HubCon
+export function highlightStringBetweenB(str, highlight) {
+    const splits = str.split('\\b');
+    if (splits.length !== 3)
+        return React.createElement("span", { style: { backgroundColor: highlight === true ? 'yellow' : null } }, str);
+    return React.createElement("span", null,
+        React.createElement("span", null, `${splits[0]}\\b`),
+        React.createElement("span", null, `${splits[1]}`),
+        React.createElement("span", null, `\\b${splits[2]}`));
+}
+//# sourceMappingURL=highlightRegex.js.map

package/lib/components/molecules/Categories/Highlights/highlightRegex.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"highlightRegex.js","sourceRoot":"","sources":["../../../../../src/components/molecules/Categories/Highlights/highlightRegex.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,oCAAoC;AAEpC,MAAM,UAAU,uBAAuB,CAAE,GAAW,EAAE,SAAkB;IAEtE,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAEhC,IAAK,MAAM,CAAC,MAAM,KAAK,CAAC;QAAG,OAAO,8BAAM,KAAK,EAAE,EAAE,eAAe,EAAE,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,IAAG,GAAG,CAAQ,CAAC;IAEvH,OAAO;QAAM,kCAAO,GAAI,MAAM,CAAC,CAAC,CAAE,KAAK,CAAQ;QAAA,kCAAO,GAAI,MAAM,CAAC,CAAC,CAAE,EAAE,CAAQ;QAAA,kCAAO,MAAO,MAAM,CAAC,CAAC,CAAE,EAAE,CAAQ,CAAO,CAAC;AAE1H,CAAC"}

package/lib/components/molecules/Categories/ICategoriesProps.d.ts

@@ -0,0 +1,30 @@
+import { IWebpartBannerProps } from '../../../banner/mainReact/IWebpartBannerProps';
+import { ICustomRegexSearch } from './applyRegExpXSearchObject';
+export type IDefSourceType = 'lists...' | '' | '' | '' | '' | '*';
+export interface ICategoryInfo {
+    label: string;
+    value: string;
+}
+export interface ICategoriesProps {
+    bannerProps: IWebpartBannerProps;
+    expandedState: boolean;
+    CustomSearch: ICustomRegexSearch;
+    HeadingHelp: JSX.Element;
+    text1?: ICategoryInfo;
+    text2?: ICategoryInfo;
+}
+/**
+ * Extends IFPSCorePinMeReactComponentState with all basics required for FPS Banner
+ */
+export interface ICategoriesState {
+    testString: string;
+    text1?: string;
+    text2?: string;
+    searchText: string;
+    topSearch: number[];
+    topIdx?: number;
+    topMeta?: string;
+    topSearchLabels?: string[];
+    showAccordion: boolean;
+}
+//# sourceMappingURL=ICategoriesProps.d.ts.map

package/lib/components/molecules/Categories/ICategoriesProps.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ICategoriesProps.d.ts","sourceRoot":"","sources":["../../../../src/components/molecules/Categories/ICategoriesProps.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;AAElE,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,mBAAmB,CAAC;IACjC,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,kBAAkB,CAAC;IACjC,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAE3B,aAAa,EAAE,OAAO,CAAC;CAExB"}

package/lib/components/molecules/Categories/ICategoriesProps.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ICategoriesProps.js.map

package/lib/components/molecules/Categories/ICategoriesProps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ICategoriesProps.js","sourceRoot":"","sources":["../../../../src/components/molecules/Categories/ICategoriesProps.ts"],"names":[],"mappings":""}

package/lib/components/molecules/Categories/applyRegExpXSearchObject.d.ts

@@ -0,0 +1,46 @@
+/**
+ * Imported from HubCon 2024-07-29 as is.
+ */
+import { IAnySourceItem } from "../AnyContent/IAnyContent";
+/**
+ * ICustomRegexSearch expects an object like this with any Keys that have RegExp[] as a prop:
+ *
+  Customer1?: RegExp[];
+  Customer2?: RegExp[];
+  Customer?: RegExp[];
+  Facilities?: RegExp[];
+ */
+export interface ICustomRegexSearch {
+    [key: string]: RegExp[];
+}
+export type IXSearchArray = 'topSearch' | 'leftSearch' | 'rightSearch' | 'typeSearch';
+/**
+ * applyRegExpXSearchObject is built to take
+ * @param items - array of IAnySourceItem
+ * @param keys - array of item.props you want to search for like ['Title', 'Description'] etc...
+ * @param Uncategorized
+ * @param searchKeyX - like 'topSearch' 'leftSearch' 'rightSearch'
+ * @param EasyRegexSearch
+ * @returns
+ */
+export declare function applyRegExpXSearchObject(items: IAnySourceItem[], keys: string[], Uncategorized: 'Uncategorized', searchKeyX: IXSearchArray, EasyRegexSearch?: ICustomRegexSearch): IAnySourceItem[];
+/**
+ * addARegExTopSearchArray is built to be called by applyRegExpXSearchObject ^^^^^^^^^
+ * addARegExTopSearchArray does the work of adding TopSearch info based on a single array of reg exp.
+ * it adds a specific label to the Search and topSearch array if any of the regex in the array are found.
+ * @param items - array of IAnySourceItem
+ * @param keys - array of item.props you want to search for like ['Title', 'Description'] etc...
+ * @param ARegex - [key: string]: RegExp [];
+ * @param label - label value to apply if Regex match is found... typically the key of ICustomRegexSearch
+ * @returns
+ */
+export declare function addARegExXSearchArray(items: IAnySourceItem[], keys: string[], searchKeyX: IXSearchArray, ARegex: RegExp[], label: string): IAnySourceItem[];
+/**
+ *
+ * @param item - array of IAnySourceItem
+ * @param ARegex - [key: string]: RegExp [];
+ * @param keys - array of item.props you want to search for like ['Title', 'Description'] etc...
+ * @returns
+ */
+export declare function isAnyRegexFoundOnKeys(item: IAnySourceItem, ARegex: RegExp[], keys: string[]): boolean;
+//# sourceMappingURL=applyRegExpXSearchObject.d.ts.map

package/lib/components/molecules/Categories/applyRegExpXSearchObject.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"applyRegExpXSearchObject.d.ts","sourceRoot":"","sources":["../../../../src/components/molecules/Categories/applyRegExpXSearchObject.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAK3D;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IACjC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAG,CAAC;CAC1B;AAGD,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,YAAY,GAAG,aAAa,GAAG,YAAY,CAAC;AAEtF;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAE,KAAK,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,aAAa,EAAG,eAAe,EAAE,UAAU,EAAE,aAAa,EAAE,eAAe,GAAE,kBAAyD,GAAK,cAAc,EAAE,CAU7O;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAE,KAAK,EAAE,cAAc,EAAE,EAAG,IAAI,EAAE,MAAM,EAAE,EAAG,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAK,cAAc,EAAE,CAehK;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAK,OAAO,CAQxG"}

package/lib/components/molecules/Categories/applyRegExpXSearchObject.js

@@ -0,0 +1,68 @@
+/**
+ * Imported from HubCon 2024-07-29 as is.
+ */
+import { check4This } from "@mikezimm/fps-pnp2/lib/services/sp/CheckSearch";
+// import { check4This } from "../../fpsReferences";
+import { EasySearchCorp } from "./EasySearchCorp/EasySearchCorp";
+/**
+ * applyRegExpXSearchObject is built to take
+ * @param items - array of IAnySourceItem
+ * @param keys - array of item.props you want to search for like ['Title', 'Description'] etc...
+ * @param Uncategorized
+ * @param searchKeyX - like 'topSearch' 'leftSearch' 'rightSearch'
+ * @param EasyRegexSearch
+ * @returns
+ */
+export function applyRegExpXSearchObject(items, keys, Uncategorized, searchKeyX, EasyRegexSearch = EasySearchCorp) {
+    Object.keys(EasyRegexSearch).map(key => {
+        items = addARegExXSearchArray(items, keys, searchKeyX, EasyRegexSearch[key], key);
+    });
+    if (Uncategorized)
+        items.map(item => { if (item.FPSItem.Search[searchKeyX].length === 0)
+            item.FPSItem.Search[searchKeyX].push(Uncategorized); });
+    return items;
+}
+/**
+ * addARegExTopSearchArray is built to be called by applyRegExpXSearchObject ^^^^^^^^^
+ * addARegExTopSearchArray does the work of adding TopSearch info based on a single array of reg exp.
+ * it adds a specific label to the Search and topSearch array if any of the regex in the array are found.
+ * @param items - array of IAnySourceItem
+ * @param keys - array of item.props you want to search for like ['Title', 'Description'] etc...
+ * @param ARegex - [key: string]: RegExp [];
+ * @param label - label value to apply if Regex match is found... typically the key of ICustomRegexSearch
+ * @returns
+ */
+export function addARegExXSearchArray(items, keys, searchKeyX, ARegex, label) {
+    items.forEach(item => {
+        if (!item.FPSItem.Search[searchKeyX])
+            item.FPSItem.Search[searchKeyX] = [];
+        if (isAnyRegexFoundOnKeys(item, ARegex, keys) === true) {
+            item.FPSItem.Search[searchKeyX].push(label);
+            item.FPSItem.Search.searchText += ` || ${label}`;
+            item.FPSItem.Search.searchTextLC += ` || ${label.toLocaleLowerCase()}`;
+        }
+        else {
+            if (label === 'Customer' && check4This('showAllConsole=true', true))
+                console.log('addHubMeta test fail', ARegex, keys, item.Title, item);
+        }
+    });
+    return items;
+}
+/**
+ *
+ * @param item - array of IAnySourceItem
+ * @param ARegex - [key: string]: RegExp [];
+ * @param keys - array of item.props you want to search for like ['Title', 'Description'] etc...
+ * @returns
+ */
+export function isAnyRegexFoundOnKeys(item, ARegex, keys) {
+    let found = false;
+    ARegex.map(filter => {
+        keys.map(key => {
+            if (typeof item[key] === 'string' && item[key].match(filter))
+                found = true;
+        });
+    });
+    return found;
+}
+//# sourceMappingURL=applyRegExpXSearchObject.js.map

package/lib/components/molecules/Categories/applyRegExpXSearchObject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"applyRegExpXSearchObject.js","sourceRoot":"","sources":["../../../../src/components/molecules/Categories/applyRegExpXSearchObject.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAC;AAE5E,oDAAoD;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAkBjE;;;;;;;;GAQG;AACH,MAAM,UAAU,wBAAwB,CAAE,KAAuB,EAAE,IAAc,EAAE,aAA+B,EAAE,UAAyB,EAAE,kBAAsC,cAAoC;IAEvN,MAAM,CAAC,IAAI,CAAE,eAAe,CAAE,CAAC,GAAG,CAAE,GAAG,CAAC,EAAE;QACxC,KAAK,GAAG,qBAAqB,CAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,CAAE,GAAG,CAAG,EAAE,GAAiB,CAAE,CAAC;IACvG,CAAC,CAAC,CAAC;IAEH,IAAK,aAAa;QAAG,KAAK,CAAC,GAAG,CAAE,IAAI,CAAC,EAAE,GAAG,IAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAE,UAAyB,CAAE,CAAC,MAAM,KAAK,CAAC;YAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAE,UAAyB,CAAE,CAAC,IAAI,CAAE,aAAa,CAAE,CAAA,CAAA,CAAC,CAAE,CAAC;IAEzL,OAAO,KAAK,CAAC;AAEf,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,qBAAqB,CAAE,KAAuB,EAAG,IAAc,EAAG,UAAyB,EAAE,MAAgB,EAAE,KAAa;IAE1I,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,IAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAE,UAAyB,CAAE;YAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAE,UAAyB,CAAE,GAAG,EAAE,CAAC;QAC/G,IAAK,qBAAqB,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAE,KAAK,IAAI,EAAG;YAC1D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAE,UAAyB,CAAE,CAAC,IAAI,CAAG,KAAK,CAAE,CAAC;YAChE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,OAAO,KAAK,EAAE,CAAC;YACjD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,OAAO,KAAK,CAAC,iBAAiB,EAAE,EAAE,CAAC;SACxE;aAAM;YACL,IAAK,KAAK,KAAK,UAAU,IAAI,UAAU,CAAE,qBAAqB,EAAE,IAAI,CAAE;gBAAG,OAAO,CAAC,GAAG,CAAE,sBAAsB,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAE,CAAC;SAChJ;IAEH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAE,IAAoB,EAAE,MAAgB,EAAE,IAAc;IAC3F,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,MAAM,CAAC,GAAG,CAAE,MAAM,CAAC,EAAE;QACnB,IAAI,CAAC,GAAG,CAAE,GAAG,CAAC,EAAE;YACd,IAAK,OAAO,IAAI,CAAE,GAAc,CAAE,KAAK,QAAQ,IAAI,IAAI,CAAE,GAAc,CAAE,CAAC,KAAK,CAAE,MAAM,CAAE;gBAAG,KAAK,GAAG,IAAI,CAAC;QAC3G,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC"}

package/lib/components/molecules/FPSTiles/functions/getFPSHubTiles.d.ts

@@ -1,5 +1,5 @@
 import { IFPSItem } from '../../AnyContent/IAnyContent';
-import { IFetchHubDepth } from '../../SpHttp/HubsSubs/fetches/fetchMyHubsites';
+import { IFetchHubDepth, IHubFilterType } from '../../SpHttp/HubsSubs/fetches/fetchMyHubsites';
 import { ISourceProps } from '../../../../pnpjs/SourceItems/Interface';
 import { ISourceSearch } from '../../SearchPage/Interfaces/ISourceSearch';
 import { IStateSourceHubSubs } from '../../SpHttp/HubsSubs/getHubAssocSites';
@@ -15,5 +15,15 @@ import { IItemIsAKeys } from '../../AnyContent/IsA/IFPSItemIsA';
  * @param departmentId - if for current site, leave empty, will get from bannerProps
  * @returns
  */
-export declare function getFPSHubTiles(bannerProps: IWebpartBannerProps, sourceProps: ISourceProps, search: ISourceSearch, webPartFPSItem: IFPSItem, departmentId?: string, depth?: IFetchHubDepth, surpressKeys?: IItemIsAKeys[]): Promise<IStateSourceHubSubs>;
+/**
+ * getFPSHubTiles was built for Hub Connection's web part to fetch both sites and webs.
+ *    Use the depth property to specify either sites or webs.
+ * @param bannerProps
+ * @param sourceProps
+ * @param search
+ * @param WPFPSItem - use buildFpsTileWPProps
+ * @param departmentId - if for current site, leave empty, will get from bannerProps
+ * @returns
+ */
+export declare function getFPSHubTiles(bannerProps: IWebpartBannerProps, sourceProps: ISourceProps, search: ISourceSearch, webPartFPSItem: IFPSItem, departmentId?: string, depth?: IFetchHubDepth, surpressKeys?: IItemIsAKeys[], filter?: IHubFilterType): Promise<IStateSourceHubSubs>;
 //# sourceMappingURL=getFPSHubTiles.d.ts.map

package/lib/components/molecules/FPSTiles/functions/getFPSHubTiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFPSHubTiles.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/FPSTiles/functions/getFPSHubTiles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,MAAM,+CAA+C,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAE7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAGvF,OAAO,EAAsB,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEpF;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAAE,WAAW,EAAE,mBAAmB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAClH,cAAc,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,KAAK,GAAE,cAAuB,EAC/E,YAAY,GAAE,YAAY,EAAuB,GAAI,OAAO,CAAC,mBAAmB,CAAC,CAuBtF"}
+{"version":3,"file":"getFPSHubTiles.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/FPSTiles/functions/getFPSHubTiles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAChH,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAE7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAGvF,OAAO,EAAsB,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEpF;;;;;;;;;GASG;AA8BH;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAAE,WAAW,EAAE,mBAAmB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EACtH,cAAc,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,KAAK,GAAE,cAAuB,EAC/E,YAAY,GAAE,YAAY,EAAuB,EAAE,MAAM,GAAE,cAA6B,GAAK,OAAO,CAAC,mBAAmB,CAAC,CAwB1H"}

package/lib/components/molecules/FPSTiles/functions/getFPSHubTiles.js

@@ -13,14 +13,44 @@ import { CommonSuppressKeys } from '../../AnyContent/IsA/IFPSItemIsA';
  * @param departmentId - if for current site, leave empty, will get from bannerProps
  * @returns
  */
-export async function getFPSHubTiles(bannerProps, sourceProps, search, webPartFPSItem, departmentId, depth = 'site', surpressKeys = CommonSuppressKeys) {
+// export async function getFPSHubTiles( bannerProps: IWebpartBannerProps, sourceProps: ISourceProps, search: ISourceSearch, 
+//       webPartFPSItem: IFPSItem, departmentId?: string, depth: IFetchHubDepth = 'site', 
+//       surpressKeys: IItemIsAKeys[] = CommonSuppressKeys ): Promise<IStateSourceHubSubs> {
+//   const useDepartmentId = departmentId ? departmentId : bannerProps.context.pageContext.legacyPageContext.departmentId;
+//   let results: IStateSourceHubSubs = await fetchMyHubsites( bannerProps.context.pageContext.web.absoluteUrl, depth, useDepartmentId,  ) as any;
+//   if (results.status !== 'Success') {
+//     results.itemsY = [ createErrorFPSTileItem( results, webPartFPSItem ) ];
+//   } else {
+//     results = processHubSubResults(results, sourceProps, search, departmentId );
+//     // moved code from makeFPSSubHubTileItemsV2 directly into here
+//     results = makeFPSSubHubTiles( results, bannerProps, webPartFPSItem, surpressKeys );
+//     // results = buildFPSAnyTileItems( results, bannerProps, webPartFPSItem, ) as IStateSourceHubSubs;
+//     // results = addFPSViewHighlightElements( results, surpressKeys ) as IStateSourceHubSubs;
+//     // results.itemsY.map((item: IAnySourceItem ) => {
+//     //   if ( !item.FPSItem.Icon.name ) item.FPSItem.Icon.name = 'SharePointLogo';
+//     // });
+//   }
+//   return results;
+// }
+/**
+ * getFPSHubTiles was built for Hub Connection's web part to fetch both sites and webs.
+ *    Use the depth property to specify either sites or webs.
+ * @param bannerProps
+ * @param sourceProps
+ * @param search
+ * @param WPFPSItem - use buildFpsTileWPProps
+ * @param departmentId - if for current site, leave empty, will get from bannerProps
+ * @returns
+ */
+export async function getFPSHubTiles(bannerProps, sourceProps, search, webPartFPSItem, departmentId, depth = 'site', surpressKeys = CommonSuppressKeys, filter = 'Associated') {
     const useDepartmentId = departmentId ? departmentId : bannerProps.context.pageContext.legacyPageContext.departmentId;
-    let results = await fetchMyHubsites(bannerProps.context.pageContext.web.absoluteUrl, depth, useDepartmentId);
+    let results = await fetchMyHubsites(bannerProps.context.pageContext.web.absoluteUrl, depth, useDepartmentId, filter);
     if (results.status !== 'Success') {
         results.itemsY = [createErrorFPSTileItem(results, webPartFPSItem)];
     }
     else {
-        results = processHubSubResults(results, sourceProps, search, departmentId);
+        // Updated for https://github.com/fps-solutions/HubCon/issues/13
+        results = processHubSubResults(results, sourceProps, search, useDepartmentId, ['MSTeam',]);
         // moved code from makeFPSSubHubTileItemsV2 directly into here
         results = makeFPSSubHubTiles(results, bannerProps, webPartFPSItem, surpressKeys);
         // results = buildFPSAnyTileItems( results, bannerProps, webPartFPSItem, ) as IStateSourceHubSubs;

package/lib/components/molecules/FPSTiles/functions/getFPSHubTiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFPSHubTiles.js","sourceRoot":"","sources":["../../../../../src/components/molecules/FPSTiles/functions/getFPSHubTiles.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAIhG,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAE5F,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAgB,MAAM,kCAAkC,CAAC;AAEpF;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAE,WAAgC,EAAE,WAAyB,EAAE,MAAqB,EAClH,cAAwB,EAAE,YAAqB,EAAE,QAAwB,MAAM,EAC/E,eAA+B,kBAAkB;IAErD,MAAM,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,YAAY,CAAC;IACrH,IAAI,OAAO,GAAwB,MAAM,eAAe,CAAE,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,eAAe,CAAW,CAAC;IAE7I,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;QAChC,OAAO,CAAC,MAAM,GAAG,CAAE,sBAAsB,CAAE,OAAO,EAAE,cAAc,CAAE,CAAE,CAAC;KAExE;SAAM;QACL,OAAO,GAAG,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,CAAE,CAAC;QAC5E,8DAA8D;QAC9D,OAAO,GAAG,kBAAkB,CAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,CAAE,CAAC;QAEnF,kGAAkG;QAClG,yFAAyF;QACzF,kDAAkD;QAClD,8EAA8E;QAC9E,MAAM;KAEP;IAED,OAAO,OAAO,CAAC;AAEjB,CAAC"}
+{"version":3,"file":"getFPSHubTiles.js","sourceRoot":"","sources":["../../../../../src/components/molecules/FPSTiles/functions/getFPSHubTiles.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,eAAe,EAAkB,MAAM,+CAA+C,CAAC;AAIhH,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAE5F,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAgB,MAAM,kCAAkC,CAAC;AAEpF;;;;;;;;;GASG;AACH,6HAA6H;AAC7H,0FAA0F;AAC1F,4FAA4F;AAE5F,0HAA0H;AAC1H,kJAAkJ;AAElJ,wCAAwC;AACxC,8EAA8E;AAE9E,aAAa;AACb,mFAAmF;AACnF,qEAAqE;AACrE,0FAA0F;AAE1F,yGAAyG;AACzG,gGAAgG;AAChG,yDAAyD;AACzD,qFAAqF;AACrF,aAAa;AAEb,MAAM;AAEN,oBAAoB;AAEpB,IAAI;AAIJ;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAE,WAAgC,EAAE,WAAyB,EAAE,MAAqB,EACtH,cAAwB,EAAE,YAAqB,EAAE,QAAwB,MAAM,EAC/E,eAA+B,kBAAkB,EAAE,SAAyB,YAAY;IAE1F,MAAM,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,YAAY,CAAC;IACrH,IAAI,OAAO,GAAwB,MAAM,eAAe,CAAE,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,CAAS,CAAC;IAEnJ,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;QAClC,OAAO,CAAC,MAAM,GAAG,CAAE,sBAAsB,CAAE,OAAO,EAAE,cAAc,CAAE,CAAE,CAAC;KAEtE;SAAM;QACP,gEAAgE;QAChE,OAAO,GAAG,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,EAAE,CAAE,QAAQ,EAAG,CAAE,CAAC;QAC9F,8DAA8D;QAC9D,OAAO,GAAG,kBAAkB,CAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,CAAE,CAAC;QAEnF,kGAAkG;QAClG,yFAAyF;QACzF,kDAAkD;QAClD,8EAA8E;QAC9E,MAAM;KAEL;IAED,OAAO,OAAO,CAAC;AAEf,CAAC"}

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

@@ -14,7 +14,7 @@ import { check4This } from '@mikezimm/fps-pnp2/lib/services/sp/CheckSearch';
 export async function fetchMyHubSubs(webUrl, depth, departmentId) {
     // const [ hubs, subs, nav ] = await Promise.all([
     const [hubs, subs,] = await Promise.all([
-        fetchMyHubsites(webUrl, depth, departmentId),
+        fetchMyHubsites(webUrl, depth, departmentId, 'HubAndAssoc'),
         fetchMySubsites(webUrl),
         // fetchMyHubNav( webUrl, departmentId ),
     ]);

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

@@ -1 +1 @@
-{"version":3,"file":"fetchMyHubsSubs.js","sourceRoot":"","sources":["../../../../../../src/components/molecules/SpHttp/HubsSubs/fetches/fetchMyHubsSubs.ts"],"names":[],"mappings":"AACA,yFAAyF;AACzF,gEAAgE;AAChE,OAAO,EAAkB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAC;AAQ5E;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAE,MAAc,EAAE,KAAqB,EAAE,YAAoB;IAE/F,kDAAkD;IAClD,MAAM,CAAE,IAAI,EAAE,IAAI,EAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxC,eAAe,CAAE,MAAM,EAAE,KAAK,EAAE,YAAY,CAAE;QAC9C,eAAe,CAAE,MAAM,CAAG;QAC1B,yCAAyC;KAC1C,CAAC,CAAC;IAEH,sCAAsC;IACtC,mDAAmD;IACnD,sDAAsD;IACtD,sDAAsD;IACtD,mDAAmD;IACnD,sDAAsD;IAEtD,2FAA2F;IAC3F,+FAA+F;IAC/F,sFAAsF;IACtF,gGAAgG;IAChG,wGAAwG;IACxG,+EAA+E;IAC/E,kEAAkE;IAElE,MAAM,OAAO,GAAiB;QAC5B,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;QACV,YAAY;KACb,CAAA;IACD,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI;QAAG,OAAO,CAAC,GAAG,CAAE,sDAAsD,EAAE,OAAO,CAAE,CAAC;IAExI,OAAO,OAAO,CAAC;AAEjB,CAAC"}
+{"version":3,"file":"fetchMyHubsSubs.js","sourceRoot":"","sources":["../../../../../../src/components/molecules/SpHttp/HubsSubs/fetches/fetchMyHubsSubs.ts"],"names":[],"mappings":"AACA,yFAAyF;AACzF,gEAAgE;AAChE,OAAO,EAAkB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAC;AAQ5E;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAE,MAAc,EAAE,KAAqB,EAAE,YAAoB;IAE/F,kDAAkD;IAClD,MAAM,CAAE,IAAI,EAAE,IAAI,EAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxC,eAAe,CAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,CAAE;QAC7D,eAAe,CAAE,MAAM,CAAG;QAC1B,yCAAyC;KAC1C,CAAC,CAAC;IAEH,sCAAsC;IACtC,mDAAmD;IACnD,sDAAsD;IACtD,sDAAsD;IACtD,mDAAmD;IACnD,sDAAsD;IAEtD,2FAA2F;IAC3F,+FAA+F;IAC/F,sFAAsF;IACtF,gGAAgG;IAChG,wGAAwG;IACxG,+EAA+E;IAC/E,kEAAkE;IAElE,MAAM,OAAO,GAAiB;QAC5B,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;QACV,YAAY;KACb,CAAA;IACD,IAAK,UAAU,CAAE,0BAA0B,CAAE,KAAK,IAAI;QAAG,OAAO,CAAC,GAAG,CAAE,sDAAsD,EAAE,OAAO,CAAE,CAAC;IAExI,OAAO,OAAO,CAAC;AAEjB,CAAC"}

package/lib/components/molecules/SpHttp/HubsSubs/fetches/fetchMyHubsites.d.ts

@@ -1,10 +1,17 @@
 import { IJSFetchReturn } from '../../doSpJsFetch';
+import { IFPSWebsWithLogo } from '../interfaces/IFPSHubSiteDataDocsApi';
+export type IFetchHubDepth = 'site' | 'web';
+export type IHubFilterType = 'Associated' | 'Hubs' | 'Teams' | 'HubAndAssoc';
+export interface IFetchHubsReturn extends IJSFetchReturn {
+    allHubs?: IFPSWebsWithLogo[];
+}
 /**
- * fetchMyHubsites will fetch an array of the current site's hub associated sites.  Used in Pivot Tiles and Hub Connections.
+ * fetchMyHubsites imported from HubCon on 2024-07-29.
  * @param webUrl
+ * @param depth  IFetchHubDepth = 'site' | 'web';
  * @param departmentId
+ * @param filter  IHubFilterType = 'Associated' | 'Hubs' | 'Teams' | 'HubAndAssoc';
  * @returns
  */
-export type IFetchHubDepth = 'site' | 'web';
-export declare function fetchMyHubsites(webUrl: string, depth: IFetchHubDepth, departmentId: string): Promise<IJSFetchReturn>;
+export declare function fetchMyHubsites(webUrl: string, depth: IFetchHubDepth, departmentId: string, filter: IHubFilterType): Promise<IFetchHubsReturn>;
 //# sourceMappingURL=fetchMyHubsites.d.ts.map

package/lib/components/molecules/SpHttp/HubsSubs/fetches/fetchMyHubsites.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchMyHubsites.d.ts","sourceRoot":"","sources":["../../../../../../src/components/molecules/SpHttp/HubsSubs/fetches/fetchMyHubsites.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAe,MAAM,mBAAmB,CAAC;AAOhE;;;;;GAKG;AAEH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,KAAK,CAAC;AAE5C,wBAAsB,eAAe,CAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,GAAI,OAAO,CAAC,cAAc,CAAC,CAkB5H"}
+{"version":3,"file":"fetchMyHubsites.d.ts","sourceRoot":"","sources":["../../../../../../src/components/molecules/SpHttp/HubsSubs/fetches/fetchMyHubsites.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAe,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAc,MAAM,sCAAsC,CAAC;AAqCpF,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,KAAK,CAAC;AAE5C,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,aAAa,CAAC;AAE7E,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACtD,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC9B;AAED;;;;;;;GAOG;AAEH,wBAAsB,eAAe,CAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAI,OAAO,CAAC,gBAAgB,CAAC,CAuCtJ"}

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

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

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

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

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

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

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

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

package/package.json

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