@rh-support/troubleshoot 2.6.358 → 2.6.363

package/lib/esm/components/CaseInformation/SupportLevel.js

@@ -1,86 +1,105 @@
 import { Popover, PopoverPosition } from '@patternfly/react-core';
 import QuestionCircleIcon from '@patternfly/react-icons/dist/js/icons/question-circle-icon';
 import { SingleSelectDropdown } from '@rh-support/components';
+import { GlobalMetadataStateContext } from '@rh-support/react-context';
 import { PreviousCaseTypes, showFtsOnCaseViewEditPage, showFtsOnCreateCasePage } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
 import isEqual from 'lodash/isEqual';
-import React, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
-import { setCaseDetails, setCaseState } from '../../reducers/CaseReducer';
+import { setCaseDetails } from '../../reducers/CaseReducer';
 const defaultProps = {
     id: '',
     className: '',
 };
 function SupportLevel(props) {
-    const { caseNumber, severity, entitlementSla, caseType, productServiceLevel, otherServiceLevels, selectedEntitlementId, } = useCaseSelector((state) => ({
+    const { product, caseNumber, severity, entitlementSla, ownersEntitlements, caseType, openShiftClusterSupportLevel, } = useCaseSelector((state) => ({
+        product: state.caseDetails.product,
         caseNumber: state.caseDetails.caseNumber,
         severity: state.caseDetails.severity,
         entitlementSla: state.caseDetails.entitlementSla,
+        ownersEntitlements: state.ownersEntitlements,
         caseType: state.caseDetails.caseType,
-        productServiceLevel: state.productServiceLevel,
-        otherServiceLevels: state.otherServiceLevels,
-        selectedEntitlementId: state.selectedEntitlementId,
+        openShiftClusterSupportLevel: state.openShiftClusterSupportLevel,
     }), isEqual);
     const caseDispatch = useCaseDispatch();
+    const { globalMetadataState: { allProducts }, } = useContext(GlobalMetadataStateContext);
     const { t } = useTranslation();
     const [isSupportLevelInValid, setIsSupportLevelInValid] = useState(false);
     const isIdea = caseType === PreviousCaseTypes.FEATURE_ENHANCEMENT;
-    const allSlaOptions = [...(productServiceLevel ? [productServiceLevel] : []), ...(otherServiceLevels !== null && otherServiceLevels !== void 0 ? otherServiceLevels : [])].sort((a, b) => b.priority - a.priority);
-    const hasMultipleSlas = allSlaOptions.length > 1;
     const onCaseDetailsChange = (caseDetails) => {
         setCaseDetails(caseDispatch, caseDetails);
     };
     const onEntitlementChange = (selectedOption) => {
-        const entitlementId = selectedOption.value;
-        const matchedSla = allSlaOptions.find((sla) => sla.entitlementId === entitlementId);
-        const slaLabel = (matchedSla === null || matchedSla === void 0 ? void 0 : matchedSla.serviceLevelLabel) || '';
-        const casePayload = { entitlementSla: slaLabel };
+        const selected = selectedOption.value;
+        const casePayload = { entitlementSla: selected };
         casePayload.fts = caseNumber
-            ? showFtsOnCaseViewEditPage(slaLabel, severity)
-            : showFtsOnCreateCasePage(slaLabel, severity);
+            ? showFtsOnCaseViewEditPage(selected, severity)
+            : showFtsOnCreateCasePage(selected, severity);
         casePayload.fts = casePayload.fts && !isIdea;
-        setIsSupportLevelInValid(isEmpty(entitlementId));
+        setIsSupportLevelInValid(isEmpty(selected));
         onCaseDetailsChange(casePayload);
-        setCaseState(caseDispatch, { selectedEntitlementId: entitlementId });
     };
-    const selectedSla = entitlementSla || (productServiceLevel === null || productServiceLevel === void 0 ? void 0 : productServiceLevel.serviceLevelLabel) || '';
-    const currentEntitlementId = selectedEntitlementId || (productServiceLevel === null || productServiceLevel === void 0 ? void 0 : productServiceLevel.entitlementId) || '';
+    const getSlaList = () => {
+        var _a, _b;
+        if (openShiftClusterSupportLevel)
+            return [openShiftClusterSupportLevel];
+        const entitledProduct = ((_b = (_a = allProducts.data) === null || _a === void 0 ? void 0 : _a.productsResult) !== null && _b !== void 0 ? _b : []).find((entitledProduct) => entitledProduct.product === product);
+        if (entitledProduct && entitledProduct.serviceLevels) {
+            return entitledProduct.serviceLevels.split(';') || [];
+        }
+        else {
+            return ownersEntitlements.data ? ownersEntitlements.data.map((sla) => sla.slaProcessId) : [];
+        }
+    };
+    const getSelectedSla = () => {
+        var _a, _b;
+        if (openShiftClusterSupportLevel)
+            return openShiftClusterSupportLevel;
+        const entitledProduct = ((_b = (_a = allProducts.data) === null || _a === void 0 ? void 0 : _a.productsResult) !== null && _b !== void 0 ? _b : []).find((entitledProduct) => entitledProduct.product === product);
+        // if sla is empty then it means either first time this component is rendered or product has changed.
+        if (isEmpty(entitlementSla) && entitledProduct && entitledProduct.preferredServiceLevel) {
+            return entitledProduct.preferredServiceLevel;
+        }
+        else {
+            return isEmpty(entitlementSla) && !isEmpty(ownersEntitlements.data)
+                ? ownersEntitlements.data[0].slaProcessId
+                : entitlementSla;
+        }
+    };
+    const selectedSla = getSelectedSla();
     useEffect(() => {
-        if (!productServiceLevel)
+        if (!selectedSla || entitlementSla)
             return;
-        const validEntitlementIds = new Set([productServiceLevel, ...(otherServiceLevels !== null && otherServiceLevels !== void 0 ? otherServiceLevels : [])]
-            .map((sla) => sla.entitlementId)
-            .filter((id) => !!id));
-        const hasValidSelection = !!selectedEntitlementId && validEntitlementIds.has(selectedEntitlementId);
-        if (!hasValidSelection) {
-            onCaseDetailsChange({ entitlementSla: productServiceLevel.serviceLevelLabel });
-            setCaseState(caseDispatch, { selectedEntitlementId: productServiceLevel.entitlementId });
+        if (entitlementSla !== selectedSla) {
+            onCaseDetailsChange({ entitlementSla: selectedSla });
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [productServiceLevel, otherServiceLevels, selectedEntitlementId]);
+    }, [selectedSla, entitlementSla]);
+    // Create selected option for SingleSelectDropdown
     const getSelectedOption = () => ({
-        label: selectedSla,
-        value: currentEntitlementId,
+        label: selectedSla || '',
+        value: selectedSla || '',
     });
-    const getDropdownOptions = () => allSlaOptions.map((sla) => ({
-        label: sla.serviceLevelLabel,
-        value: sla.entitlementId || sla.serviceLevelLabel,
+    // Create options array for SingleSelectDropdown
+    const getDropdownOptions = () => getSlaList().map((sla) => ({
+        label: sla,
+        value: sla,
     }));
-    if (!hasMultipleSlas)
-        return null;
     return (React.createElement("div", { className: `form-group ${props.className}`, id: `${props.id}` },
         React.createElement("label", { htmlFor: "get-support-supportLevel" },
             React.createElement(Trans, null, "Support level"),
             ' ',
-            React.createElement("span", { className: "form-required", "aria-hidden": true }, "*")),
+            !isEmpty(ownersEntitlements.data) && (React.createElement("span", { className: "form-required", "aria-hidden": true }, "*"))),
         React.createElement(Popover, { "aria-label": "Support Level info", position: PopoverPosition.top, bodyContent: React.createElement("p", null,
                 React.createElement(Trans, { i18nKey: "i18ProductionSupportServiceLevelAgreement" },
                     "Learn more about our",
                     ' ',
                     React.createElement("a", { href: "/support/offerings/production/sla", target: "_blank" }, "production support service level agreement"))), closeBtnAriaLabel: "Close" },
             React.createElement(QuestionCircleIcon, { color: "#5e40be", className: "pf-v6-u-ml-xs icon-size cursor-pointer", "aria-label": "Support Level Info" })),
-        React.createElement(SingleSelectDropdown, { ariaLabel: t('Select Support Level'), onSelect: onEntitlementChange, selected: getSelectedOption(), options: getDropdownOptions(), isInvalid: isSupportLevelInValid, dataTrackingId: "get-support-supportLevel", placeholder: t('Select Support Level') })));
+        React.createElement(SingleSelectDropdown, { ariaLabel: t('Select Support Level'), onSelect: onEntitlementChange, selected: getSelectedOption(), options: getDropdownOptions(), isDisabled: ownersEntitlements.isError || isEmpty(ownersEntitlements.data), isInvalid: isSupportLevelInValid, dataTrackingId: "get-support-supportLevel", placeholder: t('Select Support Level') }),
+        isEmpty(ownersEntitlements.data) && (React.createElement("p", { className: "form-instructions" }, ownersEntitlements.isError ? t('Error loading support levels') : t('No active subscriptions')))));
 }
 SupportLevel.defaultProps = defaultProps;
 export default SupportLevel;

package/lib/esm/components/CaseManagement/CaseLanguageSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseLanguageSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/CaseLanguageSelector.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAOrD,MAAM,WAAW,MAAM;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,KAAK,EAAE,MAAM,qBA6FzD"}
+{"version":3,"file":"CaseLanguageSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/CaseLanguageSelector.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAOrD,MAAM,WAAW,MAAM;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,KAAK,EAAE,MAAM,qBAoGzD"}

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

@@ -30,6 +30,12 @@ export default function CaseLanguageSelector(props) {
     const onLanguageChange = (option) => {
         onCaseDetailsChange({ caseLanguage: option.value });
     };
+    useEffect(() => {
+        if (!caseLanguage) {
+            onCaseDetailsChange({ caseLanguage: caseLanguages.data[1] });
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     useEffect(() => {
         if (!props.isManageStep || !isEmpty(caseLanguage) || isLoadingLang || !canUseLanguageDetection)
             return;
@@ -47,11 +53,11 @@ export default function CaseLanguageSelector(props) {
         props.isManageStep,
     ]);
     const getLanguageDropdownOptions = map(caseLanguages.data, (language) => ({
-        label: Constants.languagesMap[language] || language,
+        label: Constants.languagesMap[language],
         value: language,
     }));
     const getSelectedLanguageOption = {
-        label: caseLanguage ? Constants.languagesMap[caseLanguage] || caseLanguage : '',
+        label: caseLanguage ? Constants.languagesMap[caseLanguage] : '',
         value: caseLanguage || '',
     };
     return (React.createElement("div", { className: "form-group" },

package/lib/esm/components/CaseManagement/CaseManagement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseManagement.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/CaseManagement.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAmB1B,MAAM,WAAW,MAAM;CAAG;AAC1B,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAAK,EAAE,MAAM,qBA8CnD"}
+{"version":3,"file":"CaseManagement.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/CaseManagement.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAgB1B,MAAM,WAAW,MAAM;CAAG;AAC1B,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAAK,EAAE,MAAM,qBAiCnD"}

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

@@ -1,23 +1,20 @@
 import { Grid, GridItem } from '@patternfly/react-core';
 import React from 'react';
 import { useCaseDispatch } from '../../context/CaseContext';
-import { useShowCaseGroupField } from '../../hooks/useCaseGroupUiState';
 import { setCaseDetails } from '../../reducers/CaseReducer';
 import CaseGroup from '../CaseInformation/CaseGroup';
 import { ContactPhoneNumber } from '../CaseInformation/ContactPhoneNumber';
-// TODO: Re-enable once phone number verification flow is fully supported with GraphQL
-// import { ContactPhoneNumberAlert } from '../CaseInformation/ContactPhoneNumberAlert';
+import { ContactPhoneNumberAlert } from '../CaseInformation/ContactPhoneNumberAlert';
 import Fts from '../CaseInformation/Fts';
 import Severity from '../CaseInformation/Severity';
 import SupportLevel from '../CaseInformation/SupportLevel';
-import CaseLabelsCreate from './CaseLabelsCreate';
 import CaseLanguageSelector from './CaseLanguageSelector';
-// import { Cep } from './Cep';
+import { Cep } from './Cep';
 import OpenReferenceNumber from './OpenReferenceNumber';
 import { RHAssociatesSelector } from './RHAssociatesSelector';
+import CaseContactSelector from './SendNotifications/CaseContactSelector';
 export default function CaseManagement(props) {
     const caseDispatch = useCaseDispatch();
-    const showCaseGroupField = useShowCaseGroupField();
     const onSeverityChange = (payload) => {
         setCaseDetails(caseDispatch, payload);
     };
@@ -28,15 +25,15 @@ export default function CaseManagement(props) {
                 React.createElement(Severity, { showSeverityInfoIcon: true, onSeverityChange: onSeverityChange })),
             React.createElement(GridItem, { span: 12, xl2: 6, className: "pf-v6-u-mb-xs" },
                 React.createElement(ContactPhoneNumber, null))),
+        React.createElement(ContactPhoneNumberAlert, null),
         React.createElement(Fts, { inlineEditable: false }),
         React.createElement(Grid, { hasGutter: true },
-            React.createElement(GridItem, { span: 12, xl2: showCaseGroupField ? 6 : 12, className: "pf-v6-u-mb-xs" },
+            React.createElement(GridItem, { span: 12, xl2: 6, className: "pf-v6-u-mb-xs" },
                 React.createElement(CaseLanguageSelector, { isManageStep: true })),
-            showCaseGroupField && (React.createElement(GridItem, { span: 12, xl2: 6, className: "pf-v6-u-mb-xs" },
-                React.createElement(CaseGroup, { init: true })))),
-        React.createElement(Grid, { hasGutter: true },
-            React.createElement(GridItem, { span: 12, xl2: 12, className: "pf-v6-u-mb-xs" },
-                React.createElement(CaseLabelsCreate, null))),
+            React.createElement(GridItem, { span: 12, xl2: 6, className: "pf-v6-u-mb-xs" },
+                React.createElement(CaseGroup, { init: true }))),
+        React.createElement(CaseContactSelector, null),
         React.createElement(RHAssociatesSelector, null),
-        React.createElement(OpenReferenceNumber, { inlineEditable: false, hideSaveCancel: true })));
+        React.createElement(OpenReferenceNumber, { inlineEditable: false, hideSaveCancel: true }),
+        React.createElement(Cep, null)));
 }

package/lib/esm/components/CaseManagement/Cep.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Cep.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/Cep.tsx"],"names":[],"mappings":"AA2BA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAe/D,UAAU,MAAM;CAAG;AAEnB,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,qBA4ThC"}
+{"version":3,"file":"Cep.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/Cep.tsx"],"names":[],"mappings":"AA0BA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAoB/D,UAAU,MAAM;CAAG;AAEnB,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,qBA8ThC"}

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

@@ -7,7 +7,6 @@ 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, Checkbox, Form, FormGroup, FormHelperText, HelperText, HelperTextItem, Modal, ModalBody, ModalFooter, ModalHeader, ModalVariant, Popover, PopoverPosition, TextArea, TextInput, ValidatedOptions, } from '@patternfly/react-core';
 import QuestionCircleIcon from '@patternfly/react-icons/dist/js/icons/question-circle-icon';
 import { LoadingIndicator, ToastNotification, useConfirmation } from '@rh-support/components';
@@ -18,22 +17,23 @@ import isEqual from 'lodash/isEqual';
 import React, { useContext, useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
-import { GET_CASE_COMMENTS } from '../../hooks/useCaseComments';
+import { useCaseDetailsPageStateContext } from '../../context/CaseDetailsPageContext';
+import { useCaseDiscussionTabDispatchContext, useCaseDiscussionTabStateContext, } from '../../context/CaseDiscussionTabContext';
 import { useCaseUpdateErrorMessage } from '../../hooks/useCaseUpdateErrorMessage';
+import { updateDiscussionStateComments } from '../../reducers/CaseDiscussionTabReducer';
 import { checkForCaseStatusToggleOnAttachOrComment, postCepDetails, setCaseDetails, setCaseState, updateCaseDetails, } from '../../reducers/CaseReducer';
 import { PDFContext } from '../CaseEditView/PDFContainer';
 export function Cep(props) {
     var _a, _b, _c, _d, _e, _f;
     const { t } = useTranslation();
     const caseUpdateError = useCaseUpdateErrorMessage();
-    const { cep, caseNumber, status, cepDetails, isPostingCep, isCaseUpdating, existingCaseDetails } = useCaseSelector((state) => ({
+    const { cep, caseNumber, status, cepDetails, isPostingCep, isCaseUpdating } = useCaseSelector((state) => ({
         cep: state.caseDetails.cep,
         caseNumber: state.caseDetails.caseNumber,
         status: state.caseDetails.status,
         cepDetails: state.cepDetails,
         isPostingCep: state.isPostingCep,
         isCaseUpdating: state.isCaseUpdating,
-        existingCaseDetails: state.caseDetails,
     }), isEqual);
     const caseDispatch = useCaseDispatch();
     const { globalMetadataState: { loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
@@ -42,7 +42,9 @@ export function Cep(props) {
     const ability = useContext(AbilityContext);
     const canUseCep = ability.can(resourceActions.PATCH, resources.CASE_CREATE, CaseListFields.CEP);
     const confirm = useConfirmation();
-    const client = useApolloClient();
+    const dispatchDiscussion = useCaseDiscussionTabDispatchContext();
+    const { sort, allDiscussions, discussionFiltersListState } = useCaseDiscussionTabStateContext();
+    const { caseDetailsPageState: { caseFeedbacksHydra }, } = useCaseDetailsPageStateContext();
     const canEditCase = useCanEditCase();
     const [saveButtonIsClicked, setSaveButtonIsClicked] = useState(false);
     const { isExportingPDF } = useContext(PDFContext);
@@ -87,14 +89,10 @@ export function Cep(props) {
     const cepUpdate = (caseDetails) => __awaiter(this, void 0, void 0, function* () {
         try {
             yield updateCaseDetails(caseDispatch, caseNumber, caseDetails);
-            yield checkForCaseStatusToggleOnAttachOrComment(caseDispatch, loggedInUserRights.data.isInternal(), status, {
-                apolloClient: client,
-                caseNumber,
-                existingCaseDetails,
-            });
+            checkForCaseStatusToggleOnAttachOrComment(caseDispatch, loggedInUserRights.data.isInternal(), status);
             if (caseDetails.cep) {
                 yield postCepDetails(caseDispatch, caseNumber, cepDetailsLocal);
-                client.refetchQueries({ include: [GET_CASE_COMMENTS] });
+                updateDiscussionStateComments(dispatchDiscussion, caseDispatch, caseNumber, allDiscussions, sort, caseFeedbacksHydra.data, discussionFiltersListState);
             }
             ToastNotification.addSuccessMessage(t(`Consultant Engagement in Progress has been updated successfully`));
         }

package/lib/esm/components/CaseManagement/NoClusterIDReasonSelector.d.ts

@@ -1,7 +1,6 @@
 import React from 'react';
 interface IProps {
-    onReasonInputBoxChanged?: (Reason: string) => void;
-    onReasonInputBoxBlur?: (reason: string) => void;
+    onReasonInputBoxChanged: (Reason: string) => void;
     onReasonChange: (Reason: string) => void;
     noClusterIdReasonExplanation: string;
     noClusterIdReason: string;

package/lib/esm/components/CaseManagement/NoClusterIDReasonSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NoClusterIDReasonSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/NoClusterIDReasonSelector.tsx"],"names":[],"mappings":"AAWA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAM/D,UAAU,MAAM;IACZ,uBAAuB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACnD,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,4BAA4B,EAAE,MAAM,CAAC;IACrC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,QAAA,MAAM,yBAAyB,GAAI,OAAO,MAAM,sBAqL/C,CAAC;AAEF,OAAO,EAAE,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"NoClusterIDReasonSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/NoClusterIDReasonSelector.tsx"],"names":[],"mappings":"AAWA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAM/D,UAAU,MAAM;IACZ,uBAAuB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,4BAA4B,EAAE,MAAM,CAAC;IACrC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,QAAA,MAAM,yBAAyB,GAAI,OAAO,MAAM,sBAkK/C,CAAC;AAEF,OAAO,EAAE,yBAAyB,EAAE,CAAC"}

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

@@ -18,19 +18,14 @@ const NoClusterIDReasonSelector = (props) => {
     const globalDispatch = useGlobalDispatchContext();
     const { globalMetadataState: { caseNoClusterIdReasons }, } = useContext(GlobalMetadataStateContext);
     const { isExportingPDF } = useContext(PDFContext);
-    useEffect(() => {
-        setInputValue(props.noClusterIdReasonExplanation || '');
-    }, [props.noClusterIdReasonExplanation]);
     const caseNoClusterIdReasonsList = props.isCustomer
         ? filter(caseNoClusterIdReasons.data, (item) => item !==
             'I am opening a case on behalf of the customer and cannot provide their Cluster ID at this time')
         : caseNoClusterIdReasons.data;
     const clearSelection = () => {
-        var _a, _b;
         setNotRegistered(false);
         setInputValue('');
-        (_a = props.onReasonInputBoxBlur) === null || _a === void 0 ? void 0 : _a.call(props, '');
-        (_b = props.onReasonInputBoxChanged) === null || _b === void 0 ? void 0 : _b.call(props, '');
+        props.onReasonInputBoxChanged('');
         props.onReasonChange('');
     };
     const handleReasonChange = (option) => {
@@ -42,22 +37,10 @@ const NoClusterIDReasonSelector = (props) => {
         }
     };
     const handleInputChange = (_event, value) => {
-        var _a;
         const cleaned = value.trim().length === 0 ? '' : value;
         setInputValue(cleaned);
         setHasLargeReasonExplanation(cleaned.length > SESSION_NO_CLUSTER_REASON_LENGTH_LIMIT);
-        (_a = props.onReasonInputBoxChanged) === null || _a === void 0 ? void 0 : _a.call(props, cleaned);
-    };
-    const handleInputBlur = () => {
-        var _a;
-        const cleaned = (inputValue || '').trim();
-        setInputValue(cleaned);
-        setHasLargeReasonExplanation(cleaned.length > SESSION_NO_CLUSTER_REASON_LENGTH_LIMIT);
-        if (props.onReasonInputBoxBlur) {
-            props.onReasonInputBoxBlur(cleaned);
-            return;
-        }
-        (_a = props.onReasonInputBoxChanged) === null || _a === void 0 ? void 0 : _a.call(props, cleaned);
+        props.onReasonInputBoxChanged(cleaned);
     };
     const getDropdownOptions = () => {
         return map(caseNoClusterIdReasonsList || [], (option) => ({
@@ -102,7 +85,7 @@ const NoClusterIDReasonSelector = (props) => {
                 React.createElement(SingleSelectDropdown, { placeholder: t('Select an option or briefly describe your reason'), dataTrackingId: "no-openshift-cluster-id-reason", options: getDropdownOptions(), selected: getSelectedOption(), isDisabled: caseNoClusterIdReasons.isFetching || props.isDisabled, isLoading: caseNoClusterIdReasons.isFetching, isInvalid: props.isInValid, onSelect: handleReasonChange, "aria-labelledby": titleId, "aria-invalid": props.isInValid, "aria-describedby": "validate-reason-helper" })),
             props.noClusterIdReason === 'Other' && (React.createElement("div", { className: "text-input-wrapper" },
                 React.createElement(TextInputGroup, null,
-                    React.createElement(TextInput, { value: inputValue, onChange: handleInputChange, onBlur: handleInputBlur, placeholder: t('Briefly describe your reason'), "aria-label": t('Other reason description'), validated: hasLargeReasonExplanation ? ValidatedOptions.error : ValidatedOptions.default }))))),
+                    React.createElement(TextInput, { value: inputValue, onChange: handleInputChange, placeholder: t('Briefly describe your reason'), "aria-label": t('Other reason description'), validated: hasLargeReasonExplanation ? ValidatedOptions.error : ValidatedOptions.default }))))),
         React.createElement(LoadingIndicator, { show: caseNoClusterIdReasons.isFetching, size: "xs" }),
         React.createElement("p", { id: "validate-reason-helper", className: `form-instructions ${props.isInValid ? 'form-invalid' : ''}` }, notRegistered ? (registerMyClusterID()) : hasLargeReasonExplanation ? (React.createElement("span", { className: "form-instructions form-invalid pf-v6-u-danger-color-100 no-cluster-ID" }, t(`This reason exceeds ${SESSION_NO_CLUSTER_REASON_LENGTH_LIMIT} characters. Try shortening it.`))) : (React.createElement(React.Fragment, null,
             props.isInValid && React.createElement(ExclamationCircleIcon, { color: "#c9190b", className: "pf-v6-u-mr-sm" }),

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":"AAKA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAuB/D,eAAO,MAAM,oBAAoB,yBAShC,CAAC;AAEF,eAAO,MAAM,uBAAuB,yBAInC,CAAC;AAEF,eAAO,MAAM,4BAA4B,yBAYxC,CAAC;AAEF,eAAO,MAAM,qBAAqB,yBAIjC,CAAC;AAEF,UAAU,MAAM;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,qBAkT/C"}
+{"version":3,"file":"OpenShiftClusterId.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenShiftClusterId.tsx"],"names":[],"mappings":"AAKA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAuB/D,eAAO,MAAM,oBAAoB,yBAShC,CAAC;AAEF,eAAO,MAAM,uBAAuB,yBAInC,CAAC;AAEF,eAAO,MAAM,4BAA4B,yBAYxC,CAAC;AAEF,eAAO,MAAM,qBAAqB,yBAIjC,CAAC;AAEF,UAAU,MAAM;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,qBAmT/C"}

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

@@ -90,8 +90,8 @@ export function OpenShiftClusterId(props) {
         if (isEmpty(product))
             return;
         const isClusterVisible = () => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const hasCluster = yield isClusterIdEnabledForProduct(product);
+            var _a, _b;
+            const hasCluster = yield isClusterIdEnabledForProduct(product, (_a = allProducts.data) === null || _a === void 0 ? void 0 : _a.productsResult);
             setShowClusterId(hasCluster);
             if (!hasCluster) {
                 resetClusterData();
@@ -117,7 +117,7 @@ export function OpenShiftClusterId(props) {
                     setIsClusterIdInValid(false);
                 }
             }
-            const majorVersion = (_a = getVersion(version)) === null || _a === void 0 ? void 0 : _a.major;
+            const majorVersion = (_b = getVersion(version)) === null || _b === void 0 ? void 0 : _b.major;
             const isOpenShiftV3 = product === 'OpenShift Container Platform' && majorVersion === '3';
             setShowV3TextBox(isOpenShiftV3);
             if (isOpenShiftV3 || noClusterIdReasonExplanation === 'v3-cluster') {
@@ -207,9 +207,9 @@ export function OpenShiftClusterId(props) {
         const infoMessage = v3Selected ? v3Tov4TransitionLink() : discoverV4ClusterIdLink();
         return isNextBtnClickedToShowValidationError && errorMessage ? errorMessage : infoMessage;
     };
-    const onReasonExplanationInputBoxChanged = (explanation) => {
+    const onReasonExplanationInputBoxChanged = (noClusterIdReasonExplanation) => {
         if (noClusterIdReason === 'Other') {
-            setCaseDetails(caseDispatch, { noClusterIdReasonExplanation: explanation });
+            setCaseDetails(caseDispatch, { noClusterIdReasonExplanation: noClusterIdReasonExplanation });
         }
     };
     const v3ClusterNameInputBoxChanged = (v3Cluster) => {
@@ -232,7 +232,7 @@ export function OpenShiftClusterId(props) {
         return null;
     return (React.createElement("div", { className: `${props.className ? props.className : ''}` },
         !showV3TextBox && (React.createElement(OpenshiftDropdownV4, { openshiftDisplayName: openshiftDisplayName, openshiftClusterIDState: openshiftClusterID || selectedReason, onClusterIdStateUpdate: onClusterIdStateUpdate, isClusterIdInvalid: isNextBtnClickedToShowValidationError &&
-                ((isEmpty(openshiftClusterID) && isEmpty(selectedReason)) || isClusterIdInvalid), clusterIdDropdownFormInstructions: clusterIdDropdownFormInstructions(), onClusterClear: resetClusterData })),
+                ((isEmpty(openshiftClusterID) && isEmpty(selectedReason)) || isClusterIdInvalid), clusterIdDropdownFormInstructions: clusterIdDropdownFormInstructions(), onClusterClear: resetClusterData, isV3: product !== 'OpenShift Container Platform' })),
         noClusterIdReasonExplanation !== 'v3-cluster' && dontKnowSelected && !showV3TextBox && (React.createElement(NoClusterIDReasonSelector, { noClusterIdReasonExplanation: noClusterIdReasonExplanation, noClusterIdReason: noClusterIdReason, onReasonInputBoxChanged: onReasonExplanationInputBoxChanged, onReasonChange: onReasonChange, isInValid: isInVaidNoClusterIdReason, isCustomer: isCustomer })),
         (v3Selected || showV3TextBox) && (React.createElement(OpenShiftV3Inputbox, { v3ClusterName: v3ClusterName, onReasonInputBoxChanged: v3ClusterNameInputBoxChanged, isInValid: isEmpty(v3ClusterName.trim()) && isNextBtnClickedToShowValidationError, v3Selected: v3Selected }))));
 }

package/lib/esm/components/CaseManagement/OpenshiftDropdownV4.d.ts

@@ -7,6 +7,7 @@ interface IProps extends IDClassNameProps {
     isClusterIdInvalid: boolean;
     clusterIdDropdownFormInstructions?: JSX.Element;
     onClusterClear: () => void;
+    isV3: boolean;
     isDisabled?: boolean;
     noClusterIdReasonExplanation?: string;
     openshiftDisplayName?: string;

package/lib/esm/components/CaseManagement/OpenshiftDropdownV4.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenshiftDropdownV4.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenshiftDropdownV4.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAgB5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAI5D,OAAO,KAA2D,MAAM,OAAO,CAAC;AAOhF,UAAU,MAAO,SAAQ,gBAAgB;IACrC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzF,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iCAAiC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IAChD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,uBAAuB,CAAC,EAAE,CAAC,GAAG,KAAA,KAAK,IAAI,CAAC;CAC3C;AAsBD,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,qBAmfzC;AAED,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
+{"version":3,"file":"OpenshiftDropdownV4.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenshiftDropdownV4.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAgB5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAI5D,OAAO,KAA2D,MAAM,OAAO,CAAC;AAOhF,UAAU,MAAO,SAAQ,gBAAgB;IACrC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzF,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iCAAiC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IAChD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,uBAAuB,CAAC,EAAE,CAAC,GAAG,KAAA,KAAK,IAAI,CAAC;CAC3C;AAsBD,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,qBAsfzC;AAED,OAAO,EAAE,mBAAmB,EAAE,CAAC"}

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

@@ -37,18 +37,6 @@ function OpenshiftDropdownV4(props) {
     const { t } = useTranslation();
     const PER_PAGE = 200;
     const LOAD_MORE_VALUE = 'loader';
-    const getDisplayName = (id, noClusterIdReasonExplanation, display_name) => {
-        if (isEmpty(id))
-            return '';
-        if (id === 'dont-have-id') {
-            return noClusterIdReasonExplanation === 'v3-cluster'
-                ? t('The case is for a v3 cluster')
-                : t("I don't have my Cluster ID");
-        }
-        if (id === 'v3-cluster')
-            return t('The case is for a v3 cluster');
-        return display_name || id;
-    };
     const [clustersRawResponse, setClustersRawResponse] = useState([]);
     const clustersRawResponseRef = useRef(clustersRawResponse);
     clustersRawResponseRef.current = clustersRawResponse;
@@ -56,7 +44,7 @@ function OpenshiftDropdownV4(props) {
     const loadMoreInProgressRef = useRef(false);
     const [clustersSelectOptions, setClustersSelectOptions] = useState([]);
     const [isOpen, setIsOpen] = useState(false);
-    const [inputVal, setInputVal] = useState(() => getDisplayName(props.openshiftClusterIDState, props.noClusterIdReasonExplanation || '', props.openshiftDisplayName || props.openshiftClusterIDState));
+    const [inputVal, setInputVal] = useState(props.openshiftDisplayName);
     const inputValRef = useRef(inputVal);
     inputValRef.current = inputVal;
     const [showArchivedClusters, setShowArchivedClusters] = useState(false);
@@ -65,6 +53,19 @@ function OpenshiftDropdownV4(props) {
     const { getFromCache, setInCache } = useLRUCache(50);
     const textInputRef = useRef();
     const { isExportingPDF } = useContext(PDFContext);
+    // gets a cluster id and returns display name
+    const getDisplayName = (id, noClusterIdReasonExplanation, display_name) => {
+        if (isEmpty(id))
+            return '';
+        if (id === 'dont-have-id') {
+            return noClusterIdReasonExplanation === 'v3-cluster'
+                ? t('The case is for a v3 cluster')
+                : t("I don't have my Cluster ID");
+        }
+        if (id === 'v3-cluster')
+            return t('The case is for a v3 cluster');
+        return display_name || id;
+    };
     const onDropdownClear = () => __awaiter(this, void 0, void 0, function* () {
         setIsOpen(false);
         setInputVal('');
@@ -117,8 +118,8 @@ function OpenshiftDropdownV4(props) {
     const dropdownOptions = useMemo(() => [
         { type: 'checkbox', key: 'show-hide-archived-clusters', label: t('Show archived clusters') },
         { type: 'option', key: 'dont-have-id', label: t("I don't have my Cluster ID") },
-        { type: 'option', key: 'v3-cluster', label: t('The case is for a v3 cluster') },
-    ], [t]);
+        ...(props.isV3 ? [{ type: 'option', key: 'v3-cluster', label: t('The case is for a v3 cluster') }] : []),
+    ], [props.isV3, t]);
     // Use the keyboard navigation hook
     const { focusedItemIndex, onInputKeyDown } = useSelectKeyboardNavigator({
         list: dropdownOptions,
@@ -145,9 +146,15 @@ function OpenshiftDropdownV4(props) {
     const dropdownHeaderOptions = useMemo(() => [
         React.createElement(SelectOption, { hasCheckbox: true, key: "show-archived-clusters", "aria-label": t('Show archived clusters'), id: "show-archived-clusters", className: "archived-clusters-checkbox", "data-tracking-id": "show-hide-archived-clusters", value: { type: 'checkbox' }, isSelected: showArchivedClusters }, t('Show archived clusters')),
         React.createElement(Divider, { component: "div", key: 'cluster-id-options-divider-e' }),
-        React.createElement(SelectOption, { key: 'dont-have-id', value: createState('dont-have-id', t("I don't have my Cluster ID")), "data-tracking-id": "dont-have-cluster-id", isFocused: focusedItemIndex === 1 }, t("I don't have my Cluster ID")),
-        React.createElement(SelectOption, { key: 'v3-cluster', value: createState('v3-cluster', t('The case is for a v3 cluster')), "data-tracking-id": "v3-cluster-case", isFocused: focusedItemIndex === 2 }, t('The case is for a v3 cluster')),
-    ], [showArchivedClusters, focusedItemIndex, t]);
+        React.createElement(SelectOption, { key: 'dont-have-id', value: createState('dont-have-id', t("I don't have my Cluster ID")), "data-tracking-id": "dont-have-cluster-id", isFocused: focusedItemIndex === 1 }, "I don't have my Cluster ID"),
+        ...(props.isV3
+            ? [
+                React.createElement(SelectOption, { key: 'v3-cluster', value: createState('v3-cluster', t('The case is for a v3 cluster')), isFocused: focusedItemIndex === 2 }),
+            ]
+            : []),
+    ], 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [showArchivedClusters, focusedItemIndex]);
     const getClusterOptions = (clusters, total = totalResultsNo) => {
         const clustersResponseGrouped = groupBy(clusters, 'console_url') || [];
         const domainNames = Object.keys(clustersResponseGrouped) || [];
@@ -217,14 +224,17 @@ function OpenshiftDropdownV4(props) {
             }
             else {
                 if (abortControllerRef.current !== undefined) {
+                    // Cancel the previous request
                     abortControllerRef.current.abort();
                 }
+                // recreate a new AbortController for each call
                 let controller = new AbortController();
                 abortControllerRef.current = controller;
                 const clusterStatus = ` AND status not in ('Deprovisioned'${!showArchivedClusters ? ",'Archived'" : ''})`;
                 const searchPhrase = search
                     ? ` AND (external_cluster_id ILIKE '%${search}%' OR display_name ILIKE '%${search}%' OR console_url ILIKE '%${search}%')`
                     : '';
+                // query language: https://github.com/yaacov/tree-search-language
                 clustersResponse = yield cloud.getAccountClustersSubscription({
                     order: 'display_name asc',
                     page,
@@ -255,6 +265,7 @@ function OpenshiftDropdownV4(props) {
             };
         }
         catch (e) {
+            // silently fails
             setIsFetchingClusters(false);
             return { items: [], totalResult: 0, page: 1, total: 0 };
         }
@@ -290,6 +301,8 @@ function OpenshiftDropdownV4(props) {
     }, [props.openshiftClusterIDState, props.openshiftDisplayName, props.noClusterIdReasonExplanation]);
     // need to get clusters when user opens the dropdown
     // as the api response is cached np extra call is made on open/close
+    // added observing props.isV3 because re-render
+    // is needed when user on overview page changing version
     useEffect(() => {
         if (!isOpen)
             return;
@@ -308,7 +321,7 @@ function OpenshiftDropdownV4(props) {
             isUnmounted = true;
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [showArchivedClusters, isOpen, inputVal]);
+    }, [props.isV3, showArchivedClusters, isOpen, inputVal]);
     const onTextInputChange = (_event, value) => {
         setInputVal(value);
         props.onClusterIdStateUpdate({ external_cluster_id: value });

package/lib/esm/components/CaseManagement/SendNotifications/NonOrgCaseNotifyeesSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NonOrgCaseNotifyeesSelector.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseManagement/SendNotifications/NonOrgCaseNotifyeesSelector.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAwB,oBAAoB,EAAY,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,KAAkD,MAAM,OAAO,CAAC;AAEvE,UAAU,MAAO,SAAQ,gBAAgB;IACrC,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,CAAC,aAAa,EAAE,oBAAoB,EAAE,KAAK,IAAI,CAAC;IAC1D,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,MAAM,CAAC;CAC9B;AA+BD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,qBA2NxD"}
+{"version":3,"file":"NonOrgCaseNotifyeesSelector.d.ts","sourceRoot":"","sources":["../../../../../src/components/CaseManagement/SendNotifications/NonOrgCaseNotifyeesSelector.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAwB,oBAAoB,EAAY,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,KAAkD,MAAM,OAAO,CAAC;AAEvE,UAAU,MAAO,SAAQ,gBAAgB;IACrC,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,CAAC,aAAa,EAAE,oBAAoB,EAAE,KAAK,IAAI,CAAC;IAC1D,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,MAAM,CAAC;CAC9B;AA+BD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,qBA+NxD"}