@mikezimm/fps-library-v2 1.0.148 → 1.0.149

package/lib/components/molecules/SearchPage/functions/getFilteredV1.js

@@ -0,0 +1,127 @@
+/**
+ * 2023-03-28:  Originally copied from Compliance web part but is identical to
+ * src\webparts\alvFinMan\components\Search\functions.ts
+ */
+import { SearchTypes } from "../Interfaces/StandardTypes";
+/**
+ *
+ * @param startingItems
+ * @param text - this is the search text
+ * @param top - these are the selected top buttons if multi-selected
+ * @param left - these are the selected left buttons if multi-selected
+ * @param type - these are the selected type buttons if multi-selected
+ * @param searchStrings - these are the selected buttons if multi-selected... I think :)
+ * @param UseSearchTypes
+ * @returns
+ */
+export function getFilteredItems(startingItems, text, top, left, type, searchStrings, UseSearchTypes = SearchTypes) {
+    const filteredItems = [];
+    startingItems.map(item => {
+        let passMe = true;
+        if (left.length > 0) {
+            let passThis = false;
+            item.leftSearch.map(test => {
+                if (left.indexOf(test) > -1) {
+                    passThis = true;
+                }
+            });
+            if (passThis === false) {
+                passMe = false;
+            }
+        }
+        if (top.length > 0 && passMe === true) {
+            let passThis = false;
+            item.topSearch.map(test => {
+                if (top.indexOf(test) > -1) {
+                    passThis = true;
+                }
+            });
+            if (passThis === false) {
+                passMe = false;
+            }
+        }
+        if (type.length > 0 && passMe === true) {
+            // Close https://github.com/mikezimm/ALVFinMan/issues/122
+            const typeObj = UseSearchTypes.objs[item.typeIdx];
+            if (type.indexOf(typeObj.key) < 0) {
+                passMe = false;
+            }
+        }
+        //Separate logic from SearchPage.tsx search... this looks at the searchTextLC for simpler execution
+        if (passMe === true) {
+            // NOTE:  ALVFinMan had commented out code here... This was just moved into function:  doesPassButtonSearch
+            const passThis = doesPassButtonSearch(item, searchStrings);
+            if (passThis === false) {
+                passMe = false;
+            }
+        }
+        if (passMe === true && text && text.length > 0) {
+            if (item.searchTextLC.indexOf(text.toLowerCase()) < 0) {
+                passMe = false;
+            }
+        }
+        if (passMe === true) {
+            filteredItems.push(item);
+        }
+    });
+    console.log(' filteredItems: ', filteredItems);
+    return filteredItems;
+}
+export function doesPassButtonSearch(item, searchStrings) {
+    if (!searchStrings || searchStrings.length === 0) {
+        return true;
+    }
+    let passThis = false;
+    let countNotNull = 0;
+    // 2023-02-23: Added from ALVFM for when CTRL-Unselecting all items... the array searchStrings can be like this causing error:  [ null ]
+    searchStrings.map(searchObjectFull => {
+        if (searchObjectFull) {
+            countNotNull++;
+            const searchSplits = searchObjectFull.split('==');
+            const searchTest = searchSplits[0];
+            const searchTestLC = searchTest.toLowerCase();
+            if (searchSplits.length === 1) { //First test if it is simple search
+                if (item.searchTextLC.indexOf(searchTestLC) > -1) {
+                    passThis = true;
+                }
+            }
+            else { //If not simple, proceed to more complex search
+                if (searchSplits[1].toLowerCase() === 'proper' || searchSplits[1].toLowerCase() === 'exact') {
+                    if (item.searchText.indexOf(searchTest) > -1) {
+                        passThis = true;
+                    }
+                }
+                else if (searchSplits[1].indexOf('/') === 0) {
+                    const regexParams = searchSplits[1].split('/');
+                    if (regexParams.length < 3) {
+                        console.log('INVALID SEARCH REGEX:  ', searchObjectFull);
+                    }
+                    else {
+                        // const regexParams = searchSplits[1].substring(nextSlash + 1);
+                        const regex = new RegExp(regexParams[1], regexParams[2]); // eslint-disable-line @rushstack/security/no-unsafe-regexp
+                        const matches = item.searchText.match(regex);
+                        if ((matches === null || matches === void 0 ? void 0 : matches.length) > 0) {
+                            passThis = true;
+                        }
+                    }
+                }
+                else if (searchSplits[1].indexOf('item.') === 0) {
+                    //This will Target the property of the item, not case sensitive
+                    const itemColumn = searchSplits[1].substring(5);
+                    const columnValue = item[itemColumn] ? item[itemColumn] : '';
+                    if (columnValue && typeof columnValue === 'string' && columnValue.toLowerCase().indexOf(searchTestLC) > -1) {
+                        passThis = true;
+                    }
+                }
+                else {
+                    //default to string search if no paramter was provided
+                    if (item.searchTextLC.indexOf(searchTestLC) > -1) {
+                        passThis = true;
+                    }
+                }
+            } // End if basic Search or Complex Search
+        }
+    }); // End map Search Strings
+    return countNotNull > 0 ? passThis : true;
+}
+//# sourceMappingURL=getFilteredV1.js.map

