@rh-support/troubleshoot 0.2.70 → 0.2.73

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/lib/esm/components/Recommendations/EARules/EARule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EARule.d.ts","sourceRoot":"","sources":["../../../../../src/components/Recommendations/EARules/EARule.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAK1C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,UAAU,cAAc;IACpB,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC;CAClG;AAGD,eAAO,MAAM,aAAa,+BAGxB,CAAC;AAEH,wBAAgB,gBAAgB,mBAM/B;AACD,wBAAgB,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE;;;CAAA,eAyBxC;AAED,iBAAS,WAAW,gBAGnB;AAED,iBAAS,iBAAiB,gBAsBzB;AAED,iBAAS,aAAa,CAAC,EAAE,SAA6B,EAAE,SAAc,EAAE,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,eAgBnH;AAED,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"EARule.d.ts","sourceRoot":"","sources":["../../../../../src/components/Recommendations/EARules/EARule.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAK1C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,UAAU,cAAc;IACpB,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC;CAClG;AAGD,eAAO,MAAM,aAAa,+BAGxB,CAAC;AAEH,wBAAgB,gBAAgB,mBAM/B;AACD,wBAAgB,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE;;;CAAA,eAyBxC;AAED,iBAAS,WAAW,gBAGnB;AAED,iBAAS,iBAAiB,gBAsBzB;AAED,iBAAS,aAAa,CAAC,EAAE,SAA6B,EAAE,SAAc,EAAE,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,eA4BnH;AAED,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,aAAa,EAAE,CAAC"}

package/lib/esm/components/Recommendations/EARules/EARule.js

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { pcm } from '@cee-eng/hydrajs';
+import CaretRightIcon from '@patternfly/react-icons/dist/js/icons/caret-right-icon';
 import React, { useContext } from 'react';
 import { Trans } from 'react-i18next';
 import { SessionRestoreDispatchContext, SessionRestoreStateContext } from '../../../context/SessionRestoreContext';
@@ -50,7 +51,9 @@ function EARuleArticle({ linkTitle = 'Related Article', className = '' }) {
     const { getTrackingULRWithQueryParams } = useParseRuleMarkdown();
     if (!rule.cta)
         return null;
-    return (React.createElement("a", { className: `se-recommended ts-known-vuln ${className}`, rel: "noopener noreferrer", target: "_blank", "data-tracking-id": "se-recommended-asa-rule", onClick: onCtaClick(rule.cta), href: getTrackingULRWithQueryParams(rule.cta, SessionResourceSource.EDMOUND_ABOTT) },
-        React.createElement(Trans, null, linkTitle)));
+    return linkTitle === 'View details' ? (React.createElement("a", { className: `se-recommended ts-known-vuln anchor-tag-link-td-none ${className}`, rel: "noopener noreferrer", target: "_blank", "data-tracking-id": "se-recommended-asa-rule", onClick: onCtaClick(rule.cta), href: getTrackingULRWithQueryParams(rule.cta, SessionResourceSource.EDMOUND_ABOTT) },
+        React.createElement(Trans, null, linkTitle))) : (React.createElement("a", { className: `se-recommended pf-c-button pf-m-link anchor-tag-link-pl ts-known-vuln ${className}`, rel: "noopener noreferrer", target: "_blank", "data-tracking-id": "se-recommended-asa-rule", onClick: onCtaClick(rule.cta), href: getTrackingULRWithQueryParams(rule.cta, SessionResourceSource.EDMOUND_ABOTT) },
+        React.createElement(Trans, null, linkTitle),
+        React.createElement(CaretRightIcon, null)));
 }
 export { EARuleTitle, EARuleDescription, EARuleArticle };

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

@@ -75,7 +75,7 @@ export function InsightsRuleInfo({ doc, showNewTag, duplicateKeys }) {
                         React.createElement(Trans, null, "Additional info")),
                     React.createElement(AccordionContent, { isHidden: !isAdditionalExpanded },
                         React.createElement("p", { onClick: onAdditionalInfoElemClick, dangerouslySetInnerHTML: parseMoreInfo(ruleData === null || ruleData === void 0 ? void 0 : ruleData.more_info, (_g = insightsReport === null || insightsReport === void 0 ? void 0 : insightsReport.current) === null || _g === void 0 ? void 0 : _g.details) }))))),
-            React.createElement("a", { className: "se-recommended pf-c-button pf-m-link ts-result-insights cta-link", rel: "noopener noreferrer", target: "_blank", onClick: onCtaClick(doc.view_uri), "data-tracking-id": "se-recommended-insights-rule", "aria-label": "Related article", role: "button", href: getTrackingULRWithQueryParams(doc.view_uri, SessionResourceSource.INSIGHTS) },
+            React.createElement("a", { className: "se-recommended pf-c-button pf-m-link anchor-tag-link-pl ts-result-insights cta-link", rel: "noopener noreferrer", target: "_blank", onClick: onCtaClick(doc.view_uri), "data-tracking-id": "se-recommended-insights-rule", "aria-label": "Related article", role: "button", href: getTrackingULRWithQueryParams(doc.view_uri, SessionResourceSource.INSIGHTS) },
                 React.createElement(Trans, null, "Related article"),
                 React.createElement(CaretRightIcon, null)))))));
 }

package/lib/esm/scss/_main.scss

@@ -923,5 +923,15 @@ div.pf-c-alert.ea-rule-alert > div.pf-c-alert__description > p {
 }
 
 .anchor-tag-button {
-    padding: 0;
+    padding: 0px;
+}
+
+.anchor-tag-link-pl {
+    padding-left: 0px;
+    font-size: 14px;
+    display: inline-block;
+}
+
+.anchor-tag-link-td-none {
+    text-decoration: none;
 }

package/lib/esm/scss/_pf4-overrides.scss

@@ -295,3 +295,9 @@ div.common-suggestions pfe-accordion {
     --pfe-accordion--FontSize--header: 16px;
     --pfe-accordion--FontWeight--header: 600;
 }
+
+// Override PFE Collapse discloser = false
+section.grid-aside-content pfe-accordion {
+    --pfe-accordion--FontSize--header: 16px;
+    --pfe-accordion--FontWeight--header: 600;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "0.2.70",
+    "version": "0.2.73",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -143,5 +143,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "6e960efbc60f233479ef0c92bc1b3b8e2c5b8d31"
+    "gitHead": "05cc1373c1aadf41446d868520cb642065014b6e"
 }