@rh-support/troubleshoot 0.2.105 → 0.2.106

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":"AAuBA,wBAAgB,sBAAsB,gBA4RrC"}
+{"version":3,"file":"CaseOpenshiftClusterId.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenshiftClusterId.tsx"],"names":[],"mappings":"AAuBA,wBAAgB,sBAAsB,gBAqRrC"}

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

@@ -55,9 +55,7 @@ export function CaseOpenshiftClusterId() {
         if (!openshiftClusterID || getIsClusterIdInvalid(openshiftClusterID))
             return;
         let openshiftClusterVersion;
-        if (clusterDetails &&
-            clusterDetails.external_cluster_id === openshiftClusterID &&
-            clusterDetails.openshift_version) {
+        if (clusterDetails && clusterDetails.external_id === openshiftClusterID && clusterDetails.openshift_version) {
             openshiftClusterVersion = clusterDetails.openshift_version;
         }
         else {
@@ -130,7 +128,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_cluster_id;
+        const selectedClusterId = selectedCluster === null || selectedCluster === void 0 ? void 0 : selectedCluster.external_id;
         if (isEmpty(selectedClusterId))
             return;
         setLocalOpenshiftClusterIDState(selectedClusterId);

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,gBAoSjC"}
+{"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,9 +96,7 @@ export function OpenShiftClusterId() {
         if (!openshiftClusterID || getIsClusterIdInvalid(openshiftClusterID))
             return;
         let openshiftClusterVersion;
-        if (clusterDetails &&
-            clusterDetails.external_cluster_id === openshiftClusterID &&
-            clusterDetails.openshift_version) {
+        if (clusterDetails && clusterDetails.external_id === openshiftClusterID && clusterDetails.openshift_version) {
             openshiftClusterVersion = clusterDetails.openshift_version;
         }
         else {
@@ -165,7 +163,7 @@ export function OpenShiftClusterId() {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [noClusterIdReason]);
     const onClusterIdStateUpdate = (selectedCluster) => {
-        const selectedId = selectedCluster === null || selectedCluster === void 0 ? void 0 : selectedCluster.external_cluster_id;
+        const selectedId = selectedCluster.external_id;
         if (isEmpty(selectedId))
             return;
         resetClusterData();

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

@@ -1,8 +1,8 @@
-import { IClusterSubscription } from '@cee-eng/hydrajs/@types/models/cloud';
+import { ICluster } from '@rh-support/api';
 import { IDClassNameProps } from '@rh-support/types/shared';
 interface IProps extends IDClassNameProps {
     openshiftClusterIDState: string;
-    onClusterIdStateUpdate: (cluster: Partial<IClusterSubscription>, value?: string) => void;
+    onClusterIdStateUpdate: (cluster: Partial<ICluster>, value?: string) => void;
     isClusterIdInvalid: boolean;
     clusterIdDropdownFormInstructions?: JSX.Element;
     onClusterClear: () => void;
@@ -10,7 +10,7 @@ interface IProps extends IDClassNameProps {
     isDisabled?: boolean;
     noClusterIdReasonExplanation?: string;
 }
-declare const fetchClusterIdDetails: (clusterId: string) => Promise<import("@cee-eng/hydrajs/@types/models/cloud").ICluster>;
+declare const fetchClusterIdDetails: (clusterId: string) => Promise<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,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;IACrB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACzC;AAQD,QAAA,MAAM,qBAAqB,cAAqB,MAAM,qEASrD,CAAC;AAeF,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,eA0TzC;kBA1TQ,mBAAmB;;;AA6T5B,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,CAAC"}
+{"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;IACrB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACzC;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"}

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

@@ -7,13 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { cloud } from '@cee-eng/hydrajs';
-import { Checkbox, Divider, Select, SelectOption, SelectVariant } from '@patternfly/react-core';
+import { Divider, Select, SelectOption, SelectVariant } from '@patternfly/react-core';
+import { getAccountClusters } from '@rh-support/api';
+import { useFetch } from '@rh-support/components';
 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';
@@ -25,19 +24,19 @@ const defaultProps = {
 };
 const fetchClusterIdDetails = (clusterId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const clustersResponse = yield cloud.getAccountClusters({
+        const clustersResponse = yield 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_cluster_id, display_name) => {
+const createState = (external_id, display_name) => {
     return {
         display_name,
-        external_cluster_id,
+        external_id,
         toString: () => display_name || '',
         compareTo: function (value) {
             const displayName = this.toString().toLowerCase();
@@ -48,29 +47,25 @@ const createState = (external_cluster_id, display_name) => {
 };
 function OpenshiftDropdownV4(props) {
     const { t } = useTranslation();
-    const OLD_API_PER_PAGE_GET_ALL = 10000;
     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);
-    const [totalResultsNo, setTotalResultsNo] = useState(0);
     // gets a cluster id and returns display name
-    const getDisplayNameById = (clusters, id, noClusterIdReasonExplanation) => {
+    const getDisplayNameById = (clusters, id) => {
         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 === 'dont-have-id')
+            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_cluster_id === id);
+        const cluster = find(clusters, (o) => o.external_id === id);
         return isEmpty(cluster) ? id : getDisplayNameForCluster(cluster);
     };
     const onDropdownClear = () => __awaiter(this, void 0, void 0, function* () {
@@ -80,29 +75,19 @@ function OpenshiftDropdownV4(props) {
     });
     const onToggle = (isOpen) => setIsOpen(isOpen);
     const onViewMoreClick = () => __awaiter(this, void 0, void 0, function* () {
-        const fetchedClusters = yield fetchAccountClusters(inputVal);
-        const clusterResponse = [...clustersRawResponse, ...((fetchedClusters === null || fetchedClusters === void 0 ? void 0 : fetchedClusters.items) || [])];
+        const fetchedClusters = yield fetchAccountClusters();
+        const clusterResponse = [...clustersRawResponse, ...fetchedClusters.items];
         setClustersRawResponse(clusterResponse);
-        setTotalResultsNo(fetchedClusters.total);
         setClustersSelectOptions(getClusterOptions(clusterResponse));
     });
     const onSelect = (event, selectedCluster) => __awaiter(this, void 0, void 0, function* () {
         setInputVal('');
-        if (event.target.tagName !== 'BUTTON') {
-            // checkbox is clicked
-            setShowArchivedClusters(!showArchivedClusters);
-            // reset
-            props.onClusterClear();
-            setClustersRawResponse([]);
-        }
-        else {
-            props.onClusterIdStateUpdate(selectedCluster);
-            setIsOpen(false);
-        }
+        props.onClusterIdStateUpdate(selectedCluster);
+        setIsOpen(false);
     });
     const getClusterOptions = (clusters) => {
         const clustersResponseGrouped = groupBy(clusters, 'dns.base_domain') || [];
-        const domainNames = Object.keys(clustersResponseGrouped) || [];
+        const domainNames = Object.keys(clustersResponseGrouped);
         // move undefined to the end of domains array
         const undefinedIndex = domainNames.findIndex((i) => i === 'undefined');
         if (undefinedIndex !== -1 && undefinedIndex !== domainNames.length - 1) {
@@ -115,30 +100,23 @@ function OpenshiftDropdownV4(props) {
         domainNames.forEach((domain, index) => {
             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] &&
-                clustersResponseGrouped[domain].forEach((cluster, i) => {
-                    clusterOptions.push(React.createElement(SelectOption, { key: cluster.external_cluster_id, value: createState(cluster.external_cluster_id, cluster.display_name) }));
-                });
+            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(Divider, { component: "div", key: index + domain }));
         });
         return [
-            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")) }),
+            ...clusterOptions,
             ...(!props.isV4
                 ? [
                     React.createElement(SelectOption, { key: 'v3-cluster', value: createState('v3-cluster', t('The case is for a v3 cluster')) }),
                 ]
                 : []),
-            ...(clusterOptions.length !== 0 ? [React.createElement(Divider, { component: "div", key: 'cluster-id-options-divider' })] : []),
-            ...clusterOptions,
+            React.createElement(SelectOption, { key: 'dont-have-id', value: createState('dont-have-id', t("I don't have my Cluster ID")) }),
         ];
     };
     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
@@ -147,66 +125,27 @@ function OpenshiftDropdownV4(props) {
             // recreate a new AbortController for each call
             let controller = new AbortController();
             abortControllerRef.current = controller;
-            let clustersResponse;
-            let total;
             // query language: https://github.com/yaacov/tree-search-language
-            // old api has dns info
-            // new api doesn't have dns info but we can exclude archived clusters
-            // 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 }));
-                });
-                total = clustersResponses[0].value.total;
-            }
-            else if (clustersResponses[0].status === 'fulfilled' && clustersResponses[1].status === 'rejected') {
-                // old api used only for getting dns info therefore if fails still we have clusterIds
-                clustersResponse = clustersResponses[0].value.items;
-                total = clustersResponses[0].value.total;
-            }
-            else {
-                clustersResponse = [];
-                total = 0;
-            }
-            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);
+            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,
+            }));
             return {
                 items,
-                totalResult: clustersResponse.length,
-                page,
-                total,
+                totalResult: clustersResponse.total,
+                page: clustersResponse.page,
             };
         }
         catch (e) {
             // silently fails
-            setIsFetchingClusters(false);
-            return { items: [], totalResult: 0, page: 0, total: 0 };
+            return { items: [], totalResult: 0, page: 0 };
         }
     });
     // need to get clusters on load
@@ -215,11 +154,10 @@ function OpenshiftDropdownV4(props) {
     useEffect(() => {
         let isUnmounted = false;
         const fetchClusters = () => __awaiter(this, void 0, void 0, function* () {
-            const fetchedClusters = yield fetchAccountClusters(inputVal);
+            const fetchedClusters = yield fetchAccountClusters();
             if (!isUnmounted) {
-                setClustersRawResponse(fetchedClusters.items);
-                setTotalResultsNo(fetchedClusters.total);
                 setClustersSelectOptions(getClusterOptions(fetchedClusters.items));
+                setClustersRawResponse(fetchedClusters.items);
             }
         });
         fetchClusters();
@@ -227,7 +165,7 @@ function OpenshiftDropdownV4(props) {
             isUnmounted = true;
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.isV4, showArchivedClusters]);
+    }, [props.isV4]);
     useEffect(() => {
         if (props.isClusterIdInvalid) {
             setValidated('error');
@@ -240,16 +178,15 @@ function OpenshiftDropdownV4(props) {
         setInputVal(input);
         props.onClusterIdStateUpdate(createState(input, input));
         const fetchedClusters = yield fetchAccountClusters(input);
-        setClustersRawResponse(fetchedClusters.items);
-        setTotalResultsNo(fetchedClusters.total);
         setClustersSelectOptions(getClusterOptions(fetchedClusters.items));
+        setClustersRawResponse(fetchedClusters.items);
     });
     const getSelectedItem = () => {
         if (!isEmpty(inputVal)) {
             return createState(props.openshiftClusterIDState, inputVal);
         }
         else {
-            return createState(props.openshiftClusterIDState, getDisplayNameById(clustersRawResponse, props.openshiftClusterIDState, props.noClusterIdReasonExplanation));
+            return createState(props.openshiftClusterIDState, getDisplayNameById(clustersRawResponse, props.openshiftClusterIDState));
         }
     };
     const titleId = 'case-details-cluster-nickname-selector';
@@ -261,7 +198,7 @@ function OpenshiftDropdownV4(props) {
                 React.createElement(CaseOpenShiftPopover, null)),
             React.createElement("span", { id: titleId, hidden: true }, "Select a state"),
             React.createElement(Select, Object.assign({ variant: SelectVariant.typeahead, isDisabled: props.isDisabled, typeAheadAriaLabel: t('Search by Cluster ID, alias, and domain or manually enter your Cluster ID'), onToggle: onToggle, onSelect: onSelect, onClear: onDropdownClear, selections: getSelectedItem(), isOpen: isOpen, "aria-labelledby": titleId, placeholderText: t('Search by Cluster ID, alias, and domain or manually enter your Cluster ID'), hasInlineFilter: false, onTypeaheadInputChanged: onTypeaheadInputChanged, onFilter: () => undefined, validated: validated, "aria-invalid": props.isClusterIdInvalid, "aria-describedby": "clusterID-validate-helper", required: true }, (isFetchingClusters && { loadingVariant: 'spinner' }), (!isFetchingClusters &&
-                clustersRawResponse.length < totalResultsNo && {
+                PER_PAGE <= clustersRawResponse.length && {
                 loadingVariant: {
                     text: 'Display additional results',
                     onClick: onViewMoreClick,

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';
-export declare const getDisplayNameById: (clusters: Partial<IClusterSubscriptionExtended>[], id: string) => string;
-export declare const getDisplayNameForCluster: (cluster: Partial<IClusterSubscriptionExtended>) => string;
+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 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,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"}
+{"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"}

package/lib/esm/utils/caseOpenshiftClusterIdUtils.js

@@ -5,16 +5,15 @@ import isEmpty from 'lodash/isEmpty';
 export const getDisplayNameById = (clusters, id) => {
     if (isEmpty(id))
         return '';
-    const cluster = find(clusters, (o) => o.external_cluster_id === id);
+    const cluster = find(clusters, (o) => o.external_id === id);
     return isEmpty(cluster) ? `${id}` : cluster.display_name;
 };
 export const getDisplayNameForCluster = (cluster) => {
     if (isEmpty(cluster))
         return '';
-    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}>`;
+    if (isEmpty(cluster.display_name) || cluster.display_name === cluster.external_id)
+        return `${cluster.external_id}`;
+    return `${cluster.external_id} <${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.105",
+    "version": "0.2.106",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -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.15",
-        "@rh-support/components": "1.1.59",
-        "@rh-support/react-context": "0.2.61",
+        "@rh-support/api": "0.3.16",
+        "@rh-support/components": "1.1.60",
+        "@rh-support/react-context": "0.2.62",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "0.2.47",
-        "@rh-support/utils": "0.2.36",
+        "@rh-support/user-permissions": "0.2.48",
+        "@rh-support/utils": "0.2.37",
         "@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": "2b7ecbf88009c77814cd3bb6c3d608cd4add2543"
+    "gitHead": "16a9ab39fc63d39d0816ee2ef890c2f0ff2282e4"
 }