@rh-support/cases 2.6.233 → 2.6.235
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/esm/components/case/NewCaseButton.js +1 -1
- package/lib/esm/components/case-list/CaseList.d.ts +7 -0
- package/lib/esm/components/case-list/CaseList.d.ts.map +1 -1
- package/lib/esm/components/case-list/CaseList.js +137 -374
- package/lib/esm/components/case-list/CaseListContext.d.ts.map +1 -1
- package/lib/esm/components/case-list/CaseListContext.js +2 -5
- package/lib/esm/components/case-list/CaseListFilterContext.d.ts.map +1 -1
- package/lib/esm/components/case-list/CaseListFilterContext.js +1 -2
- package/lib/esm/components/case-list/CaseListFilterHelpers.d.ts +2 -3
- package/lib/esm/components/case-list/CaseListFilterHelpers.d.ts.map +1 -1
- package/lib/esm/components/case-list/CaseListFilterHelpers.js +6 -19
- package/lib/esm/components/case-list/CaseListFilterReducer.d.ts +4 -36
- package/lib/esm/components/case-list/CaseListFilterReducer.d.ts.map +1 -1
- package/lib/esm/components/case-list/CaseListFilterReducer.js +12 -6
- package/lib/esm/components/case-list/CaseListReducer.d.ts +10 -22
- package/lib/esm/components/case-list/CaseListReducer.d.ts.map +1 -1
- package/lib/esm/components/case-list/CaseListReducer.js +7 -25
- package/lib/esm/components/case-list/case-list-filters/AccountsFilter.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/AccountsFilter.js +11 -18
- package/lib/esm/components/case-list/case-list-filters/AdditionalFilters.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/AdditionalFilters.js +4 -20
- package/lib/esm/components/case-list/case-list-filters/CaseListFilterChips.d.ts +7 -1
- package/lib/esm/components/case-list/case-list-filters/CaseListFilterChips.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/CaseListFilterChips.js +16 -12
- package/lib/esm/components/case-list/case-list-filters/CaseListFilters.d.ts +5 -2
- package/lib/esm/components/case-list/case-list-filters/CaseListFilters.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/CaseListFilters.js +13 -14
- package/lib/esm/components/case-list/case-list-filters/CreatorSsoNameFilter.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/CreatorSsoNameFilter.js +14 -21
- package/lib/esm/components/case-list/case-list-filters/CreatorSsoNameFilterChip.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/CreatorSsoNameFilterChip.js +0 -3
- package/lib/esm/components/case-list/case-list-filters/GroupsFilter.d.ts +1 -11
- package/lib/esm/components/case-list/case-list-filters/GroupsFilter.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/GroupsFilter.js +70 -90
- package/lib/esm/components/case-list/case-list-filters/ProductFilterChip.d.ts +3 -1
- package/lib/esm/components/case-list/case-list-filters/ProductFilterChip.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/ProductFilterChip.js +2 -2
- package/lib/esm/components/case-list/case-list-filters/ProductsFilter.d.ts +4 -5
- package/lib/esm/components/case-list/case-list-filters/ProductsFilter.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/ProductsFilter.js +54 -15
- package/lib/esm/components/case-list/case-list-filters/SeverityFilter.d.ts +3 -0
- package/lib/esm/components/case-list/case-list-filters/SeverityFilter.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/SeverityFilter.js +44 -18
- package/lib/esm/components/case-list/case-list-filters/StatusFilter.d.ts +3 -0
- package/lib/esm/components/case-list/case-list-filters/StatusFilter.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/StatusFilter.js +49 -23
- package/lib/esm/components/case-list/case-list-filters/VersionsFilter.d.ts +3 -1
- package/lib/esm/components/case-list/case-list-filters/VersionsFilter.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-filters/VersionsFilter.js +59 -60
- package/lib/esm/components/case-list/case-list-table/CaseListTable.d.ts +3 -10
- package/lib/esm/components/case-list/case-list-table/CaseListTable.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-table/CaseListTable.js +84 -98
- package/lib/esm/components/case-list/case-list-table/DownloadCSVFileModal.d.ts +5 -0
- package/lib/esm/components/case-list/case-list-table/DownloadCSVFileModal.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-table/DownloadCSVFileModal.js +70 -51
- package/lib/esm/components/case-list/case-list-table/ExportCaseListCSV.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-table/ExportCaseListCSV.js +15 -5
- package/lib/esm/components/case-list/case-list-table/SeverityLabel.js +1 -1
- package/lib/esm/components/case-list/case-list-table/TableActionsDropdown.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-table/TableActionsDropdown.js +3 -2
- package/lib/esm/components/case-list/case-list-table/table-column-selector/TableColumnSelector.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-list-table/table-column-selector/TableColumnSelector.js +0 -1
- package/lib/esm/components/case-list/case-search/BookmarkedSearchesSelector.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-search/BookmarkedSearchesSelector.js +2 -15
- package/lib/esm/components/case-list/case-search/CaseSearch.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-search/CaseSearch.js +24 -55
- package/lib/esm/components/case-list/case-search/useAdvanceSearchParser.d.ts.map +1 -1
- package/lib/esm/components/case-list/case-search/useAdvanceSearchParser.js +1 -2
- package/lib/esm/css/caseList.css +23 -188
- package/lib/esm/css/caseSearch.css +0 -114
- package/lib/esm/enums/case.d.ts +5 -13
- package/lib/esm/enums/case.d.ts.map +1 -1
- package/lib/esm/enums/case.js +3 -23
- package/lib/esm/enums/caseSearch.d.ts +0 -3
- package/lib/esm/enums/caseSearch.d.ts.map +1 -1
- package/lib/esm/enums/caseSearch.js +1 -2
- package/lib/esm/enums/filters.d.ts +1 -5
- package/lib/esm/enums/filters.d.ts.map +1 -1
- package/lib/esm/enums/filters.js +0 -4
- package/lib/esm/hooks/useCloseCase.d.ts.map +1 -1
- package/lib/esm/hooks/useCloseCase.js +21 -38
- package/lib/esm/hooks/useExportCaseListCSV.d.ts.map +1 -1
- package/lib/esm/hooks/useExportCaseListCSV.js +9 -1
- package/lib/esm/hooks/useFilterStateOnLoad.d.ts +1 -1
- package/lib/esm/hooks/useFilterStateOnLoad.d.ts.map +1 -1
- package/lib/esm/hooks/useFilterStateOnLoad.js +5 -7
- package/lib/esm/index.js +0 -1
- package/lib/esm/models/caseList.d.ts +0 -1
- package/lib/esm/models/caseList.d.ts.map +1 -1
- package/lib/esm/test-utils/mockData.d.ts +0 -1
- package/lib/esm/test-utils/mockData.d.ts.map +1 -1
- package/lib/esm/test-utils/mockData.js +1 -2
- package/lib/esm/utils/caseSearchUtils.d.ts.map +1 -1
- package/lib/esm/utils/caseSearchUtils.js +2 -39
- package/lib/esm/utils/constants.d.ts +1 -5
- package/lib/esm/utils/constants.d.ts.map +1 -1
- package/lib/esm/utils/constants.js +2 -10
- package/lib/esm/utils/mockSolrResponse.js +1 -1
- package/package.json +8 -10
- package/lib/esm/components/case-list/case-list-filters/CaseLabelsFilter.d.ts +0 -3
- package/lib/esm/components/case-list/case-list-filters/CaseLabelsFilter.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-list-filters/CaseLabelsFilter.js +0 -178
- package/lib/esm/components/case-list/case-list-table/ArchivedCaseLabel.d.ts +0 -3
- package/lib/esm/components/case-list/case-list-table/ArchivedCaseLabel.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-list-table/ArchivedCaseLabel.js +0 -8
- package/lib/esm/components/case-list/case-list-table/CaseListLabelGroup.d.ts +0 -9
- package/lib/esm/components/case-list/case-list-table/CaseListLabelGroup.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-list-table/CaseListLabelGroup.js +0 -105
- package/lib/esm/components/case-list/case-list-table/CaseListTableRow.d.ts +0 -33
- package/lib/esm/components/case-list/case-list-table/CaseListTableRow.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-list-table/CaseListTableRow.js +0 -51
- package/lib/esm/components/case-list/case-list-table/CaseListTableSkeletonRow.d.ts +0 -9
- package/lib/esm/components/case-list/case-list-table/CaseListTableSkeletonRow.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-list-table/CaseListTableSkeletonRow.js +0 -10
- package/lib/esm/components/case-list/case-search/AdvanceSearchToggleButton.d.ts +0 -8
- package/lib/esm/components/case-list/case-search/AdvanceSearchToggleButton.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-search/AdvanceSearchToggleButton.js +0 -8
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchAccountSection.d.ts +0 -10
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchAccountSection.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchAccountSection.js +0 -29
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchAuditsSection.d.ts +0 -10
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchAuditsSection.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchAuditsSection.js +0 -16
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchCaseSection.d.ts +0 -9
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchCaseSection.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchCaseSection.js +0 -21
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchDateRangeField.d.ts +0 -12
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchDateRangeField.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchDateRangeField.js +0 -31
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchFieldBlock.d.ts +0 -10
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchFieldBlock.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchFieldBlock.js +0 -10
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchModal.d.ts +0 -10
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchModal.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchModal.js +0 -92
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchOwnerSection.d.ts +0 -9
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchOwnerSection.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchOwnerSection.js +0 -20
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchProductSection.d.ts +0 -9
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchProductSection.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-search/advance-search-modal/AdvanceSearchProductSection.js +0 -28
- package/lib/esm/components/case-list/case-search/advance-search-modal/ProductVersionDrilldownSelect.d.ts +0 -9
- package/lib/esm/components/case-list/case-search/advance-search-modal/ProductVersionDrilldownSelect.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-search/advance-search-modal/ProductVersionDrilldownSelect.js +0 -241
- package/lib/esm/components/case-list/case-search/advance-search-modal/SelectableLabelFilter.d.ts +0 -11
- package/lib/esm/components/case-list/case-search/advance-search-modal/SelectableLabelFilter.d.ts.map +0 -1
- package/lib/esm/components/case-list/case-search/advance-search-modal/SelectableLabelFilter.js +0 -23
- package/lib/esm/hooks/useCaseLabels.d.ts +0 -14
- package/lib/esm/hooks/useCaseLabels.d.ts.map +0 -1
- package/lib/esm/hooks/useCaseLabels.js +0 -50
- package/lib/esm/utils/advanceSearchFormMapper.d.ts +0 -11
- package/lib/esm/utils/advanceSearchFormMapper.d.ts.map +0 -1
- package/lib/esm/utils/advanceSearchFormMapper.js +0 -71
- package/lib/esm/utils/advanceSearchUtils.d.ts +0 -24
- package/lib/esm/utils/advanceSearchUtils.d.ts.map +0 -1
- package/lib/esm/utils/advanceSearchUtils.js +0 -150
- package/lib/esm/utils/caseGroupDefaultFilterUtils.d.ts +0 -12
- package/lib/esm/utils/caseGroupDefaultFilterUtils.d.ts.map +0 -1
- package/lib/esm/utils/caseGroupDefaultFilterUtils.js +0 -34
- package/lib/esm/utils/caseGroupDefaultUtils.d.ts +0 -10
- package/lib/esm/utils/caseGroupDefaultUtils.d.ts.map +0 -1
- package/lib/esm/utils/caseGroupDefaultUtils.js +0 -20
- package/lib/esm/utils/caseListGraphQLUtils.d.ts +0 -28
- package/lib/esm/utils/caseListGraphQLUtils.d.ts.map +0 -1
- package/lib/esm/utils/caseListGraphQLUtils.js +0 -304
- package/lib/esm/utils/caseListMapper.d.ts +0 -6
- package/lib/esm/utils/caseListMapper.d.ts.map +0 -1
- package/lib/esm/utils/caseListMapper.js +0 -47
- package/lib/esm/utils/caseListVariablesBuilder.d.ts +0 -17
- package/lib/esm/utils/caseListVariablesBuilder.d.ts.map +0 -1
- package/lib/esm/utils/caseListVariablesBuilder.js +0 -535
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MenuToggle, Select, SelectList, SelectOption, TextInputGroup, TextInputGroupMain, } from '@patternfly/react-core';
|
|
2
|
-
import { useSelectKeyboardNavigator } from '@rh-support/components';
|
|
2
|
+
import { SingleSelectDropdown, useSelectKeyboardNavigator } from '@rh-support/components';
|
|
3
3
|
import { getDropdownBtnPlaceholder } from '@rh-support/utils';
|
|
4
4
|
import isEmpty from 'lodash/isEmpty';
|
|
5
5
|
import isUndefined from 'lodash/isUndefined';
|
|
@@ -10,11 +10,11 @@ import { filterNamesMap } from '../../../utils/constants';
|
|
|
10
10
|
import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
|
|
11
11
|
import { updateFilter } from '../CaseListFilterReducer';
|
|
12
12
|
export function ProductsFilter(props) {
|
|
13
|
-
var _a;
|
|
13
|
+
var _a, _b, _c, _d, _f;
|
|
14
14
|
const { t } = useTranslation();
|
|
15
15
|
const dispatch = useContext(CaseListFilterDispatchContext);
|
|
16
16
|
const { filterInfo } = useContext(CaseListFilterStateContext);
|
|
17
|
-
const { allProducts } = props;
|
|
17
|
+
const { allProducts, filterValues, isSolrSearchDown } = props;
|
|
18
18
|
const [isOpen, setIsOpen] = useState(false);
|
|
19
19
|
const [selectedItems, setSelectedItems] = useState({});
|
|
20
20
|
const [activeItem, setActiveItem] = useState(null);
|
|
@@ -23,24 +23,51 @@ export function ProductsFilter(props) {
|
|
|
23
23
|
const selectedProducts = !isUndefined(filterInfo) && !isUndefined(filterInfo[SolrPivotKeys.product_version])
|
|
24
24
|
? filterInfo[SolrPivotKeys.product_version]
|
|
25
25
|
: [];
|
|
26
|
-
const productOptions =
|
|
26
|
+
const productOptions = filterValues.map((product) => ({
|
|
27
27
|
field: SolrKeys.product,
|
|
28
|
-
value: product.
|
|
29
|
-
productId: product.productId,
|
|
28
|
+
value: product.value,
|
|
30
29
|
[SolrKeys.version]: [],
|
|
31
30
|
}));
|
|
31
|
+
const singleSelectOptions = allProducts.length > 0
|
|
32
|
+
? allProducts.map((product) => ({
|
|
33
|
+
value: product,
|
|
34
|
+
label: product,
|
|
35
|
+
}))
|
|
36
|
+
: [{ value: '', label: t('No products available') }];
|
|
37
|
+
const selectedProduct = ((_b = (_a = filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrPivotKeys.product_version]) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.value) || '';
|
|
38
|
+
const selectedOption = {
|
|
39
|
+
value: selectedProduct,
|
|
40
|
+
label: selectedProduct,
|
|
41
|
+
};
|
|
42
|
+
// Single select mode for when Solr is down
|
|
43
|
+
const onFilterChangeSingleSelect = (selection) => {
|
|
44
|
+
updateFilter(dispatch, {
|
|
45
|
+
filterKey: SolrPivotKeys.product_version,
|
|
46
|
+
values: [{ field: SolrKeys.product, value: selection.value, [SolrKeys.version]: [] }],
|
|
47
|
+
});
|
|
48
|
+
setIsOpen(false);
|
|
49
|
+
};
|
|
50
|
+
const onSingleSelectChange = (option) => {
|
|
51
|
+
// Don't update filter if no products are available
|
|
52
|
+
if (allProducts.length === 0 || option.value === '') {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
updateFilter(dispatch, {
|
|
56
|
+
filterKey: SolrPivotKeys.product_version,
|
|
57
|
+
values: [{ field: SolrKeys.product, value: option.value, [SolrKeys.version]: [] }],
|
|
58
|
+
});
|
|
59
|
+
};
|
|
60
|
+
// Multi-select mode
|
|
32
61
|
const onSelect = (option) => {
|
|
33
|
-
var _a;
|
|
34
62
|
let newSelectedProducts = [];
|
|
35
63
|
if (selectedProducts === null || selectedProducts === void 0 ? void 0 : selectedProducts.some((product) => option.value === product.value)) {
|
|
36
64
|
newSelectedProducts = selectedProducts.filter((product) => option.value !== product.value);
|
|
37
65
|
setSelectedItems((prevData) => (Object.assign(Object.assign({}, prevData), { [option.value]: false })));
|
|
38
66
|
}
|
|
39
67
|
else {
|
|
40
|
-
const productId = option.productId || ((_a = allProducts.find((p) => p.name === option.value)) === null || _a === void 0 ? void 0 : _a.productId) || '';
|
|
41
68
|
newSelectedProducts = [
|
|
42
69
|
...selectedProducts,
|
|
43
|
-
{ field: SolrKeys.product, value: option.value,
|
|
70
|
+
{ field: SolrKeys.product, value: option.value, [SolrKeys.version]: [] },
|
|
44
71
|
];
|
|
45
72
|
setSelectedItems((prevData) => (Object.assign(Object.assign({}, prevData), { [option.value]: true })));
|
|
46
73
|
}
|
|
@@ -66,12 +93,21 @@ export function ProductsFilter(props) {
|
|
|
66
93
|
resetIndexOnClose: true,
|
|
67
94
|
isDisabled: false,
|
|
68
95
|
setIsOpen,
|
|
69
|
-
onSelect
|
|
96
|
+
onSelect: (item) => {
|
|
97
|
+
if (isSolrSearchDown) {
|
|
98
|
+
onFilterChangeSingleSelect(item);
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
onSelect(item);
|
|
102
|
+
}
|
|
103
|
+
},
|
|
70
104
|
});
|
|
71
105
|
const onTextInputChange = (_event, value) => {
|
|
72
106
|
setInputValue(value);
|
|
73
107
|
};
|
|
74
|
-
const placeholder =
|
|
108
|
+
const placeholder = isSolrSearchDown
|
|
109
|
+
? ((_d = (_c = filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrPivotKeys.product_version]) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.value) || t('Select a product')
|
|
110
|
+
: getDropdownBtnPlaceholder(t('Select a product'), ((_f = filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrPivotKeys.product_version]) === null || _f === void 0 ? void 0 : _f.map((i) => i.value)) || [], '', props.filterValues.length, t('All selected'));
|
|
75
111
|
const toggleForMultiSelect = (toggleRef) => (React.createElement(MenuToggle, { variant: "typeahead", onClick: onToggleClick, innerRef: toggleRef, isExpanded: isOpen, isFullWidth: true },
|
|
76
112
|
React.createElement(TextInputGroup, { isPlain: true },
|
|
77
113
|
React.createElement(TextInputGroupMain, Object.assign({ value: inputValue, onClick: onToggleClick, onChange: onTextInputChange, onKeyDown: onInputKeyDown, id: "multi-typeahead-product-filter-input", autoComplete: "off", innerRef: textInputRef, placeholder: placeholder }, (activeItem && { 'aria-activedescendant': activeItem }), { role: "combobox", isExpanded: isOpen, "aria-controls": "select-multi-typeahead-product-listbox" })))));
|
|
@@ -93,6 +129,9 @@ export function ProductsFilter(props) {
|
|
|
93
129
|
}, [inputValue]);
|
|
94
130
|
useEffect(() => {
|
|
95
131
|
var _a;
|
|
132
|
+
if (isSolrSearchDown) {
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
96
135
|
if (isEmpty(filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrPivotKeys.product_version])) {
|
|
97
136
|
setSelectedItems({});
|
|
98
137
|
}
|
|
@@ -103,13 +142,13 @@ export function ProductsFilter(props) {
|
|
|
103
142
|
}, {});
|
|
104
143
|
setSelectedItems(selectedProductItems || {});
|
|
105
144
|
}
|
|
106
|
-
}, [filterInfo]);
|
|
145
|
+
}, [filterInfo, isSolrSearchDown]);
|
|
107
146
|
const renderOptions = () => {
|
|
108
147
|
const filteredOptions = getFilteredOptions();
|
|
109
|
-
return filteredOptions.map((option, index) => (React.createElement(SelectOption, { key: `product-option-${index}`, value: option, hasCheckbox:
|
|
148
|
+
return filteredOptions.map((option, index) => (React.createElement(SelectOption, { key: `product-option-${index}`, value: option, hasCheckbox: !isSolrSearchDown, isSelected: selectedItems[option.value], isFocused: focusedItemIndex !== null && focusedItemIndex === index, id: `select-product-${String(option.value).replace(/\s/g, '-')}` }, option.value)));
|
|
110
149
|
};
|
|
111
150
|
return (React.createElement("div", { className: "product-filter" },
|
|
112
151
|
React.createElement("label", { htmlFor: "case-list-products-filter", className: "pf-v6-u-mb-sm products-filter-label" }, t(filterNamesMap[SolrKeys.product])),
|
|
113
|
-
React.createElement(Select, { shouldFocusToggleOnSelect: true, shouldPreventScrollOnItemFocus: true, id: "case-list-products-filter", "data-tracking-id": "products-filter", isOpen: isOpen, selected: selectedItems, onSelect: (_e, v) => onSelect(v), onOpenChange: (nextOpen) => setIsOpen(nextOpen), toggle: toggleForMultiSelect, isScrollable: true, popperProps: { direction: 'down', enableFlip: false, maxWidth: '30rem' } },
|
|
114
|
-
React.createElement(SelectList, null, renderOptions()))));
|
|
152
|
+
isSolrSearchDown ? (React.createElement(SingleSelectDropdown, { id: "case-list-products-filter", selected: selectedOption, options: singleSelectOptions, placeholder: allProducts.length > 0 ? t('Select a product') : t('No products available'), onSelect: (options) => onSingleSelectChange(options[0]), dataTrackingId: "products-filter", isScrollable: true, isDisabled: allProducts.length === 0 })) : (React.createElement(Select, { shouldFocusToggleOnSelect: true, shouldPreventScrollOnItemFocus: true, id: "case-list-products-filter", "data-tracking-id": "products-filter", isOpen: isOpen, selected: selectedItems, onSelect: (_e, v) => onSelect(v), onOpenChange: (nextOpen) => setIsOpen(nextOpen), toggle: toggleForMultiSelect, isScrollable: true, popperProps: { direction: 'down', enableFlip: false, maxWidth: '30rem' } },
|
|
153
|
+
React.createElement(SelectList, null, renderOptions())))));
|
|
115
154
|
}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { IFacetResponse } from '@rh-support/types/shared';
|
|
1
2
|
import React from 'react';
|
|
2
3
|
interface IProps {
|
|
4
|
+
filterValues: IFacetResponse[];
|
|
3
5
|
allCaseSeverities: string[];
|
|
6
|
+
isSolrSearchDown: boolean;
|
|
4
7
|
}
|
|
5
8
|
export declare function SeverityFilter(props: IProps): React.JSX.Element;
|
|
6
9
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SeverityFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/SeverityFilter.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SeverityFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/SeverityFilter.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,KAA0C,MAAM,OAAO,CAAC;AAQ/D,UAAU,MAAM;IACZ,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,gBAAgB,EAAE,OAAO,CAAC;CAC7B;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,qBAoL3C"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Button, MenuToggle, Select, SelectList, SelectOption, } from '@patternfly/react-core';
|
|
2
|
-
import { useSelectKeyboardNavigator } from '@rh-support/components';
|
|
2
|
+
import { SingleSelectDropdown, useSelectKeyboardNavigator } from '@rh-support/components';
|
|
3
3
|
import { getDropdownBtnPlaceholder } from '@rh-support/utils';
|
|
4
4
|
import isEmpty from 'lodash/isEmpty';
|
|
5
5
|
import React, { useContext, useEffect, useState } from 'react';
|
|
@@ -9,38 +9,56 @@ import { filterNamesMap } from '../../../utils/constants';
|
|
|
9
9
|
import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
|
|
10
10
|
import { updateFilter } from '../CaseListFilterReducer';
|
|
11
11
|
export function SeverityFilter(props) {
|
|
12
|
+
var _a;
|
|
12
13
|
const { t } = useTranslation();
|
|
13
14
|
const { filterInfo } = useContext(CaseListFilterStateContext);
|
|
14
15
|
const dispatch = useContext(CaseListFilterDispatchContext);
|
|
15
16
|
const [isOpen, setIsOpen] = useState(false);
|
|
16
17
|
const [selectedItems, setSelectedItems] = useState({});
|
|
17
|
-
const list =
|
|
18
|
-
value: severity,
|
|
19
|
-
key:
|
|
18
|
+
const list = props.isSolrSearchDown
|
|
19
|
+
? props.allCaseSeverities.map((severity) => ({ value: severity, key: severity }))
|
|
20
|
+
: props.filterValues.map((filterValue) => ({ value: filterValue.value, key: filterValue.value }));
|
|
21
|
+
const singleSelectOptions = list.map((item) => ({
|
|
22
|
+
value: item.value,
|
|
23
|
+
label: item.value,
|
|
20
24
|
}));
|
|
25
|
+
const selectedSeverity = ((_a = filterInfo[SolrKeys.severity]) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
26
|
+
const selectedOption = {
|
|
27
|
+
value: selectedSeverity,
|
|
28
|
+
label: selectedSeverity,
|
|
29
|
+
};
|
|
21
30
|
const onToggleClick = (e) => {
|
|
22
31
|
setIsOpen(!isOpen);
|
|
23
32
|
};
|
|
24
33
|
const onSelect = (option) => {
|
|
25
|
-
|
|
26
|
-
if (selectedItems[option.value]) {
|
|
27
|
-
setSelectedItems((prevData) => (Object.assign(Object.assign({}, prevData), { [option.value]: false })));
|
|
34
|
+
if (props.isSolrSearchDown) {
|
|
28
35
|
updateFilter(dispatch, {
|
|
29
36
|
filterKey: SolrKeys.severity,
|
|
30
|
-
values:
|
|
37
|
+
values: [option.value],
|
|
31
38
|
});
|
|
39
|
+
setIsOpen(false);
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
const prevSelectedSeverities = Object.keys(selectedItems).filter((item) => selectedItems[item] && item);
|
|
43
|
+
if (selectedItems[option.value]) {
|
|
44
|
+
setSelectedItems((prevData) => (Object.assign(Object.assign({}, prevData), { [option.value]: false })));
|
|
45
|
+
const index = prevSelectedSeverities.indexOf(option.value);
|
|
46
|
+
prevSelectedSeverities.splice(index, 1);
|
|
32
47
|
}
|
|
33
48
|
else {
|
|
34
49
|
setSelectedItems((prevData) => (Object.assign(Object.assign({}, prevData), { [option.value]: true })));
|
|
35
|
-
|
|
36
|
-
filterKey: SolrKeys.severity,
|
|
37
|
-
values: [...prevSelectedSeverities, option.value],
|
|
38
|
-
});
|
|
50
|
+
prevSelectedSeverities.push(option.value);
|
|
39
51
|
}
|
|
52
|
+
updateFilter(dispatch, {
|
|
53
|
+
filterKey: SolrKeys.severity,
|
|
54
|
+
values: prevSelectedSeverities,
|
|
55
|
+
});
|
|
40
56
|
};
|
|
57
|
+
// Use the keyboard navigator hook
|
|
41
58
|
const { focusedItemIndex, onInputKeyDown } = useSelectKeyboardNavigator({
|
|
42
59
|
list,
|
|
43
60
|
isOpen,
|
|
61
|
+
resetIndexOnClose: true,
|
|
44
62
|
setIsOpen,
|
|
45
63
|
onSelect,
|
|
46
64
|
});
|
|
@@ -51,17 +69,25 @@ export function SeverityFilter(props) {
|
|
|
51
69
|
values: [],
|
|
52
70
|
});
|
|
53
71
|
};
|
|
54
|
-
const placeholder =
|
|
72
|
+
const placeholder = props.isSolrSearchDown
|
|
73
|
+
? t('Select a severity')
|
|
74
|
+
: getDropdownBtnPlaceholder(t('Select a severity'), filterInfo[SolrKeys.severity], ' ', list.length, t('All selected'));
|
|
55
75
|
const toggle = (toggleRef) => (React.createElement(MenuToggle, { variant: "default", onClick: onToggleClick, innerRef: toggleRef, isExpanded: isOpen, isFullWidth: true, onKeyDown: onInputKeyDown },
|
|
56
76
|
placeholder,
|
|
57
77
|
Object.keys(selectedItems).filter((key) => selectedItems[key] === true).length > 0 && (React.createElement(Button, { icon: "", variant: "plain", onClick: onClick, "aria-label": "Clear selection", className: "pf-v6-c-select__toggle-clear" }))));
|
|
58
|
-
const dropdownOptions = list.map((option, index) => !isEmpty(option.value) && (React.createElement(SelectOption, { key: option.key, value: option, hasCheckbox:
|
|
78
|
+
const dropdownOptions = list.map((option, index) => !isEmpty(option.value) && (React.createElement(SelectOption, { key: option.key, value: option, hasCheckbox: !props.isSolrSearchDown, isSelected: selectedItems[option.value], isFocused: focusedItemIndex !== null && focusedItemIndex === index, id: `select-severity-${option.value.replace(' ', '-')}` }, option.value)));
|
|
79
|
+
const onSingleSelectChange = (option) => {
|
|
80
|
+
updateFilter(dispatch, {
|
|
81
|
+
filterKey: SolrKeys.severity,
|
|
82
|
+
values: [option.value],
|
|
83
|
+
});
|
|
84
|
+
};
|
|
59
85
|
useEffect(() => {
|
|
60
86
|
var _a;
|
|
61
87
|
if (isEmpty(filterInfo[SolrKeys.severity])) {
|
|
62
88
|
setSelectedItems({});
|
|
63
89
|
}
|
|
64
|
-
else {
|
|
90
|
+
else if (!props.isSolrSearchDown) {
|
|
65
91
|
const selectedSeverities = (_a = filterInfo[SolrKeys.severity]) === null || _a === void 0 ? void 0 : _a.reduce((selection, severity) => {
|
|
66
92
|
selection[severity] = true;
|
|
67
93
|
return selection;
|
|
@@ -69,9 +95,9 @@ export function SeverityFilter(props) {
|
|
|
69
95
|
setSelectedItems(selectedSeverities);
|
|
70
96
|
}
|
|
71
97
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
72
|
-
}, [filterInfo[SolrKeys.severity]]);
|
|
98
|
+
}, [filterInfo[SolrKeys.severity], props.isSolrSearchDown]);
|
|
73
99
|
return (React.createElement("div", { className: "severity-filter" },
|
|
74
100
|
React.createElement("label", { htmlFor: "case-list-severity-filter", className: "pf-v6-u-mb-sm severity-filter-label" }, t(filterNamesMap[SolrKeys.severity])),
|
|
75
|
-
React.createElement(Select, { shouldFocusToggleOnSelect: true, shouldPreventScrollOnItemFocus: true, id: "case-list-severity-filter", "data-tracking-id": "severity-filter", isOpen: isOpen, selected: selectedItems, onSelect: (_e, v) => onSelect(v), onOpenChange: (nextOpen) => setIsOpen(nextOpen), toggle: toggle, isScrollable: true, popperProps: { direction: 'down', enableFlip: false } },
|
|
76
|
-
React.createElement(SelectList, null, dropdownOptions))));
|
|
101
|
+
props.isSolrSearchDown ? (React.createElement(SingleSelectDropdown, { id: "case-list-severity-filter", selected: selectedOption, options: singleSelectOptions, placeholder: t('Select a severity'), onSelect: onSingleSelectChange, dataTrackingId: "severity-filter", isScrollable: true })) : (React.createElement(Select, { shouldFocusToggleOnSelect: true, shouldPreventScrollOnItemFocus: true, id: "case-list-severity-filter", "data-tracking-id": "severity-filter", isOpen: isOpen, selected: selectedItems, onSelect: (_e, v) => onSelect(v), onOpenChange: (nextOpen) => setIsOpen(nextOpen), toggle: toggle, isScrollable: true, popperProps: { direction: 'down', enableFlip: false } },
|
|
102
|
+
React.createElement(SelectList, null, dropdownOptions)))));
|
|
77
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StatusFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/StatusFilter.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"StatusFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/StatusFilter.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,KAA0C,MAAM,OAAO,CAAC;AAO/D,UAAU,MAAM;IACZ,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,qBAkNzC"}
|
|
@@ -1,28 +1,43 @@
|
|
|
1
1
|
import { Button, MenuToggle, Select, SelectList, SelectOption, } from '@patternfly/react-core';
|
|
2
|
-
import { useSelectKeyboardNavigator } from '@rh-support/components';
|
|
2
|
+
import { SingleSelectDropdown, useSelectKeyboardNavigator } from '@rh-support/components';
|
|
3
3
|
import isEmpty from 'lodash/isEmpty';
|
|
4
4
|
import React, { useContext, useEffect, useState } from 'react';
|
|
5
5
|
import { useTranslation } from 'react-i18next';
|
|
6
|
-
import {
|
|
7
|
-
import { filterNamesMap
|
|
6
|
+
import { SolrKeys } from '../../../enums/filters';
|
|
7
|
+
import { filterNamesMap } from '../../../utils/constants';
|
|
8
8
|
import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
|
|
9
9
|
import { updateFilter } from '../CaseListFilterReducer';
|
|
10
10
|
export function StatusFilter(props) {
|
|
11
|
+
var _a;
|
|
11
12
|
const dispatch = useContext(CaseListFilterDispatchContext);
|
|
12
13
|
const { t } = useTranslation();
|
|
13
14
|
const { filterInfo } = useContext(CaseListFilterStateContext);
|
|
14
15
|
const [isOpen, setIsOpen] = useState(false);
|
|
15
16
|
const [selectedItems, setSelectedItems] = useState({});
|
|
16
|
-
const list =
|
|
17
|
-
value: status,
|
|
18
|
-
key:
|
|
17
|
+
const list = props.isSolrSearchDown
|
|
18
|
+
? props.allCaseStatuses.map((status) => ({ value: status, key: status }))
|
|
19
|
+
: props.filterValues.map((filterValue) => ({ value: filterValue.value, key: filterValue.value }));
|
|
20
|
+
const singleSelectOptions = list.map((item) => ({
|
|
21
|
+
value: item.value,
|
|
22
|
+
label: item.value,
|
|
19
23
|
}));
|
|
20
|
-
const
|
|
21
|
-
const
|
|
24
|
+
const selectedStatus = ((_a = filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status]) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
25
|
+
const selectedOption = {
|
|
26
|
+
value: selectedStatus,
|
|
27
|
+
label: selectedStatus,
|
|
28
|
+
};
|
|
22
29
|
const onToggleClick = (e) => {
|
|
23
30
|
setIsOpen(!isOpen);
|
|
24
31
|
};
|
|
25
32
|
const onSelect = (option) => {
|
|
33
|
+
if (props.isSolrSearchDown) {
|
|
34
|
+
updateFilter(dispatch, {
|
|
35
|
+
filterKey: SolrKeys.status,
|
|
36
|
+
values: [option.value],
|
|
37
|
+
});
|
|
38
|
+
setIsOpen(false);
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
26
41
|
const prevSelectedStatuses = Object.keys(selectedItems).filter((item) => selectedItems[item] && item);
|
|
27
42
|
if (selectedItems[option.value]) {
|
|
28
43
|
setSelectedItems((prevData) => (Object.assign(Object.assign({}, prevData), { [option.value]: false })));
|
|
@@ -35,7 +50,7 @@ export function StatusFilter(props) {
|
|
|
35
50
|
}
|
|
36
51
|
updateFilter(dispatch, {
|
|
37
52
|
filterKey: SolrKeys.status,
|
|
38
|
-
values:
|
|
53
|
+
values: prevSelectedStatuses,
|
|
39
54
|
});
|
|
40
55
|
};
|
|
41
56
|
// Use the keyboard navigator hook
|
|
@@ -50,7 +65,7 @@ export function StatusFilter(props) {
|
|
|
50
65
|
setSelectedItems({});
|
|
51
66
|
updateFilter(dispatch, {
|
|
52
67
|
filterKey: SolrKeys.status,
|
|
53
|
-
values:
|
|
68
|
+
values: [],
|
|
54
69
|
});
|
|
55
70
|
};
|
|
56
71
|
const getBtnPlaceholder = (btnPlaceholder, selectedValues, type, totalLength, totalLengthString) => {
|
|
@@ -60,42 +75,53 @@ export function StatusFilter(props) {
|
|
|
60
75
|
else if (selectedValues && selectedValues.length === 1) {
|
|
61
76
|
return selectedValues[0];
|
|
62
77
|
}
|
|
63
|
-
else if (selectedValues &&
|
|
78
|
+
else if (selectedValues && selectedValues.length === 3) {
|
|
64
79
|
return t('All cases');
|
|
65
80
|
}
|
|
66
81
|
else {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
if (hasAllOpenSelected) {
|
|
82
|
+
if (selectedValues &&
|
|
83
|
+
selectedValues.length === 2 &&
|
|
84
|
+
selectedValues.every((item) => item.includes('Waiting'))) {
|
|
71
85
|
return t('All open cases');
|
|
72
86
|
}
|
|
87
|
+
else if (selectedValues && totalLength && selectedValues.length === totalLength) {
|
|
88
|
+
return totalLengthString || btnPlaceholder;
|
|
89
|
+
}
|
|
73
90
|
else {
|
|
74
91
|
return `${selectedValues.length} ${type} selected`;
|
|
75
92
|
}
|
|
76
93
|
}
|
|
77
94
|
};
|
|
78
|
-
const placeholder =
|
|
95
|
+
const placeholder = props.isSolrSearchDown
|
|
96
|
+
? t('Select a status')
|
|
97
|
+
: getBtnPlaceholder(t('Select a status'), (filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status]) || [], ' ', list.length, t('All selected'));
|
|
79
98
|
const toggle = (toggleRef) => (React.createElement(MenuToggle, { variant: "default", onClick: onToggleClick, innerRef: toggleRef, isExpanded: isOpen, isFullWidth: true, onKeyDown: onInputKeyDown },
|
|
80
99
|
placeholder,
|
|
81
100
|
Object.keys(selectedItems).filter((key) => selectedItems[key] === true).length > 0 && (React.createElement(Button, { icon: "", variant: "plain", onClick: onClick, "aria-label": "Clear selection", className: "pf-v6-c-select__toggle-clear" }))));
|
|
82
|
-
const dropdownOptions = list.map((option, index) => !isEmpty(option.value) && (React.createElement(SelectOption, { key: option.key, value: option, hasCheckbox:
|
|
101
|
+
const dropdownOptions = list.map((option, index) => !isEmpty(option.value) && (React.createElement(SelectOption, { key: option.key, value: option, hasCheckbox: !props.isSolrSearchDown, isSelected: selectedItems[option.value], isFocused: focusedItemIndex !== null && focusedItemIndex === index, id: `select-status-${option.value.replace(' ', '-')}` }, option.value)));
|
|
102
|
+
const onSingleSelectChange = (option) => {
|
|
103
|
+
updateFilter(dispatch, {
|
|
104
|
+
filterKey: SolrKeys.status,
|
|
105
|
+
values: [option.value],
|
|
106
|
+
});
|
|
107
|
+
};
|
|
83
108
|
useEffect(() => {
|
|
84
|
-
|
|
109
|
+
var _a;
|
|
110
|
+
if (isEmpty(filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status])) {
|
|
85
111
|
setSelectedItems({});
|
|
86
112
|
}
|
|
87
|
-
else {
|
|
88
|
-
const selectedStatuses =
|
|
113
|
+
else if (!props.isSolrSearchDown) {
|
|
114
|
+
const selectedStatuses = (_a = filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status]) === null || _a === void 0 ? void 0 : _a.reduce((selection, status) => {
|
|
89
115
|
selection[status] = true;
|
|
90
116
|
return selection;
|
|
91
117
|
}, {});
|
|
92
118
|
setSelectedItems(selectedStatuses || {});
|
|
93
119
|
}
|
|
94
120
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
95
|
-
}, [filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status]]);
|
|
121
|
+
}, [filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrKeys.status], props.isSolrSearchDown]);
|
|
96
122
|
const titleId = 'case-list-status-filter';
|
|
97
123
|
return (React.createElement("div", { className: "status-filter" },
|
|
98
124
|
React.createElement("label", { htmlFor: titleId, className: "pf-v6-u-mb-sm status-filter-label" }, t(filterNamesMap[SolrKeys.status])),
|
|
99
|
-
React.createElement(Select, { shouldFocusToggleOnSelect: true, shouldPreventScrollOnItemFocus: true, id: titleId, "data-tracking-id": "status-filter", isOpen: isOpen, selected: selectedItems, onSelect: (_e, v) => onSelect(v), onOpenChange: (nextOpen) => setIsOpen(nextOpen), toggle: toggle, isScrollable: true, popperProps: { direction: 'down', enableFlip: false } },
|
|
100
|
-
React.createElement(SelectList, null, dropdownOptions))));
|
|
125
|
+
props.isSolrSearchDown ? (React.createElement(SingleSelectDropdown, { id: titleId, selected: selectedOption, options: singleSelectOptions, placeholder: t('Select a status'), onSelect: onSingleSelectChange, dataTrackingId: "status-filter", isScrollable: true })) : (React.createElement(Select, { shouldFocusToggleOnSelect: true, shouldPreventScrollOnItemFocus: true, id: titleId, "data-tracking-id": "status-filter", isOpen: isOpen, selected: selectedItems, onSelect: (_e, v) => onSelect(v), onOpenChange: (nextOpen) => setIsOpen(nextOpen), toggle: toggle, isScrollable: true, popperProps: { direction: 'down', enableFlip: false } },
|
|
126
|
+
React.createElement(SelectList, null, dropdownOptions)))));
|
|
101
127
|
}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { IProductVersionPivotMap } from '../CaseList';
|
|
2
3
|
import { IProductFilter } from '../CaseListFilterReducer';
|
|
3
4
|
interface IProps {
|
|
4
5
|
productInfo: IProductFilter;
|
|
6
|
+
productVersionPivot: IProductVersionPivotMap[];
|
|
5
7
|
}
|
|
6
|
-
export declare function VersionsFilter({ productInfo }: IProps): React.JSX.Element;
|
|
8
|
+
export declare function VersionsFilter({ productInfo, productVersionPivot }: IProps): React.JSX.Element;
|
|
7
9
|
export {};
|
|
8
10
|
//# sourceMappingURL=VersionsFilter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VersionsFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/VersionsFilter.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"VersionsFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/VersionsFilter.tsx"],"names":[],"mappings":"AAeA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAIhF,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAgB,MAAM,0BAA0B,CAAC;AAoCxE,UAAU,MAAM;IACZ,WAAW,EAAE,cAAc,CAAC;IAC5B,mBAAmB,EAAE,uBAAuB,EAAE,CAAC;CAClD;AAED,wBAAgB,cAAc,CAAC,EAAE,WAAW,EAAE,mBAAmB,EAAE,EAAE,MAAM,qBAkO1E"}
|
|
@@ -1,66 +1,64 @@
|
|
|
1
|
-
import { useApolloClient } from '@apollo/client/react';
|
|
2
1
|
import { Button, MenuToggle, Select, SelectList, SelectOption, TextInputGroup, TextInputGroupMain, TextInputGroupUtilities, } from '@patternfly/react-core';
|
|
3
2
|
import TimesIcon from '@patternfly/react-icons/dist/js/icons/times-icon';
|
|
4
3
|
import { useSelectKeyboardNavigator } from '@rh-support/components';
|
|
5
|
-
import { GlobalMetadataStateContext } from '@rh-support/react-context';
|
|
6
|
-
import { compareVersions, GET_PRODUCTS, handleGraphQLVersionsResponse } from '@rh-support/utils';
|
|
7
4
|
import isEmpty from 'lodash/isEmpty';
|
|
8
5
|
import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
|
|
9
6
|
import { useTranslation } from 'react-i18next';
|
|
10
7
|
import { SolrKeys, SolrPivotKeys } from '../../../enums/filters';
|
|
11
8
|
import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
|
|
12
9
|
import { updateFilter } from '../CaseListFilterReducer';
|
|
13
|
-
|
|
10
|
+
function getVersionValuesForProduct(productPivot = [], productName) {
|
|
11
|
+
return (productPivot.find((item) => item.value === productName) || {}).case_version;
|
|
12
|
+
}
|
|
13
|
+
//split version into parts
|
|
14
|
+
function parseVersionIntoParts(version) {
|
|
15
|
+
//keep unknown version at last
|
|
16
|
+
if (version === 'Unknown')
|
|
17
|
+
return [Infinity];
|
|
18
|
+
//split dots and spaces
|
|
19
|
+
return version.split(/[.\s]/).map((p) => (isNaN(Number(p)) ? p : Number(p)));
|
|
20
|
+
}
|
|
21
|
+
function compareVersions(versionA, versionB) {
|
|
22
|
+
var _a, _b;
|
|
23
|
+
const pA = parseVersionIntoParts(versionA), pB = parseVersionIntoParts(versionB);
|
|
24
|
+
//compare each part
|
|
25
|
+
for (let i = 0; i < Math.max(pA.length, pB.length); i++) {
|
|
26
|
+
const a = (_a = pA[i]) !== null && _a !== void 0 ? _a : 0, b = (_b = pB[i]) !== null && _b !== void 0 ? _b : 0; //undefined as 0
|
|
27
|
+
if (a == b)
|
|
28
|
+
continue;
|
|
29
|
+
if (typeof a === 'number' && typeof b === 'number')
|
|
30
|
+
return a - b;
|
|
31
|
+
if (typeof a === 'string' && typeof b === 'string')
|
|
32
|
+
return a.localeCompare(b);
|
|
33
|
+
//one is string and other is number => string takes precendence
|
|
34
|
+
if (typeof a === 'string')
|
|
35
|
+
return -1;
|
|
36
|
+
if (typeof b == 'string')
|
|
37
|
+
return 1;
|
|
38
|
+
}
|
|
39
|
+
return 0;
|
|
40
|
+
}
|
|
41
|
+
export function VersionsFilter({ productInfo, productVersionPivot }) {
|
|
14
42
|
const { t } = useTranslation();
|
|
15
43
|
const { filterInfo } = useContext(CaseListFilterStateContext);
|
|
16
44
|
const dispatch = useContext(CaseListFilterDispatchContext);
|
|
17
|
-
const apolloClient = useApolloClient();
|
|
18
|
-
const { globalMetadataState: { allProducts }, } = useContext(GlobalMetadataStateContext);
|
|
19
45
|
const [inputValue, setInputValue] = useState('');
|
|
20
46
|
const [activeItem, setActiveItem] = useState(null);
|
|
21
47
|
const [isOpen, setIsOpen] = useState(false);
|
|
22
48
|
const [selectedItems, setSelectedItems] = useState({});
|
|
23
|
-
const [fetchedVersions, setFetchedVersions] = useState([]);
|
|
24
|
-
const [isLoading, setIsLoading] = useState(false);
|
|
25
49
|
const textInputRef = useRef();
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
first: 200,
|
|
37
|
-
orderBy: { Name: { order: 'ASC' } },
|
|
38
|
-
},
|
|
39
|
-
fetchPolicy: 'cache-first',
|
|
40
|
-
})
|
|
41
|
-
.then(({ data }) => {
|
|
42
|
-
var _a, _b, _c, _d;
|
|
43
|
-
const edges = (_d = (_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.redhat_support_uiapi) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.RedHatSupportProduct2) === null || _c === void 0 ? void 0 : _c.edges) !== null && _d !== void 0 ? _d : [];
|
|
44
|
-
const versionData = handleGraphQLVersionsResponse(edges, productObj.name || productInfo.value);
|
|
45
|
-
setFetchedVersions(versionData);
|
|
46
|
-
})
|
|
47
|
-
.catch((err) => {
|
|
48
|
-
console.error('[VersionsFilter] Failed to fetch versions:', err);
|
|
49
|
-
setFetchedVersions([]);
|
|
50
|
-
})
|
|
51
|
-
.finally(() => setIsLoading(false));
|
|
52
|
-
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
53
|
-
}, [productInfo.value, allProducts.data]);
|
|
54
|
-
const list = useMemo(() => {
|
|
55
|
-
const sorted = [...fetchedVersions].sort((a, b) => compareVersions(a.name, b.name));
|
|
56
|
-
return sorted.map((version) => ({
|
|
57
|
-
value: version.name,
|
|
58
|
-
key: version.name,
|
|
59
|
-
id: version.id,
|
|
60
|
-
}));
|
|
61
|
-
}, [fetchedVersions]);
|
|
50
|
+
// Memoize versions to prevent unnecessary recalculations
|
|
51
|
+
const versions = useMemo(() => {
|
|
52
|
+
const versionValues = getVersionValuesForProduct(productVersionPivot, productInfo.value);
|
|
53
|
+
return versionValues === null || versionValues === void 0 ? void 0 : versionValues.sort((a, b) => compareVersions(a.value, b.value));
|
|
54
|
+
}, [productVersionPivot, productInfo.value]);
|
|
55
|
+
// Memoize list to prevent unnecessary recreations
|
|
56
|
+
const list = useMemo(() => (versions === null || versions === void 0 ? void 0 : versions.map((version) => ({
|
|
57
|
+
value: version.value,
|
|
58
|
+
key: version.value,
|
|
59
|
+
}))) || [], [versions]);
|
|
62
60
|
const [selectOptions, setSelectOptions] = useState(list);
|
|
63
|
-
const onToggleClick = () => {
|
|
61
|
+
const onToggleClick = (e) => {
|
|
64
62
|
setIsOpen(!isOpen);
|
|
65
63
|
};
|
|
66
64
|
const onSelect = (option) => {
|
|
@@ -74,17 +72,18 @@ export function VersionsFilter({ productInfo }) {
|
|
|
74
72
|
setSelectedItems((prevData) => (Object.assign(Object.assign({}, prevData), { [option.value]: true })));
|
|
75
73
|
prevSelectedVersions.push(option.value);
|
|
76
74
|
}
|
|
77
|
-
const newVersionState = prevSelectedVersions.map((version) => {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
productId: (versionOption === null || versionOption === void 0 ? void 0 : versionOption.id) || '',
|
|
83
|
-
};
|
|
84
|
-
});
|
|
85
|
-
const productNewState = [...((filterInfo === null || filterInfo === void 0 ? void 0 : filterInfo[SolrPivotKeys.product_version]) || [])];
|
|
75
|
+
const newVersionState = prevSelectedVersions.map((version) => ({
|
|
76
|
+
field: SolrKeys.version,
|
|
77
|
+
value: version,
|
|
78
|
+
}));
|
|
79
|
+
const productNewState = [...filterInfo[SolrPivotKeys.product_version]];
|
|
86
80
|
const objIndex = productNewState.findIndex((item) => item.value === productInfo.value);
|
|
87
|
-
|
|
81
|
+
// replace product with updated versions
|
|
82
|
+
productNewState[objIndex] = {
|
|
83
|
+
field: SolrKeys.product,
|
|
84
|
+
value: productInfo.value,
|
|
85
|
+
[SolrKeys.version]: newVersionState,
|
|
86
|
+
};
|
|
88
87
|
updateFilter(dispatch, { filterKey: SolrPivotKeys.product_version, values: productNewState });
|
|
89
88
|
};
|
|
90
89
|
// Use the keyboard navigator hook
|
|
@@ -104,7 +103,7 @@ export function VersionsFilter({ productInfo }) {
|
|
|
104
103
|
var _a;
|
|
105
104
|
setInputValue('');
|
|
106
105
|
setSelectedItems({});
|
|
107
|
-
const productNewState = [...
|
|
106
|
+
const productNewState = [...filterInfo[SolrPivotKeys.product_version]];
|
|
108
107
|
const objIndex = productNewState.findIndex((item) => item.value === productInfo.value);
|
|
109
108
|
productNewState[objIndex] = {
|
|
110
109
|
field: SolrKeys.product,
|
|
@@ -118,7 +117,7 @@ export function VersionsFilter({ productInfo }) {
|
|
|
118
117
|
useEffect(() => {
|
|
119
118
|
if (focusedItemIndex !== null && list[focusedItemIndex]) {
|
|
120
119
|
const focusedItem = list[focusedItemIndex];
|
|
121
|
-
setActiveItem(`select-multi-typeahead-checkbox-${
|
|
120
|
+
setActiveItem(`select-multi-typeahead-checkbox-${focusedItem === null || focusedItem === void 0 ? void 0 : focusedItem.value.replace(' ', '-')}`);
|
|
122
121
|
}
|
|
123
122
|
else {
|
|
124
123
|
setActiveItem(null);
|
|
@@ -132,7 +131,7 @@ export function VersionsFilter({ productInfo }) {
|
|
|
132
131
|
// Memoize dropdownOptions to prevent unnecessary rerenders
|
|
133
132
|
const dropdownOptions = useMemo(() => {
|
|
134
133
|
const optionsToRender = !isEmpty(selectOptions) ? selectOptions : list;
|
|
135
|
-
return optionsToRender.map((option, index) => option.value && (React.createElement(SelectOption, { key: option.key, value: option, hasCheckbox: true, isSelected: selectedItems[
|
|
134
|
+
return optionsToRender.map((option, index) => option.value && (React.createElement(SelectOption, { key: option.key, value: option, hasCheckbox: true, isSelected: selectedItems[option.value], isFocused: focusedItemIndex !== null && focusedItemIndex === index, id: `select-multi-typeahead-${option.value.replace(' ', '-')}` }, option.value)));
|
|
136
135
|
}, [selectOptions, list, selectedItems, focusedItemIndex]);
|
|
137
136
|
// Update selectOptions when input value changes
|
|
138
137
|
useEffect(() => {
|
|
@@ -157,9 +156,9 @@ export function VersionsFilter({ productInfo }) {
|
|
|
157
156
|
setSelectedItems(selectedVersions);
|
|
158
157
|
}, [productInfo.case_version]);
|
|
159
158
|
const titleId = 'case-list-versions-filter';
|
|
160
|
-
return (React.createElement("div", { className: "version-filter-chip" },
|
|
159
|
+
return (React.createElement(React.Fragment, null, (!isEmpty(versions) || true) && (React.createElement("div", { className: "version-filter-chip" },
|
|
161
160
|
React.createElement("label", { hidden: true, htmlFor: titleId }, t('Open versions dropdown')),
|
|
162
161
|
React.createElement("div", { className: "pf-v6-c-select" },
|
|
163
162
|
React.createElement(Select, { shouldFocusToggleOnSelect: true, shouldPreventScrollOnItemFocus: true, "data-tracking-id": "versions-filter", id: titleId, title: t('Version'), isOpen: isOpen, selected: selectedItems, onSelect: (_e, v) => onSelect(v), onOpenChange: (nextOpen) => setIsOpen(nextOpen), popperProps: { direction: 'down', enableFlip: false }, toggle: toggle, isScrollable: true },
|
|
164
|
-
React.createElement(SelectList, null,
|
|
163
|
+
React.createElement(SelectList, null, dropdownOptions)))))));
|
|
165
164
|
}
|