@rh-support/cases 0.2.32 → 0.2.35-alpha.0

package/lib/esm/components/case-list/CaseList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseList.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseList.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAC;AAChC,OAAO,0BAA0B,CAAC;AA4BlC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAKH,0BAA0B,EAI7B,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAAE,mBAAmB,EAAe,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAK1C,OAAO,EAAgB,WAAW,EAA2B,MAAM,uBAAuB,CAAC;AA4B3F,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,uBAAwB,SAAQ,cAAc;IAC3D,YAAY,EAAE,cAAc,EAAE,CAAC;CAClC;AAED,oBAAY,YAAY,GAAG,0BAA0B,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;AAM5F,MAAM,WAAW,gBAAgB;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,eAidrC"}
+{"version":3,"file":"CaseList.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseList.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAC;AAChC,OAAO,0BAA0B,CAAC;AA4BlC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAKH,0BAA0B,EAI7B,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAAE,mBAAmB,EAAe,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAK1C,OAAO,EAAgB,WAAW,EAA2B,MAAM,uBAAuB,CAAC;AA4B3F,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,uBAAwB,SAAQ,cAAc;IAC3D,YAAY,EAAE,cAAc,EAAE,CAAC;CAClC;AAED,oBAAY,YAAY,GAAG,0BAA0B,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;AAM5F,MAAM,WAAW,gBAAgB;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,eAycrC"}

package/lib/esm/components/case-list/CaseList.js

@@ -37,7 +37,7 @@ import { CaseSearch } from './case-search/CaseSearch';
 import { useCaseListDispatchContext, useCaseListStateContext } from './CaseListContext';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext } from './CaseListFilterContext';
 import { isNoFilterApplied, isOnlyDefaultFilterApplied } from './CaseListFilterHelpers';