package/lib/components/molecules/SearchPage/functions/getFilteredV1.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFilteredV1.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/getFilteredV1.ts"],"names":[],"mappings":"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"}

package/lib/components/molecules/SourceList/ItemPane/IItemPaneProps.d.ts

@@ -0,0 +1,30 @@
+/// <reference types="react" />
+import { ISourceInfo, ISourceProps } from "../../../../pnpjs/SourceItems/Interface";
+import { ICanvasContentOptions } from "../../ModernPages/Interfaces/IModernPage";
+import { ISourceSearch } from "../../SearchPage/Interfaces/ISourceSearch";
+import { IAnySourceItem } from "../IAnyContent";
+export interface IItemPaneWPProps {
+    imageStyle: string;
+    topButtons: string[];
+    canvasOptions: ICanvasContentOptions;
+    debugMode?: boolean;
+    showJSONDetail?: boolean;
+    showItemLink?: boolean;
+    showListLink?: boolean;
+    showDateStamps?: boolean;
+}
+export interface IItemPaneProps extends IItemPaneWPProps {
+    item: IAnySourceItem;
+    showCanvasContent1: boolean;
+    search: ISourceSearch;
+    source: ISourceInfo;
+    primarySource: ISourceProps;
+    refreshId: string;
+    customElement1?: JSX.Element;
+    customElement2?: JSX.Element;
+}
+export interface IItemPaneState {
+    showPanelJSON: boolean;
+    showThisItem: IAnySourceItem;
+}
+//# sourceMappingURL=IItemPaneProps.d.ts.map

package/lib/components/molecules/SourceList/ItemPane/IItemPaneProps.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"IItemPaneProps.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/SourceList/ItemPane/IItemPaneProps.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACpF,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,MAAM,WAAW,gBAAgB;IAE/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IAErB,aAAa,EAAE,qBAAqB,CAAC;IAErC,SAAS,CAAC,EAAE,OAAO,CAAC;IAGpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;CAE1B;AAGD,MAAM,WAAW,cAAe,SAAQ,gBAAgB;IAEtD,IAAI,EAAE,cAAc,CAAC;IAErB,kBAAkB,EAAE,OAAO,CAAC;IAE5B,MAAM,EAAE,aAAa,CAAE;IAEvB,MAAM,EAAE,WAAW,CAAC;IACpB,aAAa,EAAE,YAAY,CAAC;IAE5B,SAAS,EAAE,MAAM,CAAC;IAElB,cAAc,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;CAE9B;AAED,MAAM,WAAW,cAAc;IAE7B,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,cAAc,CAAC;CAE9B"}

package/lib/components/molecules/SourceList/ItemPane/IItemPaneProps.js

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

package/lib/components/molecules/SourceList/ItemPane/IItemPaneProps.js.map

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

package/lib/components/molecules/SourceList/ItemPane/component.d.ts

