@leav/ui 1.2.1-11e049ea → 1.2.1-168ca0cd
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/dist/components/Explorer/_types.d.ts +4 -2
- package/dist/components/Explorer/_types.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/_shared/CommonFilterItem.js +21 -6
- package/dist/components/Explorer/manage-view-settings/_shared/CommonFilterItem.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/BooleanAttributeDropdown.js +6 -1
- package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/BooleanAttributeDropdown.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/DateAttributeDropDown.js +5 -2
- package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/DateAttributeDropDown.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/DateRangeAttributeDropDown.js +1 -0
- package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/DateRangeAttributeDropDown.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/TreeAttributeDropDown.js +8 -7
- package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/TreeAttributeDropDown.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/useConditionOptionsByType.d.ts +10 -0
- package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/useConditionOptionsByType.js +2 -2
- package/dist/components/Explorer/manage-view-settings/filter-items/filter-type/useConditionOptionsByType.js.map +1 -1
- package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.d.ts +1 -1
- package/package.json +3 -3
|
@@ -94,6 +94,7 @@ interface IExplorerBaseFilter {
|
|
|
94
94
|
*/
|
|
95
95
|
field: string;
|
|
96
96
|
value: string | null;
|
|
97
|
+
formattedValue?: string | null;
|
|
97
98
|
hidden?: boolean | undefined;
|
|
98
99
|
}
|
|
99
100
|
export interface IExplorerFilterStandard extends IExplorerBaseFilter {
|
|
@@ -110,13 +111,14 @@ export interface IExplorerFilterThrough extends IExplorerBaseFilter {
|
|
|
110
111
|
subCondition: RecordFilterCondition | null;
|
|
111
112
|
subField: string | null;
|
|
112
113
|
}
|
|
113
|
-
export interface IExplorerFilterTree extends Omit<IExplorerBaseFilter, 'value' | 'field'> {
|
|
114
|
+
export interface IExplorerFilterTree extends Omit<IExplorerBaseFilter, 'value' | 'formattedValue' | 'field'> {
|
|
114
115
|
attribute: IExplorerFilterTreeAttribute;
|
|
115
116
|
condition: RecordFilterCondition | null;
|
|
116
117
|
value: string[] | null;
|
|
118
|
+
formattedValue?: string[] | null;
|
|
117
119
|
field: string[];
|
|
118
120
|
}
|
|
119
|
-
export interface IExplorerFilterValueList extends Omit<IExplorerBaseFilter, 'value'> {
|
|
121
|
+
export interface IExplorerFilterValueList extends Omit<IExplorerBaseFilter, 'value' | 'formattedValue'> {
|
|
120
122
|
attribute: (IExplorerFilterStandardAttribute | IExplorerFilterLinkAttribute) & {
|
|
121
123
|
valuesList: NonNullable<StandardAttributeDetailsFragment['valuesList']> | NonNullable<LinkAttributeDetailsFragment['valuesList']>;
|
|
122
124
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_types.js","sourceRoot":"","sources":["../../../src/components/Explorer/_types.ts"],"names":[],"mappings":"AAIA,OAAO,EAGH,aAAa,EAQhB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAC,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"_types.js","sourceRoot":"","sources":["../../../src/components/Explorer/_types.ts"],"names":[],"mappings":"AAIA,OAAO,EAGH,aAAa,EAQhB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAC,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AAmKxD,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,MAAsB,EAAqC,EAAE,CAClG,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAEnF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,MAAsB,EAAiC,EAAE,CAC1F,CAAC,aAAa,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;IACxF,MAAM,CAAC,SAAS,KAAK,sBAAsB,CAAC,OAAO,CAAC;AAExD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,MAAsB,EAAoC,EAAE,CAChG,CAAC,aAAa,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;IACxF,MAAM,CAAC,SAAS,KAAK,sBAAsB,CAAC,OAAO,CAAC;AAExD,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,MAAsB,EAAsC,EAAE,CACpG,CAAC,wBAAwB,CAAC,MAAM,CAAC,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,qCAAqC,GAAG,CACjD,MAAsB,EACoB,EAAE,CAC5C,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;AAE1G,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,MAAsB,EAA0C,EAAE,CAChH,CAAC,aAAa,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;AAEpH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,MAAsB,EAAiC,EAAE,CAC1F,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI,CAAC;AAEjD,MAAM,WAAW,GAAG,CAAC,MAAsB,EAAyE,EAAE,CAClH,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,IAAI,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC"}
|
|
@@ -2,18 +2,33 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
2
2
|
import { FilterDropDown } from '../filter-items/filter-type/FilterDropDown';
|
|
3
3
|
import styled from 'styled-components';
|
|
4
4
|
import { KitFilter } from 'aristid-ds';
|
|
5
|
+
import { isExplorerFilterStandard, isExplorerFilterTree } from '../../_types';
|
|
5
6
|
import { nullValueConditions } from '../../conditionsHelper';
|
|
7
|
+
import { AttributeFormat } from '../../../../_gqlTypes';
|
|
8
|
+
import { useTranslation } from 'react-i18next';
|
|
9
|
+
import { getAttributeConditionOptions } from '../filter-items/filter-type/useConditionOptionsByType';
|
|
6
10
|
const FilterStyled = styled(KitFilter) `
|
|
7
11
|
flex: 0 0 auto;
|
|
8
12
|
`;
|
|
9
|
-
const getFilterValues = (filter) => {
|
|
13
|
+
const getFilterValues = (filter, t) => {
|
|
10
14
|
if (filter.condition && nullValueConditions.includes(filter.condition)) {
|
|
11
|
-
|
|
15
|
+
const conditionOption = getAttributeConditionOptions(t).find(option => option.value === filter.condition);
|
|
16
|
+
return [conditionOption?.label ?? ''];
|
|
17
|
+
}
|
|
18
|
+
if (isExplorerFilterTree(filter)) {
|
|
19
|
+
return filter.formattedValue ?? [];
|
|
20
|
+
}
|
|
21
|
+
if (isExplorerFilterStandard(filter) &&
|
|
22
|
+
[AttributeFormat.date, AttributeFormat.boolean].includes(filter.attribute.format)) {
|
|
23
|
+
return filter.formattedValue ? [filter.formattedValue] : [];
|
|
12
24
|
}
|
|
13
25
|
return Array.isArray(filter.value) ? filter.value : filter.value ? [filter.value] : [];
|
|
14
26
|
};
|
|
15
|
-
export const CommonFilterItem = ({ filter, disabled }) =>
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
27
|
+
export const CommonFilterItem = ({ filter, disabled }) => {
|
|
28
|
+
const { t } = useTranslation();
|
|
29
|
+
return (_jsx(FilterStyled, { expandable: true, disabled: disabled, label: filter.attribute.label, values: getFilterValues(filter, t), dropDownProps: {
|
|
30
|
+
placement: 'bottomLeft',
|
|
31
|
+
dropdownRender: () => _jsx(FilterDropDown, { filter: filter })
|
|
32
|
+
} }));
|
|
33
|
+
};
|
|
19
34
|
//# sourceMappingURL=CommonFilterItem.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonFilterItem.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/_shared/CommonFilterItem.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAC,cAAc,EAAC,MAAM,4CAA4C,CAAC;AAC1E,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"CommonFilterItem.js","sourceRoot":"","sources":["../../../../../src/components/Explorer/manage-view-settings/_shared/CommonFilterItem.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAC,cAAc,EAAC,MAAM,4CAA4C,CAAC;AAC1E,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,wBAAwB,EAAE,oBAAoB,EAAsB,MAAM,cAAc,CAAC;AACjG,OAAO,EAAC,mBAAmB,EAAC,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAC,4BAA4B,EAAC,MAAM,uDAAuD,CAAC;AAGnG,MAAM,YAAY,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;;CAErC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,MAAsB,EAAE,CAAY,EAAE,EAAE;IAC7D,IAAI,MAAM,CAAC,SAAS,IAAI,mBAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QACrE,MAAM,eAAe,GAAG,4BAA4B,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1G,OAAO,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;IACvC,CAAC;IAED,IACI,wBAAwB,CAAC,MAAM,CAAC;QAChC,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EACnF,CAAC;QACC,OAAO,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,CAAC;IAED,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC3F,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAoE,CAAC,EAC9F,MAAM,EACN,QAAQ,EACX,EAAE,EAAE;IACD,MAAM,EAAC,CAAC,EAAC,GAAG,cAAc,EAAE,CAAC;IAE7B,OAAO,CACH,KAAC,YAAY,IACT,UAAU,QACV,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,KAAK,EAC7B,MAAM,EAAE,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,EAClC,aAAa,EAAE;YACX,SAAS,EAAE,YAAY;YACvB,cAAc,EAAE,GAAG,EAAE,CAAC,KAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI;SAC3D,GACH,CACL,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -5,7 +5,12 @@ import { useSharedTranslation } from '../../../../../hooks/useSharedTranslation'
|
|
|
5
5
|
export const BooleanAttributeDropDown = ({ filter, onFilterChange, selectDropDownRef }) => {
|
|
6
6
|
const { t } = useSharedTranslation();
|
|
7
7
|
const _onSelectionChanged = value => {
|
|
8
|
-
onFilterChange({
|
|
8
|
+
onFilterChange({
|
|
9
|
+
...filter,
|
|
10
|
+
condition: AttributeConditionFilter.EQUAL,
|
|
11
|
+
value,
|
|
12
|
+
formattedValue: value === 'true' ? t('explorer.true') : t('explorer.false')
|
|
13
|
+
});
|
|
9
14
|
};
|
|
10
15
|
const valuesOptions = [
|
|
11
16
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BooleanAttributeDropdown.js","sourceRoot":"","sources":["../../../../../../src/components/Explorer/manage-view-settings/filter-items/filter-type/BooleanAttributeDropdown.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,wBAAwB,EAAC,MAAM,WAAW,CAAC;AACnD,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAGpE,MAAM,CAAC,MAAM,wBAAwB,GAAoD,CAAC,EACtF,MAAM,EACN,cAAc,EACd,iBAAiB,EACpB,EAAE,EAAE;IACD,MAAM,EAAC,CAAC,EAAC,GAAG,oBAAoB,EAAE,CAAC;IACnC,MAAM,mBAAmB,GAAiD,KAAK,CAAC,EAAE;QAC9E,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"BooleanAttributeDropdown.js","sourceRoot":"","sources":["../../../../../../src/components/Explorer/manage-view-settings/filter-items/filter-type/BooleanAttributeDropdown.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,wBAAwB,EAAC,MAAM,WAAW,CAAC;AACnD,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAGpE,MAAM,CAAC,MAAM,wBAAwB,GAAoD,CAAC,EACtF,MAAM,EACN,cAAc,EACd,iBAAiB,EACpB,EAAE,EAAE;IACD,MAAM,EAAC,CAAC,EAAC,GAAG,oBAAoB,EAAE,CAAC;IACnC,MAAM,mBAAmB,GAAiD,KAAK,CAAC,EAAE;QAC9E,cAAc,CAAC;YACX,GAAG,MAAM;YACT,SAAS,EAAE,wBAAwB,CAAC,KAAK;YACzC,KAAK;YACL,cAAc,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;SAC9E,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG;QAClB;YACI,KAAK,EAAE,CAAC,CAAC,eAAe,CAAC;YACzB,KAAK,EAAE,MAAM;SAChB;QACD;YACI,KAAK,EAAE,CAAC,CAAC,gBAAgB,CAAC;YAC1B,KAAK,EAAE,OAAO;SACjB;KACJ,CAAC;IAEF,OAAO,CACH,KAAC,SAAS,IACN,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,CAAC,KAAK,EACnB,iBAAiB,EAAE,GAAG,EAAE,CAAC,iBAAiB,EAAE,OAAO,IAAI,QAAQ,CAAC,IAAI,EACpE,WAAW,EAAE,CAAC,CAAC,eAAe,CAAC,GACjC,CACL,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -41,20 +41,23 @@ export const DateAttributeDropDown = ({ filter, onFilterChange, selectDropDownRe
|
|
|
41
41
|
const _onDateChanged = date => {
|
|
42
42
|
onFilterChange({
|
|
43
43
|
...filter,
|
|
44
|
-
value: date ? String(date.unix()) : null
|
|
44
|
+
value: date ? String(date.unix()) : null,
|
|
45
|
+
formattedValue: date ? date.format('YYYY-MM-DD') : null //TODO: Date format should come from the backend (will be adress in a later ticket)
|
|
45
46
|
});
|
|
46
47
|
};
|
|
47
48
|
const _onDateRangeChanged = dates => {
|
|
48
49
|
let value = null;
|
|
50
|
+
let formattedValue = null;
|
|
49
51
|
if (dates && dates.length === 2) {
|
|
50
52
|
let [dateFrom, dateTo] = dates;
|
|
51
53
|
if (dateFrom && dateTo) {
|
|
52
54
|
dateFrom = dateFrom.startOf('day');
|
|
53
55
|
dateTo = dateTo.endOf('day');
|
|
54
56
|
value = dateFrom.unix() + dateValuesSeparator + dateTo.unix();
|
|
57
|
+
formattedValue = dateFrom.format('YYYY-MM-DD') + ' -> ' + dateTo.format('YYYY-MM-DD'); //TODO: Date format should come from the backend (will be adress in a later ticket)
|
|
55
58
|
}
|
|
56
59
|
}
|
|
57
|
-
onFilterChange({ ...filter, value });
|
|
60
|
+
onFilterChange({ ...filter, value, formattedValue });
|
|
58
61
|
};
|
|
59
62
|
const showDatePicker = filter.condition && !nullValueConditions.includes(filter.condition);
|
|
60
63
|
const getDateRangeValue = (dates) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateAttributeDropDown.js","sourceRoot":"","sources":["../../../../../../src/components/Explorer/manage-view-settings/filter-items/filter-type/DateAttributeDropDown.tsx"],"names":[],"mappings":";AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAA8C,MAAM,EAAC,MAAM,OAAO,CAAC;AAC1E,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAC,aAAa,EAAE,SAAS,EAAC,MAAM,YAAY,CAAC;AACpD,OAAO,EAAC,wBAAwB,EAAC,MAAM,WAAW,CAAC;AAEnD,OAAO,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAC,mBAAmB,EAAC,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAC,0BAA0B,EAAC,MAAM,6BAA6B,CAAC;AAEvE,MAAM,4BAA4B,GAAG,MAAM,CAAC,GAAG,CAAA;;;;CAI9C,CAAC;AAEF,MAAM,oCAAoC,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;;CAQtD,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAoD,CAAC,EACnF,MAAM,EACN,cAAc,EACd,iBAAiB,EACpB,EAAE,EAAE;IACD,MAAM,aAAa,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IAEnD,MAAM,EAAC,sBAAsB,EAAC,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC;IAEpE,MAAM,mBAAmB,GAAiD,SAAS,CAAC,EAAE;QAClF,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QAChE,MAAM,UAAU,GACZ,mBAAmB,CAAC,QAAQ,CAAC,SAAS,CAAC;YACvC,CAAC,CAAC,WAAW,IAAI,SAAS,KAAK,wBAAwB,CAAC,OAAO,CAAC;YAChE,CAAC,WAAW,IAAI,SAAS,KAAK,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAEpE,cAAc,CAAC;YACX,GAAG,MAAM;YACT,SAAS;YACT,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK;SAC1C,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,MAAM,cAAc,GAAqD,IAAI,CAAC,EAAE;QAC5E,cAAc,CAAC;YACX,GAAG,MAAM;YACT,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"DateAttributeDropDown.js","sourceRoot":"","sources":["../../../../../../src/components/Explorer/manage-view-settings/filter-items/filter-type/DateAttributeDropDown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { useConditionsOptionsByType } from './useConditionOptionsByType';
|
|
|
5
5
|
export const DateRangeAttributeDropDown = ({ filter, onFilterChange, selectDropDownRef }) => {
|
|
6
6
|
const { t } = useSharedTranslation();
|
|
7
7
|
const { conditionOptionsByType } = useConditionsOptionsByType(filter);
|
|
8
|
+
// TODO: When fully implemented, we will need to handle the formatted value (Like in DateAttributeDropDown)
|
|
8
9
|
const _onConditionChanged = condition => onFilterChange({ ...filter, condition });
|
|
9
10
|
return (_jsx(KitSelect, { options: conditionOptionsByType, onChange: _onConditionChanged, value: filter.condition, getPopupContainer: () => selectDropDownRef?.current ?? document.body, placeholder: t('explorer.select-condition') }));
|
|
10
11
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateRangeAttributeDropDown.js","sourceRoot":"","sources":["../../../../../../src/components/Explorer/manage-view-settings/filter-items/filter-type/DateRangeAttributeDropDown.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAC,0BAA0B,EAAC,MAAM,6BAA6B,CAAC;AAEvE,MAAM,CAAC,MAAM,0BAA0B,GAAoD,CAAC,EACxF,MAAM,EACN,cAAc,EACd,iBAAiB,EACpB,EAAE,EAAE;IACD,MAAM,EAAC,CAAC,EAAC,GAAG,oBAAoB,EAAE,CAAC;IAEnC,MAAM,EAAC,sBAAsB,EAAC,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC;IAEpE,MAAM,mBAAmB,GAAiD,SAAS,CAAC,EAAE,CAClF,cAAc,CAAC,EAAC,GAAG,MAAM,EAAE,SAAS,EAAC,CAAC,CAAC;IAE3C,OAAO,CACH,KAAC,SAAS,IACN,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,CAAC,SAAS,EACvB,iBAAiB,EAAE,GAAG,EAAE,CAAC,iBAAiB,EAAE,OAAO,IAAI,QAAQ,CAAC,IAAI,EACpE,WAAW,EAAE,CAAC,CAAC,2BAA2B,CAAC,GAC7C,CACL,CAAC;AACN,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"DateRangeAttributeDropDown.js","sourceRoot":"","sources":["../../../../../../src/components/Explorer/manage-view-settings/filter-items/filter-type/DateRangeAttributeDropDown.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAC,0BAA0B,EAAC,MAAM,6BAA6B,CAAC;AAEvE,MAAM,CAAC,MAAM,0BAA0B,GAAoD,CAAC,EACxF,MAAM,EACN,cAAc,EACd,iBAAiB,EACpB,EAAE,EAAE;IACD,MAAM,EAAC,CAAC,EAAC,GAAG,oBAAoB,EAAE,CAAC;IAEnC,MAAM,EAAC,sBAAsB,EAAC,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC;IAEpE,2GAA2G;IAC3G,MAAM,mBAAmB,GAAiD,SAAS,CAAC,EAAE,CAClF,cAAc,CAAC,EAAC,GAAG,MAAM,EAAE,SAAS,EAAC,CAAC,CAAC;IAE3C,OAAO,CACH,KAAC,SAAS,IACN,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,CAAC,SAAS,EACvB,iBAAiB,EAAE,GAAG,EAAE,CAAC,iBAAiB,EAAE,OAAO,IAAI,QAAQ,CAAC,IAAI,EACpE,WAAW,EAAE,CAAC,CAAC,2BAA2B,CAAC,GAC7C,CACL,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -34,15 +34,15 @@ export const TreeAttributeDropDown = ({ filter, onFilterChange, selectDropDownRe
|
|
|
34
34
|
setSelectedNode([]);
|
|
35
35
|
}
|
|
36
36
|
}, [filter]);
|
|
37
|
-
const
|
|
38
|
-
const
|
|
37
|
+
const _getRecursiveChildrenRecord = (nodes) => {
|
|
38
|
+
const records = [];
|
|
39
39
|
const collectRecordIdsRecursively = (nodeList) => {
|
|
40
40
|
for (const node of nodeList) {
|
|
41
41
|
if (node.id === filter.attribute.linkedTree?.id) {
|
|
42
42
|
continue;
|
|
43
43
|
}
|
|
44
|
-
if (node.record
|
|
45
|
-
|
|
44
|
+
if (node.record) {
|
|
45
|
+
records.push(node.record);
|
|
46
46
|
}
|
|
47
47
|
if (node.children && node.children.length > 0) {
|
|
48
48
|
collectRecordIdsRecursively(node.children);
|
|
@@ -51,18 +51,19 @@ export const TreeAttributeDropDown = ({ filter, onFilterChange, selectDropDownRe
|
|
|
51
51
|
};
|
|
52
52
|
collectRecordIdsRecursively(nodes);
|
|
53
53
|
// Delete duplicates
|
|
54
|
-
return Array.from(new Set(
|
|
54
|
+
return Array.from(new Set(records));
|
|
55
55
|
};
|
|
56
56
|
const _getRecursiveFieldsFromLibraries = (nodes) => nodes
|
|
57
57
|
.filter(node => !!node.record?.whoAmI?.library?.id)
|
|
58
58
|
.map(node => `${filter.attribute.id}.${node.record?.whoAmI?.library?.id}.id`);
|
|
59
59
|
const _handleOnCheck = (selection) => {
|
|
60
60
|
setSelectedNode(selection.filter(node => !node?.disabled));
|
|
61
|
-
const
|
|
61
|
+
const records = _getRecursiveChildrenRecord(selection);
|
|
62
62
|
const fields = _getRecursiveFieldsFromLibraries(selection);
|
|
63
63
|
onFilterChange({
|
|
64
64
|
...filter,
|
|
65
|
-
value:
|
|
65
|
+
value: records.map(record => record.id),
|
|
66
|
+
formattedValue: records.map(record => record.whoAmI.label).filter(Boolean),
|
|
66
67
|
condition: filter.condition ?? RecordFilterCondition.EQUAL,
|
|
67
68
|
field: fields
|
|
68
69
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TreeAttributeDropDown.js","sourceRoot":"","sources":["../../../../../../src/components/Explorer/manage-view-settings/filter-items/filter-type/TreeAttributeDropDown.tsx"],"names":[],"mappings":";AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAA8C,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvF,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AACrC,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAC,wBAAwB,
|
|
1
|
+
{"version":3,"file":"TreeAttributeDropDown.js","sourceRoot":"","sources":["../../../../../../src/components/Explorer/manage-view-settings/filter-items/filter-type/TreeAttributeDropDown.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,19 @@
|
|
|
1
1
|
import { AttributeFormat, type RecordFilterCondition } from '../../../../../_gqlTypes';
|
|
2
2
|
import { type ExplorerFilter } from '../../../_types';
|
|
3
3
|
import { type AttributeConditionType, type ThroughConditionFilter } from '../../../../../types';
|
|
4
|
+
import { type TFunction } from 'i18next';
|
|
4
5
|
export declare const conditionsByFormat: Record<AttributeFormat, RecordFilterCondition[]>;
|
|
5
6
|
export declare const linkFilterConditions: Array<RecordFilterCondition | ThroughConditionFilter>;
|
|
6
7
|
export declare const treeFilterConditions: RecordFilterCondition[];
|
|
7
8
|
export declare const valueListTextConditions: RecordFilterCondition[];
|
|
9
|
+
interface IExplorerFilterConditionOption<T> {
|
|
10
|
+
label: string;
|
|
11
|
+
value: T;
|
|
12
|
+
textByFormat?: {
|
|
13
|
+
[key in AttributeFormat]?: string;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
export declare const getAttributeConditionOptions: (t: TFunction) => Array<IExplorerFilterConditionOption<AttributeConditionType>>;
|
|
8
17
|
export declare const getFirstConditionByFilterType: (filter: ExplorerFilter) => Array<RecordFilterCondition | ThroughConditionFilter>;
|
|
9
18
|
export declare const useConditionsOptionsByType: (filter: ExplorerFilter) => {
|
|
10
19
|
conditionOptionsByType: {
|
|
@@ -13,3 +22,4 @@ export declare const useConditionsOptionsByType: (filter: ExplorerFilter) => {
|
|
|
13
22
|
textByFormat?: { [key in AttributeFormat]?: string; };
|
|
14
23
|
}[];
|
|
15
24
|
};
|
|
25
|
+
export {};
|
|
@@ -67,7 +67,7 @@ export const valueListTextConditions = [
|
|
|
67
67
|
// disable NOT_EQUAL for now because of backend condition filter issue
|
|
68
68
|
// AttributeConditionFilter.NOT_EQUAL
|
|
69
69
|
];
|
|
70
|
-
const
|
|
70
|
+
export const getAttributeConditionOptions = (t) => [
|
|
71
71
|
{ label: t('filters.contains'), value: AttributeConditionFilter.CONTAINS },
|
|
72
72
|
{ label: t('filters.not-contains'), value: AttributeConditionFilter.NOT_CONTAINS },
|
|
73
73
|
{ label: t('filters.equal'), value: AttributeConditionFilter.EQUAL },
|
|
@@ -124,7 +124,7 @@ export const getFirstConditionByFilterType = (filter) => {
|
|
|
124
124
|
export const useConditionsOptionsByType = (filter) => {
|
|
125
125
|
const { t } = useSharedTranslation();
|
|
126
126
|
return {
|
|
127
|
-
conditionOptionsByType:
|
|
127
|
+
conditionOptionsByType: getAttributeConditionOptions(t)
|
|
128
128
|
.filter(({ value }) => {
|
|
129
129
|
// Use special condition set for text fields with closed list values
|
|
130
130
|
if (isExplorerFilterValueList(filter)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useConditionOptionsByType.js","sourceRoot":"","sources":["../../../../../../src/components/Explorer/manage-view-settings/filter-items/filter-type/useConditionOptionsByType.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,sCAAsC;AACtC,sEAAsE;AACtE,OAAO,EAAC,eAAe,EAA6B,MAAM,eAAe,CAAC;AAC1E,OAAO,EAEH,oBAAoB,EACpB,wBAAwB,EACxB,uBAAuB,EACvB,oBAAoB,EACpB,yBAAyB,EAC5B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,wBAAwB,EAA2D,MAAM,WAAW,CAAC;AAE7G,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAEpE,MAAM,CAAC,MAAM,kBAAkB,GAAqD;IAChF,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;QACpB,wBAAwB,CAAC,QAAQ;QACjC,wBAAwB,CAAC,YAAY;QACrC,wBAAwB,CAAC,KAAK;QAC9B,wBAAwB,CAAC,SAAS;QAClC,wBAAwB,CAAC,UAAU;QACnC,wBAAwB,CAAC,QAAQ;QACjC,wBAAwB,CAAC,QAAQ;QACjC,wBAAwB,CAAC,YAAY;KACxC;IACD,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;QACzB,wBAAwB,CAAC,QAAQ;QACjC,wBAAwB,CAAC,YAAY;QACrC,wBAAwB,CAAC,QAAQ;QACjC,wBAAwB,CAAC,YAAY;KACxC;IACD,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,EAAE;IAC7B,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;QACpB,wBAAwB,CAAC,KAAK;QAC9B,wBAAwB,CAAC,SAAS;QAClC,wBAAwB,CAAC,YAAY;QACrC,wBAAwB,CAAC,SAAS;QAClC,wBAAwB,CAAC,QAAQ;QACjC,wBAAwB,CAAC,YAAY;QACrC,wBAAwB,CAAC,KAAK;QAC9B,wBAAwB,CAAC,QAAQ;QACjC,wBAAwB,CAAC,SAAS;QAClC,wBAAwB,CAAC,UAAU;QACnC,wBAAwB,CAAC,UAAU;QACnC,wBAAwB,CAAC,OAAO;KACnC;IACD,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC,wBAAwB,CAAC,QAAQ,EAAE,wBAAwB,CAAC,YAAY,CAAC;IACxG,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,wBAAwB,CAAC,QAAQ,EAAE,wBAAwB,CAAC,YAAY,CAAC;IACvG,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,wBAAwB,CAAC,QAAQ,EAAE,wBAAwB,CAAC,YAAY,CAAC;IACtG,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC,QAAQ,EAAE,wBAAwB,CAAC,YAAY,CAAC;IACnG,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACvB,wBAAwB,CAAC,KAAK;QAC9B,wBAAwB,CAAC,SAAS;QAClC,wBAAwB,CAAC,QAAQ;QACjC,wBAAwB,CAAC,YAAY;QACrC,wBAAwB,CAAC,SAAS;QAClC,wBAAwB,CAAC,YAAY;KACxC;CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAA0D;IACvF,sEAAsE;IACtE,GAAG,kBAAkB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,wBAAwB,CAAC,SAAS,CAAC;IACjG,wBAAwB,CAAC,OAAO;CACnC,CAAC;AACF,MAAM,CAAC,MAAM,oBAAoB,GAA4B;IACzD,wBAAwB,CAAC,KAAK;IAC9B,wBAAwB,CAAC,QAAQ;IACjC,wBAAwB,CAAC,YAAY;IACrC,sEAAsE;IACtE,qCAAqC;CACxC,CAAC;AACF,MAAM,CAAC,MAAM,uBAAuB,GAA4B;IAC5D,wBAAwB,CAAC,KAAK;IAC9B,sEAAsE;IACtE,qCAAqC;CACxC,CAAC;AAQF,MAAM,
|
|
1
|
+
{"version":3,"file":"useConditionOptionsByType.js","sourceRoot":"","sources":["../../../../../../src/components/Explorer/manage-view-settings/filter-items/filter-type/useConditionOptionsByType.ts"],"names":[],"mappings":"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"}
|
package/dist/components/Explorer/manage-view-settings/store-view-settings/viewSettingsReducer.d.ts
CHANGED
|
@@ -43,7 +43,7 @@ export interface IViewSettingsState {
|
|
|
43
43
|
}>;
|
|
44
44
|
pageSize: number;
|
|
45
45
|
filtersOperator: 'AND' | 'OR';
|
|
46
|
-
filters: ExplorerFilter[];
|
|
46
|
+
filters: ExplorerFilter[] | IExplorerFilterTree[];
|
|
47
47
|
initialViewSettings: Pick<IViewSettingsState, 'viewType' | 'attributesIds' | 'sort' | 'pageSize' | 'filters'>;
|
|
48
48
|
defaultViewSettings: DefaultViewSettings;
|
|
49
49
|
massSelection: MassSelection;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@leav/ui",
|
|
3
|
-
"version": "1.2.1-
|
|
3
|
+
"version": "1.2.1-168ca0cd",
|
|
4
4
|
"description": "Shared React components and hooks",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"prepublishOnly": "yarn build",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"@types/react-table": "7.7.12",
|
|
46
46
|
"@types/uuid": "^9",
|
|
47
47
|
"antd": "5.22.2",
|
|
48
|
-
"aristid-ds": "14.0.0-
|
|
48
|
+
"aristid-ds": "14.0.0-68500ac",
|
|
49
49
|
"babel-jest": "29.3.1",
|
|
50
50
|
"commander": "9.5.0",
|
|
51
51
|
"graphql": "16.6.0",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"@ant-design/icons": ">=5.2",
|
|
68
68
|
"@apollo/client": ">=3.8.1",
|
|
69
69
|
"antd": "5.22.2",
|
|
70
|
-
"aristid-ds": "14.0.0-
|
|
70
|
+
"aristid-ds": "14.0.0-68500ac",
|
|
71
71
|
"dayjs": "^1.11.13",
|
|
72
72
|
"i18next": "22.5",
|
|
73
73
|
"react": "18.2.0",
|