@rh-support/troubleshoot 0.2.96 → 0.2.99

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

@@ -1 +1 @@
-{"version":3,"file":"Case.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/Case.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAS,mBAAmB,EAAiD,MAAM,kBAAkB,CAAC;AAmB7G,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,KAAK,EAAE,MAAM,eAkLzC"}
+{"version":3,"file":"Case.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/Case.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAS,mBAAmB,EAAiD,MAAM,kBAAkB,CAAC;AAmB7G,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,KAAK,EAAE,MAAM,eAmLzC"}

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

@@ -1,5 +1,5 @@
 import { CoverSpinner, ErrorBoundary, OverviewContentLoader, ToastNotification, useDocumentTitle, usePrevious, } from '@rh-support/components';
-import { GlobalMetadataStateContext } from '@rh-support/react-context';
+import { GlobalMetadataStateContext, HostnameAwarenessModal } from '@rh-support/react-context';
 import { AbilityContext, CaseDetailsFields, resourceActions, resources } from '@rh-support/user-permissions';
 import { getUrlParsedParams, isValidCaseNumber } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
@@ -118,7 +118,8 @@ export default function Case(props) {
                                 React.createElement(CaseOverview, { caseNumber: caseNumber })),
                             React.createElement(Switch, null,
                                 React.createElement(Route, { path: `${path}/:activeTab?` },
-                                    React.createElement(CaseDetailsTabs, { basePath: url, caseNumber: caseNumber, routeProps: props.routeProps }))))))),
+                                    React.createElement(CaseDetailsTabs, { basePath: url, caseNumber: caseNumber, routeProps: props.routeProps }))))),
+                        React.createElement(HostnameAwarenessModal, null))),
                 React.createElement(CaseDetailsAside, { caseNumber: caseNumber }),
                 React.createElement(CaseDetailsModals, { caseNumber: caseNumber, isSecureSupport: loggedInUsersAccount.data.secureSupport })))))));
 }

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseHostname.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseHostname.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDetails/CaseHostname.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAY5D,UAAU,MAAO,SAAQ,gBAAgB;IACrC,cAAc,EAAE,OAAO,CAAC;CAC3B;AAMD,iBAAS,YAAY,CAAC,KAAK,EAAE,MAAM,eA2HlC;kBA3HQ,YAAY;;;AA8HrB,OAAO,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"CaseHostname.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDetails/CaseHostname.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAY5D,UAAU,MAAO,SAAQ,gBAAgB;IACrC,cAAc,EAAE,OAAO,CAAC;CAC3B;AAMD,iBAAS,YAAY,CAAC,KAAK,EAAE,MAAM,eAgKlC;kBAhKQ,YAAY;;;AAmKrB,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseHostname.js

@@ -7,13 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Popover, PopoverPosition } from '@patternfly/react-core';
-import { InlineEdit, LoadingIndicator, ToastNotification, ValueChangedIcon } from '@rh-support/components';
-import { useCanEditCase } from '@rh-support/react-context';
+import { accounts } from '@cee-eng/hydrajs';
+import { Popover, PopoverPosition, Switch } from '@patternfly/react-core';
+import { InlineEdit, LoadingIndicator, ToastNotification, useFetch, ValueChangedIcon } from '@rh-support/components';
+import { GlobalMetadataStateContext, useCanEditCase } from '@rh-support/react-context';
 import { ability, CaseListFields, resourceActions, resources } from '@rh-support/user-permissions';
 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 { HOSTNAME_LENGTH_LIMIT } from '../../../../reducers/CaseConstNTypes';
