@rh-support/troubleshoot 1.0.3 → 1.0.4

package/lib/esm/components/CaseEditView/CaseDetailsAside.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseDetailsAside.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/CaseDetailsAside.tsx"],"names":[],"mappings":"AAwBA,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;CACtB;AAMD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,eAsL7C"}
+{"version":3,"file":"CaseDetailsAside.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/CaseDetailsAside.tsx"],"names":[],"mappings":"AA0BA,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;CACtB;AAMD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,eAgQ7C"}

package/lib/esm/components/CaseEditView/CaseDetailsAside.js

@@ -1,15 +1,25 @@
-import { Button, Switch, Tooltip } from '@patternfly/react-core';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { Button, Checkbox, Switch, Tooltip } from '@patternfly/react-core';
 import AngleDoubleLeftIcon from '@patternfly/react-icons/dist/js/icons/angle-double-left-icon';
 import AngleDoubleRightIcon from '@patternfly/react-icons/dist/js/icons/angle-double-right-icon';
 import ListIcon from '@patternfly/react-icons/dist/js/icons/list-icon';
 import LockIcon from '@patternfly/react-icons/dist/js/icons/lock-icon';
 import TrendUpIcon from '@patternfly/react-icons/dist/js/icons/trend-up-icon';
-import { ErrorBoundary, useBreakpoint, useForceUpdate } from '@rh-support/components';
-import { GlobalMetadataDispatchContext, toggleViewAsCustomerFlag, useGlobalStateContext, } from '@rh-support/react-context';
+import { ErrorBoundary, ToastNotification, useBreakpoint, useForceUpdate } from '@rh-support/components';
+import { GlobalMetadataDispatchContext, toggleViewAsCustomerFlag, useGlobalStateContext, useUserPreferences, } from '@rh-support/react-context';
 import { ability, CaseDetailsFields, resourceActions, resources } from '@rh-support/user-permissions';
 import { scrollIntoView } from '@rh-support/utils';
+import { isEmpty } from 'lodash';
 import isEqual from 'lodash/isEqual';
-import React, { useContext, useEffect, useRef } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseSelector } from '../../context/CaseContext';
 import { useCaseDetailsPageStateContext } from '../../context/CaseDetailsPageContext';
@@ -53,6 +63,30 @@ export function CaseDetailsAside(props) {
             sectionToScrollRef.current = null;
         }
     };
+    const { getOriginalCaseView, updateOriginalCaseView } = useUserPreferences();
+    const [viewAsInternalPref, setViewAsInternalPref] = useState();
+    const [isDefaultBoxChecked, setIsDefaultBoxChecked] = useState(false);
+    useEffect(() => {
+        const userPreferredCaseView = () => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const isRetrievedInternal = yield getOriginalCaseView(); // retrieving as string.
+                const finalIsRetrievedInternal = !!+isRetrievedInternal; // converting backend string -> num -> bool
+                if (finalIsRetrievedInternal != null) {
+                    setViewAsInternalPref(finalIsRetrievedInternal);
+                    !finalIsRetrievedInternal && setIsDefaultBoxChecked(true);
+                }
+                if (finalIsRetrievedInternal === false) {
+                    !preferredOrDefaultCaseView() && toggleViewAsCustomerFlag(globalMetadataDispatchContext);
+                }
+            }
+            catch (_a) {
+                ToastNotification.addWarningMessage(t('Failed to fetch original preference'));
+                setIsDefaultBoxChecked(false);
+            }
+        });
+        userPreferredCaseView();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     const setSectionToScollRef = (sectionRef) => {
         sectionToScrollRef.current = sectionRef;
     };
@@ -62,6 +96,14 @@ export function CaseDetailsAside(props) {
         caseDetailsAsidePanelRef.current.expanded = isExpanded;
         forceUpdate();
     };
