@rh-support/components 2.1.61 → 2.1.62

package/lib/esm/PhoneInput/PhoneInput.d.ts

@@ -10,6 +10,7 @@ interface IProps {
     setInvalid?: (boolean: any) => void;
     isLoading?: boolean;
     isDisabled?: boolean;
+    shouldNotSetCountryCode?: boolean;
 }
 export declare const getPhoneObj: (phoneNumber: string) => {
     countryCode: string;

package/lib/esm/PhoneInput/PhoneInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PhoneInput.d.ts","sourceRoot":"","sources":["../../../src/PhoneInput/PhoneInput.tsx"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,CAAC;AAM3B,OAAO,KAA8B,MAAM,OAAO,CAAC;AAKnD,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,CAAC,MAAM,KAAA,KAAK,IAAI,CAAC;IACrC,WAAW,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IACtE,mBAAmB,CAAC,EAAE,CAAC,MAAM,KAAA,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,CAAC,OAAO,KAAA,KAAK,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AA4DD,eAAO,MAAM,WAAW,gBAAiB,MAAM;;;CAqB9C,CAAC;AAEF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,qBAuPvC"}
+{"version":3,"file":"PhoneInput.d.ts","sourceRoot":"","sources":["../../../src/PhoneInput/PhoneInput.tsx"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,CAAC;AAM3B,OAAO,KAA8B,MAAM,OAAO,CAAC;AAKnD,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,CAAC,MAAM,KAAA,KAAK,IAAI,CAAC;IACrC,WAAW,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IACtE,mBAAmB,CAAC,EAAE,CAAC,MAAM,KAAA,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,CAAC,OAAO,KAAA,KAAK,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACrC;AA4ED,eAAO,MAAM,WAAW,gBAAiB,MAAM;;;CAqB9C,CAAC;AAEF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,qBAoRvC"}

package/lib/esm/PhoneInput/PhoneInput.js

@@ -32,11 +32,24 @@ const initializedCountries = COUNTRY_DATA.map((country) => {
     };
     return countryItem;
 });
+const trimAndReplacePlusFromPhone = (value) => {
+    var _a;
+    if (!value)
+        return '';
+    return (_a = value === null || value === void 0 ? void 0 : value.trim()) === null || _a === void 0 ? void 0 : _a.replace('+', '');
+};
+const removeAllSpaces = (value) => {
+    // to remove all trailing and in between spaces
+    if (!value)
+        return '';
+    return value === null || value === void 0 ? void 0 : value.replace(/\s+/g, '');
+};
 // Formatting phone numbers according to country
 const formatNumber = (fullPhoneNumber, localFormat) => {
     if (isEmpty(fullPhoneNumber))
         return '';
     let localPhone = fullPhoneNumber === null || fullPhoneNumber === void 0 ? void 0 : fullPhoneNumber.replace(PREFIX, '');
+    localPhone = removeAllSpaces(localPhone);
     if (isEmpty(localPhone))
         return '';
     // Formatting inputted number
@@ -57,6 +70,8 @@ const formatNumber = (fullPhoneNumber, localFormat) => {
             pattern += localFormat[j];
         }
     }
+    const isPatternWithPrefix = pattern.replace(/\s+/g, '').startsWith(PREFIX);
+    pattern = isPatternWithPrefix ? pattern : !isEmpty(isPatternWithPrefix) ? PREFIX + pattern : '';
     return pattern;
 };
 // return phoneline and countrycode for any given phone