@@ -0,0 +1,36 @@
+import * as React from 'react';
+import { IItemPaneProps, IItemPaneState } from './IItemPaneProps';
+export default class ItemPane extends React.Component<IItemPaneProps, IItemPaneState> {
+    private ToggleJSONCmd;
+    constructor(props: IItemPaneProps);
+    componentDidMount(): Promise<void>;
+    updateWebInfo(webUrl: string, listChangeOnly: boolean): Promise<void>;
+    /***
+   *         d8888b. d888888b d8888b.      db    db d8888b. d8888b.  .d8b.  d888888b d88888b
+   *         88  `8D   `88'   88  `8D      88    88 88  `8D 88  `8D d8' `8b `~~88~~' 88'
+   *         88   88    88    88   88      88    88 88oodD' 88   88 88ooo88    88    88ooooo
+   *         88   88    88    88   88      88    88 88~~~   88   88 88~~~88    88    88~~~~~
+   *         88  .8D   .88.   88  .8D      88b  d88 88      88  .8D 88   88    88    88.
+   *         Y8888D' Y888888P Y8888D'      ~Y8888P' 88      Y8888D' YP   YP    YP    Y88888P
+   *
+   *
+   */
+    componentDidUpdate(prevProps: IItemPaneProps): void;
+    render(): React.ReactElement<IItemPaneProps>;
+    /**
+     * function:  getValidPropLI
+     *
+     * Created this function to resolve issue:  https://github.com/mikezimm/ALVFinMan/issues/167
+     * @param showThisItem
+     * @param field
+     * @param idx
+     * @returns
+     */
+    private getValidPropLI;
+    private updateModernState;
+    private openItemNewTab;
+    private openThisLink;
+    private clickOpenInNewTab;
+    private _toggleJSON;
+}
+//# sourceMappingURL=component.d.ts.map

package/lib/components/molecules/SourceList/ItemPane/component.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/SourceList/ItemPane/component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAa/B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAG,MAAM,kBAAkB,CAAC;AAsBnE,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,KAAK,CAAC,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEnF,OAAO,CAAC,aAAa,CAAgF;gBAElF,KAAK,EAAC,cAAc;IAS1B,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,aAAa,CAAG,MAAM,EAAE,MAAM,EAAE,cAAc,EAAG,OAAO,GAAI,OAAO,CAAC,IAAI,CAAC;IAQpF;;;;;;;;;KASC;IAEI,kBAAkB,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI;IA2DnD,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC;IA4HnD;;;;;;;;OAQG;IAEH,OAAO,CAAC,cAAc;IA0BtB,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,WAAW;CAUpB"}

package/lib/components/molecules/SourceList/ItemPane/component.js

