@rh-support/troubleshoot 0.2.47 → 0.2.49

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/CaseComments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseComments.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/CaseComments.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AA6BvE,OAAO,KAA+B,MAAM,OAAO,CAAC;AAOpD,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IAClF,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,kBAAkB,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAChH;AAED,QAAA,MAAM,YAAY,4EA8ShB,CAAC;AAEH,eAAe,YAAY,CAAC"}
+{"version":3,"file":"CaseComments.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/CaseComments.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AA6BvE,OAAO,KAA+B,MAAM,OAAO,CAAC;AAOpD,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IAClF,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,kBAAkB,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAChH;AAED,QAAA,MAAM,YAAY,4EAiThB,CAAC;AAEH,eAAe,YAAY,CAAC"}

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/CaseComments.js

@@ -147,8 +147,9 @@ const CaseComments = React.forwardRef((props, ref) => {
     const parseCommentHtml = (commentText, contentType) => {
         let text = commentText;
         if (contentType === EditorMode.PLAIN) {
+            text = HTMLEntityChecker(commentText);
             // fix issue something like this <h1>ajhdjaj<d</h1>
-            text = htmlEntitiesEncode(commentText);
+            text = htmlEntitiesEncode(text);
             text = encodeAngularBrackets(text);
             text = linkifyLinks(text);
             text = linkifyWithCaseIDs(text);
@@ -160,6 +161,7 @@ const CaseComments = React.forwardRef((props, ref) => {
     /* Purpose of this method is to break the default HTML Entity rendering on the UI when in plaintext mode.
     This is achieved by directly swapping the '&' in any html entity to `&amp` in e.g. &euro swaps to &ampeuro
     so it is rendered -> &euro on the UI instead of '€' */
+    //PCM-10968
     const HTMLEntityChecker = (comment) => {
         if (comment.includes('&')) {
             return comment.replace(/&/g, '&amp;');
@@ -170,13 +172,13 @@ const CaseComments = React.forwardRef((props, ref) => {
     const computeCommentText = (comment) => {
         const parseComment = parseCommentHtml(comment.commentBody, comment.contentType);
         if (!isEmpty(comment.commentBody) && comment.contentType === EditorMode.MARKDOWN) {
-            return (React.createElement("div", { className: "push-top-narrow comment-markdown-text", dangerouslySetInnerHTML: commentMarkdown(parseComment) }));
+            return (React.createElement("div", { className: "push-top-narrow comment-markdown-text", dangerouslySetInnerHTML: commentMarkdown(comment.commentBody) }));
         }
         else if (!isEmpty(comment.commentBody) && comment.contentType === EditorMode.PLAIN) {
-            return (React.createElement("pre", { className: "push-top-narrow comment-plaintext reset-pre-text", dangerouslySetInnerHTML: commentText(HTMLEntityChecker(parseComment)) }));
+            return (React.createElement("pre", { className: "push-top-narrow comment-plaintext reset-pre-text", dangerouslySetInnerHTML: commentText(parseComment) }));
         }
         else {
-            return (React.createElement("pre", { className: "push-top-narrow comment-plaintext reset-pre-text", dangerouslySetInnerHTML: commentText(HTMLEntityChecker(comment.commentBody)) }));
+            return (React.createElement("pre", { className: "push-top-narrow comment-plaintext reset-pre-text", dangerouslySetInnerHTML: commentText(parseComment) }));
         }
     };
     if (!((_a = props.comment) === null || _a === void 0 ? void 0 : _a.isPublic) && !canSeePrivateComments)

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,CA+C1C,CAAC;AAEF,eAAe,0BAA0B,CAAC"}
+{"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,CAmD1C,CAAC;AAEF,eAAe,0BAA0B,CAAC"}

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

@@ -30,6 +30,10 @@ const ClusterRecommendationToast = () => {
             setToastVisibility(true);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [clusterRecommendations.data]);
+    useEffect(() => {
+        if (!openshiftClusterID)
+            setToastVisibility(false);
+    }, [openshiftClusterID]);
     const hasCluster = isClusterIdEnabledForProduct(product, (_a = allProducts.data) === null || _a === void 0 ? void 0 : _a.productsResult);
     if (!isToastVisible || !hasCluster)
         return null;

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

@@ -1 +1 @@
-{"version":3,"file":"ClusterRecommendations.d.ts","sourceRoot":"","sources":["../../../../src/components/Recommendations/ClusterRecommendations.tsx"],"names":[],"mappings":"AAYA,MAAM,CAAC,OAAO,UAAU,qBAAqB,gBAmC5C"}
+{"version":3,"file":"ClusterRecommendations.d.ts","sourceRoot":"","sources":["../../../../src/components/Recommendations/ClusterRecommendations.tsx"],"names":[],"mappings":"AAgBA,MAAM,CAAC,OAAO,UAAU,qBAAqB,gBAmD5C"}

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

@@ -1,18 +1,33 @@
 import { Button } from '@patternfly/react-core';
+import { GlobalMetadataStateContext } from '@rh-support/react-context';
+import { isEqual } from 'lodash';
 import React, { useContext } from 'react';
 import { Trans } 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 { ClusterRecommendationItems } from './ClusterRecommendationItems';
 import { ClusterRecommendationsModal } from './ClusterRecommendationsModal';
 export default function ClusteRecommendations() {
+    var _a;
     const { clusterRecommendationsState: { clusterRecommendations, isClusterRecommendationsModalOpen }, } = useContext(ClusterRecommendationsContext);
     const clusterRecommendationsDispatch = useContext(ClusterRecommendationsDispatchContext);
+    const { openshiftClusterID, product } = useCaseSelector((state) => ({
+        openshiftClusterID: state.caseDetails.openshiftClusterID,
+        product: state.caseDetails.product,
+    }), isEqual);
+    const { globalMetadataState: { allProducts }, } = useContext(GlobalMetadataStateContext);
     const NUMBER_OF_RULES_TO_DISPLAY = 3;
     const onViewMoreRecommendation = () => {
         toggleClusterRecommendationModal(clusterRecommendationsDispatch, !isClusterRecommendationsModalOpen);
     };
-    if (clusterRecommendations.data.length === 0 || clusterRecommendations.isError || clusterRecommendations.isFetching)
+    const hasCluster = isClusterIdEnabledForProduct(product, (_a = allProducts.data) === null || _a === void 0 ? void 0 : _a.productsResult);
+    if (clusterRecommendations.data.length === 0 ||
+        clusterRecommendations.isError ||
+        clusterRecommendations.isFetching ||
+        !hasCluster ||
+        !openshiftClusterID)
         return React.createElement(React.Fragment, null);
     return (React.createElement(React.Fragment, null,
         React.createElement("div", { className: "card card-white card-support top-recommendations" },

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

@@ -81,7 +81,7 @@ export function InsightResultModal(props) {
                 React.createElement(Button, { isDisabled: isFetching, isLoading: isFetching, onClick: handleSolvedIssue, key: "solved-my-issue", variant: "primary", "data-tracking-id": "solved-my-issue-critical-solutions-modal" }, t('I solved my issue')),
                 React.createElement(Button, { onClick: props.onModalToggle, key: "confirm", variant: "secondary", "data-tracking-id": "cancel-critical-solutions-modal" }, t('Cancel')),
             ] },
-            React.createElement(Accordion, { className: "push-top-narrow", headingLevel: "h2", asDefinitionList: false },
+            React.createElement(Accordion, { className: "push-top-narrow", headingLevel: "h2", asDefinitionList: false, isBordered: true },
                 props.insightResults.map((doc) => (React.createElement(InsightsRuleInfo, { duplicateKeys: duplicateKeys, showNewTag: canShowNewTag, key: doc.id + doc.attachmentId, doc: doc }))),
                 props.EARule.length > 0 &&
                     props.EARule.map((rule, index) => (React.createElement(EARuleInfoAccordion, { showNewTag: canShowNewTag, key: `${index}_eaRule`, rule: rule })))))));

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,eAgXtD"}
+{"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,eAkXtD"}

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

@@ -293,8 +293,10 @@ export function GlobalTroubleshootEffects(props) {
         const oldMajorVersion = previousVersion && getVersion(previousVersion).major;
         const newMajorVersion = getVersion(version).major;
         const hasCluster = isClusterIdEnabledForProduct(product, (_a = allProducts.data) === null || _a === void 0 ? void 0 : _a.productsResult);
-        const isDifferentMajorClusterVersion = hasCluster && oldMajorVersion !== newMajorVersion;
-        if (isDifferentMajorClusterVersion) {
+        // Need to check `hasCluster` is empty as when product is changing from shift product to non-shift
+        // product new product will don't have any cluster
+        const isClusterInfoShouldBeReset = !hasCluster || (hasCluster && oldMajorVersion !== newMajorVersion);
+        if (isClusterInfoShouldBeReset) {
             setCaseDetails(caseDispatch, {
                 openshiftClusterID: '',
                 openshiftClusterVersion: '',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "0.2.47",
+    "version": "0.2.49",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -26,13 +26,13 @@
         "lib/**/*"
     ],
     "peerDependencies": {
-        "@cee-eng/hydrajs": "4.7.3",
+        "@cee-eng/hydrajs": "4.7.20",
         "@cee-eng/ui-toolkit": "1.1.6",
-        "@patternfly/patternfly": "4.102.2",
-        "@patternfly/pfe-accordion": "1.1.0",
-        "@patternfly/pfe-collapse": "1.1.0",
-        "@patternfly/pfe-tabs": "1.1.0",
-        "@patternfly/react-core": "4.128.2",
+        "@patternfly/patternfly": "4.176.2",
+        "@patternfly/pfe-accordion": "1.12.3",
+        "@patternfly/pfe-collapse": "1.12.3",
+        "@patternfly/pfe-tabs": "1.12.3",
+        "@patternfly/react-core": "4.194.0",
         "@rh-support/api": "0.3.9",
         "@rh-support/components": "^0.1.3",
         "@rh-support/react-context": "^0.1.3",
@@ -63,21 +63,22 @@
         "react-virtualized": "^9.21.2"
     },
     "dependencies": {
-        "@cee-eng/hydrajs": "4.7.3",
+        "@cee-eng/hydrajs": "4.7.20",
         "@cee-eng/ui-toolkit": "1.1.6",
-        "@patternfly/patternfly": "4.102.2",
-        "@patternfly/pfe-accordion": "1.1.0",
-        "@patternfly/pfe-collapse": "1.1.0",
-        "@patternfly/pfe-tabs": "1.1.0",
-        "@patternfly/react-core": "4.128.2",
+        "@patternfly/patternfly": "4.176.2",
+        "@patternfly/pfe-accordion": "1.12.3",
+        "@patternfly/pfe-collapse": "1.12.3",
+        "@patternfly/pfe-icon": "^1.12.3",
+        "@patternfly/pfe-tabs": "1.12.3",
+        "@patternfly/react-core": "4.194.0",
         "@progress/kendo-drawing": "^1.6.0",
         "@progress/kendo-react-pdf": "^3.12.0",
-        "@rh-support/api": "0.3.9",
-        "@rh-support/components": "1.1.23",
-        "@rh-support/react-context": "0.2.26",
+        "@rh-support/api": "0.3.10",
+        "@rh-support/components": "1.1.24",
+        "@rh-support/react-context": "0.2.27",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "0.2.17",
-        "@rh-support/utils": "0.2.15",
+        "@rh-support/user-permissions": "0.2.18",
+        "@rh-support/utils": "0.2.16",
         "@types/react-redux": "^7.1.12",
         "@types/redux": "^3.6.0",
         "@webcomponents/webcomponentsjs": "^2.2.10",
@@ -142,5 +143,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "83f945a320bb7f76cb312a66f064a301485dcee0"
+    "gitHead": "b2165709013e4bfb0d0279915ee378bf8defb414"
 }