@rh-support/troubleshoot 0.2.100 → 0.2.104

package/README.md

@@ -19,5 +19,3 @@ export function TroubleshootApp(routeProps: RouteComponentProps<{}>) {
         </RootTroubleshootProvider>);
 }
 ```
-
-.

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

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

@@ -19,10 +19,10 @@ import { useCaseDispatch, useCaseSelector } from '../../../../../context/CaseCon
 import { setCaseDetails, updateCaseDetails } from '../../../../../reducers/CaseReducer';
 import { getIsClusterIdInvalid, isClusterIdEnabledForProduct } from '../../../../../utils/caseOpenshiftClusterIdUtils';
 import { NoClusterIDReasonSelector } from '../../../../CaseManagement/NoClusterIDReasonSelector';
-import { discoverV4ClusterIdLink, discoverV4ClusterIdLinkError, isInvalidErrorMessage, } from '../../../../CaseManagement/OpenShiftClusterId';
+import { discoverV4ClusterIdLink, discoverV4ClusterIdLinkError, isInvalidErrorMessage, v3Tov4TransitionLink, } from '../../../../CaseManagement/OpenShiftClusterId';
 import { fetchClusterIdDetails, OpenshiftDropdownV4 } from '../../../../CaseManagement/OpenshiftDropdownV4';
 export function CaseOpenshiftClusterId() {
-    const { openshiftClusterID, product, version, caseNumber, openshiftClusterVersion, noClusterIdReason, noClusterIdReasonExplanation, selectedAccountDetails, } = useCaseSelector((state) => ({
+    const { openshiftClusterID, product, version, caseNumber, openshiftClusterVersion, noClusterIdReason, noClusterIdReasonExplanation, selectedAccountDetails, description, } = useCaseSelector((state) => ({
         openshiftClusterID: state.caseDetails.openshiftClusterID,
         product: state.caseDetails.product,
         version: state.caseDetails.version,
@@ -31,6 +31,7 @@ export function CaseOpenshiftClusterId() {
         noClusterIdReason: state.caseDetails.noClusterIdReason,
         noClusterIdReasonExplanation: state.caseDetails.noClusterIdReasonExplanation,
         selectedAccountDetails: state.selectedAccountDetails,
+        description: state.caseDetails.description,
     }), isEqual);
     const caseDispatch = useCaseDispatch();
     const { globalMetadataState: { pcmConfig, allProducts, loggedInUserRights }, } = useContext(GlobalMetadataStateContext);
@@ -137,6 +138,24 @@ export function CaseOpenshiftClusterId() {
             setDontKnowSelected(true);
             setSelectedReason(selectedClusterId);
             setIsClusterIdInValid(false);
+            const caseDetails = {
+                openshiftClusterID: '',
+                noClusterIdReasonExplanation: '',
+                noClusterIdReason: '',
+                openshiftClusterVersion: '',
+            };
+            yield clusterIdUpdate(caseDetails);
+        }
+        else if (selectedClusterId === 'v3-cluster') {
+            setSelectedReason('dont-have-id');
+            const caseDetails = {
+                openshiftClusterID: '',
+                noClusterIdReasonExplanation: 'v3-cluster',
+                noClusterIdReason: 'Other',
+                openshiftClusterVersion: '',
+            };
+            yield clusterIdUpdate(caseDetails);
+            setDontKnowSelected(false);
         }
         else {
             const isClusterIdInvalid = getIsClusterIdInvalid(selectedClusterId);
@@ -162,13 +181,17 @@ export function CaseOpenshiftClusterId() {
             setSelectedReason('');
         }
     });
+    const isDedicatedV3 = () => noClusterIdReason === 'Other' && noClusterIdReasonExplanation === 'v3-cluster';
+    const v3Message = () => description.match(/Cluster Name: /g) ? (React.createElement(React.Fragment, null,
+        "Your Cluster Name has been added to the description below. ",
+        v3Tov4TransitionLink())) : (React.createElement(React.Fragment, null, v3Tov4TransitionLink()));
     const clusterIdDropdownFormInstructions = () => {
         const errorMessage = isClusterIdInvalid
             ? isInvalidErrorMessage()
             : isEmpty(openshiftClusterID) && isEmpty(selectedReason)
                 ? discoverV4ClusterIdLinkError()
                 : null;
-        const infoMessage = discoverV4ClusterIdLink();
+        const infoMessage = isDedicatedV3() ? v3Message() : discoverV4ClusterIdLink();
         return errorMessage ? errorMessage : infoMessage;
     };
     const onReasonExplanationInputBoxChanged = (explanationInput) => __awaiter(this, void 0, void 0, function* () {
@@ -205,10 +228,17 @@ export function CaseOpenshiftClusterId() {
         setIsReasonUpdating(false);
     });
     const isInVaidNoClusterIdReason = isEmpty(noClusterIdReason) || (noClusterIdReason === 'Other' && isEmpty(noClusterIdReasonExplanation.trim()));
-    if (!showClusterId || isOpenShiftV3)
+    if (!showClusterId) {
         return null;
-    return (React.createElement(React.Fragment, null,
-        React.createElement(OpenshiftDropdownV4, { openshiftClusterIDState: localOpenshiftClusterIDState || selectedReason, onClusterIdStateUpdate: onClusterIdSave, isClusterIdInvalid: (isEmpty(localOpenshiftClusterIDState) && isEmpty(selectedReason)) || isClusterIdInvalid, clusterIdDropdownFormInstructions: clusterIdDropdownFormInstructions(), onClusterClear: () => setLocalOpenshiftClusterIDState(''), isV4: true, isDisabled: isClusterIdUpdating || isFetchingClusterDetails }),
-        (dontKnowSelected || noClusterIdReasonExplanation || noClusterIdReason) && (React.createElement(NoClusterIDReasonSelector, { noClusterIdReasonExplanation: noClusterIdReasonExplanation, noClusterIdReason: noClusterIdReason, onReasonInputBoxChanged: debounceFn, onReasonChange: onReasonChange, isInValid: isInVaidNoClusterIdReason, isCustomer: isCustomer, isDisabled: isReasonUpdating || isFetchingClusterDetails })),
-        React.createElement(LoadingIndicator, { show: isClusterIdUpdating, size: "xs" })));
+    }
+    else if (isOpenShiftV3) {
+        return React.createElement("div", { className: "pull-top pf-u-pb-xl" }, v3Message());
+    }
+    else {
+        return (React.createElement(React.Fragment, null,
+            React.createElement(OpenshiftDropdownV4, { openshiftClusterIDState: localOpenshiftClusterIDState || selectedReason, onClusterIdStateUpdate: onClusterIdSave, isClusterIdInvalid: (isEmpty(localOpenshiftClusterIDState) && isEmpty(selectedReason)) || isClusterIdInvalid, clusterIdDropdownFormInstructions: clusterIdDropdownFormInstructions(), onClusterClear: () => setLocalOpenshiftClusterIDState(''), isV4: majorVersion === '4', isDisabled: isClusterIdUpdating || isFetchingClusterDetails, noClusterIdReasonExplanation: noClusterIdReasonExplanation }),
+            noClusterIdReasonExplanation !== 'v3-cluster' &&
+                (dontKnowSelected || noClusterIdReasonExplanation || noClusterIdReason) && (React.createElement(NoClusterIDReasonSelector, { noClusterIdReasonExplanation: noClusterIdReasonExplanation, noClusterIdReason: noClusterIdReason, onReasonInputBoxChanged: debounceFn, onReasonChange: onReasonChange, isInValid: isInVaidNoClusterIdReason, isCustomer: isCustomer, isDisabled: isReasonUpdating || isFetchingClusterDetails })),
+            React.createElement(LoadingIndicator, { show: isClusterIdUpdating, size: "xs" })));
+    }
 }

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

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

@@ -148,11 +148,12 @@ export function OpenShiftClusterId() {
             setClusterVersion(openshiftClusterID);
         }
         // when user click on back and continue button, need to show v3 text box or reasons dropdown
-        if (!isEmpty(v3ClusterName)) {
+        if (!isEmpty(v3ClusterName) ||
+            (noClusterIdReason === 'Other' && noClusterIdReasonExplanation === 'v3-cluster')) {
             setV3Selected(true);
             setSelectedReason('v3-cluster');
         }
-        if (!isEmpty(noClusterIdReason)) {
+        else if (!isEmpty(noClusterIdReason)) {
             setDontKnowSelected(true);
             setSelectedReason('dont-have-id');
         }
@@ -162,9 +163,9 @@ export function OpenShiftClusterId() {
             !clusterRecommendations.data.length &&
             fetchClusterRecommendations(clusterRecommendationsDispatch, openshiftClusterID);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [v3ClusterName, noClusterIdReason]);
+    }, [noClusterIdReason]);
     const onClusterIdStateUpdate = (selectedCluster) => {
-        const selectedId = selectedCluster.external_cluster_id;
+        const selectedId = selectedCluster === null || selectedCluster === void 0 ? void 0 : selectedCluster.external_cluster_id;
         if (isEmpty(selectedId))
             return;
         resetClusterData();
@@ -176,6 +177,12 @@ export function OpenShiftClusterId() {
         if (selectedId === 'v3-cluster') {
             setV3Selected(true);
             setSelectedReason(selectedId);
+            setCaseDetails(caseDispatch, {
+                openshiftClusterID,
+                openshiftClusterVersion: '',
+                noClusterIdReason: 'Other',
+                noClusterIdReasonExplanation: 'v3-cluster',
+            });
             return;
         }
         const isClusterInvalid = getIsClusterIdInvalid(selectedId);
@@ -214,6 +221,6 @@ export function OpenShiftClusterId() {
     return (React.createElement(React.Fragment, null,
         !isOpenShiftV3 && (React.createElement(OpenshiftDropdownV4, { openshiftClusterIDState: openshiftClusterID || selectedReason, onClusterIdStateUpdate: onClusterIdStateUpdate, isClusterIdInvalid: showValidationErrorAlert &&
                 ((isEmpty(openshiftClusterID) && isEmpty(selectedReason)) || isClusterIdInvalid), clusterIdDropdownFormInstructions: clusterIdDropdownFormInstructions(), onClusterClear: resetClusterData, isV4: majorVersion === '4' })),
-        dontKnowSelected && !isOpenShiftV3 && (React.createElement(NoClusterIDReasonSelector, { noClusterIdReasonExplanation: noClusterIdReasonExplanation, noClusterIdReason: noClusterIdReason, onReasonInputBoxChanged: onReasonExplanationInputBoxChanged, onReasonChange: onReasonChange, isInValid: isInVaidNoClusterIdReason, isCustomer: isCustomer })),
+        noClusterIdReasonExplanation !== 'v3-cluster' && dontKnowSelected && !isOpenShiftV3 && (React.createElement(NoClusterIDReasonSelector, { noClusterIdReasonExplanation: noClusterIdReasonExplanation, noClusterIdReason: noClusterIdReason, onReasonInputBoxChanged: onReasonExplanationInputBoxChanged, onReasonChange: onReasonChange, isInValid: isInVaidNoClusterIdReason, isCustomer: isCustomer })),
         (v3Selected || isOpenShiftV3) && (React.createElement(OpenShiftV3Inputbox, { v3ClusterName: v3ClusterName, onReasonInputBoxChanged: v3ClusterNameInputBoxChanged, isInValid: isEmpty(v3ClusterName.trim()) && showValidationErrorAlert, v3Selected: v3Selected }))));
 }

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

@@ -8,6 +8,7 @@ interface IProps extends IDClassNameProps {
     onClusterClear: () => void;
     isV4: boolean;
     isDisabled?: boolean;
+    noClusterIdReasonExplanation?: string;
 }
 declare const fetchClusterIdDetails: (clusterId: string) => Promise<import("@cee-eng/hydrajs/@types/models/cloud").ICluster>;
 declare function OpenshiftDropdownV4(props: IProps): JSX.Element;

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;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"}
+{"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"}

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

@@ -48,7 +48,7 @@ const createState = (external_cluster_id, display_name) => {
 };
 function OpenshiftDropdownV4(props) {
     const { t } = useTranslation();
-    const OLD_API_PER_PAGE_GET_ALL = 5000;
+    const OLD_API_PER_PAGE_GET_ALL = 10000;
     const PER_PAGE = 200;
     const [clustersRawResponse, setClustersRawResponse] = useState([]);
     const abortControllerRef = useRef(undefined);
@@ -58,12 +58,16 @@ function OpenshiftDropdownV4(props) {
     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) => {
+    const getDisplayNameById = (clusters, id, noClusterIdReasonExplanation) => {
         if (isEmpty(id))
             return '';
-        if (id === 'dont-have-id')
-            return t("I don't have my Cluster ID");
+        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');
         const cluster = find(clusters, (o) => o.external_cluster_id === id);
@@ -77,8 +81,9 @@ 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.items];
+        const clusterResponse = [...clustersRawResponse, ...((fetchedClusters === null || fetchedClusters === void 0 ? void 0 : fetchedClusters.items) || [])];
         setClustersRawResponse(clusterResponse);
+        setTotalResultsNo(fetchedClusters.total);
         setClustersSelectOptions(getClusterOptions(clusterResponse));
     });
     const onSelect = (event, selectedCluster) => __awaiter(this, void 0, void 0, function* () {
@@ -97,7 +102,7 @@ function OpenshiftDropdownV4(props) {
     });
     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) {
@@ -110,9 +115,10 @@ 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].forEach((cluster, i) => {
-                clusterOptions.push(React.createElement(SelectOption, { key: cluster.external_cluster_id, value: createState(cluster.external_cluster_id, cluster.display_name) }));
-            });
+            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) }));
+                });
             clusterOptions.push(React.createElement(Divider, { component: "div", key: index + domain }));
         });
         return [
@@ -142,50 +148,43 @@ function OpenshiftDropdownV4(props) {
             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 but we cannot exclude archived clusters
+            // old api has dns info
             // new api doesn't have dns info but we can exclude archived clusters
-            if (showArchivedClusters) {
-                // call old api
-                clustersResponse = yield cloud.getAccountClusters({
+            // 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);
-                clustersResponse = clustersResponse.items;
+                }, 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 {
-                // 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 = [];
-                }
+                clustersResponse = [];
+                total = 0;
             }
             const items = clustersResponse.map((item) => {
                 var _a, _b;
@@ -201,12 +200,13 @@ function OpenshiftDropdownV4(props) {
                 items,
                 totalResult: clustersResponse.length,
                 page,
+                total,
             };
         }
         catch (e) {
             // silently fails
             setIsFetchingClusters(false);
-            return { items: [], totalResult: 0, page: 0 };
+            return { items: [], totalResult: 0, page: 0, total: 0 };
         }
     });
     // need to get clusters on load
@@ -217,8 +217,9 @@ function OpenshiftDropdownV4(props) {
         const fetchClusters = () => __awaiter(this, void 0, void 0, function* () {
             const fetchedClusters = yield fetchAccountClusters(inputVal);
             if (!isUnmounted) {
-                setClustersSelectOptions(getClusterOptions(fetchedClusters.items));
                 setClustersRawResponse(fetchedClusters.items);
+                setTotalResultsNo(fetchedClusters.total);
+                setClustersSelectOptions(getClusterOptions(fetchedClusters.items));
             }
         });
         fetchClusters();
@@ -239,15 +240,16 @@ function OpenshiftDropdownV4(props) {
         setInputVal(input);
         props.onClusterIdStateUpdate(createState(input, input));
         const fetchedClusters = yield fetchAccountClusters(input);
-        setClustersSelectOptions(getClusterOptions(fetchedClusters.items));
         setClustersRawResponse(fetchedClusters.items);
+        setTotalResultsNo(fetchedClusters.total);
+        setClustersSelectOptions(getClusterOptions(fetchedClusters.items));
     });
     const getSelectedItem = () => {
         if (!isEmpty(inputVal)) {
             return createState(props.openshiftClusterIDState, inputVal);
         }
         else {
-            return createState(props.openshiftClusterIDState, getDisplayNameById(clustersRawResponse, props.openshiftClusterIDState));
+            return createState(props.openshiftClusterIDState, getDisplayNameById(clustersRawResponse, props.openshiftClusterIDState, props.noClusterIdReasonExplanation));
         }
     };
     const titleId = 'case-details-cluster-nickname-selector';
@@ -259,7 +261,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 &&
-                PER_PAGE <= clustersRawResponse.length && {
+                clustersRawResponse.length < totalResultsNo && {
                 loadingVariant: {
                     text: 'Display additional results',
                     onClick: onViewMoreClick,

package/lib/esm/reducers/CaseHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseHelpers.d.ts","sourceRoot":"","sources":["../../../src/reducers/CaseHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AACpG,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAW3D,OAAO,EAMH,UAAU,EAcb,MAAM,mBAAmB,CAAC;AAE3B,eAAO,MAAM,sBAAsB,SAAU,mBAAmB,EAAE,wBAMjE,CAAC;AAEF,eAAO,MAAM,2BAA2B,eAAgB,WAAW,KAAG,MAOrE,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAAS,mBAAmB,SAAS,MAAM,sBAyB9E,CAAC;AAIF,eAAO,MAAM,qBAAqB,UACvB,MAAM,gBACC,MAAM,uBACC,MAAM,yBACJ,MAAM,kBACb,MAAM,KACvB,MAuBF,CAAC;AAIF,eAAO,MAAM,oBAAoB,UACtB,MAAM,gBACC,MAAM,uBACC,MAAM,yBACJ,MAAM,KAC9B,MAQF,CAAC;AAEF,eAAO,MAAM,uBAAuB,iBAAkB,MAAM,YAAY,MAAM,KAAG,MAQhF,CAAC;AAEF,eAAO,MAAM,uBAAuB,iBAAkB,MAAM,YAAY,MAAM,KAAG,MAQhF,CAAC;AAEF,eAAO,MAAM,sBAAsB,aAAc,MAAM,KAAG,MAKzD,CAAC;AAEF,eAAO,MAAM,gBAAgB,+CAkC5B,CAAC;AAIF,eAAO,MAAM,gBAAgB,cAAe,UAAU,wBAAwB,QAAQ,eAAe,CAAC,KAAG,OA2BxG,CAAC;AAEF,eAAO,MAAM,0BAA0B,cACxB,UAAU,wBACC,QAAQ,eAAe,CAAC,KAC/C,OAiBF,CAAC;AAIF,eAAO,MAAM,6BAA6B,cAC3B,UAAU,wBACC,QAAQ,eAAe,CAAC,KAC/C,OAiBF,CAAC;AAEF,eAAO,MAAM,iBAAiB,cACf,UAAU,gBACP,YAAY,iBACZ,OAAO,KACtB,QAAQ,YAAY,CAiEtB,CAAC;AAEF,eAAO,MAAM,wBAAwB,qBAAsB,YAAY,EAAE,KAAG,YAAY,EAEvF,CAAC;AACF,eAAO,MAAM,yBAAyB,qBAAsB,YAAY,EAAE,KAAG,OAE5E,CAAC;AAEF,eAAO,MAAM,yBAAyB,gBACrB,YAAY,6BACE,MAAM,mBAChB,MAAM,KACxB,QAAQ,YAAY,CA6BtB,CAAC;AACF,eAAO,MAAM,yBAAyB,gBACrB,QAAQ,YAAY,CAAC,gCACJ,QAAQ,EAAE,KACzC,eAyCF,CAAC"}
+{"version":3,"file":"CaseHelpers.d.ts","sourceRoot":"","sources":["../../../src/reducers/CaseHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AACpG,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAW3D,OAAO,EAMH,UAAU,EAcb,MAAM,mBAAmB,CAAC;AAE3B,eAAO,MAAM,sBAAsB,SAAU,mBAAmB,EAAE,wBAMjE,CAAC;AAEF,eAAO,MAAM,2BAA2B,eAAgB,WAAW,KAAG,MAOrE,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAAS,mBAAmB,SAAS,MAAM,sBAyB9E,CAAC;AAIF,eAAO,MAAM,qBAAqB,UACvB,MAAM,gBACC,MAAM,uBACC,MAAM,yBACJ,MAAM,kBACb,MAAM,KACvB,MAuBF,CAAC;AAIF,eAAO,MAAM,oBAAoB,UACtB,MAAM,gBACC,MAAM,uBACC,MAAM,yBACJ,MAAM,KAC9B,MAQF,CAAC;AAEF,eAAO,MAAM,uBAAuB,iBAAkB,MAAM,YAAY,MAAM,KAAG,MAQhF,CAAC;AAEF,eAAO,MAAM,uBAAuB,iBAAkB,MAAM,YAAY,MAAM,KAAG,MAQhF,CAAC;AAEF,eAAO,MAAM,sBAAsB,aAAc,MAAM,KAAG,MAKzD,CAAC;AAEF,eAAO,MAAM,gBAAgB,+CA8B5B,CAAC;AAIF,eAAO,MAAM,gBAAgB,cAAe,UAAU,wBAAwB,QAAQ,eAAe,CAAC,KAAG,OA2BxG,CAAC;AAEF,eAAO,MAAM,0BAA0B,cACxB,UAAU,wBACC,QAAQ,eAAe,CAAC,KAC/C,OAiBF,CAAC;AAIF,eAAO,MAAM,6BAA6B,cAC3B,UAAU,wBACC,QAAQ,eAAe,CAAC,KAC/C,OAiBF,CAAC;AAEF,eAAO,MAAM,iBAAiB,cACf,UAAU,gBACP,YAAY,iBACZ,OAAO,KACtB,QAAQ,YAAY,CAiEtB,CAAC;AAEF,eAAO,MAAM,wBAAwB,qBAAsB,YAAY,EAAE,KAAG,YAAY,EAEvF,CAAC;AACF,eAAO,MAAM,yBAAyB,qBAAsB,YAAY,EAAE,KAAG,OAE5E,CAAC;AAEF,eAAO,MAAM,yBAAyB,gBACrB,YAAY,6BACE,MAAM,mBAChB,MAAM,KACxB,QAAQ,YAAY,CA6BtB,CAAC;AACF,eAAO,MAAM,yBAAyB,gBACrB,QAAQ,YAAY,CAAC,gCACJ,QAAQ,EAAE,KACzC,eAyCF,CAAC"}

package/lib/esm/reducers/CaseHelpers.js

@@ -118,10 +118,7 @@ export const isClusterIDValid = (caseState, allProducts) => {
         case_details.noClusterIdReason === 'Other' &&
         !isEmpty(case_details.noClusterIdReasonExplanation) &&
         isEmpty(caseState.v3ClusterName);
-    const hasValidV3ClusterName = () => isEmpty(case_details.openshiftClusterID) &&
-        isEmpty(case_details.noClusterIdReason) &&
-        isEmpty(case_details.noClusterIdReasonExplanation) &&
-        !isEmpty(caseState.v3ClusterName);
+    const hasValidV3ClusterName = () => isEmpty(case_details.openshiftClusterID) && !isEmpty(caseState.v3ClusterName);
     return productHasClusterID
         ? hasValidClusterId() || hasValidReason() || hasValidReasonExplanation() || hasValidV3ClusterName()
         : true;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "0.2.100",
+    "version": "0.2.104",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -75,7 +75,7 @@
         "@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.60",
+        "@rh-support/react-context": "0.2.61",
         "@rh-support/types": "0.2.0",
         "@rh-support/user-permissions": "0.2.47",
         "@rh-support/utils": "0.2.36",
@@ -143,5 +143,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "c5cd879a2db2a9d1761c8a62eaac17d94a9f1204"
+    "gitHead": "f2b203085e179115277901c8d155d7c72f7f152e"
 }