@@ -0,0 +1,263 @@
+import * as React from 'react';
+import { Icon } from 'office-ui-fabric-react/lib/Icon';
+// import * as strings from 'AlvFinManWebPartStrings';
+import ReactJson from "react-json-view";
+import { makeToggleJSONCmd } from '../../../atoms/Elements/ToggleJSONButton';
+require('@mikezimm/fps-styles/dist/fpsDateStamp.css');
+require('@mikezimm/fps-styles/dist/sourceItemPane.css');
+// import { replaceHTMLEntities } from '../../../fpsReferences';
+// import { sortStringArray, sortObjectArrayByStringKey, sortNumberArray, sortObjectArrayByNumberKey, sortKeysByOtherKey } from '../../../fpsReferences';
+// import { divide, stubFalse } from 'lodash';
+// import { makeToggleJSONCmd } from '../../../fpsReferences';
+// import { getDocWiki } from './getModernContent';
+// import { getModernHumanReadable } from './processModernContent';
+// const consoleLineItemBuild: boolean = false;
+export default class ItemPane extends React.Component {
+    constructor(props) {
+        super(props);
+        this.ToggleJSONCmd = makeToggleJSONCmd(this._toggleJSON.bind(this), 'Click for more details');
+        console.log('constructor:');
+        this.state = {
+            showPanelJSON: false,
+            showThisItem: this.props.item,
+        };
+    }
+    async componentDidMount() {
+        console.log('componentDidMount:');
+        await this.updateWebInfo('', false);
+    }
+    async updateWebInfo(webUrl, listChangeOnly) {
+        console.log('updateWebInfo:');
+        if (this.props.item && this.props.showCanvasContent1 === true) {
+            // getDocWiki( this.props.page , this.props.source, this.props.canvasOptions, this.props.showCanvasContent1, this.updateModernState.bind( this ) );
+        }
+    }
+    //        
+    /***
+   *         d8888b. d888888b d8888b.      db    db d8888b. d8888b.  .d8b.  d888888b d88888b
+   *         88  `8D   `88'   88  `8D      88    88 88  `8D 88  `8D d8' `8b `~~88~~' 88'
+   *         88   88    88    88   88      88    88 88oodD' 88   88 88ooo88    88    88ooooo
+   *         88   88    88    88   88      88    88 88~~~   88   88 88~~~88    88    88~~~~~
+   *         88  .8D   .88.   88  .8D      88b  d88 88      88  .8D 88   88    88    88.
+   *         Y8888D' Y888888P Y8888D'      ~Y8888P' 88      Y8888D' YP   YP    YP    Y88888P
+   *
+   *
+   */
+    componentDidUpdate(prevProps) {
+        //Just rebuild the component
+        console.log('ItemPane', this.props);
+        // refresh any changes in these props:
+        const compareProps = ['refreshId', 'imageStyle', 'showJSONDetail', 'showDateStamps', 'showItemLink', 'showListLink',];
+        let itemRefreshed = false;
+        compareProps.map(testProp => {
+            // here casting testProp as a valid key because casting as any throws a linting error
+            if (itemRefreshed === false && this.props[testProp] !== prevProps[testProp]) {
+                itemRefreshed = true;
+                this.setState({ showThisItem: this.props.item });
+            }
+        });
+        const compareStringy = ['canvasOptions',];
+        compareStringy.map(testProp => {
+            // here casting testProp as a valid key because casting as any throws a linting error
+            if (itemRefreshed === false && JSON.stringify(this.props[testProp]) !== JSON.stringify(prevProps[testProp])) {
+                itemRefreshed = true;
+                this.setState({ showThisItem: this.props.item });
+            }
+        });
+        // if ( this.props.refreshId !== prevProps.refreshId ) {
+        //   this.setState({ showThisItem: this.props.item });
+        // // } else if ( this.props.imageStyle !== prevProps.imageStyle ) {
+        // //     this.setState({ showThisItem: this.props.item });
+        // // eslint-disable-next-line dot-notation
+        // } else if ( this.props[ 'imageStyle' ] !== prevProps[ 'imageStyle' ] ) {
+        //     this.setState({ showThisItem: this.props.item });
+        // } else if ( JSON.stringify( this.props.canvasOptions) !== JSON.stringify( prevProps.canvasOptions ) ) {
+        //   this.setState({ showThisItem: this.props.item, });
+        // } else if ( this.props.item === null ) {
+        //   //Do nothing if page is null
+        // } else if ( this.props.item.ID !== prevProps.item.ID ) {
+        //   this.setState({ showThisItem: this.props.item, });
+        // } else if ( this.props.showJSONDetail !== prevProps.showJSONDetail ) {
+        //   this.setState({ showThisItem: this.props.item, });
+        // } else if ( this.props.showDateStamps !== prevProps.showDateStamps ) {
+        //   this.setState({ showThisItem: this.props.item, });
+        // } else if ( this.props.showItemLink !== prevProps.showItemLink ) {
+        //   this.setState({ showThisItem: this.props.item, });
+        // } else if ( this.props.showListLink !== prevProps.showListLink ) {
+        //   this.setState({ showThisItem: this.props.item, });
+        // }
+    }
+    render() {
+        const { primarySource, topButtons, debugMode, showCanvasContent1, showJSONDetail, showDateStamps, showItemLink, showListLink } = this.props; // eslint-disable-line @typescript-eslint/no-unused-vars
+        const { showThisItem, } = this.state;
+        if (!showThisItem) {
+            // const FetchingSpinner = <Spinner size={SpinnerSize.large} label={"Fetching Page ..."} style={{ padding: 30 }} />;
+            // return ( <div>{ FetchingSpinner }</div> );
+            return (React.createElement("div", null));
+        }
+        else {
+            const gotoListLink = showListLink === false || !primarySource.webRelativeLink ? null : React.createElement("div", { className: ['listLink', 'goToLink'].join(' '), onClick: () => { window.open(`${primarySource.webUrl}${primarySource.webRelativeLink}`, '_blank'); } },
+                "Open list ",
+                React.createElement(Icon, { iconName: 'OpenInNewTab' }));
+            //Go directly to file if it's a file, else go to list item
+            const viewItemLink = `${showThisItem.FileRef ? showThisItem.FileRef : primarySource.viewItemLink.replace('{{item.ID}}', showThisItem.ID)} `;
+            const gotoItemLink = showItemLink === false || !viewItemLink ? undefined : React.createElement("div", { style: { cursor: 'pointer' }, onClick: () => { window.open(viewItemLink, '_blank'); } },
+                "Open item ",
+                React.createElement(Icon, { iconName: 'OpenInNewTab' }));
+            const debugContent = this.props.debugMode !== true ? null : React.createElement("div", { style: { cursor: 'default', marginLeft: '20px' } },
+                "App in debugMode - Change in Web Part Properties - Page Preferences.  ",
+                React.createElement("b", null,
+                    React.createElement("em", null, "Currently in ItemPane")));
+            let panelTitle = 'Unknown Title';
+            if (showThisItem.Title) {
+                panelTitle = showThisItem.Title;
+            }
+            else if (showThisItem.Title0) {
+                panelTitle = showThisItem.Title0;
+            }
+            else if (showThisItem.FileLeafRef) {
+                panelTitle = showThisItem.FileLeafRef;
+            }
+            const viewItemElement = !viewItemLink || showItemLink === false ? undefined :
+                React.createElement(React.Fragment, null,
+                    gotoItemLink,
+                    gotoListLink);
+            const dateStampes = showDateStamps === false ? undefined :
+                React.createElement(React.Fragment, null,
+                    React.createElement("div", { className: 'fps-date-stamp' },
+                        React.createElement("div", null, "Created"),
+                        " ",
+                        React.createElement("div", null, showThisItem.createdLoc),
+                        " ",
+                        React.createElement("div", null, showThisItem['Author/Title'])),
+                    React.createElement("div", { className: 'fps-date-stamp' },
+                        React.createElement("div", null, "Modified"),
+                        " ",
+                        React.createElement("div", null, showThisItem.modifiedLoc),
+                        " ",
+                        React.createElement("div", null, showThisItem['Editor/Title'])));
+            const panelHeading = React.createElement("div", { className: 'supPanelHeader' },
+                React.createElement("h2", null, panelTitle),
+                dateStampes,
+                React.createElement("h3", { style: { display: 'flex', justifyContent: 'flex-start', alignItems: 'center', paddingBottom: '20px' } },
+                    React.createElement("div", { style: { paddingRight: '30px' } }, showThisItem.ID),
+                    viewItemElement));
+            const headerComponent = React.createElement("div", null,
+                debugContent,
+                panelHeading);
+            const fileEmbed = !showThisItem.ServerRedirectedEmbedUrl ? null : React.createElement("iframe", { src: showThisItem.ServerRedirectedEmbedUrl, height: '350px', width: '100%', style: { paddingTop: '20px' } });
+            const searchProps = JSON.parse(JSON.stringify(primarySource.searchProps));
+            console.log('selectThese - searchProps', searchProps);
+            const searchPropsList = primarySource && searchProps && searchProps.length > 0 ?
+                React.createElement("ul", null, searchProps.map((field, idx) => {
+                    // https://github.com/mikezimm/ALVFinMan/issues/167
+                    return this.getValidPropLI(showThisItem, field, idx);
+                })) : React.createElement("div", null, "There are no Searched properties.");
+            //Created this ling hand instead of filter after the LinkColumn issue.
+            //Filter may work but I've had it on this one trying to figure it out.
+            const selectThese = [];
+            primarySource.selectThese.map((selectProp) => {
+                if (primarySource.searchProps.indexOf(selectProp) < 0)
+                    selectThese.push(selectProp);
+            });
+            console.log('selectThese - selectThese', selectThese);
+            const selectTheseList = primarySource && selectThese && selectThese.length > 0 ?
+                React.createElement("ul", null, selectThese.map((field, idx) => {
+                    // https://github.com/mikezimm/ALVFinMan/issues/167
+                    return this.getValidPropLI(showThisItem, field, idx);
+                })) : React.createElement("div", null, "There are no Selected properties.");
+            const itemContent = React.createElement("div", null,
+                React.createElement("div", { className: 'source-itemPane-properties' },
+                    React.createElement("h3", null, "Searched Properties"),
+                    searchPropsList),
+                React.createElement("div", { className: 'source-itemPane-properties' },
+                    React.createElement("h3", null, "Selected Properties"),
+                    selectTheseList));
+            const jsonContent = showJSONDetail === false || this.state.showPanelJSON !== true ? undefined : React.createElement("div", null,
+                React.createElement(ReactJson, { src: showThisItem, name: 'Summary', collapsed: false, displayDataTypes: true, displayObjectSize: true, enableClipboard: true, style: { padding: '20px 0px' } }));
+            // const fileEmbed = !showThisItem || !showThisItem.ServerRedirectedEmbedUrl ? null : <iframe src={ showThisItem.ServerRedirectedEmbedUrl } height='350px' width='100%' style={{paddingTop: '20px' }}></iframe>;
+            return (React.createElement("div", { className: ['source-itemPane', ''].join(' ') },
+                headerComponent,
+                this.props.customElement1 ? this.props.customElement1 : undefined,
+                fileEmbed,
+                itemContent,
+                this.props.customElement2 ? this.props.customElement2 : undefined,
+                this.ToggleJSONCmd,
+                jsonContent));
+        }
+    }
+    /**
+     * function:  getValidPropLI
+     *
+     * Created this function to resolve issue:  https://github.com/mikezimm/ALVFinMan/issues/167
+     * @param showThisItem
+     * @param field
+     * @param idx
+     * @returns
+     */
+    getValidPropLI(showThisItem, field, idx) {
+        var _a;
+        console.log('field', field, typeof showThisItem[field], JSON.stringify(showThisItem[field]));
+        const isLink = ((_a = showThisItem[field]) === null || _a === void 0 ? void 0 : _a.Url) ? true : false;
+        const isObject = typeof showThisItem[field] === 'object' ? true : false;
+        const isRich = typeof showThisItem[field] === 'string' && showThisItem[field].indexOf(`<div class="ExternalClass`) === 0 ? true : false;
+        if (isRich === true) {
+            return React.createElement("li", { key: idx },
+                React.createElement("div", null,
+                    field,
+                    ":"),
+                " ",
+                React.createElement("div", { dangerouslySetInnerHTML: { __html: showThisItem[field] } }));
+        }
+        else if (isLink === true) {
+            return React.createElement("li", { key: idx },
+                React.createElement("div", null,
+                    field,
+                    ":"),
+                " ",
+                React.createElement("div", { style: { cursor: 'pointer', fontSize: 'larger' }, onClick: () => window.open(showThisItem[field].Url, '_blank') },
+                    showThisItem[field].Description,
+                    React.createElement(Icon, { style: { marginLeft: '30px' }, iconName: 'OpenInNewTab' })));
+        }
+        else if (isObject === true) {
+            const obj = JSON.stringify(showThisItem[field]);
+            return React.createElement("li", { key: idx },
+                React.createElement("div", null,
+                    field,
+                    ":"),
+                " ",
+                React.createElement("div", null, obj));
+        }
+        else {
+            return React.createElement("li", { key: idx },
+                React.createElement("div", null,
+                    field,
+                    ":"),
+                " ",
+                React.createElement("div", null, showThisItem[field]));
+        }
+    }
+    //getDocWiki( item: IPagesContent, source: ISourcePropsFM,  canvasOptions: ICanvasContentOptions, callBack: any )
+    updateModernState(item) {
+        this.setState({
+            showThisItem: item
+        });
+    }
+    openItemNewTab(item) {
+        window.open(item.File.ServerRelativeUrl, '_blank');
+    }
+    openThisLink(link) {
+        window.open(link, '_blank');
+    }
+    clickOpenInNewTab(href) {
+        console.log('clickOpenInNewTab:', href);
+        window.open(href, '_blank');
+    }
+    _toggleJSON() {
+        const newState = this.state.showPanelJSON === true ? false : true;
+        const result = this.state.showThisItem;
+        // result = getModernHumanReadable( result );
+        this.setState({ showThisItem: result, showPanelJSON: newState });
+    }
+}
+//# sourceMappingURL=component.js.map

