@rh-support/troubleshoot 2.2.23 → 2.2.24

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/ProductVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProductVersion.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDetails/ProductVersion.tsx"],"names":[],"mappings":"AA6BA,UAAU,MAAM;IACZ,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACvC;AAYD,iBAAS,eAAe,CAAC,KAAK,EAAE,MAAM,eAoRrC;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ProductVersion.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDetails/ProductVersion.tsx"],"names":[],"mappings":"AA6BA,UAAU,MAAM;IACZ,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACvC;AAED,iBAAS,eAAe,CAAC,KAAK,EAAE,MAAM,eAwOrC;AAED,eAAe,eAAe,CAAC"}

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/ProductVersion.js

@@ -8,27 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { Alert, AlertVariant } from '@patternfly/react-core';
-import { AlertMessage, AlertType, Dropdown, ToastNotification, usePrevious } from '@rh-support/components';
+import { AlertMessage, AlertType, Dropdown, ToastNotification } from '@rh-support/components';
 import { fetchProducts, GlobalMetadataDispatchContext, GlobalMetadataStateContext, useCanEditCase, } from '@rh-support/react-context';
 import { getUniqueSortedVersions, haventLoadedMetadata, toOption, toOptions, } from '@rh-support/utils';
 import filter from 'lodash/filter';
-import findIndex from 'lodash/findIndex';
 import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
-import React, { useContext, useEffect, useMemo, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../../../context/CaseContext';
 import { useCaseUpdateErrorMessage } from '../../../../hooks/useCaseUpdateErrorMessage';
 import { getVersionsDetails, updateCaseDetails } from '../../../../reducers/CaseReducer';
+import { getProductObj } from '../../../shared/utils';
 import { PDFContext } from '../../PDFContainer';
-const getVersions = (products, product) => {
-    const allProductsIndex = findIndex(products, (p) => p.product === product);
-    return allProductsIndex !== -1 ? products[allProductsIndex].versions || [] : [];
-};
-const checkIsTopProduct = (products, product) => {
-    const allProductsIndex = findIndex(products, (p) => p.product === product);
-    return allProductsIndex !== -1 ? products[allProductsIndex].isTopProduct : false;
-};
 function ProductNVersion(props) {
     const { t } = useTranslation();
     const caseUpdateError = useCaseUpdateErrorMessage();
@@ -42,16 +34,9 @@ function ProductNVersion(props) {
         caseNumber: state.caseDetails.caseNumber,
         versionsDetails: state.versionsDetails,
     }), isEqual);
-    const productVersions = useMemo(() => versionsDetails.data
-        .map(({ name }) => name)
-        .sort()
-        .reverse(), 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [product, versionsDetails.data]);
     const caseDispatch = useCaseDispatch();
     const dispatchToGlobalMetadataReducer = useContext(GlobalMetadataDispatchContext);
     const { globalMetadataState: { allProducts }, } = useContext(GlobalMetadataStateContext);
-    const productSEVersions = useMemo(() => getVersions(allProducts.data.productsResult, product), [allProducts.data.productsResult, product]);
     const [isProductInvalid, setIsProductInvalid] = useState(false);
     const [isVersionInvalid, setIsVersionInvalid] = useState(false);
     const [selectedProductLocal, setSelectedProductLocal] = useState(product);
@@ -59,33 +44,12 @@ function ProductNVersion(props) {
     const canEditCase = useCanEditCase();
     const { isExportingPDF } = useContext(PDFContext);
     useEffect(() => {
-        setVersions(productVersions);
-        if ((productVersions === null || productVersions === void 0 ? void 0 : productVersions.length) && !selectedVersionLocal && (productVersions === null || productVersions === void 0 ? void 0 : productVersions.length) < 2)
-            setSelectedVersionLocal(productVersions[0]);
-    }, [productVersions, selectedVersionLocal]);
-    /**
-     * Sync local version from global state if they change from someplace else
-     */
-    useEffect(() => {
-        setSelectedVersionLocal(version);
-    }, [version]);
-    useEffect(() => {
-        var _a;
         if (haventLoadedMetadata(allProducts, (data) => isEmpty(data.productsResult))) {
             fetchProducts(dispatchToGlobalMetadataReducer, contactSSOName);
         }
-        if (allProducts.data && ((_a = allProducts.data.productsResult) === null || _a === void 0 ? void 0 : _a.length) !== 0) {
-            const productSEVersions = getVersions(allProducts.data.productsResult, product);
-            const versions = (productSEVersions === null || productSEVersions === void 0 ? void 0 : productSEVersions.length) ? productSEVersions : productVersions;
-            setVersions(versions);
-        }
-        setSelectedProductLocal(product);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [allProducts, product, dispatchToGlobalMetadataReducer, contactSSOName]);
-    let previousProduct = usePrevious(selectedProductLocal);
-    let previousVersion = usePrevious(selectedVersionLocal);
+    }, [allProducts, dispatchToGlobalMetadataReducer, contactSSOName]);
     const onProductChange = (option) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
         if (canEditCase.alert())
             return;
         validateProduct(option);
