@rh-support/troubleshoot 0.2.104 → 0.2.107-beta.0

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

@@ -53,7 +53,7 @@ function CaseAlternateId(props) {
     const updateAlternateId = () => __awaiter(this, void 0, void 0, function* () {
         try {
             setIsUpdating(true);
-            const caseDetails = { alternateId: alternateIdState };
+            const caseDetails = { alternateId: alternateIdState === null || alternateIdState === void 0 ? void 0 : alternateIdState.trim() };
             yield updateCaseDetails(caseDispatch, caseNumber, caseDetails);
             ToastNotification.addSuccessMessage(t(`Alternate case ID has been successfully updated`));
             setIsUpdating(false);

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

@@ -64,7 +64,7 @@ function CaseHostname(props) {
         }
     });
     const onSave = (e) => __awaiter(this, void 0, void 0, function* () {
-        const caseDetails = { hostname: hostnameState };
+        const caseDetails = { hostname: hostnameState === null || hostnameState === void 0 ? void 0 : hostnameState.trim() };
         try {
             yield onHostnameUpdate(caseDetails);
             setLocalHostnameChange(true);

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

@@ -67,7 +67,7 @@ function Summary(props) {
     });
     const onSave = (e) => __awaiter(this, void 0, void 0, function* () {
         setHasLargeSummary(false);
-        const caseDetails = { summary: summaryState };
+        const caseDetails = { summary: summaryState === null || summaryState === void 0 ? void 0 : summaryState.trim() };
         if (caseNumber) {
             // edit/view case
             try {

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

@@ -153,13 +153,13 @@ export function Cep(props) {
                         React.createElement(Trans, null, "Contact information"),
                         "\u00A0",
                         React.createElement("span", { className: "form-required", "aria-hidden": true }, "*")),
-                    React.createElement(TextAreaResizable, { id: "cep-contactInformation", className: `form-control`, "aria-required": true, required: true, maxLength: 2000, name: "cep-contactInformation", value: cepDetailsLocal.contactInformation, onChange: onCepContactInformationsChange, "aria-label": "auto resizing text area example", isSpaceAllowed: false, autoResize: true }),
+                    React.createElement(TextAreaResizable, { id: "cep-contactInformation", className: `form-control`, "aria-required": true, isRequired: true, maxLength: 2000, name: "cep-contactInformation", value: cepDetailsLocal.contactInformation, onChange: onCepContactInformationsChange, "aria-label": "auto resizing text area example", isSpaceAllowed: false, autoResize: true }),
                     React.createElement("p", { className: "form-instructions" },
                         React.createElement(Trans, null, "Please provide phone number, chat ID or email."))),
                 React.createElement("div", { className: "form-group" },
                     React.createElement("label", { htmlFor: "cep-notes" },
                         React.createElement(Trans, null, "Notes")),
-                    React.createElement(TextAreaResizable, { id: "cep-notes", className: `form-control`, "aria-required": true, required: true, maxLength: 2000, name: "cep-notese", value: cepDetailsLocal.notes, onChange: onCepNotesChange, isSpaceAllowed: false, autoResize: true }),
+                    React.createElement(TextAreaResizable, { id: "cep-notes", className: `form-control`, "aria-required": false, isRequired: false, maxLength: 2000, name: "cep-notese", value: cepDetailsLocal.notes, onChange: onCepNotesChange, isSpaceAllowed: false, autoResize: true }),
                     React.createElement("p", { className: "form-instructions" },
                         React.createElement(Trans, null, "Provide any pertinent information that Red Hat Support should be aware of that's not already captured in the issue statement or comments.")))))));
 }

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,EAAE,oBAAoB,EAAgC,MAAM,sCAAsC,CAAC;AAE1G,OAAO,EAAE,gBAAgB,EAAuB,MAAM,0BAA0B,CAAC;AAWjF,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,eAkTzC;kBAlTQ,mBAAmB;;;AAqT5B,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,CAAC"}

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

@@ -10,10 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { cloud } from '@cee-eng/hydrajs';
 import { Checkbox, Divider, Select, SelectOption, SelectVariant } from '@patternfly/react-core';
 import find from 'lodash/find';
+import findIndex from 'lodash/findIndex';
 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';
@@ -48,8 +47,7 @@ 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 PER_PAGE = 20;
     const [clustersRawResponse, setClustersRawResponse] = useState([]);
     const abortControllerRef = useRef(undefined);
     const [clustersSelectOptions, setClustersSelectOptions] = useState([]);
@@ -123,7 +121,7 @@ function OpenshiftDropdownV4(props) {
         });
         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(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, className: "archived-clusters-checkbox" })),
             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