@@ -33,6 +34,13 @@ function CaseHostname(props) {
     const [hostnameState, setHostnameState] = useState(hostname);
     const [isHostnameUpdating, setIsHostnameUpdating] = useState(false);
     const canUseHostName = ability.can(resourceActions.PATCH, resources.CASE_CREATE, CaseListFields.HOSTNAME);
+    const [isShareHostNamesChecked, setIsShareHostNamesChecked] = useState(false);
+    const { globalMetadataState: { loggedInUsersAccount }, } = useContext(GlobalMetadataStateContext);
+    const { request: fetchHostnameDefault } = useFetch(accounts.getIsSharingHostname);
+    const userOriginalHostnameValue = () => __awaiter(this, void 0, void 0, function* () {
+        const fetchedHostnameStatus = yield fetchHostnameDefault(accountNumber);
+        setIsShareHostNamesChecked(fetchedHostnameStatus.shareHostnameWithRHT);
+    });
     // value changed logic to show a none local status change
     const [localHostnameChange, setLocalHostnameChange] = useState(false);
     const afterLocalChange = () => setLocalHostnameChange(false);
@@ -71,6 +79,21 @@ function CaseHostname(props) {
     useEffect(() => {
         setHostnameState(hostname);
     }, [hostname]);
+    const accountNumber = loggedInUsersAccount.data.accountNumber;
+    const { request: updateShareHostnames } = useFetch(accounts.updateIsSharingHostname);
+    const onShareHostnameCheck = () => __awaiter(this, void 0, void 0, function* () {
+        try {
+            yield updateShareHostnames(!isShareHostNamesChecked, accountNumber);
+            setIsShareHostNamesChecked(!isShareHostNamesChecked);
+        }
+        catch (error) {
+            console.log(error);
+        }
+    });
+    const shareHostnameLabel = 'Share hostnames with Red Hat';
+    const hostNameVisibilityContent = (React.createElement("div", null,
+        React.createElement("p", null, "Share hostnames with our support professionals for a smoother and faster experience."),
+        React.createElement(Switch, { label: shareHostnameLabel, isChecked: isShareHostNamesChecked, onChange: onShareHostnameCheck })));
     if (!canUseHostName) {
         return React.createElement(React.Fragment, null);
     }
@@ -80,7 +103,7 @@ function CaseHostname(props) {
     return (React.createElement(React.Fragment, null,
         React.createElement(InlineEdit, { labelProps: { htmlFor: 'case-details-hostname' }, formClassName: props.className || '', labelContent: React.createElement(React.Fragment, null,
                 React.createElement(Trans, null, "Hostname"),
-                React.createElement(ValueChangedIcon, { afterLocalChange: afterLocalChange, isLocalChange: localHostnameChange, value: hostname, getTooltipContent: getChangedValueTooltip(() => CaseValuesToWatch.hostname) })), helperContent: React.createElement(Popover, { "aria-label": "Hostname Info", position: PopoverPosition.auto, bodyContent: React.createElement(Trans, null, "Hostname is not visible to Red Hat Support professionals."), closeBtnAriaLabel: "Close" },
+                React.createElement(ValueChangedIcon, { afterLocalChange: afterLocalChange, isLocalChange: localHostnameChange, value: hostname, getTooltipContent: getChangedValueTooltip(() => CaseValuesToWatch.hostname) })), helperContent: React.createElement(Popover, { "aria-label": "Hostname Info", position: PopoverPosition.auto, bodyContent: hostNameVisibilityContent, closeBtnAriaLabel: "Close", headerContent: 'Hostname Visibility', onShow: () => userOriginalHostnameValue() },
                 React.createElement("i", { "aria-label": "Hostname Info", className: "m-l-1 fa fa-question-circle" })), allowInlineEdit: props.inlineEditable, content: hostname, saveDisabled: isHostNameEmpty || hostnameState === hostname || isHostnameUpdating || lengthError, onSave: onSave, onCancel: onCancel, initialIsEditing: false, loadingIndicator: isHostnameUpdating ? React.createElement(LoadingIndicator, { show: isHostnameUpdating, isInline: true }) : null },
             React.createElement("input", { type: "text", id: "case-details-hostname", className: `form-control${lengthError ? ' form-invalid' : ''}`, name: "case-details-hostname", value: hostnameState, onChange: onHostnameChange, disabled: isHostnameUpdating, "data-tracking-id": "case-details-hostname", "aria-invalid": lengthError })),
         lengthError && (React.createElement("div", { className: "pull-top" },

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenshiftClusterId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseOpenshiftClusterId.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenshiftClusterId.tsx"],"names":[],"mappings":"AAsBA,wBAAgB,sBAAsB,gBAkPrC"}
+{"version":3,"file":"CaseOpenshiftClusterId.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenshiftClusterId.tsx"],"names":[],"mappings":"AAsBA,wBAAgB,sBAAsB,gBA2PrC"}

package/lib/esm/components/CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenshiftClusterId.js

@@ -54,7 +54,9 @@ export function CaseOpenshiftClusterId() {
         if (!openshiftClusterID || getIsClusterIdInvalid(openshiftClusterID))
             return;
         let openshiftClusterVersion;
-        if (clusterDetails && clusterDetails.external_id === openshiftClusterID && clusterDetails.openshift_version) {
+        if (clusterDetails &&
+            clusterDetails.external_cluster_id === openshiftClusterID &&
+            clusterDetails.openshift_version) {
             openshiftClusterVersion = clusterDetails.openshift_version;
         }
         else {
@@ -70,7 +72,7 @@ export function CaseOpenshiftClusterId() {
             const hasCluster = yield isClusterIdEnabledForProduct(product, (_b = allProducts.data) === null || _b === void 0 ? void 0 : _b.productsResult);
             setShowClusterId(hasCluster);
             // when product changes from a product with cluster to a product without cluster, reset the clusterId
-            const isResetClusterID = (!hasCluster || isOpenShiftV3) && openshiftClusterID;
+            const isResetClusterID = !hasCluster || isOpenShiftV3;
             if (isResetClusterID) {
                 const caseDetails = {
                     openshiftClusterID: '',
@@ -79,6 +81,8 @@ export function CaseOpenshiftClusterId() {
                 };
                 yield clusterIdUpdate(caseDetails, false);
                 setCaseDetails(caseDispatch, caseDetails);
+                setLocalOpenshiftClusterIDState('');
+                clusterStateReset();
             }
         });
         if ((((_a = allProducts.data) === null || _a === void 0 ? void 0 : _a.productsResult) || []).length) {
@@ -89,7 +93,7 @@ export function CaseOpenshiftClusterId() {
     // user may change product and version we need to reset internal state
     // context api state will be reset on parent component each time user changes product and version
     useEffect(() => {
-        clusterStateReset(); //=>
+        clusterStateReset();
     }, [product, version]);
     /**
      * Hook to make sure that if cluster id comes from session or someother source
@@ -125,7 +129,7 @@ export function CaseOpenshiftClusterId() {
         }
     });
     const onClusterIdSave = (selectedCluster) => __awaiter(this, void 0, void 0, function* () {
-        const selectedClusterId = selectedCluster === null || selectedCluster === void 0 ? void 0 : selectedCluster.external_id;
+        const selectedClusterId = selectedCluster === null || selectedCluster === void 0 ? void 0 : selectedCluster.external_cluster_id;
         if (isEmpty(selectedClusterId))
             return;
         setLocalOpenshiftClusterIDState(selectedClusterId);

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

@@ -72,11 +72,11 @@ function SupportLevel(props) {
             React.createElement(Trans, null, "Support level"),
             ' ',
             !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(Trans, { i18nKey: "i18ProductionSupportServiceLevelAgreement" },
-                React.createElement("p", null,
+        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.html", target: "_blank" }, "production support service level agreement"))), closeBtnAriaLabel: "Close" },
+                    React.createElement("a", { href: "/support/offerings/production/sla", target: "_blank" }, "production support service level agreement"))), closeBtnAriaLabel: "Close" },
             React.createElement("i", { "aria-label": "Support Level info", className: "fa fa-question-circle" })),
         React.createElement(Dropdown, { id: "open-case-support-level", name: "open-case-support-level", placeholder: "Select", title: `Select Support Level`, list: getSlaList(), selectedItem: toOption({ slaProcessId: selectedSla }, { labelKey: 'slaProcessId' }), disabled: ownersEntitlements.isError || isEmpty(ownersEntitlements.data), isLoadingList: ownersEntitlements.isFetching, isInValid: isSupportLevelInValid, required: true, onChange: onEntitlementChange, onOuterClick: validateSupportLevel, "data-tracking-id": "open-case-support-level" }),
         isEmpty(ownersEntitlements.data) && (React.createElement("p", { className: "form-instructions" }, ownersEntitlements.isError ? t('Error loading support levels') : t('No active subscriptions')))));

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":"AAcA,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;AA0BD,QAAA,MAAM,yBAAyB,UAAW,MAAM,gBAsI/C,CAAC;AAEF,OAAO,EAAE,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"NoClusterIDReasonSelector.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/NoClusterIDReasonSelector.tsx"],"names":[],"mappings":"AAcA,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;AA0BD,QAAA,MAAM,yBAAyB,UAAW,MAAM,gBAqI/C,CAAC;AAEF,OAAO,EAAE,yBAAyB,EAAE,CAAC"}

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

@@ -74,7 +74,6 @@ const NoClusterIDReasonSelector = (props) => {
         setIsOpen(false);
         setInputVal(input);
         props.onReasonInputBoxChanged(input);
-        props.onReasonChange('Other');
     };
     useEffect(() => {
         if (haventLoadedMetadata(caseNoClusterIdReasons)) {

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":"AAwBA,eAAO,MAAM,oBAAoB,mBAShC,CAAC;AAEF,eAAO,MAAM,uBAAuB,mBAInC,CAAC;AAEF,eAAO,MAAM,4BAA4B,mBAKxC,CAAC;AAEF,eAAO,MAAM,qBAAqB,mBAIjC,CAAC;AAEF,wBAAgB,kBAAkB,gBAsRjC"}
+{"version":3,"file":"OpenShiftClusterId.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenShiftClusterId.tsx"],"names":[],"mappings":"AAwBA,eAAO,MAAM,oBAAoB,mBAShC,CAAC;AAEF,eAAO,MAAM,uBAAuB,mBAInC,CAAC;AAEF,eAAO,MAAM,4BAA4B,mBAKxC,CAAC;AAEF,eAAO,MAAM,qBAAqB,mBAIjC,CAAC;AAEF,wBAAgB,kBAAkB,gBA6RjC"}

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

@@ -96,7 +96,9 @@ export function OpenShiftClusterId() {
         if (!openshiftClusterID || getIsClusterIdInvalid(openshiftClusterID))
             return;
         let openshiftClusterVersion;
-        if (clusterDetails && clusterDetails.external_id === openshiftClusterID && clusterDetails.openshift_version) {
+        if (clusterDetails &&
+            clusterDetails.external_cluster_id === openshiftClusterID &&
+            clusterDetails.openshift_version) {
             openshiftClusterVersion = clusterDetails.openshift_version;
         }
         else {
@@ -162,7 +164,7 @@ export function OpenShiftClusterId() {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [v3ClusterName, noClusterIdReason]);
     const onClusterIdStateUpdate = (selectedCluster) => {
-        const selectedId = selectedCluster.external_id;
+        const selectedId = selectedCluster.external_cluster_id;
         if (isEmpty(selectedId))
             return;
         resetClusterData();

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

@@ -1,15 +1,15 @@
-import { ICluster } from '@rh-support/api';
+import { IClusterSubscription } from '@cee-eng/hydrajs/@types/models/cloud';
 import { IDClassNameProps } from '@rh-support/types/shared';
 interface IProps extends IDClassNameProps {
     openshiftClusterIDState: string;
-    onClusterIdStateUpdate: (cluster: Partial<ICluster>, value?: string) => void;
+    onClusterIdStateUpdate: (cluster: Partial<IClusterSubscription>, value?: string) => void;
     isClusterIdInvalid: boolean;
     clusterIdDropdownFormInstructions?: JSX.Element;
     onClusterClear: () => void;
     isV4: boolean;
     isDisabled?: boolean;
 }
-declare const fetchClusterIdDetails: (clusterId: string) => Promise<ICluster>;
+declare const fetchClusterIdDetails: (clusterId: string) => Promise<import("@cee-eng/hydrajs/@types/models/cloud").ICluster>;
 declare function OpenshiftDropdownV4(props: IProps): JSX.Element;
 declare namespace OpenshiftDropdownV4 {
     var defaultProps: {};

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,EAAsB,QAAQ,EAAqB,MAAM,iBAAiB,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAuB,MAAM,0BAA0B,CAAC;AAUjF,UAAU,MAAO,SAAQ,gBAAgB;IACrC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7E,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;CACxB;AAcD,QAAA,MAAM,qBAAqB,cAAqB,MAAM,sBASrD,CAAC;AAeF,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,eA6OzC;kBA7OQ,mBAAmB;;;AAgP5B,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"OpenshiftDropdownV4.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenshiftDropdownV4.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAgC,MAAM,sCAAsC,CAAC;AAE1G,OAAO,EAAE,gBAAgB,EAAuB,MAAM,0BAA0B,CAAC;AAYjF,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;CACxB;AAQD,QAAA,MAAM,qBAAqB,cAAqB,MAAM,qEASrD,CAAC;AAeF,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,eAgTzC;kBAhTQ,mBAAmB;;;AAmT5B,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,CAAC"}

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

@@ -7,12 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Divider, Select, SelectOption, SelectVariant } from '@patternfly/react-core';
-import { getAccountClusters } from '@rh-support/api';
-import { useFetch } from '@rh-support/components';
+import { cloud } from '@cee-eng/hydrajs';
+import { Checkbox, Divider, Select, SelectOption, SelectVariant } from '@patternfly/react-core';
 import find from 'lodash/find';
 import groupBy from 'lodash/groupBy';
 import isEmpty from 'lodash/isEmpty';
+import map from 'lodash/map';
+import merge from 'lodash/merge';
 import React, { useEffect, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { getDisplayNameForCluster } from '../../utils/caseOpenshiftClusterIdUtils';
@@ -24,19 +25,19 @@ const defaultProps = {
 };
 const fetchClusterIdDetails = (clusterId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const clustersResponse = yield getAccountClusters({
+        const clustersResponse = yield cloud.getAccountClusters({
             order: 'display_name asc',
-            search: `external_id ILIKE '%${clusterId}%'`,
+            search: `external_id ILIKE  '%${clusterId}%'`,
         });
         const clusterDetails = (clustersResponse.items || []).find((item) => item.external_id === clusterId);
         return clusterDetails;
     }
     catch (e) { }
 });
-const createState = (external_id, display_name) => {
+const createState = (external_cluster_id, display_name) => {
     return {
         display_name,
-        external_id,
+        external_cluster_id,
         toString: () => display_name || '',
         compareTo: function (value) {
             const displayName = this.toString().toLowerCase();
@@ -47,16 +48,16 @@ const createState = (external_id, display_name) => {
 };
 function OpenshiftDropdownV4(props) {
     const { t } = useTranslation();
+    const OLD_API_PER_PAGE_GET_ALL = 5000;
     const PER_PAGE = 200;
-    const { request: getAccountClustersRequest, isFetching: isFetchingClusters } = useFetch(getAccountClusters, {
-        propgateErrors: true,
-    });
     const [clustersRawResponse, setClustersRawResponse] = useState([]);
     const abortControllerRef = useRef(undefined);
     const [clustersSelectOptions, setClustersSelectOptions] = useState([]);
     const [isOpen, setIsOpen] = useState(false);
     const [validated, setValidated] = useState('default');
     const [inputVal, setInputVal] = useState('');
+    const [showArchivedClusters, setShowArchivedClusters] = useState(false);
+    const [isFetchingClusters, setIsFetchingClusters] = useState(false);
     // gets a cluster id and returns display name
     const getDisplayNameById = (clusters, id) => {
         if (isEmpty(id))
@@ -65,7 +66,7 @@ function OpenshiftDropdownV4(props) {
             return t("I don't have my Cluster ID");
         if (id === 'v3-cluster')
             return t('The case is for a v3 cluster');
-        const cluster = find(clusters, (o) => o.external_id === id);
+        const cluster = find(clusters, (o) => o.external_cluster_id === id);
         return isEmpty(cluster) ? id : getDisplayNameForCluster(cluster);
     };
     const onDropdownClear = () => __awaiter(this, void 0, void 0, function* () {
@@ -75,15 +76,24 @@ function OpenshiftDropdownV4(props) {
     });
     const onToggle = (isOpen) => setIsOpen(isOpen);
     const onViewMoreClick = () => __awaiter(this, void 0, void 0, function* () {
-        const fetchedClusters = yield fetchAccountClusters();
+        const fetchedClusters = yield fetchAccountClusters(inputVal);
         const clusterResponse = [...clustersRawResponse, ...fetchedClusters.items];
         setClustersRawResponse(clusterResponse);
         setClustersSelectOptions(getClusterOptions(clusterResponse));
     });
     const onSelect = (event, selectedCluster) => __awaiter(this, void 0, void 0, function* () {
         setInputVal('');
-        props.onClusterIdStateUpdate(selectedCluster);
-        setIsOpen(false);
+        if (event.target.tagName !== 'BUTTON') {
+            // checkbox is clicked
+            setShowArchivedClusters(!showArchivedClusters);
+            // reset
+            props.onClusterClear();
+            setClustersRawResponse([]);
+        }
+        else {
+            props.onClusterIdStateUpdate(selectedCluster);
+            setIsOpen(false);
+        }
     });
     const getClusterOptions = (clusters) => {
         const clustersResponseGrouped = groupBy(clusters, 'dns.base_domain') || [];
@@ -101,22 +111,28 @@ function OpenshiftDropdownV4(props) {
             domain !== 'undefined' &&
                 clusterOptions.push(React.createElement(SelectOption, { isDisabled: true, className: "pf-u-font-weight-bold pf-u-color-400", value: createState(domain, domain), key: domain + index }));
             clustersResponseGrouped[domain].forEach((cluster, i) => {
-                clusterOptions.push(React.createElement(SelectOption, { key: i + cluster.external_id, value: createState(cluster.external_id, cluster.display_name) }));
+                clusterOptions.push(React.createElement(SelectOption, { key: cluster.external_cluster_id, value: createState(cluster.external_cluster_id, cluster.display_name) }));
             });
             clusterOptions.push(React.createElement(Divider, { component: "div", key: index + domain }));
         });
         return [
-            ...clusterOptions,
+            React.createElement(SelectOption, { key: 'show-hide-archived-clusters', inputId: "check-box" },
+                React.createElement(Checkbox, { label: t('Show archived clusters'), key: "show-archived-clusters", "aria-label": t('Show archived clusters'), id: "show-archived-clusters", "data-tracking-id": "show-hide-archived-clusters", isChecked: showArchivedClusters })),
+            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")) }),
             ...(!props.isV4
                 ? [
                     React.createElement(SelectOption, { key: 'v3-cluster', value: createState('v3-cluster', t('The case is for a v3 cluster')) }),
                 ]
                 : []),
-            React.createElement(SelectOption, { key: 'dont-have-id', value: createState('dont-have-id', t("I don't have my Cluster ID")) }),
+            ...(clusterOptions.length !== 0 ? [React.createElement(Divider, { component: "div", key: 'cluster-id-options-divider' })] : []),
+            ...clusterOptions,
         ];
     };
     const fetchAccountClusters = (search = '') => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const page = Math.floor(clustersRawResponse.length / PER_PAGE) + 1;
+        setIsFetchingClusters(true);
         try {
             if (abortControllerRef.current !== undefined) {
                 // Cancel the previous request
@@ -125,26 +141,71 @@ function OpenshiftDropdownV4(props) {
             // recreate a new AbortController for each call
             let controller = new AbortController();
             abortControllerRef.current = controller;
+            let clustersResponse;
             // query language: https://github.com/yaacov/tree-search-language
-            const clustersResponse = yield getAccountClustersRequest({
-                order: 'display_name asc',
-                page,
-                size: PER_PAGE,
-                search: `external_id ILIKE '%${search}%' OR display_name ILIKE '%${search}%' OR dns.base_domain ILIKE '%${search}%'`,
-            }, controller.signal);
-            const items = clustersResponse.items.map((item) => ({
-                display_name: getDisplayNameForCluster(item),
-                external_id: item.external_id,
-                dns: item.dns,
-            }));
+            // old api has dns info but we cannot exclude archived clusters
+            // new api doesn't have dns info but we can exclude archived clusters
+            if (showArchivedClusters) {
+                // call old api
+                clustersResponse = yield cloud.getAccountClusters({
+                    order: 'display_name asc',
+                    page,
+                    size: PER_PAGE,
+                    search: `external_id ILIKE '%${search}%' OR display_name ILIKE '%${search}%' OR dns.base_domain ILIKE '%${search}%'`,
+                }, controller.signal);
+                clustersResponse = clustersResponse.items;
+            }
+            else {
+                // call old api get all clusters and call new api get limitted number of clusters
+                // then add dns info to the new api response
+                const clustersResponses = yield Promise.allSettled([
+                    cloud.getAccountClustersSubscription({
+                        order: 'display_name asc',
+                        page,
+                        size: PER_PAGE,
+                        search: `${showArchivedClusters ? '' : "status!='Archived' AND "} (external_cluster_id ILIKE '%${search}%' OR display_name ILIKE '%${search}%')`,
+                        fields: 'external_cluster_id,display_name,status,metrics.openshift_version',
+                    }, controller.signal),
+                    cloud.getAccountClusters({
+                        order: 'display_name asc',
+                        page: 1,
+                        size: OLD_API_PER_PAGE_GET_ALL,
+                        search: `external_id ILIKE '%${search}%' OR display_name ILIKE '%${search}%' OR dns.base_domain ILIKE '%${search}%'`,
+                    }, controller.signal),
+                ]);
+                if (clustersResponses[0].status === 'fulfilled' && clustersResponses[1].status === 'fulfilled') {
+                    const newApi = ((_a = clustersResponses[0].value) === null || _a === void 0 ? void 0 : _a.items) || [];
+                    const oldApi = ((_b = clustersResponses[1].value) === null || _b === void 0 ? void 0 : _b.items) || [];
+                    clustersResponse = map(newApi, function (item) {
+                        return merge(item, find(oldApi, { external_id: item.external_cluster_id }));
+                    });
+                }
+                else if (clustersResponses[0].status === 'fulfilled' && clustersResponses[1].status === 'rejected') {
+                    clustersResponse = clustersResponses[0].value.items;
+                }
+                else {
+                    clustersResponse = [];
+                }
+            }
+            const items = clustersResponse.map((item) => {
+                var _a, _b;
+                return ({
+                    display_name: getDisplayNameForCluster(item),
+                    external_cluster_id: item.external_cluster_id || item.external_id,
+                    openshift_version: item.openshift_version || ((_b = (_a = item === null || item === void 0 ? void 0 : item.metrics) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.openshift_version) || '',
+                    dns: item.dns || {},
+                });
+            });
+            setIsFetchingClusters(false);
             return {
                 items,
-                totalResult: clustersResponse.total,
-                page: clustersResponse.page,
+                totalResult: clustersResponse.length,
+                page,
             };
         }
         catch (e) {
             // silently fails
+            setIsFetchingClusters(false);
             return { items: [], totalResult: 0, page: 0 };
         }
     });
@@ -154,7 +215,7 @@ function OpenshiftDropdownV4(props) {
     useEffect(() => {
         let isUnmounted = false;
         const fetchClusters = () => __awaiter(this, void 0, void 0, function* () {
-            const fetchedClusters = yield fetchAccountClusters();
+            const fetchedClusters = yield fetchAccountClusters(inputVal);
             if (!isUnmounted) {
                 setClustersSelectOptions(getClusterOptions(fetchedClusters.items));
                 setClustersRawResponse(fetchedClusters.items);
@@ -165,7 +226,7 @@ function OpenshiftDropdownV4(props) {
             isUnmounted = true;
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.isV4]);
+    }, [props.isV4, showArchivedClusters]);
     useEffect(() => {
         if (props.isClusterIdInvalid) {
             setValidated('error');

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,eA2XtD"}
+{"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,eAqXtD"}

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

@@ -293,10 +293,7 @@ export function GlobalTroubleshootEffects(props) {
     const previousActiveSessionId = usePrevious(activeSessionId);
     useEffect(() => {
         var _a;
-        if (isEmpty(product) ||
-            isEmpty(version) ||
-            isEmpty(previousVersion) ||
-            activeSessionId !== previousActiveSessionId)
+        if (isEmpty(product) || isEmpty(version) || activeSessionId !== previousActiveSessionId)
             return;
         // we need to reset openshift cluster states only when major version is different
         const oldMajorVersion = previousVersion && getVersion(previousVersion).major;

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

@@ -301,6 +301,10 @@ section.grid-aside-content pfe-accordion {
     --pfe-accordion--FontSize--header: 16px;
     --pfe-accordion--FontWeight--header: 600;
 }
+
+div.pf-c-modal-box__body label.pf-c-switch {
+    padding: 1rem;
+}
 // override added padding
 div.pf-c-alert__description div.ea-rule p a.pf-c-button {
     padding: 0;
@@ -310,4 +314,4 @@ div.pf-c-alert__description div.ea-rule p a.pf-c-button {
 div pfe-accordion {
     --pfe-accordion--FontSize--header: 16px;
     --pfe-accordion--FontWeight--header: 600;
-}
+}

package/lib/esm/utils/caseOpenshiftClusterIdUtils.d.ts

@@ -1,7 +1,7 @@
+import { IClusterSubscriptionExtended } from '@cee-eng/hydrajs/@types/models/cloud';
 import { ISEProduct } from '@cee-eng/hydrajs/@types/models/product';
-import { ICluster } from '@rh-support/api';
-export declare const getDisplayNameById: (clusters: Partial<ICluster>[], id: string) => string;
-export declare const getDisplayNameForCluster: (cluster: Partial<ICluster>) => string;
+export declare const getDisplayNameById: (clusters: Partial<IClusterSubscriptionExtended>[], id: string) => string;
+export declare const getDisplayNameForCluster: (cluster: Partial<IClusterSubscriptionExtended>) => string;
 export declare const invalidGuidHelperText = "Please enter a valid Cluster ID (For example: d3aa88e2-c754-41e0-8ba6-4198a34aa0a2)";
 export declare const isClusterIdEnabledForProduct: (selectedProduct: string, allProducts: Partial<ISEProduct>[]) => boolean;
 export declare const isOpenShiftV3Product: (product: string, pcmConfig: any) => boolean;

package/lib/esm/utils/caseOpenshiftClusterIdUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"caseOpenshiftClusterIdUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseOpenshiftClusterIdUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAM3C,eAAO,MAAM,kBAAkB,aAAc,QAAQ,QAAQ,CAAC,EAAE,MAAM,MAAM,WAI3E,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAAa,QAAQ,QAAQ,CAAC,WAIlE,CAAC;AAEF,eAAO,MAAM,qBAAqB,wFACuD,CAAC;AAE1F,eAAO,MAAM,4BAA4B,oBAAqB,MAAM,eAAe,QAAQ,UAAU,CAAC,EAAE,YAIvG,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,4BAenD,CAAC;AAEF,eAAO,MAAM,qBAAqB,sCACkC,CAAC"}
+{"version":3,"file":"caseOpenshiftClusterIdUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseOpenshiftClusterIdUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAMpE,eAAO,MAAM,kBAAkB,aAAc,QAAQ,4BAA4B,CAAC,EAAE,MAAM,MAAM,WAI/F,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAAa,QAAQ,4BAA4B,CAAC,WAKtF,CAAC;AAEF,eAAO,MAAM,qBAAqB,wFACuD,CAAC;AAE1F,eAAO,MAAM,4BAA4B,oBAAqB,MAAM,eAAe,QAAQ,UAAU,CAAC,EAAE,YAIvG,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,4BAenD,CAAC;AAEF,eAAO,MAAM,qBAAqB,sCACkC,CAAC"}

package/lib/esm/utils/caseOpenshiftClusterIdUtils.js

@@ -5,15 +5,16 @@ import isEmpty from 'lodash/isEmpty';
 export const getDisplayNameById = (clusters, id) => {
     if (isEmpty(id))
         return '';
-    const cluster = find(clusters, (o) => o.external_id === id);
+    const cluster = find(clusters, (o) => o.external_cluster_id === id);
     return isEmpty(cluster) ? `${id}` : cluster.display_name;
 };
 export const getDisplayNameForCluster = (cluster) => {
     if (isEmpty(cluster))
         return '';
-    if (isEmpty(cluster.display_name) || cluster.display_name === cluster.external_id)
-        return `${cluster.external_id}`;
-    return `${cluster.external_id} <${cluster.display_name}>`;
+    const clusterId = (cluster === null || cluster === void 0 ? void 0 : cluster.external_cluster_id) || cluster.external_id;
+    if (isEmpty(cluster.display_name) || cluster.display_name === clusterId)
+        return clusterId;
+    return `${clusterId} <${cluster.display_name}>`;
 };
 export const invalidGuidHelperText = 'Please enter a valid Cluster ID (For example: d3aa88e2-c754-41e0-8ba6-4198a34aa0a2)';
 export const isClusterIdEnabledForProduct = (selectedProduct, allProducts) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "0.2.96",
+    "version": "0.2.99",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -26,7 +26,7 @@
         "lib/**/*"
     ],
     "peerDependencies": {
-        "@cee-eng/hydrajs": "4.8.34",
+        "@cee-eng/hydrajs": "4.9.1",
         "@cee-eng/ui-toolkit": "1.1.6",
         "@patternfly/patternfly": "4.185.1",
         "@patternfly/pfe-accordion": "1.12.3",
@@ -63,7 +63,7 @@
         "react-virtualized": "^9.21.2"
     },
     "dependencies": {
-        "@cee-eng/hydrajs": "4.8.34",
+        "@cee-eng/hydrajs": "4.9.1",
         "@cee-eng/ui-toolkit": "1.1.6",
         "@patternfly/patternfly": "4.185.1",
         "@patternfly/pfe-accordion": "1.12.3",
@@ -73,12 +73,12 @@
         "@patternfly/react-core": "4.202.16",
         "@progress/kendo-drawing": "^1.6.0",
         "@progress/kendo-react-pdf": "^3.12.0",
-        "@rh-support/api": "0.3.14",
-        "@rh-support/components": "1.1.58",
-        "@rh-support/react-context": "0.2.58",
+        "@rh-support/api": "0.3.15",
+        "@rh-support/components": "1.1.59",
+        "@rh-support/react-context": "0.2.59",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "0.2.46",
-        "@rh-support/utils": "0.2.35",
+        "@rh-support/user-permissions": "0.2.47",
+        "@rh-support/utils": "0.2.36",
         "@types/react-redux": "^7.1.12",
         "@types/redux": "^3.6.0",
         "@webcomponents/webcomponentsjs": "^2.2.10",
@@ -143,5 +143,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "f0c7d083eb6f8cce7089d9b5806e8537df3cafc1"
+    "gitHead": "f72a63763d2616389844f8305e74adaf9b3c1624"
 }