package/lib/components/molecules/SourceList/ItemPane/component.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SourceList/ItemPane/component.tsx"],"names":[],"mappings":"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"}

package/lib/logic/Strings/getWordsFromString.d.ts

@@ -2,6 +2,7 @@ import { ISeriesSort } from "../../logic/Arrays/sorting/Interfaces";
 /**
  *
  * Originally used in Compliance to get list of words from a string
+ * Updated 2023-03-28
  *
  * @param str
  * @param removeDigits

package/lib/logic/Strings/getWordsFromString.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getWordsFromString.d.ts","sourceRoot":"","sources":["../../../src/logic/Strings/getWordsFromString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAIpE;;;;;;;GAOG;AAEH,wBAAgB,2BAA2B,CAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAO3M;AAGD,wBAAgB,yBAAyB,CAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAwCpL;AAED,wBAAgB,eAAe,CAAE,UAAU,EAAE,MAAM,EAAE,EAAE,SAAS,EAAC,MAAM,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAiB3J"}
+{"version":3,"file":"getWordsFromString.d.ts","sourceRoot":"","sources":["../../../src/logic/Strings/getWordsFromString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAGpE;;;;;;;;GAQG;AAEH,wBAAgB,2BAA2B,CAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAO3M;AAGD,wBAAgB,yBAAyB,CAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CA+CpL;AAED,wBAAgB,eAAe,CAAE,UAAU,EAAE,MAAM,EAAE,EAAE,SAAS,EAAC,MAAM,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAiB3J"}

package/lib/logic/Strings/getWordsFromString.js

@@ -2,6 +2,7 @@ import { sortStringArrayCollator } from "../../logic/Arrays/sorting/strings";
 /**
  *
  * Originally used in Compliance to get list of words from a string
+ * Updated 2023-03-28
  *
  * @param str
  * @param removeDigits
@@ -20,8 +21,14 @@ export function getArrayOfWordsFromString(str, removeDigits, removeDups, ignoreC
         return results;
     let baseStr = `${str}`;
     if (removeDigits === true)
-        baseStr = baseStr.replace(/[0-9]/g, " ");
-    const originalWords = baseStr.split(/\b([a-z]+)\b/gi);
+        baseStr = baseStr.replace(/[0-9]/g, ' ');
+    baseStr = baseStr.replace(/[-_,&[\]]+/g, ' '); // Replace most common special characters
+    baseStr = baseStr.replace(/[()]+/g, ' '); // Replace most common special characters
+    baseStr = baseStr.replace(/[/\\]+/g, ' '); // Replace most common special characters
+    baseStr = baseStr.replace(/[']+/g, ' '); // Replace most common special characters
+    baseStr = baseStr.replace(/\s\s+/g, ' '); // Replace multiple spaces with just one
+    // get array of original trimmed words and exclude empties
+    const originalWords = baseStr.split(/\b([a-z]+)\b/gi).map(word => { return word.trim(); }).filter(word => { return word; });
     // Correct case of compare array of strings from str
     let originalCompareWords = ignoreCase === true ? originalWords.map(item => { return item.toLocaleLowerCase(); }) : originalWords;
     originalCompareWords = removeDups === true ? originalCompareWords.filter(item => { return item.toLocaleLowerCase(); }) : originalCompareWords;
@@ -49,9 +56,9 @@ export function getArrayOfWordsFromString(str, removeDigits, removeDups, ignoreC
     return finalVals;
 }
 export function mergeWordArrays(mergeThese, intoThese, ignoreCase, order, localLanguage = 'en') {
-    let finalWords = [...intoThese];
-    const finalCompareWords = ignoreCase === true ? finalWords.map(item => { return item.toLocaleLowerCase(); }) : [...finalWords];
-    const mergeTheseCompare = ignoreCase === true ? mergeThese.map(item => { return item.toLocaleLowerCase(); }) : [...mergeThese];
+    let finalWords = intoThese;
+    const finalCompareWords = ignoreCase === true ? finalWords.map(item => { return item.toLocaleLowerCase(); }) : finalWords;
+    const mergeTheseCompare = ignoreCase === true ? mergeThese.map(item => { return item.toLocaleLowerCase(); }) : mergeThese;
     // Now compare the filteredNewWords with the finalWords and only add ones that are not a duplicate.
     mergeTheseCompare.map((compareWord, index) => {
         if (finalCompareWords.indexOf(compareWord) === -1) {

package/lib/logic/Strings/getWordsFromString.js.map

@@ -1 +1 @@
-{"version":3,"file":"getWordsFromString.js","sourceRoot":"","sources":["../../../src/logic/Strings/getWordsFromString.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getWordsFromString.js","sourceRoot":"","sources":["../../../src/logic/Strings/getWordsFromString.ts"],"names":[],"mappings":"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"}

package/lib/logic/Time/getFPSPrefNavLang.js

@@ -6,7 +6,7 @@ export function getFPSPrefNavLang() {
     let found = false; // Only get first one of preferences
     navigatorLanguages.map((lang) => {
         if (found === false && DateLanguageKeys.indexOf(lang.toLocaleLowerCase()) > -1) {
-            pref = lang;
+            pref = lang.toLowerCase();
             found = true;
         }
     });

package/lib/logic/Time/getFPSPrefNavLang.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFPSPrefNavLang.js","sourceRoot":"","sources":["../../../src/logic/Time/getFPSPrefNavLang.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,sBAAsB,CAAC;AAI5E,MAAM,UAAU,iBAAiB;IAC/B,MAAM,kBAAkB,GAAG,SAAS,CAAC,SAAS,CAAC;IAC/C,2DAA2D;IAC3D,IAAI,IAAI,GAAuB,OAAO,CAAC;IACvC,IAAI,KAAK,GAAG,KAAK,CAAC,CAAC,oCAAoC;IAEvD,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAwB,EAAE,EAAE;QAClD,IAAI,KAAK,KAAK,KAAK,IAAI,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAwB,CAAC,GAAG,CAAC,CAAC,EAAE;YACpG,IAAI,GAAG,IAAI,CAAC;YACZ,KAAK,GAAG,IAAI,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AAEd,CAAC"}
+{"version":3,"file":"getFPSPrefNavLang.js","sourceRoot":"","sources":["../../../src/logic/Time/getFPSPrefNavLang.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,sBAAsB,CAAC;AAI5E,MAAM,UAAU,iBAAiB;IAC/B,MAAM,kBAAkB,GAAG,SAAS,CAAC,SAAS,CAAC;IAC/C,2DAA2D;IAC3D,IAAI,IAAI,GAAuB,OAAO,CAAC;IACvC,IAAI,KAAK,GAAG,KAAK,CAAC,CAAC,oCAAoC;IAEvD,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAwB,EAAE,EAAE;QAClD,IAAI,KAAK,KAAK,KAAK,IAAI,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAwB,CAAC,GAAG,CAAC,CAAC,EAAE;YACpG,IAAI,GAAG,IAAI,CAAC,WAAW,EAAwB,CAAC;YAChD,KAAK,GAAG,IAAI,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AAEd,CAAC"}

package/lib/pnpjs/SourceItems/Interface.d.ts

@@ -14,6 +14,9 @@ export interface IMinSourceWPProps {
     orderByProp?: string;
     orderByAsc?: boolean;
 }
+export interface ISourceInfo {
+    history: ISourceProps;
+}
 export interface ISourceProps extends IMinSourceFetchProps {
     webUrl: string;
     absoluteWebUrl?: string;

package/lib/pnpjs/SourceItems/Interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Interface.d.ts","sourceRoot":"","sources":["../../../src/pnpjs/SourceItems/Interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAG,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,GAAG,EAAE,CAAC;IACb,SAAS,EAAE,eAAe,CAAC;CAC5B;AAID,MAAM,WAAW,iBAAiB;IAEhC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CAEtB;AAID,MAAM,WAAW,YAAa,SAAQ,oBAAoB;IAGxD,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAG5B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAEhB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAGnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAE5B;AAED,MAAM,WAAW,mBAAoB,SAAQ,YAAY;IACvD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,CAAC,EAAE,GAAG,CAAC;CACxB"}
+{"version":3,"file":"Interface.d.ts","sourceRoot":"","sources":["../../../src/pnpjs/SourceItems/Interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAG,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,GAAG,EAAE,CAAC;IACb,SAAS,EAAE,eAAe,CAAC;CAC5B;AAID,MAAM,WAAW,iBAAiB;IAEhC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CAEtB;AAGD,MAAM,WAAW,WAAW;IAe1B,OAAO,EAAE,YAAY,CAAC;CACvB;AAED,MAAM,WAAW,YAAa,SAAQ,oBAAoB;IAGxD,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAG5B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAEhB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAGnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAE5B;AAED,MAAM,WAAW,mBAAoB,SAAQ,YAAY;IACvD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,CAAC,EAAE,GAAG,CAAC;CACxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikezimm/fps-library-v2",
-  "version": "1.0.148",
+  "version": "1.0.149",
   "description": "Library of reusable typescript/javascript functions, interfaces and constants",
   "license": "MIT",
   "main": "./lib/index.js",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@microsoft/sp-property-pane": "^1.15.2",
     "@mikezimm/fps-pnp2": "^1.0.40",
-    "@mikezimm/fps-styles": "^1.0.16",
+    "@mikezimm/fps-styles": "^1.0.18",
     "@pnp/spfx-controls-react": "3.12.0",
     "@pnp/spfx-property-controls": "^3.6.0",
     "office-ui-fabric-react": "^7.199.1",