@@ -78,12 +93,13 @@ export const getPhoneObj = (phoneNumber) => {
     };
 };
 export function PhoneInput(props) {
-    const { phoneValue, countryCode, onCountryCodeChange, onPhoneValueChange, validations, setInvalid } = props;
+    const { phoneValue, countryCode, onCountryCodeChange, onPhoneValueChange, validations, setInvalid, shouldNotSetCountryCode, } = props;
     const { t } = useTranslation();
     const [isOpen, setIsOpen] = useState(false);
     const [iso2, setIso2] = useState('');
     const [formattedNumber, setFormattedNumber] = useState('');
     const [format, setFormat] = useState('');
+    const [phoneWithoutCountryCode, setPhoneWithoutCountryCode] = useState('');
     const [countryObj, setCountryObj] = useState({
         name: '', // Country name
         regions: [''], // Surronding regions
@@ -98,8 +114,11 @@ export function PhoneInput(props) {
         let localPhone = phoneNumber === null || phoneNumber === void 0 ? void 0 : phoneNumber.replace(PREFIX, '').trim();
         localPhone = localPhone === null || localPhone === void 0 ? void 0 : localPhone.replace('(', '').trim();
         localPhone = localPhone === null || localPhone === void 0 ? void 0 : localPhone.replace(/ +/g, '');
-        // if the user selects a value from the dropdown and the country code is the same as prev, iso2 values shouldn't override
+        if (shouldNotSetCountryCode) {
+            return PREFIX + DEFAULT_MASK; // default format for portal phone without country code
+        }
         if (!isEmpty(countryObj) && isEqual(localPhone, countryObj.dialCode)) {
+            // if the user selects a value from the dropdown and the country code is the same as prev, iso2 values shouldn't override
             onCountryCodeChange && onCountryCodeChange(PREFIX + countryObj.countryCode);
             return countryObj.format;
         }
@@ -198,24 +217,15 @@ export function PhoneInput(props) {
         React.createElement("div", { className: "pf-v5-u-display-inline-flex" },
             React.createElement("div", { className: `flag ${iso2}`, style: { marginRight: '5px' } }),
             iso2.toUpperCase())));
-    useEffect(() => {
-        if (isEmpty(phoneValue)) {
-            setInvalid && setInvalid(false);
-            return;
-        }
-        if (isEmpty(iso2)) {
-            const localFormat = setLocalFormat(phoneValue);
-            const _formattedNumber = formatNumber(phoneValue, localFormat);
-            setFormattedNumber(_formattedNumber);
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
     useEffect(() => {
         if (!isEmpty(countryObj.iso2) && `${PREFIX}${countryObj.dialCode}` !== countryCode) {
+            if (shouldNotSetCountryCode) {
+                onCountryCodeChange && onCountryCodeChange(PREFIX + countryObj.dialCode);
+            }
             setIso2(countryObj.iso2);
             setFormat(countryObj.format);
-            onPhoneValueChange(`${PREFIX}${countryObj.dialCode}`);
-            setFormattedNumber(`${PREFIX}${countryObj.dialCode}`);
+            onPhoneValueChange(`${PREFIX}${countryObj.dialCode} ${trimAndReplacePlusFromPhone(phoneWithoutCountryCode)}`);
+            setFormattedNumber(`${PREFIX}${countryObj.dialCode} ${trimAndReplacePlusFromPhone(phoneWithoutCountryCode)}`);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [countryObj]);
@@ -243,15 +253,37 @@ export function PhoneInput(props) {
             setInvalid && setInvalid(false);
             setFormattedNumber('');
             onPhoneValueChange('');
+            setPhoneWithoutCountryCode('');
         }
         else {
             onPhoneValueChange(phoneValue);
             const localFormat = setLocalFormat(phoneValue);
             const _formattedNumber = formatNumber(phoneValue, localFormat);
             setFormattedNumber(_formattedNumber);
+            // to have phone without country code so it can populated with the newly selected country code
+            // instead of keeping it just country code
+            setPhoneWithoutCountryCode(removeAllSpaces(phoneValue).replace(countryCode, ''));
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [phoneValue]);
+    // For first time user whose phone is fetched from portal without country code
+    // For phone length less or equal to 10 country code shouldn't be fetched to avoid faulty phone population
+    // shouldNotSetCountryCode flag from ContactPhoneNumber
+    useEffect(() => {
+        if (shouldNotSetCountryCode) {
+            setIso2('');
+            onCountryCodeChange && onCountryCodeChange('');
+        }
+        else {
+            setIso2(countryObj.iso2);
+            onCountryCodeChange && onCountryCodeChange(PREFIX + countryCode);
+        }
+        onPhoneValueChange && onPhoneValueChange(removeAllSpaces(phoneValue)); // removing trailing and in between spaces
+        const localFormat = setLocalFormat(phoneValue);
+        const _formattedNumber = formatNumber(phoneValue, localFormat);
+        setFormattedNumber(_formattedNumber);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [shouldNotSetCountryCode]);
     return (React.createElement(InputGroup, { className: "phone-number-input" },
         React.createElement(InputGroupItem, null,
             React.createElement("div", null,

package/lib/esm/TopContentSearch/TopContentSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TopContentSearch.d.ts","sourceRoot":"","sources":["../../../src/TopContentSearch/TopContentSearch.tsx"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,2DAA2D,CAAC;AAQ5F,OAAO,KAA4D,MAAM,OAAO,CAAC;AAGjF,UAAU,MAAM;IACZ,cAAc,EAAE,MAAM,CAAC;IACvB,2BAA2B,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACzD,cAAc,EAAE,eAAe,EAAE,CAAC;IAClC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;IACxE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,QAAQ,CAAC;CAC7B;AAED,eAAO,MAAM,gBAAgB,eAAgB,MAAM,WASlD,CAAC;AAOF,wBAAgB,gBAAgB,CAAC,EAC7B,cAAmB,EACnB,2BAA6C,EAC7C,QAAQ,EACR,cAAc,EACd,mBAA2B,EAC3B,WAAgB,EAChB,cAAc,GACjB,EAAE,MAAM,qBAwHR"}
+{"version":3,"file":"TopContentSearch.d.ts","sourceRoot":"","sources":["../../../src/TopContentSearch/TopContentSearch.tsx"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,2DAA2D,CAAC;AAQ5F,OAAO,KAA4D,MAAM,OAAO,CAAC;AAGjF,UAAU,MAAM;IACZ,cAAc,EAAE,MAAM,CAAC;IACvB,2BAA2B,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACzD,cAAc,EAAE,eAAe,EAAE,CAAC;IAClC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;IACxE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,QAAQ,CAAC;CAC7B;AAED,eAAO,MAAM,gBAAgB,eAAgB,MAAM,WASlD,CAAC;AAOF,wBAAgB,gBAAgB,CAAC,EAC7B,cAAmB,EACnB,2BAA6C,EAC7C,QAAQ,EACR,cAAc,EACd,mBAA2B,EAC3B,WAAgB,EAChB,cAAc,GACjB,EAAE,MAAM,qBAyHR"}

package/lib/esm/TopContentSearch/TopContentSearch.js

@@ -70,6 +70,7 @@ export function TopContentSearch({ topContentData = [], topContentResultsWrapper
     }, [topContentResultsWrapperRef]);
     const onSearchInputClear = useCallback((event) => {
         setSearchText('');
+        setSearchQuery && setSearchQuery('');
         onSearch('', topContentData);
         logCustomEvent(CustomEvents.inputClear, event);
         highlightSearchResults('');

package/lib/esm/hooks/index.d.ts

@@ -13,4 +13,5 @@ export * from './useBreakpoint';
 export * from './useOnScreen';
 export * from './useSelectKeyboardNavigator';
 export * from './useSessionStorage';
+export * from './useSearchDocument';
 //# sourceMappingURL=index.d.ts.map

package/lib/esm/hooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC"}

package/lib/esm/hooks/index.js

@@ -13,3 +13,4 @@ export * from './useBreakpoint';
 export * from './useOnScreen';
 export * from './useSelectKeyboardNavigator';
 export * from './useSessionStorage';
+export * from './useSearchDocument';

package/lib/esm/hooks/useSearchDocument.d.ts

@@ -0,0 +1,7 @@
+interface IIndexStrategy<T> {
+    indexKey: keyof T;
+    strategy: (doc: T) => string;
+}
+export declare function useSearchDocument<T>(documents: T[], searchQuery: string, indexStrategy: IIndexStrategy<T>): T[];
+export {};
+//# sourceMappingURL=useSearchDocument.d.ts.map

package/lib/esm/hooks/useSearchDocument.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSearchDocument.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSearchDocument.ts"],"names":[],"mappings":"AAMA,UAAU,cAAc,CAAC,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClB,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,CAAC;CAChC;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,OAwCzG"}

package/lib/esm/hooks/useSearchDocument.js

@@ -0,0 +1,42 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import SearchApi, { INDEX_MODES } from 'js-worker-search';
+import isEmpty from 'lodash/isEmpty';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { useDeepCompareDebounce } from './useDebounce';
+export function useSearchDocument(documents, searchQuery, indexStrategy) {
+    const [filteredDocs, setFilteredDocs] = useState(documents);
+    const searchWorkerRef = useRef(new SearchApi({
+        indexMode: INDEX_MODES.ALL_SUBSTRINGS,
+        caseSensitive: false,
+        matchAnyToken: true,
+    }));
+    const handleSearch = useCallback((query) => __awaiter(this, void 0, void 0, function* () {
+        if (isEmpty(query)) {
+            setFilteredDocs(documents);
+            return;
+        }
+        const indexedVals = yield searchWorkerRef.current.search(query);
+        setFilteredDocs(documents.filter((d) => indexedVals.includes(d[indexStrategy.indexKey])));
+    }), 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [documents]);
+    useEffect(() => {
+        documents.forEach((doc) => {
+            const indexedString = indexStrategy.strategy(doc);
+            searchWorkerRef.current.indexDocument(doc[indexStrategy.indexKey], indexedString);
+        });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [documents]);
+    useDeepCompareDebounce(() => {
+        handleSearch(searchQuery);
+    }, [searchQuery, documents], 500);
+    return filteredDocs;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/components",
-    "version": "2.1.61",
+    "version": "2.1.62",
     "description": "Contains all reusabel components for support app",
     "author": "Vikas Rathee <vrathee@redhat.com>",
     "license": "ISC",
@@ -67,9 +67,9 @@
         "@patternfly/patternfly": "5.1.0",
         "@patternfly/react-core": "5.1.1",
         "@patternfly/react-table": "5.1.1",
-        "@rh-support/types": "2.0.3",
-        "@rh-support/user-permissions": "2.1.44",
-        "@rh-support/utils": "2.1.33",
+        "@rh-support/types": "2.0.4",
+        "@rh-support/user-permissions": "2.1.45",
+        "@rh-support/utils": "2.1.34",
         "dompurify": "^2.2.6",
         "downshift": "^6.0.5",
         "js-worker-search": "^1.4.1",
@@ -109,5 +109,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "908b440e3c6cd625c77178c3205f4e2908630446"
+    "gitHead": "ecb9820a2fe40793e79c0f9f4786ec657070fe64"
 }