@@ -94,60 +58,44 @@ function ProductNVersion(props) {
         if (!option.value.product) {
             return;
         }
-        const hasSingleVersion = ((_b = (_a = option === null || option === void 0 ? void 0 : option.value) === null || _a === void 0 ? void 0 : _a.versions) === null || _b === void 0 ? void 0 : _b.length) < 2;
-        setVersions((_c = option === null || option === void 0 ? void 0 : option.value) === null || _c === void 0 ? void 0 : _c.versions);
-        if (hasSingleVersion) {
-            setIsProductUpdating(true);
-            setIsVersionUpdating(true);
-            setSelectedVersionLocal(option.value.featuredVersion);
-            try {
-                const caseDetails = { product: option.value.product, version: option.value.featuredVersion };
-                yield updateCaseDetails(caseDispatch, caseNumber, caseDetails);
-                setIsProductUpdating(false);
-                setIsVersionUpdating(false);
-                setIsProductInvalid(false);
-                ToastNotification.addSuccessMessage(t(`Product and Version have been successfully updated`));
-            }
-            catch (e) {
-                setSelectedProductLocal(product);
-                setSelectedVersionLocal(version);
-                setIsProductUpdating(false);
-                setIsVersionUpdating(false);
-                setIsProductInvalid(false);
-                caseUpdateError.showError(e, t('Product and Version failed to update'));
-            }
-        }
-        else {
-            setIsVersionUpdating(true);
-            try {
-                yield getVersionsDetails(caseDispatch, option.value.product);
-            }
-            catch (e) {
-                setSelectedProductLocal(previousProduct);
-                setSelectedVersionLocal(previousVersion);
-            }
-            setIsVersionUpdating(false);
-        }
     });
     const onVersionChange = (option) => __awaiter(this, void 0, void 0, function* () {
         if (canEditCase.alert())
             return;
-        let onlyVersionChanged = false;
-        if (isEmpty(selectedVersionLocal)) {
-            setIsProductUpdating(true);
-        }
-        setIsVersionUpdating(true);
         setSelectedVersionLocal(option.value);
+        updateProductVerstion(selectedProductLocal, option.value);
+    });
+    const validateProduct = (selectedItem) => {
+        const isValid = !isProductUpdating && (isEmpty(selectedItem) || isEmpty(selectedItem.label));
+        setIsProductInvalid(isValid);
+    };
+    const onOuterClick = () => {
+        setSelectedProductLocal(product);
+        setSelectedVersionLocal(version);
+        setIsProductInvalid(false);
+    };
+    const onProductClear = () => {
+        const defaultSelectedProduct = {
+            featuredVersion: '',
+            product: '',
+            versions: [],
+            isEntitledProduct: true,
+        };
+        setIsProductInvalid(true);
+        setIsVersionInvalid(true);
+        onProductChange(toOption(defaultSelectedProduct, { labelKey: 'product' }));
+    };
+    const updateProductVerstion = (selectedProduct, selectedVersion) => __awaiter(this, void 0, void 0, function* () {
+        let onlyVersionChanged = false;
         try {
-            const caseDetails = { product: selectedProductLocal, version: option.value };
-            if (caseDetails.product === previousProduct) {
+            if (product === selectedProduct) {
                 onlyVersionChanged = true;
             }
-            yield updateCaseDetails(caseDispatch, caseNumber, caseDetails);
+            setIsProductUpdating(true);
+            setIsVersionUpdating(true);
+            yield updateCaseDetails(caseDispatch, caseNumber, { product: selectedProduct, version: selectedVersion });
             setIsProductUpdating(false);
             setIsVersionUpdating(false);
-            setIsProductInvalid(false);
-            setIsVersionInvalid(false);
             if (onlyVersionChanged) {
                 ToastNotification.addSuccessMessage(t(`Version has been successfully updated`));
             }
@@ -156,11 +104,10 @@ function ProductNVersion(props) {
             }
         }
         catch (e) {
-            setSelectedProductLocal(product);
             setSelectedVersionLocal(version);
+            setSelectedProductLocal(product);
             setIsProductUpdating(false);
             setIsVersionUpdating(false);
-            setIsProductInvalid(false);
             if (onlyVersionChanged) {
                 caseUpdateError.showError(e, t('Version failed to update'));
             }
@@ -169,39 +116,46 @@ function ProductNVersion(props) {
             }
         }
     });
-    const validateProduct = (selectedItem) => {
-        const isValid = !isProductUpdating && (isEmpty(selectedItem) || isEmpty(selectedItem.label));
-        setIsProductInvalid(isValid);
-    };
-    const onOuterClick = () => {
-        setSelectedProductLocal(product);
-        setSelectedVersionLocal(version);
-        setIsProductInvalid(true);
-    };
-    const onProductClear = () => {
-        const defaultSelectedProduct = {
-            featuredVersion: '',
-            product: '',
-            versions: [],
-            isTopProduct: false,
-            isEntitledProduct: true,
-        };
-        setIsProductInvalid(true);
-        setIsVersionInvalid(true);
-        onProductChange(toOption(defaultSelectedProduct, { labelKey: 'product' }));
-    };
-    useEffect(() => {
-        if (!isEmpty(product)) {
-            getVersionsDetails(caseDispatch, product);
-        }
-    }, [caseDispatch, product]);
     // To check if version in invalid
     const checkIfVersionIsInvalid = isVersionInvalid && isEmpty(selectedVersionLocal);
-    const versionsListMemo = useMemo(() => {
-        return getUniqueSortedVersions(versions);
-    }, [versions]);
-    // Versions List
-    const versionsList = toOptions(versionsListMemo);
+    // when user changes selected product, we need to fetch versions
+    useEffect(() => {
+        const getVersions = () => __awaiter(this, void 0, void 0, function* () {
+            if (!isEmpty(selectedProductLocal)) {
+                try {
+                    setIsVersionUpdating(true);
+                    yield getVersionsDetails(caseDispatch, selectedProductLocal);
+                    setIsVersionUpdating(false);
+                }
+                catch (e) {
+                    console.log(e);
+                    setIsVersionUpdating(false);
+                    // if sfdc api was downd and verssions were not available then populate versions with SE versions
+                    const productObj = getProductObj(allProducts.data.productsResult, selectedProductLocal);
+                    setVersions((productObj === null || productObj === void 0 ? void 0 : productObj.versions) || []);
+                }
+            }
+            else {
+                setVersions([]);
+            }
+        });
+        getVersions();
+    }, [selectedProductLocal, caseDispatch, allProducts.data]);
+    // observe when fetched versions are available
+    useEffect(() => {
+        const fetchedVersions = versionsDetails.data.map(({ name }) => name);
+        if (fetchedVersions.length === 1 && !selectedVersionLocal) {
+            setVersions(fetchedVersions);
+            setSelectedVersionLocal(fetchedVersions[0]);
+            updateProductVerstion(selectedProductLocal, fetchedVersions[0]);
+            return;
+        }
+        const productObj = getProductObj(allProducts.data.productsResult, selectedProductLocal);
+        const sfdcVersions = getUniqueSortedVersions(fetchedVersions);
+        const productVersions = (productObj === null || productObj === void 0 ? void 0 : productObj.hasComponentsInsteadOfVersions) ? sfdcVersions.reverse() : sfdcVersions;
+        setVersions(productVersions);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [versionsDetails.data]);
     return (React.createElement(React.Fragment, null,
         React.createElement(AlertMessage, { show: !allProducts.isFetching && allProducts.isError, title: t('There was an error loading products.'), variant: AlertType.DANGER }),
         isEmpty(selectedVersionLocal) && (selectedVersionLocal === null || selectedVersionLocal === void 0 ? void 0 : selectedVersionLocal.length) < 2 && (React.createElement(Alert, { isInline: true, className: "pf-u-mb-md", variant: AlertVariant.danger, title: React.createElement(Trans, null, "Please clear the errors to change the product on your case") })),
@@ -212,15 +166,14 @@ function ProductNVersion(props) {
                         React.createElement(Trans, null, "Product")),
                     React.createElement(Dropdown, { className: "open-case-product", placeholder: t('Select a product'), id: "case-details-product-selector", selectedItem: toOption({
                             product: selectedProductLocal,
-                            versions: (productSEVersions === null || productSEVersions === void 0 ? void 0 : productSEVersions.length) ? productSEVersions : productVersions,
+                            versions: versions,
                             featuredVersion: '',
                             selectedVersion: selectedVersionLocal,
-                            isTopProduct: checkIsTopProduct(allProducts.data.productsResult, product),
                             isEntitledProduct: true,
                         }, { labelKey: 'product' }), list: toOptions(filter(allProducts.data.productsResult, (p) => p.isEntitledProduct), { labelKey: 'product' }), title: t(`Select a product`), disabled: isProductUpdating || (allProducts.isFetching && !allProducts.isError), isInValid: isProductInvalid, onChange: onProductChange, isLoadingList: isProductUpdating, "data-tracking-id": "case-details-product-selector", onOuterClick: onOuterClick, searchable: true, onClearSelection: onProductClear, isExportingPDF: isExportingPDF })),
                 React.createElement("div", { className: "version-selector-wrapper" },
                     React.createElement("label", { htmlFor: "version-dropdown" },
                         React.createElement(Trans, null, "Version")),
-                    React.createElement(Dropdown, { className: "open-case-version", id: "version-dropdown", placeholder: t(`Select a version`), selectedItem: toOption(selectedVersionLocal), list: versionsList, title: t(`Select a version`), isInValid: checkIfVersionIsInvalid, disabled: isVersionUpdating || (allProducts.isFetching && !allProducts.isError), onChange: onVersionChange, isLoadingList: isVersionUpdating, "data-tracking-id": "case-details-version-selector" }))))));
+                    React.createElement(Dropdown, { className: "open-case-version", id: "version-dropdown", placeholder: t(`Select a version`), selectedItem: toOption(selectedVersionLocal), list: toOptions(versions), title: t(`Select a version`), isInValid: checkIfVersionIsInvalid, disabled: isVersionUpdating || (allProducts.isFetching && !allProducts.isError), onChange: onVersionChange, isLoadingList: isVersionUpdating, "data-tracking-id": "case-details-version-selector" }))))));
 }
 export default ProductNVersion;

