@rh-support/troubleshoot 0.2.71 → 0.2.72

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":"AAqBA,eAAO,MAAM,oBAAoB,mBAShC,CAAC;AAqBF,wBAAgB,kBAAkB,gBAgRjC"}
+{"version":3,"file":"OpenShiftClusterId.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenShiftClusterId.tsx"],"names":[],"mappings":"AAwBA,eAAO,MAAM,oBAAoB,mBAShC,CAAC;AAqBF,wBAAgB,kBAAkB,gBAsRjC"}

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

@@ -16,7 +16,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import { Trans } from 'react-i18next';
 import { useLocation } from 'react-router';
 import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
-import { ClusterRecommendationsDispatchContext } from '../../context/ClusterRecommendationsContext';
+import { ClusterRecommendationsContext, ClusterRecommendationsDispatchContext, } from '../../context/ClusterRecommendationsContext';
 import { RouteContext } from '../../context/RouteContext';
 import { getUpdatedDescription } from '../../reducers/CaseHelpers';
 import { setCaseDetails, setCaseState } from '../../reducers/CaseReducer';
@@ -58,6 +58,7 @@ export function OpenShiftClusterId() {
     const { globalMetadataState: { pcmConfig, allProducts, loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
     const { routeState: { showValidationErrorAlert }, } = useContext(RouteContext);
     const clusterRecommendationsDispatch = useContext(ClusterRecommendationsDispatchContext);
+    const { clusterRecommendationsState: { clusterRecommendations }, } = useContext(ClusterRecommendationsContext);
     const majorVersion = (version && getVersion(version).major) || '';
     const isOpenShiftV3 = majorVersion === '3';
     const isCustomer = loggedInUserRights.data.isAccountSameAsLoggedInAccount(selectedAccountDetails.data.accountNumber);
@@ -154,7 +155,9 @@ export function OpenShiftClusterId() {
             setSelectedReason('dont-have-id');
         }
         const canFetchClusterRecommendation = isClusterRecommendationEnabled && !isClusterIdInvalid && !isEmpty(openshiftClusterID);
+        // To prevent refetching clusterRecommendations checking for clusterRecommendations data length
         canFetchClusterRecommendation &&
+            !clusterRecommendations.data.length &&
             fetchClusterRecommendations(clusterRecommendationsDispatch, openshiftClusterID);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [v3ClusterName, noClusterIdReason]);

package/lib/esm/components/Recommendations/ClusterRecommendationToast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterRecommendationToast.d.ts","sourceRoot":"","sources":["../../../../src/components/Recommendations/ClusterRecommendationToast.tsx"],"names":[],"mappings":"AAIA,OAAc,EAAE,EAAE,EAAmC,MAAM,OAAO,CAAC;AAUnE,UAAU,MAAM;CAAG;AAEnB,QAAA,MAAM,0BAA0B,EAAE,EAAE,CAAC,MAAM,CAwD1C,CAAC;AAEF,eAAe,0BAA0B,CAAC"}
+{"version":3,"file":"ClusterRecommendationToast.d.ts","sourceRoot":"","sources":["../../../../src/components/Recommendations/ClusterRecommendationToast.tsx"],"names":[],"mappings":"AAGA,OAAc,EAAE,EAAE,EAAmC,MAAM,OAAO,CAAC;AAUnE,UAAU,MAAM;CAAG;AAEnB,QAAA,MAAM,0BAA0B,EAAE,EAAE,CAAC,MAAM,CAqD1C,CAAC;AAEF,eAAe,0BAA0B,CAAC"}

package/lib/esm/components/Recommendations/ClusterRecommendationToast.js

@@ -1,5 +1,4 @@
 import { Alert, AlertActionCloseButton, Button } from '@patternfly/react-core';
-import { usePrevious } from '@rh-support/components';
 import { GlobalMetadataStateContext } from '@rh-support/react-context';
 import { isEmpty, isEqual } from 'lodash';
 import React, { useContext, useEffect, useState } from 'react';
@@ -7,7 +6,7 @@ import { Trans, useTranslation } from 'react-i18next';
 import { useCaseSelector } from '../../context/CaseContext';
 import { ClusterRecommendationsContext, ClusterRecommendationsDispatchContext, } from '../../context/ClusterRecommendationsContext';
 import { toggleClusterRecommendationModal } from '../../reducers/ClusterRecommendationsReducer';
-import { isClusterIdEnabledForProduct } from '../../utils/caseOpenshiftClusterIdUtils';
+import { getIsClusterIdInvalid, isClusterIdEnabledForProduct } from '../../utils/caseOpenshiftClusterIdUtils';
 const ClusterRecommendationToast = () => {
     var _a;
     const { t } = useTranslation();
@@ -19,21 +18,21 @@ const ClusterRecommendationToast = () => {
         product: state.caseDetails.product,
     }), isEqual);
     const { globalMetadataState: { allProducts }, } = useContext(GlobalMetadataStateContext);
-    const previousOpenShiftClusterId = usePrevious(openshiftClusterID);
     const onViewRecommendations = () => {
         setToastVisibility(false);
         toggleClusterRecommendationModal(clusterRecommendationsDispatch, !isClusterRecommendationsModalOpen);
     };
-    // To prevent toast to reopen even after user close it we need to check cluster id
+    // To open popover we check for cluster id and clusterRecommendations array length
     useEffect(() => {
-        if (!isEmpty(openshiftClusterID) &&
-            previousOpenShiftClusterId !== openshiftClusterID &&
-            clusterRecommendations.data.length)
+        if (!isEmpty(openshiftClusterID) && clusterRecommendations.data.length)
             setToastVisibility(true);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [clusterRecommendations.data]);
+    /**
+     * Hide Popover on cluster id change
+     */
     useEffect(() => {
-        if (!openshiftClusterID)
+        if (!openshiftClusterID || getIsClusterIdInvalid(openshiftClusterID))
             setToastVisibility(false);
     }, [openshiftClusterID]);
     const hasCluster = isClusterIdEnabledForProduct(product, (_a = allProducts.data) === null || _a === void 0 ? void 0 : _a.productsResult);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "0.2.71",
+    "version": "0.2.72",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -143,5 +143,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "1cdbdc6728ef3ea47afa61a60407e82cd81da6af"
+    "gitHead": "4c011d810dfd20f1da1b9aa172636543263db426"
 }