@rh-support/troubleshoot 2.7.35 → 2.7.36

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

@@ -1 +1 @@
-{"version":3,"file":"VerifyCaseStatusModal.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/VerifyCaseStatusModal/VerifyCaseStatusModal.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAsD,MAAM,OAAO,CAAC;AAa3E,UAAU,MAAM;IACZ,SAAS,EAAE,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,qBA8IlD"}
+{"version":3,"file":"VerifyCaseStatusModal.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/VerifyCaseStatusModal/VerifyCaseStatusModal.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAYzE,UAAU,MAAM;IACZ,SAAS,EAAE,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,qBA6HlD"}

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

@@ -7,16 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { useApolloClient } from '@apollo/client/react';
 import { Button, ButtonVariant, Modal, ModalBody, ModalFooter, ModalHeader, ModalVariant, } from '@patternfly/react-core';
 import { SingleSelectDropdown, ToastNotification } from '@rh-support/components';
 import { GlobalMetadataStateContext, useCanEditCase } from '@rh-support/react-context';
+import { getPortalStatusDropdownOptions, mapSfdcStatusToPortalStatus, resolvePortalStatusToApiValue, } from '@rh-support/utils';
 import isEqual from 'lodash/isEqual';
-import React, { useContext, useEffect, useReducer, useState } from 'react';
+import React, { useContext, useMemo, useReducer, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../../../../context/CaseContext';
 import { useCaseUpdateErrorMessage } from '../../../../../hooks/useCaseUpdateErrorMessage';
-import { caseOverviewReducer, fetchAllStatuses, initialCaseViewState, setStatusUpdating, } from '../../../../../reducers/CaseOverviewReducer';
+import { caseOverviewReducer, initialCaseViewState, setStatusUpdating, } from '../../../../../reducers/CaseOverviewReducer';
 import { updateCaseDetails } from '../../../../../reducers/CaseReducer';
 export function VerifyCaseStatusModal(props) {
     const { t } = useTranslation();
@@ -24,75 +24,59 @@ export function VerifyCaseStatusModal(props) {
     const [caseOverviewState, caseOverviewDispatch] = useReducer(caseOverviewReducer, initialCaseViewState);
     const caseState = useCaseSelector((state) => ({
         caseDetails: {
-            product: state.caseDetails.product,
-            version: state.caseDetails.version,
             status: state.caseDetails.status,
-            caseType: state.caseDetails.caseType,
-            createdDate: state.caseDetails.createdDate,
-            createdById: state.caseDetails.createdById,
-            ownerId: state.caseDetails.ownerId,
-            caseNumber: state.caseDetails.caseNumber,
-            cep: state.caseDetails.cep,
-            accountNumber: state.caseDetails.accountNumberRef,
-            firstCaseInactivityWarningSentAt: state.caseDetails.firstCaseInactivityWarningSentAt,
-            secondCaseInactivityWarningSentAt: state.caseDetails.secondCaseInactivityWarningSentAt,
         },
         isCaseUpdating: state.isCaseUpdating,
-        contactIsPartner: state.contactIsPartner,
-        hotfixRequested: state.hotfixRequested,
-        hotfixDelivered: state.hotfixDelivered,
-        selectedAccountDetails: state.selectedAccountDetails,
     }), isEqual);
     const { status } = caseState.caseDetails;
     const { globalMetadataState: { loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
-    const apolloClient = useApolloClient();
     const canManageCase = loggedInUserRights.data.canManageCases();
-    useEffect(() => {
-        fetchAllStatuses(caseOverviewDispatch, apolloClient);
-    }, [caseOverviewDispatch, apolloClient]);
+    const isInternal = loggedInUserRights.data.isInternal();
+    const currentPortalStatus = useMemo(() => (status ? mapSfdcStatusToPortalStatus(status) : ''), [status]);
+    const isClosed = currentPortalStatus === 'Closed';
     const { isCaseUpdating } = caseState;
     const canEditCase = useCanEditCase();
     const caseDispatch = useCaseDispatch();
-    const [statusChange, setStatusChange] = useState(status);
+    const [selectedPortalStatus, setSelectedPortalStatus] = useState(currentPortalStatus);
     const [isVerifyCaseStatusLoading, setIsVerifyCaseStatusLoading] = useState(false);
     const onSubmit = () => __awaiter(this, void 0, void 0, function* () {
         yield props.onConfirm();
-        yield updateStatusState(statusChange);
+        yield updateStatusState(selectedPortalStatus);
         setIsVerifyCaseStatusLoading(true);
     });
-    const updateStatusState = (statusVal_1, ...args_1) => __awaiter(this, [statusVal_1, ...args_1], void 0, function* (statusVal, onStatusUpdate = null) {
-        if (status !== statusVal) {
-            setStatusUpdating(caseOverviewDispatch, true);
-            try {
-                yield updateCaseDetails(caseDispatch, props.caseNumber, { status: statusVal });
-                setStatusUpdating(caseOverviewDispatch, false);
-                onStatusUpdate && (yield onStatusUpdate());
-                ToastNotification.addSuccessMessage(t('Status has been successfully updated'));
-            }
-            catch (e) {
-                setStatusUpdating(caseOverviewDispatch, false);
-                caseUpdateError.showFieldError(e, t('Status'), () => updateStatusState(statusVal, onStatusUpdate));
-            }
-        }
-        else {
+    const updateStatusState = (portalStatusVal_1, ...args_1) => __awaiter(this, [portalStatusVal_1, ...args_1], void 0, function* (portalStatusVal, onStatusUpdate = null) {
+        if (currentPortalStatus === portalStatusVal)
             return;
+        const apiValue = resolvePortalStatusToApiValue(portalStatusVal, status);
+        setStatusUpdating(caseOverviewDispatch, true);
+        try {
+            yield updateCaseDetails(caseDispatch, props.caseNumber, { status: apiValue });
+            setStatusUpdating(caseOverviewDispatch, false);
+            if (onStatusUpdate)
+                yield onStatusUpdate();
+            ToastNotification.addSuccessMessage(t('Status has been successfully updated'));
+        }
+        catch (e) {
+            setStatusUpdating(caseOverviewDispatch, false);
+            caseUpdateError.showFieldError(e, t('Status'), () => updateStatusState(portalStatusVal, onStatusUpdate));
         }
     });
     const onStatusChange = (selectedOption) => __awaiter(this, void 0, void 0, function* () {
         if (canEditCase.alert())
             return;
-        setStatusChange(selectedOption.value);
+        if (selectedOption.disabled)
+            return;
+        setSelectedPortalStatus(selectedOption.value);
     });
-    // Create selected option for SingleSelectDropdown
     const getSelectedOption = () => ({
-        label: t(statusChange || status),
-        value: statusChange || status,
+        label: t(selectedPortalStatus || currentPortalStatus),
+        value: selectedPortalStatus || currentPortalStatus,
     });
-    // Create options array for SingleSelectDropdown
-    const getDropdownOptions = () => caseOverviewState.allCaseStatuses.data.map((statusOption) => ({
-        label: t(statusOption),
-        value: statusOption,
-        disabled: statusOption === status,
+    const statusOptions = getPortalStatusDropdownOptions(isClosed, isInternal);
+    const getDropdownOptions = () => statusOptions.map((opt) => ({
+        label: t(opt.value),
+        value: opt.value,
+        disabled: opt.disabled,
     }));
     return (React.createElement(Modal, { id: "case-close-modal", title: t(`Please verify this case's status`), "aria-describedby": "case-close-modal", isOpen: true, onClose: props.onClose, variant: ModalVariant.medium },
         React.createElement(ModalHeader, null,
@@ -100,9 +84,7 @@ export function VerifyCaseStatusModal(props) {
                 React.createElement(Trans, null, "Status"),
                 React.createElement("span", { className: "form-required", "aria-hidden": true }, "*"))),
         React.createElement(ModalBody, null,
-            React.createElement(SingleSelectDropdown, { ariaLabel: t(status), id: "verify-case-status", selected: getSelectedOption(), options: getDropdownOptions(), onSelect: onStatusChange, isDisabled: !canManageCase ||
-                    caseOverviewState.allCaseStatuses.isFetching ||
-                    (caseOverviewState.caseStatusUpdating && isCaseUpdating), isInvalid: !status, placeholder: t(status) })),
+            React.createElement(SingleSelectDropdown, { ariaLabel: t(currentPortalStatus), id: "verify-case-status", selected: getSelectedOption(), options: getDropdownOptions(), onSelect: onStatusChange, isDisabled: !canManageCase || (caseOverviewState.caseStatusUpdating && isCaseUpdating), isInvalid: !status, placeholder: t(currentPortalStatus) })),
         React.createElement(ModalFooter, null,
             React.createElement(Button, { key: "submit-description", variant: ButtonVariant.primary, onClick: onSubmit, isLoading: isVerifyCaseStatusLoading, isDisabled: props.isUpdating, "data-tracking-id": "close-case-description-modal-submit" },
                 React.createElement(Trans, null, "Continue")),

package/lib/esm/css/case.css

@@ -683,7 +683,7 @@ input[aria-invalid='true'].pf-v6-c-form-control {
 
 .comment-body p,
 .comment-richtext p {
-    margin-bottom: 1rem;
+    margin-bottom: 0;
     margin-top: 0;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "2.7.35",
+    "version": "2.7.36",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -52,8 +52,8 @@
         "@progress/kendo-licensing": "1.3.5",
         "@progress/kendo-react-pdf": "^5.16.0",
         "@redux-devtools/extension": "^3.3.0",
-        "@rh-support/components": "2.6.31",
-        "@rh-support/react-context": "2.6.33",
+        "@rh-support/components": "2.6.32",
+        "@rh-support/react-context": "2.6.34",
         "@rh-support/types": "2.0.31",
         "@rh-support/user-permissions": "2.6.29",
         "@rh-support/utils": "2.6.28",
@@ -129,5 +129,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "502b4ddee254af10ba0f905309e059d28cb59ff8"
+    "gitHead": "872788369fcbc6755ab025758c43dde299c1863c"
 }