package/lib/esm/components/CaseInformation/Severity.js

@@ -181,7 +181,7 @@ function Severity(props) {
                         props.isDisabled ||
                         allCaseSeverities.isFetching ||
                         ownersEntitlements.isFetching ||
-                        versionsDetails.isFetching, isLoadingList: props.isFetching || versionsDetails.isFetching, isInValid: allCaseSeverities.isError || isSeverityInValid, required: true, onChange: onSeverityChange, onOuterClick: setIsSeverityInValidLocal, "data-tracking-id": "get-support-severity" })),
+                        versionsDetails.isFetching, isLoadingList: props.isFetching, isInValid: allCaseSeverities.isError || isSeverityInValid, required: true, onChange: onSeverityChange, onOuterClick: setIsSeverityInValidLocal, "data-tracking-id": "get-support-severity" })),
             React.createElement(UpdateSeverityModal, { isDisabled: props.isFetching, isFetching: props.isFetching, show: openUpdateSeverityModal, onClose: toggleModal }))) : (React.createElement(Dropdown, { name: "get-support-severity", placeholder: t(`Select a severity`), title: t(`Select a severity`), list: allCaseSeverities.data
                 ? toOptions(filteredSeverities, {
                     labelKey: 'label',
@@ -196,7 +196,7 @@ function Severity(props) {
                 props.isDisabled ||
                 allCaseSeverities.isFetching ||
                 ownersEntitlements.isFetching ||
-                versionsDetails.isFetching, isLoadingList: props.isFetching || versionsDetails.isFetching, isInValid: allCaseSeverities.isError || isSeverityInValid, required: true, onChange: onSeverityChange, onOuterClick: setIsSeverityInValidLocal, "data-tracking-id": "get-support-severity" }))));
+                versionsDetails.isFetching, isLoadingList: props.isFetching, isInValid: allCaseSeverities.isError || isSeverityInValid, required: true, onChange: onSeverityChange, onOuterClick: setIsSeverityInValidLocal, "data-tracking-id": "get-support-severity" }))));
 }
 Severity.defaultProps = defaultProps;
 export default Severity;

