@rh-support/troubleshoot 0.2.119 → 0.2.120

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

@@ -1 +1 @@
-{"version":3,"file":"OpenshiftDropdownV4.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenshiftDropdownV4.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,EAAE,gBAAgB,EAAuB,MAAM,0BAA0B,CAAC;AAcjF,UAAU,MAAO,SAAQ,gBAAgB;IACrC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzF,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iCAAiC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IAChD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACjC;AAuBD,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,eAiXzC;kBAjXQ,mBAAmB;;;AAoX5B,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
+{"version":3,"file":"OpenshiftDropdownV4.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenshiftDropdownV4.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAG5E,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,oBAAoB,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzF,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iCAAiC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IAChD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACjC;AAuBD,iBAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,eA6WzC;kBA7WQ,mBAAmB;;;AAgX5B,OAAO,EAAE,mBAAmB,EAAE,CAAC"}

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

@@ -15,7 +15,7 @@ import groupBy from 'lodash/groupBy';
 import isEmpty from 'lodash/isEmpty';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
-import { getDisplayNameForCluster, getIsClusterIdInvalid, } from '../../utils/caseOpenshiftClusterIdUtils';
+import { getDisplayNameForCluster } from '../../utils/caseOpenshiftClusterIdUtils';
 import CaseOpenShiftPopover from '../CaseEditView/Tabs/CaseDetails/CaseOpenshiftClusterId/CaseOpenShiftPopover';
 const defaultProps = {
     className: '',
@@ -48,7 +48,7 @@ function OpenshiftDropdownV4(props) {
     const [showArchivedClusters, setShowArchivedClusters] = useState(false);
     const [isFetchingClusters, setIsFetchingClusters] = useState(false);
     const [totalResultsNo, setTotalResultsNo] = useState(0);
-    const { getFromCache, setInCache } = useLRUCache(25);
+    const { getFromCache, setInCache } = useLRUCache(50);
     // gets a cluster id and returns display name
     const getDisplayName = (id, noClusterIdReasonExplanation, display_name) => {
         if (isEmpty(id))
@@ -136,10 +136,12 @@ function OpenshiftDropdownV4(props) {
     };
     const fetchAClusterIdDetails = (clusterId) => __awaiter(this, void 0, void 0, function* () {
         var _a;
+        if (isEmpty(clusterId))
+            return {};
         setIsFetchingClusters(true);
         try {
             const clustersResponse = yield cloud.getAccountClustersSubscription({
-                search: `external_cluster_id='${clusterId}'`,
+                search: `external_cluster_id='${clusterId.trim()}'`,
                 fields: 'external_cluster_id,display_name,status,metrics.openshift_version',
             });
             setIsFetchingClusters(false);
@@ -157,6 +159,7 @@ function OpenshiftDropdownV4(props) {
         }
     });
     const fetchAccountClusters = (search = '', page = 0) => __awaiter(this, void 0, void 0, function* () {
+        search = search.trim();
         setIsFetchingClusters(true);
         try {
             let clustersResponse;
@@ -176,7 +179,7 @@ function OpenshiftDropdownV4(props) {
                     order: 'display_name asc',
                     page,
                     size: PER_PAGE,
-                    search: `${showArchivedClusters ? '' : "status!='Archived'"} ${search && !showArchivedClusters ? 'AND' : ''} ${search
+                    search: `external_cluster_id!='' AND ${showArchivedClusters ? '' : "status!='Archived'"} ${search && !showArchivedClusters ? 'AND' : ''} ${search
                         ? `(external_cluster_id ILIKE '%${search}%' OR display_name ILIKE '%${search}%' OR console_url ILIKE '%${search}%')`
                         : ''}`,
                     fields: 'external_cluster_id,display_name,status,metrics.openshift_version,console_url',
@@ -184,9 +187,7 @@ function OpenshiftDropdownV4(props) {
                 setInCache(`showArchived=${showArchivedClusters}input=${search}p=${page}`, clustersResponse);
             }
             setIsFetchingClusters(false);
-            const items = clustersResponse.items
-                .filter((c) => !isEmpty(c.external_cluster_id))
-                .map((item) => {
+            const items = clustersResponse.items.map((item) => {
                 var _a, _b;
                 return ({
                     display_name: item.display_name,
@@ -214,7 +215,7 @@ function OpenshiftDropdownV4(props) {
     // we have clusterId but need to get display name
     useEffect(() => {
         const getClusterDetails = () => __awaiter(this, void 0, void 0, function* () {
-            if (props.openshiftClusterIDState &&
+            if (!isEmpty(props.openshiftClusterIDState) &&
                 props.openshiftClusterIDState !== 'dont-have-id' &&
                 props.openshiftClusterIDState !== 'v3-cluster' &&
                 isEmpty(props.openshiftDisplayName)) {
@@ -260,20 +261,13 @@ function OpenshiftDropdownV4(props) {
     // when user type or paste a clusterId we land here
     const onTypeaheadInputChanged = (input) => __awaiter(this, void 0, void 0, function* () {
         setInputVal(input);
-        if (getIsClusterIdInvalid(input)) {
-            const fetchedClusters = yield fetchAccountClusters(input);
-            setClustersRawResponse(fetchedClusters.items);
-            setTotalResultsNo(fetchedClusters.total);
-            setClustersSelectOptions(getClusterOptions(fetchedClusters.items));
-            props.onClusterIdStateUpdate({ external_cluster_id: input });
-        }
-        else {
-            // user paste a valid cluster id
-            const fetchedCluster = yield fetchAClusterIdDetails(input);
-            props.onClusterIdStateUpdate(fetchedCluster);
-        }
+        const fetchedClusters = yield fetchAccountClusters(input);
+        setClustersRawResponse(fetchedClusters.items);
+        setTotalResultsNo(fetchedClusters.total);
+        setClustersSelectOptions(getClusterOptions(fetchedClusters.items));
+        props.onClusterIdStateUpdate({ external_cluster_id: input });
     });
-    const debounceFn = debounce(onTypeaheadInputChanged, 1000);
+    const debounceFn = debounce(onTypeaheadInputChanged, 500);
     const getSelectedItem = () => {
         if (!isEmpty(inputVal)) {
             return createState(props.openshiftClusterIDState, inputVal);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "0.2.119",
+    "version": "0.2.120",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -143,5 +143,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "1d8c25adcf1bc30eb2560bf210f96994b63237e3"
+    "gitHead": "403aee29c2ee4be4cadb20fb74753c495803d387"
 }