@@ -136,7 +134,6 @@ function OpenshiftDropdownV4(props) {
         ];
     };
     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 {
@@ -147,60 +144,49 @@ 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) => {
+            const clustersResponse = yield cloud.getAccountClustersSubscription({
+                order: 'display_name asc',
+                page,
+                size: PER_PAGE,
+                search: `${showArchivedClusters ? '' : "status!='Archived'"} ${search && !showArchivedClusters ? 'AND' : ''} ${search ? `(external_cluster_id ILIKE '%${search}%' OR display_name ILIKE '%${search}%')` : ''}`,
+                fields: 'external_cluster_id,display_name,status,metrics.openshift_version',
+            }, controller.signal);
+            const items = clustersResponse.items.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 || {},
+                    external_cluster_id: item.external_cluster_id,
+                    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) || '',
                 });
             });
+            try {
+                // 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 promiseArray = clustersResponse.items.map((cluster) => cloud.getAccountClusters({
+                    order: 'display_name asc',
+                    search: `external_id='${cluster.external_cluster_id}' OR display_name='${cluster.external_cluster_id}'`,
+                }, controller.signal));
+                const oldApiResponse = yield Promise.allSettled(promiseArray);
+                oldApiResponse.forEach((response) => {
+                    var _a, _b;
+                    if (response.status === 'fulfilled' && ((_b = (_a = response.value) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b[0].dns)) {
+                        var index = findIndex(items, { external_cluster_id: response.value.items[0].external_id });
+                        items[index] = Object.assign(Object.assign({}, items[index]), { dns: response.value.items[0].dns });
+                    }
+                });
+            }
+            catch (e) {
+                // silently fails
+            }
             setIsFetchingClusters(false);
             return {
                 items,
-                totalResult: clustersResponse.length,
+                totalResult: items.length,
                 page,
-                total,
+                total: clustersResponse.total,
             };
         }
         catch (e) {
@@ -260,7 +246,7 @@ function OpenshiftDropdownV4(props) {
                 React.createElement("span", { className: "form-required", "aria-hidden": true }, "*"),
                 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 &&
+            React.createElement(Select, Object.assign({ variant: SelectVariant.typeahead, isDisabled: props.isDisabled, typeAheadAriaLabel: t('Search by Cluster ID and alias 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 and alias 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 && {
                 loadingVariant: {
                     text: 'Display additional results',

package/lib/esm/components/ImproveCase/Hostname.js

@@ -13,8 +13,7 @@ export function Hostname(props) {
         setCaseDetails(caseDispatch, caseDetails);
     };
     const onHostnameChange = (e) => {
-        var _a;
-        onCaseDetailsChange({ hostname: (_a = e.target.value) === null || _a === void 0 ? void 0 : _a.trim() });
+        onCaseDetailsChange({ hostname: e.target.value });
     };
     if (!canUseHostName) {
         return React.createElement(React.Fragment, null);

package/lib/esm/css/case.css

@@ -31,6 +31,10 @@ button,
     font-size: 14px;
 }
 
+.archived-clusters-checkbox {
+    grid-gap: 0px;
+}
+
 .case-details-tabs .case-details-tabs-content {
     background-color: #f0f0f0;
     margin-left: -1.8rem;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "0.2.104",
+    "version": "0.2.107-beta.0",
     "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-beta.0",
+        "@rh-support/components": "1.1.61-beta.0",
+        "@rh-support/react-context": "0.2.63-beta.0",
         "@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.49-beta.0",
+        "@rh-support/utils": "0.2.37-beta.0",
         "@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": "f2b203085e179115277901c8d155d7c72f7f152e"
+    "gitHead": "66b9e765df2035e24ee6ae3ee02289ca5a4eed09"
 }