-import { initialFilterInfo, updateFilterState } from './CaseListFilterReducer';
+import { updateFilterState } from './CaseListFilterReducer';
 import { setCaseList, setCurrentQuery, setFilterValuesFromFacetResponse, setIsFetching, setPivotValues, } from './CaseListReducer';
 export function CaseList(props) {
     var _a, _b;
@@ -81,11 +81,7 @@ export function CaseList(props) {
                 // recreate a new AbortController for each call
                 let controller = new AbortController();
                 abortControllerRef.current = controller;
-                const { caseListResponse, isSolrSearchDownSFDCUp, showErrorMessage, resetFilters } = yield getCaseList(currentFilterState, loggedInUserRights.data, loggedInUsersAccount.data, controller.signal);
-                if (resetFilters) {
-                    updateFilterState(filterDispatch, Object.assign(Object.assign({}, filterState), { filterInfo: Object.assign({}, initialFilterInfo) }));
-                    return;
-                }
+                const { caseListResponse, isSolrSearchDownSFDCUp, showErrorMessage } = yield getCaseList(currentFilterState, loggedInUserRights.data, loggedInUsersAccount.data, controller.signal);
                 showError = showErrorMessage;
                 setSolrSearchDown(isSolrSearchDownSFDCUp);
                 setFilterValuesFromFacetResponse(CaseListDispatch, solrResponseToFacetFields(caseListResponse));
@@ -134,11 +130,7 @@ export function CaseList(props) {
     };
     const checkNewCases = () => __awaiter(this, void 0, void 0, function* () {
         try {
-            const { caseListResponse, isSolrSearchDownSFDCUp, resetFilters } = yield getCaseList(filterState, loggedInUserRights.data, loggedInUsersAccount.data, null);
-            if (resetFilters) {
-                updateFilterState(filterDispatch, Object.assign(Object.assign({}, filterState), { filterInfo: Object.assign({}, initialFilterInfo) }));
-                return;
-            }
+            const { caseListResponse, isSolrSearchDownSFDCUp } = yield getCaseList(filterState, loggedInUserRights.data, loggedInUsersAccount.data, null);
             setSolrSearchDown(isSolrSearchDownSFDCUp);
             let changed = false;
             if (caseListResponse.response.numFound <= filterState.paginationInfo.pageSize &&
@@ -322,7 +314,7 @@ export function CaseList(props) {
                 React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading case search input') } },
                     React.createElement(CaseSearch, null))),
             isBasicSearchMode && (React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading filter chips') } },
-                React.createElement(CaseListFilterChips, { productVersionPivotValues: get(pivotValues, SolrPivotKeys.product_version, []) })))),
+                React.createElement(CaseListFilterChips, { productVersionPivotValues: get(pivotValues, SolrPivotKeys.product_version, []), isSolrSearchDown: isSolrSearchDown })))),
         React.createElement("section", { className: "case-search-bottom" },
             isBasicSearchMode && (React.createElement("aside", { className: `case-search-filters ${((_a = filterSectionRef.current) === null || _a === void 0 ? void 0 : _a.expanded) ? '' : 'collapsed'}` },
                 React.createElement("h3", { className: "filter-header" }, ((_b = filterSectionRef.current) === null || _b === void 0 ? void 0 : _b.expanded) ? (React.createElement(React.Fragment, null,

package/lib/esm/components/case-list/CaseListFilterHelpers.d.ts

@@ -1,3 +1,4 @@
+import { SolrKeys, SolrPivotKeys } from '../../enums/filters';
 import { ICaseListFilterState, IFilterInfo } from './CaseListFilterReducer';
 declare const isNoFilterApplied: (filterState: ICaseListFilterState) => boolean;
 declare const isOnlyDefaultFilterApplied: (filterState: ICaseListFilterState) => boolean;
@@ -5,5 +6,9 @@ declare const isStatusFilterWithSFDCSupportedValues: ({ case_status }: Partial<I
 declare const isOnlyGroupFilterApplied: (filterInfo: Partial<IFilterInfo>) => boolean;
 declare const isOnlyStatusFilter: (filterInfo: Partial<IFilterInfo>) => boolean;
 declare const isSearchSupportedBySFDC: (filterState: ICaseListFilterState) => boolean;
-export { isNoFilterApplied, isOnlyDefaultFilterApplied, isOnlyGroupFilterApplied, isSearchSupportedBySFDC, isOnlyStatusFilter, isStatusFilterWithSFDCSupportedValues, };
+declare const eligibleSFDCFiltersWithLengthOne: (SolrKeys | SolrPivotKeys)[];
+declare const eligibleSFDCFiltersMultipleValues: SolrKeys[];
+declare const visibleFilterChipsWhenSolrDownSfdcUp: (SolrKeys | SolrPivotKeys)[];
+declare function canDoSfdcSearch(filterState: ICaseListFilterState): boolean;
+export { isNoFilterApplied, isOnlyDefaultFilterApplied, isOnlyGroupFilterApplied, isSearchSupportedBySFDC, isOnlyStatusFilter, isStatusFilterWithSFDCSupportedValues, canDoSfdcSearch, visibleFilterChipsWhenSolrDownSfdcUp, eligibleSFDCFiltersWithLengthOne, eligibleSFDCFiltersMultipleValues, };
 //# sourceMappingURL=CaseListFilterHelpers.d.ts.map

package/lib/esm/components/case-list/CaseListFilterHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseListFilterHelpers.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseListFilterHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,oBAAoB,EAAE,WAAW,EAAqB,MAAM,yBAAyB,CAAC;AAe7G,QAAA,MAAM,iBAAiB,gBAAiB,oBAAoB,YAE3D,CAAC;AAEF,QAAA,MAAM,0BAA0B,gBAAiB,oBAAoB,YAEpE,CAAC;AAEF,QAAA,MAAM,qCAAqC,oBAA0B,QAAQ,WAAW,CAAC,YAGxF,CAAC;AAEF,QAAA,MAAM,wBAAwB,eAAgB,QAAQ,WAAW,CAAC,YAMjE,CAAC;AAEF,QAAA,MAAM,kBAAkB,eAAgB,QAAQ,WAAW,CAAC,YAG3D,CAAC;AAEF,QAAA,MAAM,uBAAuB,gBAAiB,oBAAoB,YAOjE,CAAC;AAEF,OAAO,EACH,iBAAiB,EACjB,0BAA0B,EAC1B,wBAAwB,EACxB,uBAAuB,EACvB,kBAAkB,EAClB,qCAAqC,GACxC,CAAC"}
+{"version":3,"file":"CaseListFilterHelpers.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseListFilterHelpers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAgB,oBAAoB,EAAE,WAAW,EAAqB,MAAM,yBAAyB,CAAC;AAe7G,QAAA,MAAM,iBAAiB,gBAAiB,oBAAoB,YAE3D,CAAC;AAEF,QAAA,MAAM,0BAA0B,gBAAiB,oBAAoB,YAEpE,CAAC;AAEF,QAAA,MAAM,qCAAqC,oBAA0B,QAAQ,WAAW,CAAC,YAGxF,CAAC;AAaF,QAAA,MAAM,wBAAwB,eAAgB,QAAQ,WAAW,CAAC,YAMjE,CAAC;AAEF,QAAA,MAAM,kBAAkB,eAAgB,QAAQ,WAAW,CAAC,YAG3D,CAAC;AAEF,QAAA,MAAM,uBAAuB,gBAAiB,oBAAoB,YAOjE,CAAC;AAEF,QAAA,MAAM,gCAAgC,8BAAsE,CAAC;AAC7G,QAAA,MAAM,iCAAiC,YAAmB,CAAC;AAE3D,QAAA,MAAM,oCAAoC,8BAGzC,CAAC;AAIF,iBAAS,eAAe,CAAC,WAAW,EAAE,oBAAoB,WAiBzD;AAED,OAAO,EACH,iBAAiB,EACjB,0BAA0B,EAC1B,wBAAwB,EACxB,uBAAuB,EACvB,kBAAkB,EAClB,qCAAqC,EACrC,eAAe,EACf,oCAAoC,EACpC,gCAAgC,EAChC,iCAAiC,GACpC,CAAC"}

package/lib/esm/components/case-list/CaseListFilterHelpers.js

@@ -9,9 +9,11 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+import every from 'lodash/every';
 import isEqual from 'lodash/isEqual';
 import sortBy from 'lodash/sortBy';
 import { CaseStatus } from '../../enums/case';
+import { SolrKeys, SolrPivotKeys } from '../../enums/filters';
 import { emptyFilters, initialFilterInfo } from './CaseListFilterReducer';
 function sortArrayHashMap(hashMap = {}) {
     const sortedHashMap = Object.keys(hashMap).reduce((acc, currKey) => {
@@ -34,6 +36,16 @@ const isStatusFilterWithSFDCSupportedValues = ({ case_status = [] }) => {
     const statusLength = case_status.length;
     return statusLength !== 2 || (statusLength === 2 && !case_status.includes(CaseStatus.Closed));
 };
+// SFDC on most fields including case_status only accept one value
+// on case type field if 'closed' is selected then, we can have 2 filters selected
+// because closed in SFDC passes as a seperate param
+// if closed not selected then only one filter can be selected
+const isStatusFilterWithSFDCSupported = (filterKey, filterValue) => {
+    const statusLength = filterValue.length;
+    if (filterKey !== SolrKeys.status || statusLength > 2)
+        return false;
+    return statusLength === 1 || (statusLength === 2 && filterValue.includes(CaseStatus.Closed));
+};
 const isOnlyGroupFilterApplied = (filterInfo) => {
     const { case_folderNumber = [], case_status } = filterInfo, rest = __rest(filterInfo, ["case_folderNumber", "case_status"]);
     // only group filter with status filter supported by sfdc
@@ -49,4 +61,29 @@ const isSearchSupportedBySFDC = (filterState) => {
         isOnlyGroupFilterApplied(filterState.filterInfo) ||
         isOnlyStatusFilter(filterState.filterInfo));
 };
-export { isNoFilterApplied, isOnlyDefaultFilterApplied, isOnlyGroupFilterApplied, isSearchSupportedBySFDC, isOnlyStatusFilter, isStatusFilterWithSFDCSupportedValues, };
+const eligibleSFDCFiltersWithLengthOne = [SolrKeys.status, SolrKeys.severity, SolrPivotKeys.product_version];
+const eligibleSFDCFiltersMultipleValues = [SolrKeys.group];
+const visibleFilterChipsWhenSolrDownSfdcUp = [
+    ...eligibleSFDCFiltersWithLengthOne,
+    ...eligibleSFDCFiltersMultipleValues,
+];
+//sfdc call should be called only when user has selected the filters that SFDC supports that are products, severity, state and group
+//products, severity, state only can have one selected value but group can have multiple values
+function canDoSfdcSearch(filterState) {
+    if (isNoFilterApplied(filterState) || isOnlyDefaultFilterApplied(filterState))
+        return true;
+    return every(filterState.filterInfo, (filterValue, filterKey) => {
+        if (filterValue.length === 0 ||
+            isStatusFilterWithSFDCSupported(filterKey, filterValue) ||
+            // @ts-ignore
+            (filterValue.length >= 1 && eligibleSFDCFiltersMultipleValues.includes(filterKey)) ||
+            // @ts-ignore
+            (filterValue.length === 1 && eligibleSFDCFiltersWithLengthOne.includes(filterKey))) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    });
+}
+export { isNoFilterApplied, isOnlyDefaultFilterApplied, isOnlyGroupFilterApplied, isSearchSupportedBySFDC, isOnlyStatusFilter, isStatusFilterWithSFDCSupportedValues, canDoSfdcSearch, visibleFilterChipsWhenSolrDownSfdcUp, eligibleSFDCFiltersWithLengthOne, eligibleSFDCFiltersMultipleValues, };

package/lib/esm/components/case-list/case-list-filters/CaseListFilterChips.d.ts

@@ -1,6 +1,7 @@
 import { IProductVersionPivotMap } from '../CaseList';
 interface IProps {
     productVersionPivotValues: IProductVersionPivotMap[];
+    isSolrSearchDown: boolean;
 }
 export declare function CaseListFilterChips(props: IProps): JSX.Element;
 export {};

package/lib/esm/components/case-list/case-list-filters/CaseListFilterChips.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseListFilterChips.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/CaseListFilterChips.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAKtD,UAAU,MAAM;IACZ,yBAAyB,EAAE,uBAAuB,EAAE,CAAC;CACxD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,eAqHhD"}
+{"version":3,"file":"CaseListFilterChips.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/CaseListFilterChips.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAMtD,UAAU,MAAM;IACZ,yBAAyB,EAAE,uBAAuB,EAAE,CAAC;IACrD,gBAAgB,EAAE,OAAO,CAAC;CAC7B;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,eAsIhD"}

package/lib/esm/components/case-list/case-list-filters/CaseListFilterChips.js

@@ -6,6 +6,7 @@ import { Trans } from 'react-i18next';
 import { ProductVersionKey, SolrKeys, SolrPivotKeys } from '../../../enums/filters';
 import { filterNamesMap } from '../../../utils/constants';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
+import { eligibleSFDCFiltersWithLengthOne, visibleFilterChipsWhenSolrDownSfdcUp } from '../CaseListFilterHelpers';
 import { clearFilters, removeFilterItem } from '../CaseListFilterReducer';
 import { CreatorSsoNameFilterChip } from './CreatorSsoNameFilterChip';
 import { ProductFilterChip } from './ProductFilterChip';
@@ -27,16 +28,28 @@ export function CaseListFilterChips(props) {
         clearFilters(dispatch);
     };
     const renderFilterValueChips = (filterKey, filterValues, chipKeySuffix = '') => {
+        const singleValueSfdcFilterHasMultipleValues = visibleFilterChipsWhenSolrDownSfdcUp.includes(filterKey) &&
+            eligibleSFDCFiltersWithLengthOne.includes(filterKey) &&
+            Array.isArray(filterValues) &&
+            filterValues[0];
+        if (props.isSolrSearchDown && singleValueSfdcFilterHasMultipleValues) {
+            filterValues = [filterValues[0]];
+        }
         const filterChips = filterValues.map((chip, index) => {
             return (React.createElement(Chip, { key: `${filterKey}-${index}-${chipKeySuffix}`, onClick: deleteChip(filterKey, getChipKey(chip)) }, getChipValue(chip)));
         });
         return filterChips;
     };
     const getChipGroupForFilter = (filterKey, filterValues, groupName = '') => {
-        return (React.createElement("div", { className: "filter-chip", key: `${filterKey}-bookmarks-${groupName}` },
-            React.createElement("span", { className: "filter-chip__heading" },
-                React.createElement(Trans, null, groupName || filterNamesMap[filterKey] || filterKey)),
-            React.createElement(ChipGroup, { numChips: 7, className: "pf-c-chip-group__simple" }, renderFilterValueChips(filterKey, filterValues, groupName))));
+        if (props.isSolrSearchDown && !visibleFilterChipsWhenSolrDownSfdcUp.includes(filterKey)) {
+            return React.createElement(React.Fragment, null);
+        }
+        else {
+            return (React.createElement("div", { className: "filter-chip", key: `${filterKey}-bookmarks-${groupName}` },
+                React.createElement("span", { className: "filter-chip__heading" },
+                    React.createElement(Trans, null, groupName || filterNamesMap[filterKey] || filterKey)),
+                React.createElement(ChipGroup, { numChips: 7, className: "pf-c-chip-group__simple" }, renderFilterValueChips(filterKey, filterValues, groupName))));
+        }
     };
     const renderAccountFilterChip = () => {
         const visibleChips = [];
@@ -77,8 +90,10 @@ export function CaseListFilterChips(props) {
     return (React.createElement(React.Fragment, null, isAnyFilterApplied && (React.createElement("div", { className: "filter-chip-wrapper" },
         React.createElement("h2", null, "Filtering by"),
         React.createElement("div", { className: "filter-chips" },
-            Array.isArray(filterInfo[ProductVersionKey]) && filterInfo[ProductVersionKey].length > 0 && (React.createElement(ProductFilterChip, { productList: filterInfo[ProductVersionKey], productVersionPivot: props.productVersionPivotValues })),
-            showUsernameFilter && React.createElement(CreatorSsoNameFilterChip, null),
+            Array.isArray(filterInfo[ProductVersionKey]) && filterInfo[ProductVersionKey].length > 0 && (React.createElement(ProductFilterChip, { productList: props.isSolrSearchDown && filterInfo[ProductVersionKey].length > 1
+                    ? [filterInfo[ProductVersionKey][0]]
+                    : filterInfo[ProductVersionKey], productVersionPivot: props.productVersionPivotValues })),
+            !props.isSolrSearchDown && showUsernameFilter && React.createElement(CreatorSsoNameFilterChip, null),
             renderChips(),
             currentFilterLength > 1 && (React.createElement(Button, { variant: "link", isInline: true, onClick: clearAllFilters, "data-tracking-id": "case-list-clear-filters", className: "clear-filters" },
                 React.createElement(Trans, null, "Clear all filters"))))))));

package/lib/esm/utils/caseListUtils.d.ts

@@ -12,9 +12,8 @@ interface ICaseListResponse {
     caseListResponse: ISolrCaseSearchResponse;
     isSolrSearchDownSFDCUp: boolean;
     showErrorMessage: boolean;
-    resetFilters: boolean;
 }
-export declare function getCaseList(filterState: ICaseListFilterState, loggedInUser: UserAuth, loggedInUserAccount: Partial<IAccount>, abortSignal: AbortSignal, forceSfdcSearch?: boolean): Promise<ICaseListResponse>;
+export declare function getCaseList(filterState: ICaseListFilterState, loggedInUser: UserAuth, loggedInUserAccount: Partial<IAccount>, abortSignal: AbortSignal): Promise<ICaseListResponse>;
 export declare function getCaseListFromSolr(solrQuery: ISearchSolrQuery, partnerSearch: boolean, abortSignal: AbortSignal, isSecureSupport?: boolean): Promise<ISolrCaseSearchResponse>;
 export {};
 //# sourceMappingURL=caseListUtils.d.ts.map

package/lib/esm/utils/caseListUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"caseListUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseListUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAuC,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAOlG,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACjC,CAAC,CAAC,EAAE,CAAC,CAAC;IACN,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC;IACjC,CAAC,CAAC,EAAE,KAAK,CAAC;CACb;AAED,UAAU,iBAAiB;IACvB,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;CACzB;AAiBD,wBAAsB,WAAW,CAC7B,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,EACtC,WAAW,EAAE,WAAW,EACxB,eAAe,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CAyE5B;AAED,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,OAAO,EACtB,WAAW,EAAE,WAAW,EACxB,eAAe,GAAE,OAAe,GACjC,OAAO,CAAC,uBAAuB,CAAC,CASlC"}
+{"version":3,"file":"caseListUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseListUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAuC,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAOlG,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACjC,CAAC,CAAC,EAAE,CAAC,CAAC;IACN,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC;IACjC,CAAC,CAAC,EAAE,KAAK,CAAC;CACb;AAED,UAAU,iBAAiB;IACvB,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;CAC7B;AAiBD,wBAAsB,WAAW,CAC7B,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,EACtC,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAwF5B;AAED,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,OAAO,EACtB,WAAW,EAAE,WAAW,EACxB,eAAe,GAAE,OAAe,GACjC,OAAO,CAAC,uBAAuB,CAAC,CASlC"}

package/lib/esm/utils/caseListUtils.js

@@ -20,10 +20,10 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { publicApi, search } from '@cee-eng/hydrajs';
 import { promiseReflection } from '@rh-support/utils';
-import { isNoFilterApplied, isSearchSupportedBySFDC } from '../components/case-list/CaseListFilterHelpers';
+import { canDoSfdcSearch, isNoFilterApplied } from '../components/case-list/CaseListFilterHelpers';
 import { createSFDCQueryFromFilterState, createSolrQueryFromFilterState, mapSFDCCaseListToSolrCaseList, } from './caseSearchUtils';
 const throwErrorOnAbort = (message) => {
-    const isAbortError = message && message.toLowerCase().indexOf('abort') > -1;
+    const isAbortError = message && message.toLowerCase().includes('abort');
     if (isAbortError)
         throw new Error(message);
 };
@@ -36,16 +36,15 @@ const throwErrorOnAbort = (message) => {
 // and override the solr result with sfdc.
 // Even though SFDC support most of the filters but another problem with SFDC is it doesnot support multiple values for a praticular filter.
 // if user applies any filter apart from default filter we will always call solr and assume that(not safely) 10 sec scenario is not bound to happen.
-export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abortSignal, forceSfdcSearch) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abortSignal) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     return __awaiter(this, void 0, void 0, function* () {
         let isSolrSearchDownSFDCUp = false;
         let showErrorMessage = false;
-        let resetFilters = false;
         let caseListResponse;
         const solrFilter = createSolrQueryFromFilterState(filterState, loggedInUser);
         const partnerSearch = loggedInUser.hasManagedAccounts() && ((_b = (_a = filterState.filterInfo) === null || _a === void 0 ? void 0 : _a.case_accountNumber) !== null && _b !== void 0 ? _b : []).length > 0;
-        const isSfdcSearchRequired = (forceSfdcSearch || isSearchSupportedBySFDC(filterState)) && !filterState.filterQueryInfo.queryString;
+        const isSfdcSearchRequired = canDoSfdcSearch(filterState) && !filterState.filterQueryInfo.queryString;
         let solrPromise = getCaseListFromSolr(solrFilter, partnerSearch, abortSignal, loggedInUserAccount === null || loggedInUserAccount === void 0 ? void 0 : loggedInUserAccount.secureSupport);
         const sfdcAPICall = () => publicApi.caseList.getCaseListFromSFDC(createSFDCQueryFromFilterState(filterState, loggedInUser, loggedInUserAccount, isNoFilterApplied(filterState)), partnerSearch, loggedInUserAccount === null || loggedInUserAccount === void 0 ? void 0 : loggedInUserAccount.secureSupport, abortSignal);
         const sfdcPromise = isSfdcSearchRequired ? sfdcAPICall() : Promise.resolve(undefined);
@@ -64,11 +63,29 @@ export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abor
         }
         else if (!solrFullfilled && sfdcCallNotMade) {
             // SFDC call didn't make because we had filters that SFDC doesn't support
-            resetFilters = true;
+            try {
+                const sfdcRes = yield promiseReflection(sfdcAPICall());
+                sfdcFullfilled = !!(sfdcRes.status === 'fulfilled' && ((_e = sfdcRes.v) === null || _e === void 0 ? void 0 : _e.cases));
+                if (sfdcFullfilled) {
+                    isSolrSearchDownSFDCUp = true;
+                    const mappedSfdcRes = mapSFDCCaseListToSolrCaseList((_g = (_f = sfdcRes === null || sfdcRes === void 0 ? void 0 : sfdcRes.v) === null || _f === void 0 ? void 0 : _f.cases) !== null && _g !== void 0 ? _g : []);
+                    caseListResponse = {
+                        response: {
+                            docs: mappedSfdcRes,
+                            numFound: sfdcRes.v.totalCount,
+                        },
+                    };
+                }
+            }
+            catch (e) {
+                if (!e.message.toLowerCase().includes('abort')) {
+                    showErrorMessage = true;
+                }
+            }
         }
         else if (solrFullfilled && sfdcFullfilled) {
             caseListResponse = Object.assign(Object.assign({}, solrResponse.v), { response: {
-                    docs: mapSFDCCaseListToSolrCaseList((_f = (_e = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _e === void 0 ? void 0 : _e.cases) !== null && _f !== void 0 ? _f : []),
+                    docs: mapSFDCCaseListToSolrCaseList((_j = (_h = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _h === void 0 ? void 0 : _h.cases) !== null && _j !== void 0 ? _j : []),
                     numFound: sfdcResponse.v.totalCount,
                 } });
         }
@@ -76,7 +93,7 @@ export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abor
             isSolrSearchDownSFDCUp = true;
             caseListResponse = {
                 response: {
-                    docs: mapSFDCCaseListToSolrCaseList((_h = (_g = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _g === void 0 ? void 0 : _g.cases) !== null && _h !== void 0 ? _h : []),
+                    docs: mapSFDCCaseListToSolrCaseList((_l = (_k = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _k === void 0 ? void 0 : _k.cases) !== null && _l !== void 0 ? _l : []),
                     numFound: sfdcResponse.v.totalCount,
                 },
             };
@@ -88,7 +105,6 @@ export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abor
             caseListResponse,
             isSolrSearchDownSFDCUp,
             showErrorMessage,
-            resetFilters,
         };
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "0.2.32",
+    "version": "0.2.35-alpha.0",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -26,7 +26,7 @@
         "lib/**/*"
     ],
     "peerDependencies": {
-        "@cee-eng/hydrajs": "4.7.3",
+        "@cee-eng/hydrajs": "4.7.20",
         "@patternfly/patternfly": "4.102.2",
         "@patternfly/pfe-collapse": "1.1.0",
         "@patternfly/react-core": "4.128.2",
@@ -47,17 +47,17 @@
         "solr-query-builder": "1.0.1"
     },
     "dependencies": {
-        "@cee-eng/hydrajs": "4.7.3",
+        "@cee-eng/hydrajs": "4.7.20",
         "@patternfly/patternfly": "4.102.2",
         "@patternfly/pfe-collapse": "1.1.0",
         "@patternfly/react-core": "4.128.2",
         "@patternfly/react-table": "4.26.7",
-        "@rh-support/api": "0.3.9",
-        "@rh-support/components": "1.1.23",
-        "@rh-support/react-context": "0.2.26",
+        "@rh-support/api": "0.3.10-alpha.0",
+        "@rh-support/components": "1.1.24-alpha.0",
+        "@rh-support/react-context": "0.2.27-alpha.0",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "0.2.17",
-        "@rh-support/utils": "0.2.15",
+        "@rh-support/user-permissions": "0.2.18-alpha.0",
+        "@rh-support/utils": "0.2.16-alpha.0",
         "i18next": "^19.0.1",
         "localforage": "^1.7.3",
         "lodash": "^4.17.15",
@@ -101,5 +101,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "89ef7aa11c6152e04055c8869184e1e146ebea99"
+    "gitHead": "c270e1594ee0d15480e217813fef7a88192db45d"
 }