@rh-support/troubleshoot 0.2.117 → 0.2.120

package/lib/esm/components/CaseEditView/ActiveCustomerEscalation/RequestEscalationModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestEscalationModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/ActiveCustomerEscalation/RequestEscalationModal.tsx"],"names":[],"mappings":"AAwCA,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAID,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,eA4VnD"}
+{"version":3,"file":"RequestEscalationModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/ActiveCustomerEscalation/RequestEscalationModal.tsx"],"names":[],"mappings":"AAwCA,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAID,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,eA+VnD"}

package/lib/esm/components/CaseEditView/ActiveCustomerEscalation/RequestEscalationModal.js

@@ -131,11 +131,14 @@ export function RequestEscalationModal(props) {
         React.createElement(Popover, { showClose: false, position: 'top', hasAutoWidth: true, bodyContent: () => (React.createElement("a", { href: "/support/escalation", target: "_blank" },
                 React.createElement(Trans, null, "Learn more about escalation cases."))) },
             React.createElement(InfoCircleIcon, { className: "pf-u-ml-sm" }))));
+    // load rme categories as soon as user opens the modal
     useEffect(() => {
+        if (!props.show || categories.length !== 0)
+            return;
         const fetchCategories = () => __awaiter(this, void 0, void 0, function* () {
             try {
-                const cats = yield getRmeCategories();
-                setCategories(cats);
+                const categories = yield getRmeCategories();
+                setCategories((categories === null || categories === void 0 ? void 0 : categories.items) || []);
             }
             catch (e) {
                 console.log(e);
@@ -143,7 +146,7 @@ export function RequestEscalationModal(props) {
         });
         fetchCategories();
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    }, [props.show]);
     return (React.createElement(Modal, { isOpen: props.show, onClose: onCancel, actions: modalActions, header: header },
         React.createElement("p", { className: "pf-u-mb-md" },
             React.createElement(Trans, { i18nKey: "i18RequestEscalationDescription" }, "Submit an escalation if an issue has become more severe or you feel the case needs a higher priority. A support manager will review yor escalation request.")),

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

@@ -1 +1 @@
-{"version":3,"file":"CaseOpenshiftClusterId.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenshiftClusterId.tsx"],"names":[],"mappings":"AAuBA,wBAAgB,sBAAsB,gBA4RrC"}
+{"version":3,"file":"CaseOpenshiftClusterId.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenshiftClusterId.tsx"],"names":[],"mappings":"AA0BA,wBAAgB,sBAAsB,gBA4QrC"}

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

@@ -13,14 +13,14 @@ import { getVersion } from '@rh-support/utils';
 import debounce from 'lodash/debounce';
 import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
-import React, { useCallback, useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../../../../context/CaseContext';
 import { setCaseDetails, updateCaseDetails } from '../../../../../reducers/CaseReducer';
-import { getIsClusterIdInvalid, isClusterIdEnabledForProduct } from '../../../../../utils/caseOpenshiftClusterIdUtils';
+import { getIsClusterIdInvalid, isClusterIdEnabledForProduct, } from '../../../../../utils/caseOpenshiftClusterIdUtils';
 import { NoClusterIDReasonSelector } from '../../../../CaseManagement/NoClusterIDReasonSelector';
 import { discoverV4ClusterIdLink, discoverV4ClusterIdLinkError, isInvalidErrorMessage, v3Tov4TransitionLink, } from '../../../../CaseManagement/OpenShiftClusterId';
-import { fetchClusterIdDetails, OpenshiftDropdownV4 } from '../../../../CaseManagement/OpenshiftDropdownV4';
+import { OpenshiftDropdownV4 } from '../../../../CaseManagement/OpenshiftDropdownV4';
 export function CaseOpenshiftClusterId() {
     const { openshiftClusterID, product, version, caseNumber, openshiftClusterVersion, noClusterIdReason, noClusterIdReasonExplanation, selectedAccountDetails, description, } = useCaseSelector((state) => ({
         openshiftClusterID: state.caseDetails.openshiftClusterID,
@@ -42,30 +42,25 @@ export function CaseOpenshiftClusterId() {
     const [isClusterIdInvalid, setIsClusterIdInValid] = useState(false);
     const [dontKnowSelected, setDontKnowSelected] = useState(false);
     const [selectedReason, setSelectedReason] = useState('');
-    const [isFetchingClusterDetails, setIsFetchingClusterDetails] = useState(false);
     const [localOpenshiftClusterIDState, setLocalOpenshiftClusterIDState] = useState(openshiftClusterID);
     const [isClusterIdUpdating, setIsClusterIdUpdating] = useState(false);
     const [isReasonUpdating, setIsReasonUpdating] = useState(false);
+    const displayName = useRef('');
     const { t } = useTranslation();
     const clusterStateReset = () => {
         setSelectedReason('');
         setDontKnowSelected(false);
     };
-    const setClusterVersion = (openshiftClusterID, clusterDetails) => __awaiter(this, void 0, void 0, function* () {
-        if (!openshiftClusterID || getIsClusterIdInvalid(openshiftClusterID))
-            return;
-        let openshiftClusterVersion;
-        if (clusterDetails &&
-            clusterDetails.external_cluster_id === openshiftClusterID &&
-            clusterDetails.openshift_version) {
-            openshiftClusterVersion = clusterDetails.openshift_version;
-        }
-        else {
-            const clusterDetails = yield fetchClusterIdDetails(openshiftClusterID);
-            openshiftClusterVersion = clusterDetails === null || clusterDetails === void 0 ? void 0 : clusterDetails.openshift_version;
-        }
-        setCaseDetails(caseDispatch, { openshiftClusterVersion });
-    });
+    const resetClusterData = () => {
+        setLocalOpenshiftClusterIDState('');
+        clusterStateReset();
+        setCaseDetails(caseDispatch, {
+            openshiftClusterID: '',
+            openshiftClusterVersion: '',
+            noClusterIdReasonExplanation: '',
+            noClusterIdReason: '',
+        });
+    };
     useEffect(() => {
         var _a;
         const isClusterVisible = () => __awaiter(this, void 0, void 0, function* () {
@@ -103,9 +98,6 @@ export function CaseOpenshiftClusterId() {
     useEffect(() => {
         const isClusterIdInvalid = getIsClusterIdInvalid(openshiftClusterID);
         setIsClusterIdInValid(isClusterIdInvalid);
-        if (openshiftClusterID && !isClusterIdInvalid && isEmpty(openshiftClusterVersion)) {
-            setClusterVersion(openshiftClusterID);
-        }
         if (!isEmpty(noClusterIdReason)) {
             setDontKnowSelected(true);
             setSelectedReason('dont-have-id');
@@ -138,13 +130,6 @@ export function CaseOpenshiftClusterId() {
             setDontKnowSelected(true);
             setSelectedReason(selectedClusterId);
             setIsClusterIdInValid(false);
-            const caseDetails = {
-                openshiftClusterID: '',
-                noClusterIdReasonExplanation: '',
-                noClusterIdReason: '',
-                openshiftClusterVersion: '',
-            };
-            yield clusterIdUpdate(caseDetails);
         }
         else if (selectedClusterId === 'v3-cluster') {
             setSelectedReason('dont-have-id');
@@ -160,25 +145,18 @@ export function CaseOpenshiftClusterId() {
         else {
             const isClusterIdInvalid = getIsClusterIdInvalid(selectedClusterId);
             setIsClusterIdInValid(isClusterIdInvalid);
+            setDontKnowSelected(false);
+            setSelectedReason('');
+            displayName.current = selectedCluster.display_name;
             if (isClusterIdInvalid || selectedClusterId === openshiftClusterID)
                 return;
             const caseDetails = {
                 openshiftClusterID: selectedClusterId,
                 noClusterIdReasonExplanation: '',
                 noClusterIdReason: '',
+                openshiftClusterVersion: selectedCluster.openshift_version,
             };
-            if (selectedCluster === null || selectedCluster === void 0 ? void 0 : selectedCluster.openshift_version) {
-                caseDetails.openshiftClusterVersion = selectedCluster.openshift_version;
-            }
-            else {
-                setIsFetchingClusterDetails(true);
-                const clusterDetails = yield fetchClusterIdDetails(selectedClusterId);
-                caseDetails.openshiftClusterVersion = (clusterDetails === null || clusterDetails === void 0 ? void 0 : clusterDetails.openshift_version) || '';
-                setIsFetchingClusterDetails(false);
-            }
             yield clusterIdUpdate(caseDetails);
-            setDontKnowSelected(false);
-            setSelectedReason('');
         }
     });
     const isDedicatedV3 = () => noClusterIdReason === 'Other' && noClusterIdReasonExplanation === 'v3-cluster';
@@ -212,13 +190,18 @@ export function CaseOpenshiftClusterId() {
         }
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    const debounceFn = useCallback(debounce(onReasonExplanationInputBoxChanged, 1000), []);
+    const debounceFn = debounce(onReasonExplanationInputBoxChanged, 1000);
     const onReasonChange = (reason) => __awaiter(this, void 0, void 0, function* () {
         if (!reason || reason === noClusterIdReason)
             return;
         try {
             setIsReasonUpdating(true);
-            const caseDetails = { openshiftClusterID: '', noClusterIdReason: reason, noClusterIdReasonExplanation: '' };
+            const caseDetails = {
+                openshiftClusterID: '',
+                openshiftClusterVersion: '',
+                noClusterIdReason: reason,
+                noClusterIdReasonExplanation: '',
+            };
             setCaseDetails(caseDispatch, { noClusterIdReason: reason });
             yield clusterIdUpdate(caseDetails);
         }
@@ -236,9 +219,9 @@ export function CaseOpenshiftClusterId() {
     }
     else {
         return (React.createElement(React.Fragment, null,
-            React.createElement(OpenshiftDropdownV4, { openshiftClusterIDState: localOpenshiftClusterIDState || selectedReason, onClusterIdStateUpdate: onClusterIdSave, isClusterIdInvalid: (isEmpty(localOpenshiftClusterIDState) && isEmpty(selectedReason)) || isClusterIdInvalid, clusterIdDropdownFormInstructions: clusterIdDropdownFormInstructions(), onClusterClear: () => setLocalOpenshiftClusterIDState(''), isV4: majorVersion === '4', isDisabled: isClusterIdUpdating || isFetchingClusterDetails, noClusterIdReasonExplanation: noClusterIdReasonExplanation }),
+            React.createElement(OpenshiftDropdownV4, { openshiftDisplayName: displayName.current, openshiftClusterIDState: localOpenshiftClusterIDState || selectedReason, onClusterIdStateUpdate: onClusterIdSave, isClusterIdInvalid: (isEmpty(localOpenshiftClusterIDState) && isEmpty(selectedReason)) || isClusterIdInvalid, clusterIdDropdownFormInstructions: clusterIdDropdownFormInstructions(), onClusterClear: resetClusterData, isV4: majorVersion === '4', isDisabled: isClusterIdUpdating, noClusterIdReasonExplanation: noClusterIdReasonExplanation }),
             noClusterIdReasonExplanation !== 'v3-cluster' &&
-                (dontKnowSelected || noClusterIdReasonExplanation || noClusterIdReason) && (React.createElement(NoClusterIDReasonSelector, { noClusterIdReasonExplanation: noClusterIdReasonExplanation, noClusterIdReason: noClusterIdReason, onReasonInputBoxChanged: debounceFn, onReasonChange: onReasonChange, isInValid: isInVaidNoClusterIdReason, isCustomer: isCustomer, isDisabled: isReasonUpdating || isFetchingClusterDetails })),
+                (dontKnowSelected || noClusterIdReasonExplanation || noClusterIdReason) && (React.createElement(NoClusterIDReasonSelector, { noClusterIdReasonExplanation: noClusterIdReasonExplanation, noClusterIdReason: noClusterIdReason, onReasonInputBoxChanged: debounceFn, onReasonChange: onReasonChange, isInValid: isInVaidNoClusterIdReason, isCustomer: isCustomer, isDisabled: isReasonUpdating })),
             React.createElement(LoadingIndicator, { show: isClusterIdUpdating, size: "xs" })));
     }
 }

package/lib/esm/components/CaseEditView/Tabs/RMEEscalations/RMEEscalationList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RMEEscalationList.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/RMEEscalations/RMEEscalationList.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAqB,MAAM,2CAA2C,CAAC;AAwB/F,UAAU,MAAM;IACZ,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACtB;AAOD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,KAAK,EAAE,MAAM,eAyMtD"}
+{"version":3,"file":"RMEEscalationList.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/RMEEscalations/RMEEscalationList.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAqB,MAAM,2CAA2C,CAAC;AAwB/F,UAAU,MAAM;IACZ,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACtB;AAOD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,KAAK,EAAE,MAAM,eAsMtD"}

package/lib/esm/components/CaseEditView/Tabs/RMEEscalations/RMEEscalationList.js

@@ -11,7 +11,7 @@ import { escalations, publicApi } from '@cee-eng/hydrajs';
 import { Button, ButtonVariant, Flex, FlexItem } from '@patternfly/react-core';
 import { LoadingIndicator, PFTable, Table, ToastNotification, useFetch } from '@rh-support/components';
 import { ability, resourceActions, resources } from '@rh-support/user-permissions';
-import { formatDate } from '@rh-support/utils';
+import { formatDate, sendToSentry } from '@rh-support/utils';
 import find from 'lodash/find';
 import isEmpty from 'lodash/isEmpty';
 import React, { useEffect, useRef, useState } from 'react';
@@ -71,10 +71,7 @@ export default function RMEEscalationList(props) {
         }
         catch (e) {
             ToastNotification.addDangerMessage(e);
-            window === null || window === void 0 ? void 0 : window.Raven.captureException(e);
-            window === null || window === void 0 ? void 0 : window.Raven.captureMessage('RME form submit error', {
-                level: 'error',
-            });
+            sendToSentry(e, {}, 'RME form submit error');
         }
         finally {
             escalationUpdateInProgessIds.current = escalationUpdateInProgessIds.current.filter((item) => item !== escalationNum);

package/lib/esm/components/CaseManagement/OpenShiftClusterId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenShiftClusterId.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenShiftClusterId.tsx"],"names":[],"mappings":"AAwBA,eAAO,MAAM,oBAAoB,mBAShC,CAAC;AAEF,eAAO,MAAM,uBAAuB,mBAInC,CAAC;AAEF,eAAO,MAAM,4BAA4B,mBAKxC,CAAC;AAEF,eAAO,MAAM,qBAAqB,mBAIjC,CAAC;AAEF,wBAAgB,kBAAkB,gBAoSjC"}
+{"version":3,"file":"OpenShiftClusterId.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenShiftClusterId.tsx"],"names":[],"mappings":"AA2BA,eAAO,MAAM,oBAAoB,mBAShC,CAAC;AAEF,eAAO,MAAM,uBAAuB,mBAInC,CAAC;AAEF,eAAO,MAAM,4BAA4B,mBAKxC,CAAC;AAEF,eAAO,MAAM,qBAAqB,mBAIjC,CAAC;AAEF,wBAAgB,kBAAkB,gBAkRjC"}

package/lib/esm/components/CaseManagement/OpenShiftClusterId.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
 import { GlobalMetadataStateContext } from '@rh-support/react-context';
-import { getConfigField, getUrlParsedParams, getVersion, PCM_CONFIG_FIELD_TYPE } from '@rh-support/utils';
+import { getUrlParsedParams, getVersion } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
 import React, { useContext, useEffect, useState } from 'react';
@@ -21,9 +21,9 @@ import { RouteContext } from '../../context/RouteContext';
 import { getUpdatedDescription } from '../../reducers/CaseHelpers';
 import { setCaseDetails, setCaseState } from '../../reducers/CaseReducer';
 import { fetchClusterRecommendations } from '../../reducers/ClusterRecommendationsReducer';
-import { getIsClusterIdInvalid, isClusterIdEnabledForProduct } from '../../utils/caseOpenshiftClusterIdUtils';
+import { getIsClusterIdInvalid, isClusterIdEnabledForProduct, } from '../../utils/caseOpenshiftClusterIdUtils';
 import { NoClusterIDReasonSelector } from './NoClusterIDReasonSelector';
-import { fetchClusterIdDetails, OpenshiftDropdownV4 } from './OpenshiftDropdownV4';
+import { OpenshiftDropdownV4 } from './OpenshiftDropdownV4';
 import { OpenShiftV3Inputbox } from './OpenShiftV3Inputbox';
 export const v3Tov4TransitionLink = () => (React.createElement("a", { className: "show-target", href: "https://access.redhat.com/documentation/en-us/openshift_container_platform/4.8/html-single/migrating_from_openshift_container_platform_3_to_4/index", target: "_blank", rel: "noopener noreferrer" },
     React.createElement(Trans, null, "How to transition from v3 to v4?")));
@@ -40,7 +40,7 @@ export const isInvalidErrorMessage = () => (React.createElement(React.Fragment,
     discoverV4ClusterIdLink()));
 export function OpenShiftClusterId() {
     const queryParams = getUrlParsedParams(useLocation().search);
-    const { openshiftClusterID, product, version, issue, environment, periodicityOfIssue, timeFramesAndUrgency, openshiftClusterVersion, noClusterIdReason, noClusterIdReasonExplanation, v3ClusterName, selectedAccountDetails, } = useCaseSelector((state) => ({
+    const { openshiftClusterID, product, version, issue, environment, periodicityOfIssue, timeFramesAndUrgency, noClusterIdReason, noClusterIdReasonExplanation, v3ClusterName, openshiftDisplayName, selectedAccountDetails, } = useCaseSelector((state) => ({
         openshiftClusterID: state.caseDetails.openshiftClusterID,
         product: state.caseDetails.product,
         version: state.caseDetails.version,
@@ -48,17 +48,17 @@ export function OpenShiftClusterId() {
         environment: state.caseDetails.environment,
         periodicityOfIssue: state.caseDetails.periodicityOfIssue,
         timeFramesAndUrgency: state.caseDetails.timeFramesAndUrgency,
-        openshiftClusterVersion: state.caseDetails.openshiftClusterVersion,
         noClusterIdReason: state.caseDetails.noClusterIdReason,
         noClusterIdReasonExplanation: state.caseDetails.noClusterIdReasonExplanation,
         v3ClusterName: state.v3ClusterName,
+        openshiftDisplayName: state.openshiftDisplayName,
         selectedAccountDetails: state.selectedAccountDetails,
     }), isEqual);
     const caseDispatch = useCaseDispatch();
-    const { globalMetadataState: { pcmConfig, allProducts, loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
+    const { globalMetadataState: { allProducts, loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
     const { routeState: { showValidationErrorAlert }, } = useContext(RouteContext);
     const clusterRecommendationsDispatch = useContext(ClusterRecommendationsDispatchContext);
-    const { clusterRecommendationsState: { clusterRecommendations }, } = useContext(ClusterRecommendationsContext);
+    const { clusterRecommendationsState: { clusterRecommendationsCache }, } = useContext(ClusterRecommendationsContext);
     const majorVersion = (version && getVersion(version).major) || '';
     const isOpenShiftV3 = majorVersion === '3';
     const isCustomer = loggedInUserRights.data.isAccountSameAsLoggedInAccount(selectedAccountDetails.data.accountNumber);
@@ -67,11 +67,11 @@ export function OpenShiftClusterId() {
     const [v3Selected, setV3Selected] = useState(false);
     const [dontKnowSelected, setDontKnowSelected] = useState(false);
     const [selectedReason, setSelectedReason] = useState('');
-    const isClusterRecommendationEnabled = getConfigField(pcmConfig.data, 'isClusterRecommendationEnabled', PCM_CONFIG_FIELD_TYPE.FEATURE_FLAG);
     const resetClusterData = () => {
         clusterStateReset();
         setCaseDetails(caseDispatch, {
             openshiftClusterID: '',
+            openshiftClusterVersion: '',
             noClusterIdReasonExplanation: '',
             noClusterIdReason: '',
         });
@@ -82,41 +82,26 @@ export function OpenShiftClusterId() {
         setDontKnowSelected(false);
         setV3Selected(false);
     };
-    const setCusterId = (openshiftClusterID, clusterDetails) => __awaiter(this, void 0, void 0, function* () {
-        setCaseDetails(caseDispatch, {
-            openshiftClusterID,
-            openshiftClusterVersion: '',
-            noClusterIdReason: '',
-            noClusterIdReasonExplanation: '',
-        });
-        setCaseState(caseDispatch, { v3ClusterName: '' });
-        setClusterVersion(openshiftClusterID, clusterDetails);
-    });
-    const setClusterVersion = (openshiftClusterID, clusterDetails) => __awaiter(this, void 0, void 0, function* () {
-        if (!openshiftClusterID || getIsClusterIdInvalid(openshiftClusterID))
-            return;
-        let openshiftClusterVersion;
-        if (clusterDetails &&
-            clusterDetails.external_cluster_id === openshiftClusterID &&
-            clusterDetails.openshift_version) {
-            openshiftClusterVersion = clusterDetails.openshift_version;
-        }
-        else {
-            const clusterDetails = yield fetchClusterIdDetails(openshiftClusterID);
-            openshiftClusterVersion = clusterDetails === null || clusterDetails === void 0 ? void 0 : clusterDetails.openshift_version;
-        }
-        setCaseDetails(caseDispatch, { openshiftClusterVersion });
-    });
+    /**
+     * Hook to show cluster fields and check if cluster id comes from url
+     */
     useEffect(() => {
         var _a;
         const isClusterVisible = () => __awaiter(this, void 0, void 0, function* () {
             var _b;
             const hasCluster = yield isClusterIdEnabledForProduct(product, (_b = allProducts.data) === null || _b === void 0 ? void 0 : _b.productsResult);
             setShowClusterId(hasCluster);
-            // we get cluster id from url and validate it
+            // if clusterId is already populated it means it comes from session and
+            // we ignore url clusterId otherwise we get cluster id from url and validate it
             const clusterIdFromUrl = queryParams === null || queryParams === void 0 ? void 0 : queryParams.clusterId;
-            if (hasCluster && clusterIdFromUrl && clusterIdFromUrl !== openshiftClusterID) {
-                setCusterId(clusterIdFromUrl);
+            if (hasCluster &&
+                clusterIdFromUrl &&
+                isEmpty(openshiftClusterID) &&
+                isEmpty(noClusterIdReason) &&
+                isEmpty(noClusterIdReasonExplanation)) {
+                setCaseDetails(caseDispatch, {
+                    openshiftClusterID: clusterIdFromUrl,
+                });
                 const isClusterIdInvalid = getIsClusterIdInvalid(clusterIdFromUrl);
                 if (isClusterIdInvalid) {
                     // if we get invalid id from url we need to add red line to dropdown
@@ -131,22 +116,18 @@ export function OpenShiftClusterId() {
             isClusterVisible();
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [product, version, pcmConfig, allProducts.data]);
+    }, [product, version, allProducts.data]);
     // On preview page user may change product and version we need to reset internal state
     // context api state will be reset on parent component each time user changes product and version
     useEffect(() => {
         clusterStateReset();
     }, [product, version]);
     /**
-     * Hook to make sure that if cluster id comes from session or someother source
-     * we also fetch the details for the cluster id so that we can have fields like cluster version while creating the case
-     */
+     * Hook to set clusterId fields when comes from session or backward/forward
+     **/
     useEffect(() => {
         const isClusterIdInvalid = getIsClusterIdInvalid(openshiftClusterID);
         setIsClusterIdInValid(isClusterIdInvalid);
-        if (openshiftClusterID && !isClusterIdInvalid && isEmpty(openshiftClusterVersion)) {
-            setClusterVersion(openshiftClusterID);
-        }
         // when user click on back and continue button, need to show v3 text box or reasons dropdown
         if (!isEmpty(v3ClusterName) ||
             (noClusterIdReason === 'Other' && noClusterIdReasonExplanation === 'v3-cluster')) {
@@ -157,11 +138,9 @@ export function OpenShiftClusterId() {
             setDontKnowSelected(true);
             setSelectedReason('dont-have-id');
         }
-        const canFetchClusterRecommendation = isClusterRecommendationEnabled && !isClusterIdInvalid && !isEmpty(openshiftClusterID);
-        // To prevent refetching clusterRecommendations checking for clusterRecommendations data length
+        const canFetchClusterRecommendation = !isClusterIdInvalid && !isEmpty(openshiftClusterID);
         canFetchClusterRecommendation &&
-            !clusterRecommendations.data.length &&
-            fetchClusterRecommendations(clusterRecommendationsDispatch, openshiftClusterID);
+            fetchClusterRecommendations(clusterRecommendationsDispatch, openshiftClusterID, clusterRecommendationsCache);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [noClusterIdReason]);
     const onClusterIdStateUpdate = (selectedCluster) => {
@@ -178,7 +157,7 @@ export function OpenShiftClusterId() {
             setV3Selected(true);
             setSelectedReason(selectedId);
             setCaseDetails(caseDispatch, {
-                openshiftClusterID,
+                openshiftClusterID: '',
                 openshiftClusterVersion: '',
                 noClusterIdReason: 'Other',
                 noClusterIdReasonExplanation: 'v3-cluster',
@@ -186,10 +165,17 @@ export function OpenShiftClusterId() {
             return;
         }
         const isClusterInvalid = getIsClusterIdInvalid(selectedId);
-        const canFetchClusterRecommendation = !isClusterInvalid && isClusterRecommendationEnabled;
         setIsClusterIdInValid(isClusterInvalid);
-        setCusterId(selectedId, selectedCluster);
-        canFetchClusterRecommendation && fetchClusterRecommendations(clusterRecommendationsDispatch, selectedId);
+        setCaseDetails(caseDispatch, {
+            openshiftClusterID: selectedId,
+            openshiftClusterVersion: selectedCluster.openshift_version,
+            noClusterIdReason: '',
+            noClusterIdReasonExplanation: '',
+        });
+        setCaseState(caseDispatch, { v3ClusterName: '', openshiftDisplayName: selectedCluster.display_name });
+        !isClusterInvalid &&
+            !isEmpty(selectedId) &&
+            fetchClusterRecommendations(clusterRecommendationsDispatch, selectedId, clusterRecommendationsCache);
     };
     const clusterIdDropdownFormInstructions = () => {
         const errorMessage = isClusterIdInvalid
@@ -219,7 +205,7 @@ export function OpenShiftClusterId() {
     if (!showClusterId)
         return null;
     return (React.createElement(React.Fragment, null,
-        !isOpenShiftV3 && (React.createElement(OpenshiftDropdownV4, { openshiftClusterIDState: openshiftClusterID || selectedReason, onClusterIdStateUpdate: onClusterIdStateUpdate, isClusterIdInvalid: showValidationErrorAlert &&
+        !isOpenShiftV3 && (React.createElement(OpenshiftDropdownV4, { openshiftDisplayName: openshiftDisplayName, openshiftClusterIDState: openshiftClusterID || selectedReason, onClusterIdStateUpdate: onClusterIdStateUpdate, isClusterIdInvalid: showValidationErrorAlert &&
                 ((isEmpty(openshiftClusterID) && isEmpty(selectedReason)) || isClusterIdInvalid), clusterIdDropdownFormInstructions: clusterIdDropdownFormInstructions(), onClusterClear: resetClusterData, isV4: majorVersion === '4' })),
         noClusterIdReasonExplanation !== 'v3-cluster' && dontKnowSelected && !isOpenShiftV3 && (React.createElement(NoClusterIDReasonSelector, { noClusterIdReasonExplanation: noClusterIdReasonExplanation, noClusterIdReason: noClusterIdReason, onReasonInputBoxChanged: onReasonExplanationInputBoxChanged, onReasonChange: onReasonChange, isInValid: isInVaidNoClusterIdReason, isCustomer: isCustomer })),
         (v3Selected || isOpenShiftV3) && (React.createElement(OpenShiftV3Inputbox, { v3ClusterName: v3ClusterName, onReasonInputBoxChanged: v3ClusterNameInputBoxChanged, isInValid: isEmpty(v3ClusterName.trim()) && showValidationErrorAlert, v3Selected: v3Selected }))));

package/lib/esm/components/CaseManagement/OpenshiftDropdownV4.d.ts

@@ -9,11 +9,11 @@ interface IProps extends IDClassNameProps {
     isV4: boolean;
     isDisabled?: boolean;
     noClusterIdReasonExplanation?: string;
+    openshiftDisplayName?: string;
 }
-declare const fetchClusterIdDetails: (clusterId: string) => Promise<import("@cee-eng/hydrajs/@types/models/cloud").ICluster>;
 declare function OpenshiftDropdownV4(props: IProps): JSX.Element;
 declare namespace OpenshiftDropdownV4 {
     var defaultProps: {};
 }
-export { OpenshiftDropdownV4, fetchClusterIdDetails };
+export { OpenshiftDropdownV4 };
 //# sourceMappingURL=OpenshiftDropdownV4.d.ts.map

package/lib/esm/components/CaseManagement/OpenshiftDropdownV4.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenshiftDropdownV4.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenshiftDropdownV4.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAgC,MAAM,sCAAsC,CAAC;AAE1G,OAAO,EAAE,gBAAgB,EAAuB,MAAM,0BAA0B,CAAC;AAWjF,UAAU,MAAO,SAAQ,gBAAgB;IACrC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzF,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iCAAiC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IAChD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACzC;AAQD,QAAA,MAAM,qBAAqB,cAAqB,MAAM,qEASrD,CAAC;AAeF,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,eAmTzC;kBAnTQ,mBAAmB;;;AAsT5B,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"OpenshiftDropdownV4.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenshiftDropdownV4.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,EAAE,gBAAgB,EAAuB,MAAM,0BAA0B,CAAC;AAUjF,UAAU,MAAO,SAAQ,gBAAgB;IACrC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzF,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iCAAiC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IAChD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACjC;AAuBD,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,eA6WzC;kBA7WQ,mBAAmB;;;AAgX5B,OAAO,EAAE,mBAAmB,EAAE,CAAC"}

package/lib/esm/components/CaseManagement/OpenshiftDropdownV4.js

@@ -9,11 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { cloud } from '@cee-eng/hydrajs';
 import { Checkbox, Divider, Select, SelectOption, SelectVariant } from '@patternfly/react-core';
-import find from 'lodash/find';
-import findIndex from 'lodash/findIndex';
+import { useLRUCache } from '@rh-support/components';
+import debounce from 'lodash/debounce';
 import groupBy from 'lodash/groupBy';
 import isEmpty from 'lodash/isEmpty';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { getDisplayNameForCluster } from '../../utils/caseOpenshiftClusterIdUtils';
 import CaseOpenShiftPopover from '../CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenShiftPopover';
@@ -21,22 +21,13 @@ const defaultProps = {
     className: '',
     id: '',
     isDisabled: false,
+    openshiftDisplayName: '',
 };
-const fetchClusterIdDetails = (clusterId) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const clustersResponse = yield cloud.getAccountClusters({
-            order: 'display_name asc',
-            search: `external_id ILIKE  '%${clusterId}%'`,
-        });
-        const clusterDetails = (clustersResponse.items || []).find((item) => item.external_id === clusterId);
-        return clusterDetails;
-    }
-    catch (e) { }
-});
-const createState = (external_cluster_id, display_name) => {
+const createState = (external_cluster_id, display_name, openshift_version) => {
     return {
         display_name,
         external_cluster_id,
+        openshift_version: openshift_version || '',
         toString: () => display_name || '',
         compareTo: function (value) {
             const displayName = this.toString().toLowerCase();
@@ -49,7 +40,7 @@ function OpenshiftDropdownV4(props) {
     const { t } = useTranslation();
     const PER_PAGE = 200;
     const [clustersRawResponse, setClustersRawResponse] = useState([]);
-    const abortControllerRef = useRef(undefined);
+    const abortControllerRef = useRef();
     const [clustersSelectOptions, setClustersSelectOptions] = useState([]);
     const [isOpen, setIsOpen] = useState(false);
     const [validated, setValidated] = useState('default');
@@ -57,8 +48,9 @@ function OpenshiftDropdownV4(props) {
     const [showArchivedClusters, setShowArchivedClusters] = useState(false);
     const [isFetchingClusters, setIsFetchingClusters] = useState(false);
     const [totalResultsNo, setTotalResultsNo] = useState(0);
+    const { getFromCache, setInCache } = useLRUCache(50);
     // gets a cluster id and returns display name
-    const getDisplayNameById = (clusters, id, noClusterIdReasonExplanation) => {
+    const getDisplayName = (id, noClusterIdReasonExplanation, display_name) => {
         if (isEmpty(id))
             return '';
         if (id === 'dont-have-id') {
@@ -68,8 +60,7 @@ function OpenshiftDropdownV4(props) {
         }
         if (id === 'v3-cluster')
             return t('The case is for a v3 cluster');
-        const cluster = find(clusters, (o) => o.external_cluster_id === id);
-        return isEmpty(cluster) ? id : getDisplayNameForCluster(cluster);
+        return display_name || id;
     };
     const onDropdownClear = () => __awaiter(this, void 0, void 0, function* () {
         setIsOpen(false);
@@ -103,88 +94,110 @@ function OpenshiftDropdownV4(props) {
             setIsOpen(false);
         }
     });
+    const dropdownHeaderOptions = useMemo(() => [
+        React.createElement(SelectOption, { key: 'show-hide-archived-clusters', inputId: "check-box" },
+            React.createElement(Checkbox, { label: t('Show archived clusters'), key: "show-archived-clusters", "aria-label": t('Show archived clusters'), id: "show-archived-clusters", "data-tracking-id": "show-hide-archived-clusters", isChecked: showArchivedClusters, className: "archived-clusters-checkbox" })),
+        React.createElement(Divider, { component: "div", key: 'cluster-id-options-divider-e' }),
+        React.createElement(SelectOption, { key: 'dont-have-id', value: createState('dont-have-id', t("I don't have my Cluster ID")) }),
+        ...(!props.isV4
+            ? [
+                React.createElement(SelectOption, { key: 'v3-cluster', value: createState('v3-cluster', t('The case is for a v3 cluster')) }),
+            ]
+            : []),
+    ], 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [showArchivedClusters]);
     const getClusterOptions = (clusters) => {
-        const clustersResponseGrouped = groupBy(clusters, 'dns.base_domain') || [];
+        const clustersResponseGrouped = groupBy(clusters, 'console_url') || [];
         const domainNames = Object.keys(clustersResponseGrouped) || [];
-        // move undefined to the end of domains array
-        const undefinedIndex = domainNames.findIndex((i) => i === 'undefined');
+        // move clusters with empty console_urls to the end of domains array
+        const undefinedIndex = domainNames.findIndex((i) => i === '');
         if (undefinedIndex !== -1 && undefinedIndex !== domainNames.length - 1) {
             domainNames.splice(undefinedIndex, 1);
-            domainNames.push('undefined');
+            domainNames.push('');
         }
         // SelectGroup had a bug when keyboard was used to navigate
         // to show group names used disabled SelectOption, need to be replaced after bug fix
         const clusterOptions = [];
         domainNames.forEach((domain, index) => {
-            domain !== 'undefined' &&
+            domain !== '' &&
                 clusterOptions.push(React.createElement(SelectOption, { isDisabled: true, className: "pf-u-font-weight-bold pf-u-color-400", value: createState(domain, domain), key: domain + index }));
             clustersResponseGrouped[domain] &&
                 clustersResponseGrouped[domain].forEach((cluster, i) => {
-                    clusterOptions.push(React.createElement(SelectOption, { key: cluster.external_cluster_id, value: createState(cluster.external_cluster_id, cluster.display_name) }));
+                    clusterOptions.push(React.createElement(SelectOption, { key: cluster.external_cluster_id, value: createState(cluster.external_cluster_id, getDisplayNameForCluster(cluster) || cluster.external_cluster_id, cluster.openshift_version) }));
                 });
             clusterOptions.push(React.createElement(Divider, { component: "div", key: index + domain }));
         });
         return [
-            React.createElement(SelectOption, { key: 'show-hide-archived-clusters', inputId: "check-box" },
-                React.createElement(Checkbox, { label: t('Show archived clusters'), key: "show-archived-clusters", "aria-label": t('Show archived clusters'), id: "show-archived-clusters", "data-tracking-id": "show-hide-archived-clusters", isChecked: showArchivedClusters, className: "archived-clusters-checkbox" })),
-            React.createElement(Divider, { component: "div", key: 'cluster-id-options-divider-e' }),
-            React.createElement(SelectOption, { key: 'dont-have-id', value: createState('dont-have-id', t("I don't have my Cluster ID")) }),
-            ...(!props.isV4
-                ? [
-                    React.createElement(SelectOption, { key: 'v3-cluster', value: createState('v3-cluster', t('The case is for a v3 cluster')) }),
-                ]
-                : []),
+            ...dropdownHeaderOptions,
             ...(clusterOptions.length !== 0 ? [React.createElement(Divider, { component: "div", key: 'cluster-id-options-divider' })] : []),
             ...clusterOptions,
         ];
     };
-    const fetchAccountClusters = (search = '', page = 0) => __awaiter(this, void 0, void 0, function* () {
+    const fetchAClusterIdDetails = (clusterId) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        if (isEmpty(clusterId))
+            return {};
         setIsFetchingClusters(true);
         try {
-            if (abortControllerRef.current !== undefined) {
-                // Cancel the previous request
-                abortControllerRef.current.abort();
-            }
-            // recreate a new AbortController for each call
-            let controller = new AbortController();
-            abortControllerRef.current = controller;
-            // query language: https://github.com/yaacov/tree-search-language
             const clustersResponse = yield cloud.getAccountClustersSubscription({
-                order: 'display_name asc',
-                page,
-                size: PER_PAGE,
-                search: `${showArchivedClusters ? '' : "status!='Archived'"} ${search && !showArchivedClusters ? 'AND' : ''} ${search ? `(external_cluster_id ILIKE '%${search}%' OR display_name ILIKE '%${search}%')` : ''}`,
+                search: `external_cluster_id='${clusterId.trim()}'`,
                 fields: 'external_cluster_id,display_name,status,metrics.openshift_version',
-            }, controller.signal);
-            const items = clustersResponse.items
-                .filter((c) => !isEmpty(c.external_cluster_id))
-                .map((item) => {
+            });
+            setIsFetchingClusters(false);
+            return (((_a = clustersResponse.items.map((item) => {
                 var _a, _b;
                 return ({
-                    display_name: getDisplayNameForCluster(item),
+                    display_name: item.display_name,
                     external_cluster_id: item.external_cluster_id,
                     openshift_version: ((_b = (_a = item === null || item === void 0 ? void 0 : item.metrics) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.openshift_version) || '',
                 });
-            });
-            try {
-                // old api has dns info
-                // call old api to get clusters from prev call then add dns info to the new api response
-                const oldApiResponse = yield cloud.getAccountClusters({
-                    search: clustersResponse.items
-                        .map((c) => `external_id='${c.external_cluster_id}'`)
-                        .join(' OR '),
-                }, controller.signal);
-                oldApiResponse === null || oldApiResponse === void 0 ? void 0 : oldApiResponse.items.forEach((response) => {
-                    if (response.dns) {
-                        var index = findIndex(items, { external_cluster_id: response.external_id });
-                        items[index] = Object.assign(Object.assign({}, items[index]), { dns: response.dns });
-                    }
-                });
+            })) === null || _a === void 0 ? void 0 : _a[0]) || {});
+        }
+        catch (e) {
+            return {};
+        }
+    });
+    const fetchAccountClusters = (search = '', page = 0) => __awaiter(this, void 0, void 0, function* () {
+        search = search.trim();
+        setIsFetchingClusters(true);
+        try {
+            let clustersResponse;
+            if (getFromCache(`showArchived=${showArchivedClusters}input=${search}p=${page}`)) {
+                clustersResponse = getFromCache(`showArchived=${showArchivedClusters}input=${search}p=${page}`);
             }
-            catch (e) {
-                // silently fails
+            else {
+                if (abortControllerRef.current !== undefined) {
+                    // Cancel the previous request
+                    abortControllerRef.current.abort();
+                }
+                // recreate a new AbortController for each call
+                let controller = new AbortController();
+                abortControllerRef.current = controller;
+                // query language: https://github.com/yaacov/tree-search-language
+                clustersResponse = yield cloud.getAccountClustersSubscription({
+                    order: 'display_name asc',
+                    page,
+                    size: PER_PAGE,
+                    search: `external_cluster_id!='' AND ${showArchivedClusters ? '' : "status!='Archived'"} ${search && !showArchivedClusters ? 'AND' : ''} ${search
+                        ? `(external_cluster_id ILIKE '%${search}%' OR display_name ILIKE '%${search}%' OR console_url ILIKE '%${search}%')`
+                        : ''}`,
+                    fields: 'external_cluster_id,display_name,status,metrics.openshift_version,console_url',
+                }, controller.signal);
+                setInCache(`showArchived=${showArchivedClusters}input=${search}p=${page}`, clustersResponse);
             }
             setIsFetchingClusters(false);
+            const items = clustersResponse.items.map((item) => {
+                var _a, _b;
+                return ({
+                    display_name: item.display_name,
+                    external_cluster_id: item.external_cluster_id,
+                    openshift_version: ((_b = (_a = item === null || item === void 0 ? void 0 : item.metrics) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.openshift_version) || '',
+                    console_url: (item === null || item === void 0 ? void 0 : item.console_url) && (item === null || item === void 0 ? void 0 : item.console_url) !== null
+                        ? item.console_url.split('.').slice(4).join('.')
+                        : '',
+                });
+            });
             return {
                 items,
                 totalResult: items.length,
@@ -198,17 +211,37 @@ function OpenshiftDropdownV4(props) {
             return { items: [], totalResult: 0, page: 0, total: 0 };
         }
     });
-    // need to get clusters on load
+    // when user visits case detail or clusterId comes from url,
+    // we have clusterId but need to get display name
+    useEffect(() => {
+        const getClusterDetails = () => __awaiter(this, void 0, void 0, function* () {
+            if (!isEmpty(props.openshiftClusterIDState) &&
+                props.openshiftClusterIDState !== 'dont-have-id' &&
+                props.openshiftClusterIDState !== 'v3-cluster' &&
+                isEmpty(props.openshiftDisplayName)) {
+                const fetchedCluster = yield fetchAClusterIdDetails(props.openshiftClusterIDState);
+                props.onClusterIdStateUpdate(Object.assign(Object.assign({}, fetchedCluster), { display_name: getDisplayNameForCluster(fetchedCluster) }));
+            }
+        });
+        getClusterDetails();
+        //  no dependency here as we want to run this once on load
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+    // need to get clusters when user opens the dropdown
+    // as the api response is cached np extra call is made on open/close
     // added observing props.isV4 because re-render
     // is needed when user on overview page changing version
     useEffect(() => {
+        if (!isOpen)
+            return;
         let isUnmounted = false;
         const fetchClusters = () => __awaiter(this, void 0, void 0, function* () {
+            setClustersSelectOptions(getClusterOptions([]));
             const fetchedClusters = yield fetchAccountClusters(inputVal);
             if (!isUnmounted) {
                 setClustersRawResponse(fetchedClusters.items);
                 setTotalResultsNo(fetchedClusters.total);
-                setClustersSelectOptions(getClusterOptions(fetchedClusters.items));
+                setClustersSelectOptions(getClusterOptions(fetchedClusters.items) || []);
             }
         });
         fetchClusters();
@@ -216,7 +249,7 @@ function OpenshiftDropdownV4(props) {
             isUnmounted = true;
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.isV4, showArchivedClusters]);
+    }, [props.isV4, showArchivedClusters, isOpen, inputVal]);
     useEffect(() => {
         if (props.isClusterIdInvalid) {
             setValidated('error');
@@ -225,20 +258,22 @@ function OpenshiftDropdownV4(props) {
             setValidated('default');
         }
     }, [props.isClusterIdInvalid]);
+    // when user type or paste a clusterId we land here
     const onTypeaheadInputChanged = (input) => __awaiter(this, void 0, void 0, function* () {
         setInputVal(input);
-        props.onClusterIdStateUpdate(createState(input, input));
         const fetchedClusters = yield fetchAccountClusters(input);
         setClustersRawResponse(fetchedClusters.items);
         setTotalResultsNo(fetchedClusters.total);
         setClustersSelectOptions(getClusterOptions(fetchedClusters.items));
+        props.onClusterIdStateUpdate({ external_cluster_id: input });
     });
+    const debounceFn = debounce(onTypeaheadInputChanged, 500);
     const getSelectedItem = () => {
         if (!isEmpty(inputVal)) {
             return createState(props.openshiftClusterIDState, inputVal);
         }
         else {
-            return createState(props.openshiftClusterIDState, getDisplayNameById(clustersRawResponse, props.openshiftClusterIDState, props.noClusterIdReasonExplanation));
+            return createState(props.openshiftClusterIDState, getDisplayName(props.openshiftClusterIDState, props.noClusterIdReasonExplanation || '', props.openshiftDisplayName || props.openshiftClusterIDState));
         }
     };
     const titleId = 'case-details-cluster-nickname-selector';
@@ -249,7 +284,7 @@ function OpenshiftDropdownV4(props) {
                 React.createElement("span", { className: "form-required", "aria-hidden": true }, "*"),
                 React.createElement(CaseOpenShiftPopover, null)),
             React.createElement("span", { id: titleId, hidden: true }, "Select a state"),
-            React.createElement(Select, Object.assign({ variant: SelectVariant.typeahead, isDisabled: props.isDisabled, typeAheadAriaLabel: t('Search by Cluster ID and alias or manually enter your Cluster ID'), onToggle: onToggle, onSelect: onSelect, onClear: onDropdownClear, selections: getSelectedItem(), isOpen: isOpen, "aria-labelledby": titleId, placeholderText: t('Search by Cluster ID and alias or manually enter your Cluster ID'), hasInlineFilter: false, onTypeaheadInputChanged: onTypeaheadInputChanged, onFilter: () => undefined, validated: validated, "aria-invalid": props.isClusterIdInvalid, "aria-describedby": "clusterID-validate-helper", required: true }, (isFetchingClusters && { loadingVariant: 'spinner' }), (!isFetchingClusters &&
+            React.createElement(Select, Object.assign({ variant: SelectVariant.typeahead, isDisabled: props.isDisabled, typeAheadAriaLabel: t('Search by Cluster ID, alias, and domain or manually enter your Cluster ID'), onToggle: onToggle, onSelect: onSelect, onClear: onDropdownClear, selections: getSelectedItem(), isOpen: isOpen, "aria-labelledby": titleId, placeholderText: t('Search by Cluster ID, alias, and domain or manually enter your Cluster ID'), hasInlineFilter: false, onTypeaheadInputChanged: debounceFn, onFilter: () => undefined, validated: validated, "aria-invalid": props.isClusterIdInvalid, "aria-describedby": "clusterID-validate-helper", required: true }, (isFetchingClusters && { loadingVariant: 'spinner' }), (!isFetchingClusters &&
                 clustersRawResponse.length < totalResultsNo && {
                 loadingVariant: {
                     text: 'Display additional results',
@@ -259,4 +294,4 @@ function OpenshiftDropdownV4(props) {
             React.createElement("div", { id: "clusterID-validate-helper", className: `form-instructions ${props.isClusterIdInvalid ? 'form-invalid' : ''}` }, props.clusterIdDropdownFormInstructions))));
 }
 OpenshiftDropdownV4.defaultProps = defaultProps;
-export { OpenshiftDropdownV4, fetchClusterIdDetails };
+export { OpenshiftDropdownV4 };

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":"AAUA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAqB,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAOrF,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,eAqXtD"}
+{"version":3,"file":"GlobalTroubleshootEffects.d.ts","sourceRoot":"","sources":["../../../../src/components/wizardLayout/GlobalTroubleshootEffects.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAqB,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAQrF,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,eA6YtD"}

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

@@ -30,6 +30,7 @@ import { fetchEdmundAbbottRules } from '../../reducers/RulesReducer';
 import { fetchTopContent } from '../../reducers/TopContentReducer';
 import { isClusterIdEnabledForProduct } from '../../utils/caseOpenshiftClusterIdUtils';
 import RouteUtils from '../../utils/routeUtils';
+import { AttachmentStateContext } from '../shared/fileUpload/reducer/AttachmentReducerContext';
 export function GlobalTroubleshootEffects(props) {
     const [initDefaultSection, setInitDefaultSection] = useState(false);
     const dispatchToRouteReducer = useContext(RouteDispatchContext);
@@ -64,6 +65,7 @@ export function GlobalTroubleshootEffects(props) {
     // top content state
     const { topContentState: { topContentPayload }, } = useContext(TCStateContext);
     const tcDispatch = useContext(TCDispatchContext);
+    const { attachmentState: { caseFiles: { selectedLocalFiles }, }, } = useContext(AttachmentStateContext);
     const { resetCaseCreateState } = useResetCaseCreate();
     const prevSectionsToHide = usePrevious(sectionsToHide);
     const hasSummaryInUrl = !isEmpty(urlQueryParams.summary);
@@ -238,8 +240,7 @@ export function GlobalTroubleshootEffects(props) {
             return;
         }
         const getEARules = () => __awaiter(this, void 0, void 0, function* () {
-            const rulesBody = {
-                caseType: {
+            const rulesBody = Object.assign({ caseType: {
                     product,
                     version,
                     summary,
@@ -247,11 +248,15 @@ export function GlobalTroubleshootEffects(props) {
                     type: caseType,
                     language,
                     accountNumber,
-                },
-                accountType: { isSecure: selectedAccountDetails.data.securedEnvironment || false },
-                userType: { canAddAttachments },
-                fields: ['title', 'cta', 'description', 'rule_type', 'rule_sub_type', 'rule_id'],
-            };
+                    session_id: activeSessionId,
+                }, accountType: { isSecure: selectedAccountDetails.data.securedEnvironment || false }, userType: { canAddAttachments }, fields: ['title', 'cta', 'description', 'rule_type', 'rule_sub_type', 'rule_id'] }, ((selectedLocalFiles === null || selectedLocalFiles === void 0 ? void 0 : selectedLocalFiles.length) && {
+                attachment: selectedLocalFiles.map((file) => ({
+                    uuid: file.attachmentId,
+                    fileName: file.name,
+                    size: file.size,
+                    fileType: file.type,
+                })),
+            }));
             yield fetchEdmundAbbottRules(rulesDispatch, rulesBody);
         });
         getEARules();
@@ -269,6 +274,9 @@ export function GlobalTroubleshootEffects(props) {
         loggedInUserRights.data,
         rulesDispatch,
         selectedAccountDetails.data.securedEnvironment,
+        selectedLocalFiles,
+        selectedLocalFiles === null || selectedLocalFiles === void 0 ? void 0 : selectedLocalFiles.length,
+        activeSessionId,
     ], 2000);
     /**
      * If a component refetches the global account details , we want to make sure that the same changes are reflected in the
@@ -293,7 +301,10 @@ export function GlobalTroubleshootEffects(props) {
     const previousActiveSessionId = usePrevious(activeSessionId);
     useEffect(() => {
         var _a;
-        if (isEmpty(product) || isEmpty(version) || activeSessionId !== previousActiveSessionId)
+        if (isEmpty(product) ||
+            isEmpty(version) ||
+            activeSessionId !== previousActiveSessionId ||
+            isEmpty(previousVersion))
             return;
         // we need to reset openshift cluster states only when major version is different
         const oldMajorVersion = previousVersion && getVersion(previousVersion).major;

package/lib/esm/reducers/CaseConstNTypes.d.ts

@@ -188,6 +188,7 @@ export interface ICaseState {
     versionsDetails: IApiResponseDetails<IVersionsDetails[]>;
     v3ClusterName?: string;
     caseCreation500ErrorStatus: boolean;
+    openshiftDisplayName?: string;
 }
 export interface ICreateCasePayloadType extends ICaseState {
 }

package/lib/esm/reducers/CaseConstNTypes.d.ts.map

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

package/lib/esm/reducers/CaseConstNTypes.js

@@ -137,6 +137,7 @@ export const initialCaseState = {
         notes: '',
         noClusterIdReason: '',
         noClusterIdReasonExplanation: '',
+        openshiftClusterVersion: '',
     },
     customerEscalation: false,
     isClosed: false,
@@ -174,6 +175,7 @@ export const initialCaseState = {
     versionsDetails: getApiResourceObject([]),
     v3ClusterName: '',
     caseCreation500ErrorStatus: false,
+    openshiftDisplayName: '',
 };
 export const ORG_ADMIN_SEND_NOTIFCATION_KBASE_LINK = 'https://access.redhat.com/articles/5967811';
 export const NON_ORG_ADMIN_SEND_NOTIFCATION_KBASE_LINK = 'https://access.redhat.com/articles/5967831';

package/lib/esm/reducers/ClusterRecommendationsReducer.d.ts

@@ -1,4 +1,4 @@
-import { IClusterRecommendation } from '@cee-eng/hydrajs/@types/api/pcm/preCaseDiagnostics';
+import { IClusterRecommendation, IClusterRecommendationsResult } from '@cee-eng/hydrajs/@types/api/pcm/preCaseDiagnostics';
 import { IAction, IApiResponseDetails } from '@rh-support/types/shared';
 export declare enum RulesReducerConstants {
     requestClusterRecommendations = "requestClusterRecommendations",
@@ -11,11 +11,14 @@ export declare const initialClusterRecommendations: IApiResponseDetails<ICluster
 export interface IInitialClusterRecommendationsStateType {
     clusterRecommendations: IApiResponseDetails<IClusterRecommendation[]>;
     isClusterRecommendationsModalOpen: boolean;
+    clusterRecommendationsCache: {
+        [key: string]: IClusterRecommendationsResult;
+    };
 }
 export declare const initialState: IInitialClusterRecommendationsStateType;
 export declare const clusterRecommendationsReducer: (state: IInitialClusterRecommendationsStateType, action: IActionType) => IInitialClusterRecommendationsStateType;
 export declare const resetClusterRecommendations: (dispatch: ClusterRecommendationsDispatchType) => void;
-export declare const fetchClusterRecommendations: (dispatch: ClusterRecommendationsDispatchType, clusterId: string) => Promise<void>;
+export declare const fetchClusterRecommendations: (dispatch: ClusterRecommendationsDispatchType, clusterId: string, clusterRecommendationsCache: any) => Promise<void>;
 export declare const toggleClusterRecommendationModal: (dispatch: ClusterRecommendationsDispatchType, newModalVisibilityValue: boolean) => void;
 export {};
 //# sourceMappingURL=ClusterRecommendationsReducer.d.ts.map

package/lib/esm/reducers/ClusterRecommendationsReducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterRecommendationsReducer.d.ts","sourceRoot":"","sources":["../../../src/reducers/ClusterRecommendationsReducer.ts"],"names":[],"mappings":"AACA,OAAO,EACH,sBAAsB,EAEzB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAGxE,oBAAY,qBAAqB;IAC7B,6BAA6B,kCAAkC;IAC/D,2BAA2B,gCAAgC;IAC3D,gCAAgC,qCAAqC;CACxE;AAED,aAAK,WAAW,GAAG,OAAO,CAAC,qBAAqB,EAAE,uCAAuC,CAAC,CAAC;AAC3F,oBAAY,kCAAkC,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;AAE9E,eAAO,MAAM,6BAA6B,EAAE,mBAAmB,CAAC,sBAAsB,EAAE,CAA4B,CAAC;AAErH,MAAM,WAAW,uCAAuC;IACpD,sBAAsB,EAAE,mBAAmB,CAAC,sBAAsB,EAAE,CAAC,CAAC;IACtE,iCAAiC,EAAE,OAAO,CAAC;CAC9C;AAED,eAAO,MAAM,YAAY,EAAE,uCAG1B,CAAC;AAEF,eAAO,MAAM,6BAA6B,UAC/B,uCAAuC,0BAE/C,uCAgBF,CAAC;AAGF,eAAO,MAAM,2BAA2B,aAAc,kCAAkC,SAEvF,CAAC;AACF,eAAO,MAAM,2BAA2B,aAAoB,kCAAkC,aAAa,MAAM,kBAyBhH,CAAC;AACF,eAAO,MAAM,gCAAgC,aAC/B,kCAAkC,2BACnB,OAAO,SAMnC,CAAC"}
+{"version":3,"file":"ClusterRecommendationsReducer.d.ts","sourceRoot":"","sources":["../../../src/reducers/ClusterRecommendationsReducer.ts"],"names":[],"mappings":"AACA,OAAO,EACH,sBAAsB,EACtB,6BAA6B,EAChC,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAGxE,oBAAY,qBAAqB;IAC7B,6BAA6B,kCAAkC;IAC/D,2BAA2B,gCAAgC;IAC3D,gCAAgC,qCAAqC;CACxE;AAED,aAAK,WAAW,GAAG,OAAO,CAAC,qBAAqB,EAAE,uCAAuC,CAAC,CAAC;AAC3F,oBAAY,kCAAkC,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;AAE9E,eAAO,MAAM,6BAA6B,EAAE,mBAAmB,CAAC,sBAAsB,EAAE,CAA4B,CAAC;AAErH,MAAM,WAAW,uCAAuC;IACpD,sBAAsB,EAAE,mBAAmB,CAAC,sBAAsB,EAAE,CAAC,CAAC;IACtE,iCAAiC,EAAE,OAAO,CAAC;IAC3C,2BAA2B,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,6BAA6B,CAAA;KAAE,CAAC;CACjF;AAED,eAAO,MAAM,YAAY,EAAE,uCAI1B,CAAC;AAEF,eAAO,MAAM,6BAA6B,UAC/B,uCAAuC,0BAE/C,uCAmBF,CAAC;AAGF,eAAO,MAAM,2BAA2B,aAAc,kCAAkC,SAEvF,CAAC;AACF,eAAO,MAAM,2BAA2B,aAC1B,kCAAkC,aACjC,MAAM,oDAqCpB,CAAC;AACF,eAAO,MAAM,gCAAgC,aAC/B,kCAAkC,2BACnB,OAAO,SAMnC,CAAC"}

package/lib/esm/reducers/ClusterRecommendationsReducer.js

@@ -19,18 +19,19 @@ export const initialClusterRecommendations = getApiResourceObject([]);
 export const initialState = {
     clusterRecommendations: initialClusterRecommendations,
     isClusterRecommendationsModalOpen: false,
+    clusterRecommendationsCache: {},
 };
 export const clusterRecommendationsReducer = (state, action) => {
     switch (action.type) {
         case RulesReducerConstants.requestClusterRecommendations: {
-            return Object.assign(Object.assign({}, state), { clusterRecommendations: action.payload.clusterRecommendations });
+            return Object.assign(Object.assign({}, state), action.payload);
         }
         // used for reseting the rules when reseting on a new troubleshoot issue.
         case RulesReducerConstants.resetClusterRecommendations: {
             return Object.assign(Object.assign({}, state), { clusterRecommendations: initialClusterRecommendations });
         }
         case RulesReducerConstants.toggleClusterRecommendationModal: {
-            return Object.assign(Object.assign({}, state), { isClusterRecommendationsModalOpen: action.payload.isClusterRecommendationsModalOpen });
+            return Object.assign(Object.assign({}, state), action.payload);
         }
         default: {
             return state;
@@ -41,27 +42,39 @@ export const clusterRecommendationsReducer = (state, action) => {
 export const resetClusterRecommendations = (dispatch) => {
     dispatch({ type: RulesReducerConstants.resetClusterRecommendations });
 };
-export const fetchClusterRecommendations = (dispatch, clusterId) => __awaiter(void 0, void 0, void 0, function* () {
+export const fetchClusterRecommendations = (dispatch, clusterId, clusterRecommendationsCache) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     dispatch({
         type: RulesReducerConstants.requestClusterRecommendations,
         payload: {
             clusterRecommendations: getApiResourceObject([], true),
+            clusterRecommendationsCache,
         },
     });
     try {
-        const clusterInsight = yield pcm.preCase.diag.getClusterRecommendations(clusterId);
+        let clusterInsight;
+        if (clusterRecommendationsCache[clusterId]) {
+            clusterInsight = clusterRecommendationsCache[clusterId];
+        }
+        else {
+            clusterInsight = yield pcm.preCase.diag.getClusterRecommendations(clusterId);
+            clusterRecommendationsCache[clusterId] = clusterInsight;
+        }
         const rules = ((_a = clusterInsight === null || clusterInsight === void 0 ? void 0 : clusterInsight.report) === null || _a === void 0 ? void 0 : _a.data) || [];
         dispatch({
             type: RulesReducerConstants.requestClusterRecommendations,
-            payload: { clusterRecommendations: getApiResourceObject(rules) },
+            payload: { clusterRecommendations: getApiResourceObject(rules), clusterRecommendationsCache },
         });
     }
     catch (e) {
         console.log(e.message);
+        clusterRecommendationsCache[clusterId] = {};
         dispatch({
             type: RulesReducerConstants.requestClusterRecommendations,
-            payload: { clusterRecommendations: getApiResourceObject([], false, true, e.message) },
+            payload: {
+                clusterRecommendations: getApiResourceObject([], false, true, e.message),
+                clusterRecommendationsCache,
+            },
         });
     }
 });

package/lib/esm/utils/caseOpenshiftClusterIdUtils.d.ts

@@ -1,6 +1,8 @@
-import { IClusterSubscriptionExtended } from '@cee-eng/hydrajs/@types/models/cloud';
+import { IClusterSubscription } from '@cee-eng/hydrajs/@types/models/cloud';
 import { ISEProduct } from '@cee-eng/hydrajs/@types/models/product';
-export declare const getDisplayNameById: (clusters: Partial<IClusterSubscriptionExtended>[], id: string) => string;
+export interface IClusterSubscriptionExtended extends IClusterSubscription {
+    openshift_version: string;
+}
 export declare const getDisplayNameForCluster: (cluster: Partial<IClusterSubscriptionExtended>) => string;
 export declare const invalidGuidHelperText = "Please enter a valid Cluster ID (For example: d3aa88e2-c754-41e0-8ba6-4198a34aa0a2)";
 export declare const isClusterIdEnabledForProduct: (selectedProduct: string, allProducts: Partial<ISEProduct>[]) => boolean;

package/lib/esm/utils/caseOpenshiftClusterIdUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"caseOpenshiftClusterIdUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseOpenshiftClusterIdUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAMpE,eAAO,MAAM,kBAAkB,aAAc,QAAQ,4BAA4B,CAAC,EAAE,MAAM,MAAM,WAI/F,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAAa,QAAQ,4BAA4B,CAAC,WAKtF,CAAC;AAEF,eAAO,MAAM,qBAAqB,wFACuD,CAAC;AAE1F,eAAO,MAAM,4BAA4B,oBAAqB,MAAM,eAAe,QAAQ,UAAU,CAAC,EAAE,YAIvG,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,4BAenD,CAAC;AAEF,eAAO,MAAM,qBAAqB,sCACkC,CAAC"}
+{"version":3,"file":"caseOpenshiftClusterIdUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseOpenshiftClusterIdUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAIpE,MAAM,WAAW,4BAA6B,SAAQ,oBAAoB;IACtE,iBAAiB,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,wBAAwB,YAAa,QAAQ,4BAA4B,CAAC,WAKtF,CAAC;AAEF,eAAO,MAAM,qBAAqB,wFACuD,CAAC;AAE1F,eAAO,MAAM,4BAA4B,oBAAqB,MAAM,eAAe,QAAQ,UAAU,CAAC,EAAE,YAIvG,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,4BAenD,CAAC;AAEF,eAAO,MAAM,qBAAqB,sCACkC,CAAC"}

package/lib/esm/utils/caseOpenshiftClusterIdUtils.js

@@ -1,17 +1,9 @@
 import { getConfigField, isValidGuid } from '@rh-support/utils';
-import find from 'lodash/find';
 import isEmpty from 'lodash/isEmpty';
-// gets a cluster id and returns display name
-export const getDisplayNameById = (clusters, id) => {
-    if (isEmpty(id))
-        return '';
-    const cluster = find(clusters, (o) => o.external_cluster_id === id);
-    return isEmpty(cluster) ? `${id}` : cluster.display_name;
-};
 export const getDisplayNameForCluster = (cluster) => {
     if (isEmpty(cluster))
         return '';
-    const clusterId = (cluster === null || cluster === void 0 ? void 0 : cluster.external_cluster_id) || cluster.external_id;
+    const clusterId = cluster === null || cluster === void 0 ? void 0 : cluster.external_cluster_id;
     if (isEmpty(cluster.display_name) || cluster.display_name === clusterId)
         return clusterId;
     return `${clusterId} <${cluster.display_name}>`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "0.2.117",
+    "version": "0.2.120",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -26,7 +26,7 @@
         "lib/**/*"
     ],
     "peerDependencies": {
-        "@cee-eng/hydrajs": "4.12.1",
+        "@cee-eng/hydrajs": "4.12.6",
         "@cee-eng/ui-toolkit": "1.1.6",
         "@patternfly/patternfly": "4.185.1",
         "@patternfly/pfe-accordion": "1.12.3",
@@ -63,7 +63,7 @@
         "react-virtualized": "^9.21.2"
     },
     "dependencies": {
-        "@cee-eng/hydrajs": "4.12.1",
+        "@cee-eng/hydrajs": "4.12.6",
         "@cee-eng/ui-toolkit": "1.1.6",
         "@patternfly/patternfly": "4.185.1",
         "@patternfly/pfe-accordion": "1.12.3",
@@ -73,12 +73,12 @@
         "@patternfly/react-core": "4.202.16",
         "@progress/kendo-drawing": "^1.6.0",
         "@progress/kendo-react-pdf": "^3.12.0",
-        "@rh-support/api": "0.3.22",
-        "@rh-support/components": "1.1.70",
-        "@rh-support/react-context": "0.2.75",
+        "@rh-support/api": "0.3.24",
+        "@rh-support/components": "1.1.72",
+        "@rh-support/react-context": "0.2.77",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "0.2.59",
-        "@rh-support/utils": "0.2.44",
+        "@rh-support/user-permissions": "0.2.61",
+        "@rh-support/utils": "0.2.46",
         "@types/react-redux": "^7.1.12",
         "@types/redux": "^3.6.0",
         "@webcomponents/webcomponentsjs": "^2.2.10",
@@ -143,5 +143,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "079114145196d9af66c46a5047a0e0ecac32277b"
+    "gitHead": "403aee29c2ee4be4cadb20fb74753c495803d387"
 }