+    const preferredOrDefaultCaseView = () => {
+        if (isEmpty(viewAsInternalPref)) {
+            return viewAsCustomer; // This is the default var used by the component we only want this if value is null meaning user made no preference.
+        }
+        else if (!isEmpty(viewAsInternalPref)) {
+            return !viewAsInternalPref;
+        }
+    };
     useEffect(() => {
         if (isFetchingCaseDetails || !isFirstMountRef.current || isFetchingCaseDetailsError)
             return;
@@ -73,6 +115,25 @@ export function CaseDetailsAside(props) {
         !isXLScreen && toggleAside(false);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [breakPoint]);
+    const onDefaultCheckboxChange = (e) => {
+        try {
+            //if user is unchecking the box we look for it being checked
+            if (isDefaultBoxChecked) {
+                updateOriginalCaseView(+viewAsCustomer);
+                setIsDefaultBoxChecked(!isDefaultBoxChecked);
+            }
+            else if (isDefaultBoxChecked === false) {
+                updateOriginalCaseView(0);
+                setIsDefaultBoxChecked(true);
+            }
+        }
+        catch (error) {
+            setIsDefaultBoxChecked(isDefaultBoxChecked);
+        }
+    };
+    const onCaseSwitchChange = (e) => {
+        toggleViewAsCustomerFlag(globalMetadataDispatchContext);
+    };
     const isSideBarExpanded = (_a = caseDetailsAsidePanelRef.current) === null || _a === void 0 ? void 0 : _a.expanded;
     if (isFetchingCaseDetails || isFetchingCaseDetailsError)
         return null;
@@ -96,9 +157,16 @@ export function CaseDetailsAside(props) {
                     React.createElement(TrendUpIcon, { size: "md" }))))))),
         React.createElement("pfe-collapse-panel", { className: "sidebar-content", "pfe-animation": "false", id: "case-details-aside-content", ref: caseDetailsAsidePanelRef },
             React.createElement("div", { className: "grid-aside-content" },
-                canSeeToggleCustomerView && (React.createElement("div", { className: "pf-u-display-flex customer-view-toggle", ref: toggleCustomerViewRef },
-                    React.createElement("span", { className: "customer-view-switch-label" }, viewAsCustomer ? t('Customer view') : t('Internal view')),
-                    React.createElement(Switch, { title: viewAsCustomer ? t('Customer view') : t('Internal view'), "data-tracking-id": viewAsCustomer ? 'disable-view-as-customer' : 'enable-view-as-customer', "aria-label": viewAsCustomer ? 'disable view as customer' : 'enable view as customer', id: "customer-view-switch", className: "pf-u-ml-auto", isChecked: viewAsCustomer, onChange: () => toggleViewAsCustomerFlag(globalMetadataDispatchContext) }))),
+                React.createElement("div", null,
+                    canSeeToggleCustomerView && (React.createElement("div", { className: "pf-u-display-flex customer-view-toggle", ref: toggleCustomerViewRef },
+                        React.createElement("span", { className: "customer-view-switch-label" }, preferredOrDefaultCaseView() ? t('Customer view') : t('Internal view')),
+                        React.createElement(Switch, { title: preferredOrDefaultCaseView() ? t('Customer view') : t('Internal view'), "data-tracking-id": preferredOrDefaultCaseView()
+                                ? 'disable-view-as-customer'
+                                : 'enable-view-as-customer', "aria-label": preferredOrDefaultCaseView()
+                                ? 'disable view as customer'
+                                : 'enable view as customer', id: "customer-view-switch", className: "pf-u-ml-auto", isChecked: preferredOrDefaultCaseView(), onChange: onCaseSwitchChange }))),
+                    React.createElement("div", null,
+                        React.createElement(Checkbox, { label: t('Set to default'), isChecked: isDefaultBoxChecked, onChange: onDefaultCheckboxChange, id: "set-default-view-checkbox", name: "default-view-checkbox", isDisabled: !viewAsCustomer, className: 'defaultViewCheckbox' }))),
                 React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading top solutions') } },
                     React.createElement(CaseSolutions, { caseNumber: caseNumber, ref: topSolutionsRef, isSecureSupportAccount: isSecureSupportAccount })),
                 !caseEscalations.isFetching && canViewACESection && (React.createElement(ErrorBoundary, null,

package/lib/esm/components/CaseEditView/CaseOverview/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/CaseOverview/index.tsx"],"names":[],"mappings":"AAyCA,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,KAAK,EAAE,MAAM,eAgfjD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseEditView/CaseOverview/index.tsx"],"names":[],"mappings":"AAwCA,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,KAAK,EAAE,MAAM,eAmejD"}

package/lib/esm/components/CaseEditView/CaseOverview/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { Alert, AlertVariant, Button, ButtonVariant, ExpandableSection, Label } from '@patternfly/react-core';
 import { ToastNotification, useConfirmation } from '@rh-support/components';
-import { AddRemoveBookmarkWrapper, CloseCaseModal, fetchCaseSeverities, fetchCaseTypes, GlobalMetadataDispatchContext, GlobalMetadataStateContext, useCanEditCase, } from '@rh-support/react-context';
+import { CloseCaseModal, fetchCaseSeverities, fetchCaseTypes, GlobalMetadataDispatchContext, GlobalMetadataStateContext, useCanEditCase, } from '@rh-support/react-context';
 import { AbilityContext, CaseDetailsFields, resourceActions, resources } from '@rh-support/user-permissions';
 import { haventLoadedMetadata, isOpenShiftOnlineProduct } from '@rh-support/utils';
 import isEqual from 'lodash/isEqual';
@@ -35,7 +35,6 @@ export default function CaseOverview(props) {
     const { t } = useTranslation();
     const canManageCase = ability.can(resourceActions.UPDATE, resources.CASE_DETAILS);
     const canSeeCaseOwnerInfo = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_OWNER);
-    const canAccessBookmark = ability.can(resourceActions.READ, resources.BOOKMARK_ACCOUNTS);
     const canSeeInactivityWarning = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_ACTIVITY_WARNING);
     const [caseOverviewState, caseOverviewDispatch] = useReducer(caseOverviewReducer, initialCaseViewState);
     const [isDetailsExpanded, setIsDetailsExpanded] = useState(true);
@@ -261,12 +260,7 @@ export default function CaseOverview(props) {
                 React.createElement("div", { className: "account" },
                     React.createElement("h3", { className: "subheading subheading-sm" },
                         React.createElement(Trans, null, "Account")),
-                    React.createElement("div", null,
-                        accountNumber,
-                        canAccessBookmark && accountNumber && (React.createElement(AddRemoveBookmarkWrapper, { selectedAccount: {
-                                accountNumber: accountNumber,
-                                name: selectedAccountDetails.data.name,
-                            }, removeBookmarkTitle: t('Remove bookmark'), addBookmarkTitle: t('Bookmark account') }))),
+                    React.createElement("div", null, accountNumber),
                     React.createElement("div", null, selectedAccountDetails.data.name)),
                 React.createElement("div", { className: "created-by" },
                     React.createElement("h3", { className: "subheading subheading-sm" },

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

@@ -1 +1 @@
-{"version":3,"file":"ClusterRecommendationItems.d.ts","sourceRoot":"","sources":["../../../../src/components/Recommendations/ClusterRecommendationItems.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,oDAAoD,CAAC;AAe5F,UAAU,MAAM;IACZ,sBAAsB,EAAE,sBAAsB,EAAE,CAAC;CACpD;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,eAiGvD"}
+{"version":3,"file":"ClusterRecommendationItems.d.ts","sourceRoot":"","sources":["../../../../src/components/Recommendations/ClusterRecommendationItems.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,oDAAoD,CAAC;AAe5F,UAAU,MAAM;IACZ,sBAAsB,EAAE,sBAAsB,EAAE,CAAC;CACpD;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,eA0EvD"}

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

@@ -1,11 +1,11 @@
 import { pcm } from '@cee-eng/hydrajs';
 import { Label } from '@patternfly/react-core';
+import ArrowRightIcon from '@patternfly/react-icons/dist/js/icons/arrow-right-icon';
 import isEqual from 'lodash/isEqual';
 import React, { useContext, useEffect } from 'react';
 import { Trans } from 'react-i18next';
 import { useCaseSelector } from '../../context/CaseContext';
 import { SessionRestoreDispatchContext, SessionRestoreStateContext } from '../../context/SessionRestoreContext';
-import { useParseRuleMarkdown } from '../../hooks/useParseRuleMarkdown';
 import { createOrUpdateSessionResources, getRulesToSave, getSessResFromRules, } from '../../reducers/SessionRestoreReducer';
 import { riskLabels } from '../shared/Constants';
 export function ClusterRecommendationItems(props) {
@@ -17,12 +17,8 @@ export function ClusterRecommendationItems(props) {
         product: state.caseDetails.product,
         openshiftClusterID: state.caseDetails.openshiftClusterID,
     }), isEqual);
-    const { parseDotMarkdownWithTracking } = useParseRuleMarkdown();
     const onResourceClick = (e, rule) => {
-        if (e.target.tagName.toLowerCase() === 'a') {
-            const visitedUrl = e.target.href.split('?')[0];
-            createOrUpdateSessionResources(sessionRestoreDispatch, activeSessionId, sessionResourceTracking, SessionResourceSource.CLUSTER_RECOMMENDATION, [getSessResFromRules(visitedUrl, SessionResourceVisibility.VISITED, rule.rule_id)], JSON.stringify({ product, version, openshiftClusterID }));
-        }
+        createOrUpdateSessionResources(sessionRestoreDispatch, activeSessionId, sessionResourceTracking, SessionResourceSource.CLUSTER_RECOMMENDATION, [getSessResFromRules('', SessionResourceVisibility.VISITED, rule.rule_id)], JSON.stringify({ product, version, openshiftClusterID }));
     };
     useEffect(() => {
         createOrUpdateSessionResources(sessionRestoreDispatch, activeSessionId, sessionResourceTracking, SessionResourceSource.CLUSTER_RECOMMENDATION, getRulesToSave('', '', props.clusterRecommendations), JSON.stringify({ product, version, openshiftClusterID }));
@@ -36,10 +32,8 @@ export function ClusterRecommendationItems(props) {
                 React.createElement(Label, { icon: riskLabels[rule.total_risk].icon, className: riskLabels[rule.total_risk].className },
                     React.createElement(Trans, null, riskLabels[rule.total_risk].label))),
             React.createElement("p", null, rule.details || ''),
-            rule.reason && (React.createElement(React.Fragment, null,
-                React.createElement("h3", { className: "subheading subheading-sm" }, "Reason: "),
-                React.createElement("p", { onClick: (e) => onResourceClick(e, rule), dangerouslySetInnerHTML: parseDotMarkdownWithTracking(rule.reason, rule.extra_data, SessionResourceSource.CLUSTER_RECOMMENDATION, 'ts-cluster-recommendation', 'se-cluster-recommendation-rule') }))),
-            rule.resolution && (React.createElement(React.Fragment, null,
-                React.createElement("h3", { className: "subheading subheading-sm" }, "Resolution: "),
-                React.createElement("p", { onClick: (e) => onResourceClick(e, rule), dangerouslySetInnerHTML: parseDotMarkdownWithTracking(rule.resolution, rule.extra_data, SessionResourceSource.CLUSTER_RECOMMENDATION, 'ts-cluster-recommendation', 'se-cluster-recommendation-rule') })))))))));
+            React.createElement("a", { onClick: (e) => onResourceClick(e, rule), className: "pf-u-font-weight-bold", "data-tracking-id": "cluster-recommendations", href: `https://console.redhat.com/openshift/insights/advisor/clusters/${openshiftClusterID}`, target: "_blank", rel: "noopener noreferrer" },
+                React.createElement(Trans, null,
+                    "View details and remediation steps ",
+                    React.createElement(ArrowRightIcon, { "aria-hidden": "true" })))))))));
 }

package/lib/esm/scss/_main.scss

@@ -945,3 +945,7 @@ div.pf-c-alert.ea-rule-alert > div.pf-c-alert__description > p {
         }
     }
 }
+
+div.defaultViewCheckbox {
+    grid-gap: 0px;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -73,10 +73,10 @@
         "@patternfly/react-core": "4.202.16",
         "@progress/kendo-drawing": "^1.6.0",
         "@progress/kendo-react-pdf": "^3.12.0",
-        "@rh-support/components": "1.2.1",
-        "@rh-support/react-context": "1.0.2",
+        "@rh-support/components": "1.2.2",
+        "@rh-support/react-context": "1.0.3",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "1.0.1",
+        "@rh-support/user-permissions": "1.0.2",
         "@rh-support/utils": "1.0.1",
         "@types/react-redux": "^7.1.12",
         "@types/redux": "^3.6.0",
@@ -142,5 +142,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "4c44ec177438ff8e09a761a4f38ce3fbd83c7aaa"
+    "gitHead": "727b155d872dbee66440d6fb874eef95d119bc3a"
 }