package/lib/esm/components/ProductSelector/NewProductVersionSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NewProductVersionSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/ProductSelector/NewProductVersionSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAMpE,UAAU,MAAM;IACZ,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACrC,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,qCAAqC,EAAE,OAAO,CAAC;CAClD;AAED,eAAO,MAAM,yBAAyB,UAAW,MAAM,gBA+EtD,CAAC"}
+{"version":3,"file":"NewProductVersionSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/ProductSelector/NewProductVersionSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAYpE,UAAU,MAAM;IACZ,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACrC,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,qCAAqC,EAAE,OAAO,CAAC;CAClD;AAED,eAAO,MAAM,yBAAyB,UAAW,MAAM,gBA+HtD,CAAC"}

package/lib/esm/components/ProductSelector/NewProductVersionSelector.js

@@ -1,13 +1,33 @@
+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 { Select, SelectGroup, SelectOption, SelectVariant } from '@patternfly/react-core';
+import { GlobalMetadataStateContext } from '@rh-support/react-context';
+import { getUniqueSortedVersions } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
-import React, { useEffect, useState } from 'react';
+import isEqual from 'lodash/isEqual';
+import React, { useContext, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
+import { getVersionsDetails } from '../../reducers/CaseReducer';
+import { getProductObj } from '../shared/utils';
 export const NewProductVersionSelector = (props) => {
     const { t } = useTranslation();
     const [isOpen, setIsOpen] = useState(false);
     const [selected, setSelected] = useState('');
     const [selectVersionOptions, setSelectVersionOptions] = React.useState([]);
     const [showValidationLocal, setShowValidationLocal] = useState(props.isNextBtnClickedToShowValidationError);
+    const caseDispatch = useCaseDispatch();
+    const { versionsDetails } = useCaseSelector((state) => ({
+        versionsDetails: state.versionsDetails,
+    }), isEqual);
+    const { globalMetadataState: { allProducts }, } = useContext(GlobalMetadataStateContext);
     useEffect(() => {
         setShowValidationLocal(props.isNextBtnClickedToShowValidationError);
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -21,18 +41,43 @@ export const NewProductVersionSelector = (props) => {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [props.selectedProduct]);
+    // when user selects a product, we need to fetch versions
     useEffect(() => {
-        const renderVersions = () => {
-            let versionArray = [];
-            props.selectedProduct.versions.forEach((version, index) => {
-                let selectVersionItem = React.createElement(SelectOption, { key: index, value: version });
-                versionArray.push(selectVersionItem);
-            });
-            setSelectVersionOptions(versionArray);
-        };
-        renderVersions();
+        const getVersions = () => __awaiter(void 0, void 0, void 0, function* () {
+            if (!isEmpty(props.selectedProduct.name)) {
+                try {
+                    yield getVersionsDetails(caseDispatch, props.selectedProduct.name);
+                }
+                catch (e) {
+                    console.log(e);
+                    // if sfdc api was downd and verssions were not available then populate versions with SE versions
+                    const productObj = getProductObj(allProducts.data.productsResult, props.selectedProduct.name);
+                    const versionArray = productObj.versions.map((version, index) => (React.createElement(SelectOption, { key: index, value: version })));
+                    setSelectVersionOptions(versionArray);
+                }
+            }
+            else {
+                setSelectVersionOptions([]);
+            }
+        });
+        getVersions();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [props.selectedProduct]);
+    // observe when fetched versions are available
+    useEffect(() => {
+        const fetchedVersions = versionsDetails.data.map(({ name }) => name);
+        // if versions array has one value set that value as selected
+        if (fetchedVersions.length === 1) {
+            props.onVersionChange(fetchedVersions[0]);
+            setSelected(fetchedVersions[0]);
+        }
+        const productObj = getProductObj(allProducts.data.productsResult, props.selectedProduct.name);
+        const sfdcVersions = getUniqueSortedVersions(fetchedVersions);
+        const productVersions = (productObj === null || productObj === void 0 ? void 0 : productObj.hasComponentsInsteadOfVersions) ? sfdcVersions.reverse() : sfdcVersions;
+        const versionArray = productVersions.map((version, index) => (React.createElement(SelectOption, { key: index, value: version })));
+        setSelectVersionOptions(versionArray);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [versionsDetails.data]);
     let options = [React.createElement(SelectGroup, { key: "productVersions" }), ...selectVersionOptions];
     const onToggle = (isOpen) => {
         setIsOpen(isOpen);
@@ -53,5 +98,5 @@ export const NewProductVersionSelector = (props) => {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [props.versionState]);
     const titleId = 'version-selector';
-    return (React.createElement(Select, { variant: SelectVariant.single, onToggle: onToggle, onSelect: onSelect, isOpen: isOpen, placeholderText: t('Select a version'), "aria-labelledby": titleId, selections: selected, validated: isEmpty(selected) && showValidationLocal ? 'error' : 'default', isDisabled: isEmpty(props.selectedProduct.product), "data-tracking-id": "get-support-version-dropdown-selector" }, options));
+    return (React.createElement(Select, Object.assign({ variant: SelectVariant.single, onToggle: onToggle, onSelect: onSelect, isOpen: isOpen, placeholderText: t('Select a version'), "aria-labelledby": titleId, selections: selected, validated: isEmpty(selected) && showValidationLocal ? 'error' : 'default', isDisabled: isEmpty(props.selectedProduct.product), "data-tracking-id": "get-support-version-dropdown-selector" }, (versionsDetails.isFetching && { loadingVariant: 'spinner' })), options));
 };

package/lib/esm/components/TroubleshootSection/TroubleshootSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TroubleshootSection.d.ts","sourceRoot":"","sources":["../../../../src/components/TroubleshootSection/TroubleshootSection.tsx"],"names":[],"mappings":"AAmBA,UAAU,MAAM;IACZ,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B;AASD,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,eA0HzC;kBA1HQ,mBAAmB;;;AA6H5B,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"TroubleshootSection.d.ts","sourceRoot":"","sources":["../../../../src/components/TroubleshootSection/TroubleshootSection.tsx"],"names":[],"mappings":"AAmBA,UAAU,MAAM;IACZ,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B;AASD,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,eA4GzC;kBA5GQ,mBAAmB;;;AA+G5B,eAAe,mBAAmB,CAAC"}

package/lib/esm/components/TroubleshootSection/TroubleshootSection.js

@@ -37,15 +37,8 @@ function TroubleshootSection(props) {
     const canShowTopContent = !canShowTopProducts && ((_a = topContent === null || topContent === void 0 ? void 0 : topContent.data) === null || _a === void 0 ? void 0 : _a.length) > 0;
     const canAddAttachments = ability.can(resourceActions.PATCH, resources.CASE_CREATE, CaseListFields.ATTACHMENTS);
     const isNotAnIdea = caseType !== PreviousCaseTypes.FEATURE_ENHANCEMENT;
-    const ParentSection = ({ children }) => {
-        if (!children) {
-            return null;
-        }
-        return React.createElement("section", { className: "parent-section" }, children);
-    };
     return (React.createElement(React.Fragment, null,
-        !isCreatingCase && (React.createElement(ParentSection, null,
-            React.createElement(OpenShiftClusterId, { className: "push-bottom", "data-tracking-id": "troubleshoot-section-openshift-cluster-id" }))),
+        !isCreatingCase && (React.createElement(OpenShiftClusterId, { className: "push-bottom", "data-tracking-id": "troubleshoot-section-openshift-cluster-id" })),
         React.createElement("section", null,
             React.createElement("header", null,
                 React.createElement("h3", null,

package/lib/esm/components/shared/utils.d.ts

@@ -1,3 +1,4 @@
+import { ISEProduct } from '@cee-eng/hydrajs/@types/models/product';
 import { CaseValuesToWatch } from './Constants';
 /**
  *
@@ -11,4 +12,5 @@ import { CaseValuesToWatch } from './Constants';
 export declare function getChangedValueTooltip<T>(valueNameCb: (current: T, previous: T) => CaseValuesToWatch, accessor?: (value: T, otherValue: T) => any): (currentValue: T, previousValue: T) => JSX.Element;
 export declare const isPhoneValid: (countryCode: string, phoneLine: string) => boolean;
 export declare const trimAndReplacePlus: (value: string) => string;
+export declare const getProductObj: (products: Partial<ISEProduct>[], product: string) => Partial<ISEProduct>;
 //# sourceMappingURL=utils.d.ts.map

package/lib/esm/components/shared/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/components/shared/utils.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,EACpC,WAAW,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,iBAAiB,EAC3D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,GAAG,kBAErB,CAAC,iBAAiB,CAAC,iBAQ5C;AAED,eAAO,MAAM,YAAY,gBAAiB,MAAM,aAAa,MAAM,KAAG,OAarE,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAW,MAAM,WAG/C,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/components/shared/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAOpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,EACpC,WAAW,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,iBAAiB,EAC3D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,GAAG,kBAErB,CAAC,iBAAiB,CAAC,iBAQ5C;AAED,eAAO,MAAM,YAAY,gBAAiB,MAAM,aAAa,MAAM,KAAG,OAarE,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAW,MAAM,WAG/C,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,UAAU,CAAC,EAAE,WAAW,MAAM,wBAG7E,CAAC"}

package/lib/esm/components/shared/utils.js

@@ -1,3 +1,4 @@
+import findIndex from 'lodash/findIndex';
 import isEmpty from 'lodash/isEmpty';
 import React from 'react';
 import { Trans } from 'react-i18next';
@@ -42,3 +43,7 @@ export const trimAndReplacePlus = (value) => {
         return '';
     return (_a = value.trim()) === null || _a === void 0 ? void 0 : _a.replace('+', '');
 };
+export const getProductObj = (products, product) => {
+    const productIndex = findIndex(products, (p) => p.product === product);
+    return productIndex === -1 ? {} : products[productIndex];
+};

package/lib/esm/components/wizardLayout/GlobalTroubleshootEffects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GlobalTroubleshootEffects.d.ts","sourceRoot":"","sources":["../../../../src/components/wizardLayout/GlobalTroubleshootEffects.tsx"],"names":[],"mappings":"AAWA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAqB,eAAe,EAAE,MAAM,iCAAiC,CAAC;AASrF,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,eAmWtD"}
+{"version":3,"file":"GlobalTroubleshootEffects.d.ts","sourceRoot":"","sources":["../../../../src/components/wizardLayout/GlobalTroubleshootEffects.tsx"],"names":[],"mappings":"AAWA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAUvD,OAAO,EAAqB,eAAe,EAAE,MAAM,iCAAiC,CAAC;AASrF,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,eAgVtD"}

package/lib/esm/components/wizardLayout/GlobalTroubleshootEffects.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { useDebounce, usePrevious } from '@rh-support/components';
 import { GlobalMetadataStateContext, useUserPreferences } from '@rh-support/react-context';
 import { ability, CaseListFields, resourceActions, resources } from '@rh-support/user-permissions';
-import { getUrlParsedParams, getVersion, getVersionIfOnlyVersion, isOnlyVersion } from '@rh-support/utils';
+import { getVersion } from '@rh-support/utils';
 import findIndex from 'lodash/findIndex';
 import includes from 'lodash/includes';
 import isEmpty from 'lodash/isEmpty';
@@ -22,7 +22,6 @@ import { RulesDispatchContext } from '../../context/RulesContext';
 import { SessionRestoreStateContext } from '../../context/SessionRestoreContext';
 import { TCDispatchContext, TCStateContext } from '../../context/TopContentContext';
 import { useResetCaseCreate } from '../../hooks/useResetCaseCreate';
-import { initialCaseState } from '../../reducers/CaseConstNTypes';
 import { getDescriptionWOQues } from '../../reducers/CaseHelpers';
 import { setCaseAccountNumber, setCaseDetails, setCaseOwner, setCaseState } from '../../reducers/CaseReducer';
 import { setRouteFlags } from '../../reducers/RouteReducer';
@@ -51,11 +50,6 @@ export function GlobalTroubleshootEffects(props) {
         language: state.caseDetails.caseLanguage,
         selectedAccountDetails: state.selectedAccountDetails,
     }), isEqual);
-    const versionsDetails = useCaseSelector((state) => {
-        if (isEmpty(state.versionsDetails.data))
-            return [];
-        return state.versionsDetails.data.map(({ name }) => name);
-    }, isEqual);
     const caseDispatch = useCaseDispatch();
     const isCaseCreate = RouteUtils.getQueryParams(props.routeProps).caseCreate === 'true';
     const urlQueryParams = RouteUtils.getQueryParams(props.routeProps);
@@ -74,19 +68,13 @@ export function GlobalTroubleshootEffects(props) {
      * Setting product version on case details from url.
      */
     useEffect(() => {
-        if (allProducts.isFetching || allProducts.isError || isEmpty(allProducts.data.productsResult))
+        const productFromUrl = urlQueryParams.product;
+        const versionFromUrl = urlQueryParams.version;
+        if (!productFromUrl ||
+            allProducts.isFetching ||
+            allProducts.isError ||
+            isEmpty(allProducts.data.productsResult))
             return;
-        const parsedUrlParams = getUrlParsedParams(props.routeProps.location.search);
-        const productFromUrl = parsedUrlParams.product || initialCaseState.caseDetails.product;
-        if (isEmpty(productFromUrl)) {
-            // Reset case state
-            setCaseDetails(caseDispatch, {
-                product: productFromUrl,
-                version: undefined,
-            });
-            return;
-        }
-        const versionFromUrl = parsedUrlParams.version || initialCaseState.caseDetails.version;
         const index = findIndex(allProducts.data.productsResult, (p) => p.product === productFromUrl);
         if (index === -1) {
             // invalid product, reset url
@@ -95,37 +83,20 @@ export function GlobalTroubleshootEffects(props) {
                 version: undefined,
             };
             RouteUtils.updateQueryParams(props.routeProps, newParams);
+            return;
         }
-        else {
-            // Check if product information it self is having version list or fallback to version list from different source.
-            const productVersions = isEmpty(allProducts.data.productsResult[index].versions)
-                ? versionsDetails
-                : allProducts.data.productsResult[index].versions;
-            // product in url is valid
-            const isVersionFromURLValid = !isEmpty(versionFromUrl) && includes(productVersions, versionFromUrl);
-            const isMultiVersionProduct = !isOnlyVersion(productVersions);
-            if (isVersionFromURLValid || isMultiVersionProduct) {
-                // version is also valid
-                const versionToSet = isVersionFromURLValid ? versionFromUrl : undefined;
-                if (product !== productFromUrl || version !== versionToSet) {
-                    setCaseDetails(caseDispatch, {
-                        product: productFromUrl,
-                        version: versionToSet,
-                    });
-                }
-            }
-            else if (!isMultiVersionProduct) {
-                // no version or invalid version and there is only 1 version we set default version in url that will trigger the flow with valid version this time
-                const defaultVersion = getVersionIfOnlyVersion(productVersions);
-                const newParams = {
-                    product: productFromUrl,
-                    version: defaultVersion,
-                };
-                RouteUtils.updateQueryParams(props.routeProps, newParams);
-            }
+        // product in url is valid check to see if version is valid
+        const productVersions = allProducts.data.productsResult[index].versions;
+        const isVersionFromURLValid = !isEmpty(versionFromUrl) && includes(productVersions, versionFromUrl);
+        const versionToSet = isVersionFromURLValid ? versionFromUrl : undefined;
+        if (product !== productFromUrl || version !== versionToSet) {
+            setCaseDetails(caseDispatch, {
+                product: productFromUrl,
+                version: versionToSet,
+            });
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [allProducts, allProducts.data.productsResult, caseDispatch, props.routeProps]);
+    }, [allProducts.data.productsResult, caseDispatch, props.routeProps]);
     // if you want to hide any section on page load then the logic will go here..
     useEffect(() => {
         if (!isFirstMount.current && loggedInUser.data && managedAccounts.data)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "2.2.23",
+    "version": "2.2.24",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -26,7 +26,7 @@
         "lib/**/*"
     ],
     "peerDependencies": {
-        "@cee-eng/hydrajs": "4.15.87",
+        "@cee-eng/hydrajs": "4.16.11",
         "@cee-eng/ui-toolkit": "1.1.6",
         "@patternfly/patternfly": "4.196.7",
         "@patternfly/pfe-accordion": "1.12.3",
@@ -56,7 +56,7 @@
         "react-virtualized": "^9.21.2"
     },
     "dependencies": {
-        "@cee-eng/hydrajs": "4.15.87",
+        "@cee-eng/hydrajs": "4.16.11",
         "@cee-eng/ui-toolkit": "1.1.6",
         "@patternfly/patternfly": "4.196.7",
         "@patternfly/pfe-accordion": "1.12.3",
@@ -66,11 +66,11 @@
         "@patternfly/react-core": "4.264.0",
         "@progress/kendo-drawing": "^1.6.0",
         "@progress/kendo-react-pdf": "^3.12.0",
-        "@rh-support/components": "2.1.12",
-        "@rh-support/react-context": "2.1.12",
+        "@rh-support/components": "2.1.13",
+        "@rh-support/react-context": "2.1.13",
         "@rh-support/types": "2.0.2",
-        "@rh-support/user-permissions": "2.1.6",
-        "@rh-support/utils": "2.1.3",
+        "@rh-support/user-permissions": "2.1.7",
+        "@rh-support/utils": "2.1.4",
         "@types/react-redux": "^7.1.12",
         "@types/redux": "^3.6.0",
         "dompurify": "^2.4.1",
@@ -133,5 +133,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "37be192367e7927f47125f2452142bbb8ccf9215"
+    "gitHead": "3cb1c9deeb0f55a0df73b0f0845194a72cbac688"
 }

package/lib/esm/components/ProductSelector/TopProductsSelector.d.ts

@@ -1,12 +0,0 @@
-import { RouteComponentProps } from 'react-router';
-import { IRouteUrlParams } from '../../reducers/RouteConstNTypes';
-interface IProps {
-    isDropdownSelected?: boolean;
-    setIsDropdownSelected?: (flag: boolean) => void;
-    routeProps: RouteComponentProps<IRouteUrlParams>;
-    showOnlyEntitledProducts: boolean;
-    productSelectorRef: HTMLDivElement;
-}
-export declare function TopProductsSelector(props: IProps): JSX.Element;
-export {};
-//# sourceMappingURL=TopProductsSelector.d.ts.map

package/lib/esm/components/ProductSelector/TopProductsSelector.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TopProductsSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/ProductSelector/TopProductsSelector.tsx"],"names":[],"mappings":"AAcA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,EAAqB,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAGrF,UAAU,MAAM;IACZ,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;IACjD,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,EAAE,cAAc,CAAC;CACtC;AAYD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,eAgHhD"}

package/lib/esm/components/ProductSelector/TopProductsSelector.js

@@ -1,107 +0,0 @@
-import { GlobalMetadataStateContext } from '@rh-support/react-context';
-import { getVersionIfOnlyVersion } from '@rh-support/utils';
-import filter from 'lodash/filter';
-import find from 'lodash/find';
-import findIndex from 'lodash/findIndex';
-import includes from 'lodash/includes';
-import isArray from 'lodash/isArray';
-import isEmpty from 'lodash/isEmpty';
-import isEqual from 'lodash/isEqual';
-import map from 'lodash/map';
-import noop from 'lodash/noop';
-import React, { useContext, useEffect, useState } from 'react';
-import { Trans } from 'react-i18next';
-import { useCaseSelector } from '../../context/CaseContext';
-import RouteUtils from '../../utils/routeUtils';
-/**
- * Renders a radio list to select top products.
- * Manages selected product internally.
- * Uses product version from case details and isDropdownSelected from props to determine its state.
- * Change URL on changing selection
- *
- * @param props
- */
-const SPACE = 32;
-const ENTER = 13;
-export function TopProductsSelector(props) {
-    const defaultSelectedProduct = {
-        featuredVersion: '',
-        product: '',
-        versions: [],
-        isTopProduct: false,
-        isEntitledProduct: true,
-    };
-    const { globalMetadataState: { allProducts, loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
-    const { product, version } = useCaseSelector((state) => ({
-        product: state.caseDetails.product,
-        version: state.caseDetails.version,
-    }), isEqual);
-    const [selectedProductForRadioList, setSelectedProductForRadioList] = useState(defaultSelectedProduct);
-    const entitledTopProducts = filter(allProducts.data.topProducts, (p) => p.isEntitledProduct);
-    const topProducts = props.showOnlyEntitledProducts ? entitledTopProducts : allProducts.data.topProducts;
-    /**
-     * Update value in radio list based on product & version from case details and if Dropdown is not Selected
-     */
-    useEffect(() => {
-        if (allProducts.isFetching || allProducts.isError)
-            return;
-        if (props.isDropdownSelected) {
-            if (isEmpty(selectedProductForRadioList.product))
-                return;
-            else
-                setSelectedProductForRadioList(defaultSelectedProduct);
-        }
-        else {
-            const caseDetailsProduct = find(topProducts, (p) => p.product === product);
-            // When the selectedProductForRadioList is not in sync
-            if (!isEmpty(caseDetailsProduct) && !isEmpty(version) && includes(caseDetailsProduct.versions, version)) {
-                setSelectedProductForRadioList(caseDetailsProduct);
-            }
-            else if (isEmpty(caseDetailsProduct) && !isEmpty(selectedProductForRadioList.product)) {
-                setSelectedProductForRadioList(defaultSelectedProduct);
-            }
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [allProducts, defaultSelectedProduct, product, props, selectedProductForRadioList.product, version]);
-    function onProductChange(selectedProduct) {
-        var _a;
-        setTimeout(() => {
-            props.productSelectorRef.focus();
-        }, 200); // Will make sure product is selected before we focus
-        if (props.isDropdownSelected) {
-            (_a = props.setIsDropdownSelected) === null || _a === void 0 ? void 0 : _a.call(props, false);
-        }
-        const newParams = {
-            product: selectedProduct.product,
-            version: getVersionIfOnlyVersion(selectedProduct.versions),
-        };
-        RouteUtils.updateQueryParams(props.routeProps, newParams);
-    }
-    const onHandleKey = (item) => (e) => {
-        if (e.keyCode === SPACE || e.keyCode === ENTER) {
-            onProductChange(item);
-        }
-    };
-    const onHandleInputClick = (item) => (event) => {
-        if (event.detail > 0 || loggedInUserRights.data.isOnIE11()) {
-            onProductChange(item);
-        }
-    };
-    const onHandleLabelClick = (item) => (event) => {
-        onProductChange(item);
-    };
-    if (isEmpty(topProducts) || !isArray(topProducts))
-        return React.createElement(React.Fragment, null);
-    const selectedRadioIndex = findIndex(topProducts, (p) => p.product === selectedProductForRadioList.product || p.product === product);
-    return (React.createElement("div", { className: "top-products" },
-        React.createElement("p", { id: "productSelectRadioGroup" },
-            React.createElement(Trans, null, "You can also select a top product:")),
-        React.createElement("ul", { className: `product-selector-list unstyled-list`, role: "radiogroup", "aria-labelledby": "productSelectRadioGroup" }, map(topProducts, (item, i) => {
-            if (Array.isArray(item) && item.length === 0) {
-                return null;
-            }
-            return (React.createElement("li", { key: i, className: "form-group" },
-                React.createElement("input", { type: "radio", id: `product-selector-${i}`, checked: selectedRadioIndex === i, onClick: onHandleInputClick(item), onKeyDown: onHandleKey(item), onChange: noop }),
-                React.createElement("label", { htmlFor: `product-selector-${i}`, onClick: onHandleLabelClick(item) }, item.product)));
-        }))));
-}