@rh-support/troubleshoot 0.2.102 → 0.2.104

package/README.md

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

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,eA4TzC;kBA5TQ,mBAAmB;;;AA+T5B,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,6 +58,7 @@ 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, noClusterIdReasonExplanation) => {
         if (isEmpty(id))
@@ -80,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* () {
@@ -100,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) {
@@ -113,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 [
@@ -145,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;
@@ -204,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
@@ -220,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();
@@ -242,8 +240,9 @@ 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)) {
@@ -262,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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "0.2.102",
+    "version": "0.2.104",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -143,5 +143,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "82a2161f34c47eeb658bec78e6af2eff79a61b2f"
+    "gitHead": "f2b203085e179115277901c8d155d7c72f7f152e"
 }