@reltio/components 1.4.1936 → 1.4.1937
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/cjs/AttributesFiltersBuilder/AttributesFiltersBuilder.d.ts +4 -3
- package/cjs/AttributesFiltersBuilder/AttributesFiltersBuilder.js +2 -2
- package/cjs/AttributesFiltersBuilder/helpers.d.ts +1 -1
- package/cjs/AttributesFiltersBuilder/helpers.js +5 -2
- package/cjs/AttributesFiltersButton/AttributesFiltersButton.d.ts +4 -3
- package/cjs/AttributesFiltersButton/AttributesFiltersButton.js +2 -2
- package/cjs/HOCs/withFilter/components/ColumnFilter/ColumnFilter.js +2 -2
- package/cjs/features/activity-log/hooks/useProfileActivitiesLoader.js +10 -2
- package/esm/AttributesFiltersBuilder/AttributesFiltersBuilder.d.ts +4 -3
- package/esm/AttributesFiltersBuilder/AttributesFiltersBuilder.js +2 -2
- package/esm/AttributesFiltersBuilder/helpers.d.ts +1 -1
- package/esm/AttributesFiltersBuilder/helpers.js +5 -2
- package/esm/AttributesFiltersButton/AttributesFiltersButton.d.ts +4 -3
- package/esm/AttributesFiltersButton/AttributesFiltersButton.js +2 -2
- package/esm/HOCs/withFilter/components/ColumnFilter/ColumnFilter.js +2 -2
- package/esm/features/activity-log/hooks/useProfileActivitiesLoader.js +11 -3
- package/package.json +2 -2
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { SearchFilter } from '@reltio/mdm-sdk';
|
|
3
|
-
import { AttributeSelectionInfo, AttributesFilterComponentsClasses, AttributesTypesGroup } from '../types';
|
|
2
|
+
import { Metadata, SearchFilter } from '@reltio/mdm-sdk';
|
|
3
|
+
import { AttributeSelectionInfo, AttributeSelectorItemsGroup, AttributesFilterComponentsClasses, AttributesTypesGroup } from '../types';
|
|
4
4
|
type Props = {
|
|
5
5
|
classes?: AttributesFilterComponentsClasses;
|
|
6
6
|
filters: SearchFilter[];
|
|
7
7
|
onChange: (filters: SearchFilter[]) => void;
|
|
8
8
|
attributesTypesGroups: AttributesTypesGroup[];
|
|
9
|
+
attributesTypesGroupFilter?: (metadata: Metadata, attributeSelectorItemsGroup: AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[];
|
|
9
10
|
components?: {
|
|
10
11
|
ValuesEditor?: React.ElementType;
|
|
11
12
|
FilterSelector?: React.ElementType;
|
|
@@ -13,5 +14,5 @@ type Props = {
|
|
|
13
14
|
};
|
|
14
15
|
onFilterAttributeChange?: (attrSelectInfo: AttributeSelectionInfo) => void;
|
|
15
16
|
};
|
|
16
|
-
declare const _default: React.MemoExoticComponent<({ classes, attributesTypesGroups, filters, onChange, components, onFilterAttributeChange }: Props) => JSX.Element>;
|
|
17
|
+
declare const _default: React.MemoExoticComponent<({ classes, attributesTypesGroups, attributesTypesGroupFilter, filters, onChange, components, onFilterAttributeChange }: Props) => JSX.Element>;
|
|
17
18
|
export default _default;
|
|
@@ -57,7 +57,7 @@ var AttributesValuesEditor_1 = require("../AttributesValuesEditor");
|
|
|
57
57
|
var styles_1 = require("./styles");
|
|
58
58
|
var EMPTY_FILTER = { fieldName: null, filter: null, operator: mdm_sdk_1.SearchOperator.and, values: [] };
|
|
59
59
|
var AttributesFiltersBuilder = function (_a) {
|
|
60
|
-
var _b = _a.classes, classes = _b === void 0 ? {} : _b, attributesTypesGroups = _a.attributesTypesGroups, filters = _a.filters, onChange = _a.onChange, _c = _a.components, components = _c === void 0 ? {} : _c, onFilterAttributeChange = _a.onFilterAttributeChange;
|
|
60
|
+
var _b = _a.classes, classes = _b === void 0 ? {} : _b, attributesTypesGroups = _a.attributesTypesGroups, attributesTypesGroupFilter = _a.attributesTypesGroupFilter, filters = _a.filters, onChange = _a.onChange, _c = _a.components, components = _c === void 0 ? {} : _c, onFilterAttributeChange = _a.onFilterAttributeChange;
|
|
61
61
|
var _d = components, CustomValuesEditor = _d.ValuesEditor, CustomFilterSelector = _d.FilterSelector, _e = _d.LogicalOperator, LogicalOperator = _e === void 0 ? EmptyStub_1.EmptyStub : _e;
|
|
62
62
|
var styles = (0, styles_1.useStyles)();
|
|
63
63
|
var actualFilters = (0, react_1.useRef)(filters);
|
|
@@ -80,7 +80,7 @@ var AttributesFiltersBuilder = function (_a) {
|
|
|
80
80
|
var closestEntityTypeAncestorUri = (0, mdm_sdk_1.findClosestCommonAncestor)(metadata, entityTypesUris);
|
|
81
81
|
return (0, mdm_sdk_1.getEntityType)(metadata, closestEntityTypeAncestorUri);
|
|
82
82
|
}, [attributesTypesGroups, metadata]);
|
|
83
|
-
var attributeSelectorItemsGroups = (0, react_1.useMemo)(function () { return (0, helpers_1.getAttributeSelectorItems)(attributesTypesGroups,
|
|
83
|
+
var attributeSelectorItemsGroups = (0, react_1.useMemo)(function () { return (0, helpers_1.getAttributeSelectorItems)(metadata, attributesTypesGroups, attributesTypesGroupFilter); }, [attributesTypesGroups, metadata]);
|
|
84
84
|
var rowsData = (0, react_1.useMemo)(function () { return (filters.length ? (0, helpers_1.getRowsDataFromFilters)(filters, attributeSelectorItemsGroups) : []); }, [attributeSelectorItemsGroups, filters]);
|
|
85
85
|
attributesCountRef.current = rowsData.length;
|
|
86
86
|
(0, react_1.useEffect)(function () {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AttributeType, Metadata, SearchFilter } from '@reltio/mdm-sdk';
|
|
2
2
|
import { AttributeSelectorItem, AttributeSelectorItemsGroup, AttributesTypesGroup } from '../types';
|
|
3
3
|
import { FilterOption } from './types';
|
|
4
|
-
export declare const getAttributeSelectorItems: (attributesTypesGroups: AttributesTypesGroup[], metadata: Metadata) => AttributeSelectorItemsGroup[];
|
|
4
|
+
export declare const getAttributeSelectorItems: (metadata: Metadata, attributesTypesGroups: AttributesTypesGroup[], attributesTypesGroupFilter: (metadata: Metadata, attributeSelectorItemsGroup: AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[];
|
|
5
5
|
export declare const findValue: (options: FilterOption[], filter: string) => FilterOption;
|
|
6
6
|
export declare const getRowsDataFromFilters: (filters: SearchFilter[], attributesGroupArr: AttributeSelectorItemsGroup[]) => {
|
|
7
7
|
attribute: AttributeSelectorItem;
|
|
@@ -51,8 +51,8 @@ var createAttributesConfig = function (metadata, attrNode, entityTypeUri, parent
|
|
|
51
51
|
}
|
|
52
52
|
return resConfig;
|
|
53
53
|
};
|
|
54
|
-
var getAttributeSelectorItems = function (attributesTypesGroups,
|
|
55
|
-
|
|
54
|
+
var getAttributeSelectorItems = function (metadata, attributesTypesGroups, attributesTypesGroupFilter) {
|
|
55
|
+
var attributeSelectorItemsGroup = attributesTypesGroups.map(function (_a) {
|
|
56
56
|
var id = _a.id, title = _a.title, attributeTypes = _a.attributeTypes;
|
|
57
57
|
var entityType = (0, mdm_sdk_1.getEntityType)(metadata, (0, exports.getEntityTypeFromAttrTypes)(attributeTypes));
|
|
58
58
|
return {
|
|
@@ -64,6 +64,9 @@ var getAttributeSelectorItems = function (attributesTypesGroups, metadata) {
|
|
|
64
64
|
})
|
|
65
65
|
};
|
|
66
66
|
});
|
|
67
|
+
return attributesTypesGroupFilter
|
|
68
|
+
? attributesTypesGroupFilter(metadata, attributeSelectorItemsGroup)
|
|
69
|
+
: attributeSelectorItemsGroup;
|
|
67
70
|
};
|
|
68
71
|
exports.getAttributeSelectorItems = getAttributeSelectorItems;
|
|
69
72
|
var findAttributeSelectorItem = function (fieldName, attributesGroup) {
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { SearchFilter } from '@reltio/mdm-sdk';
|
|
3
|
-
import { AttributeSelectionInfo, AttributesFilterComponentsClasses, AttributesTypesGroup } from '../types';
|
|
2
|
+
import { Metadata, SearchFilter } from '@reltio/mdm-sdk';
|
|
3
|
+
import { AttributeSelectionInfo, AttributeSelectorItemsGroup, AttributesFilterComponentsClasses, AttributesTypesGroup } from '../types';
|
|
4
4
|
type Props = {
|
|
5
5
|
classes?: AttributesFilterComponentsClasses;
|
|
6
6
|
filters: SearchFilter[];
|
|
7
7
|
onChange: (filters: SearchFilter[]) => void;
|
|
8
8
|
attributesTypesGroups: AttributesTypesGroup[];
|
|
9
|
+
attributesTypesGroupFilter?: (metadata: Metadata, attributeSelectorItemsGroup: AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[];
|
|
9
10
|
components?: {
|
|
10
11
|
ValuesEditor?: React.ElementType;
|
|
11
12
|
FilterSelector?: React.ElementType;
|
|
@@ -20,5 +21,5 @@ type Props = {
|
|
|
20
21
|
onCancel?: () => void;
|
|
21
22
|
onApply?: () => void;
|
|
22
23
|
};
|
|
23
|
-
declare const _default: React.MemoExoticComponent<({ filters: filtersProp, classes, attributesTypesGroups, onChange, components, children, onTogglePopup, isFiltersApplied: isFiltersAppliedProp, dataReltioId, onFilterAttributeChange, onCancel, onClear, onApply }: Props) => JSX.Element>;
|
|
24
|
+
declare const _default: React.MemoExoticComponent<({ filters: filtersProp, classes, attributesTypesGroups, attributesTypesGroupFilter, onChange, components, children, onTogglePopup, isFiltersApplied: isFiltersAppliedProp, dataReltioId, onFilterAttributeChange, onCancel, onClear, onApply }: Props) => JSX.Element>;
|
|
24
25
|
export default _default;
|
|
@@ -39,7 +39,7 @@ var AttributesFiltersBuilder_1 = require("../AttributesFiltersBuilder");
|
|
|
39
39
|
var ActionButtons_1 = require("./components/ActionButtons/");
|
|
40
40
|
var styles_1 = require("./styles");
|
|
41
41
|
var AttributesFiltersButton = function (_a) {
|
|
42
|
-
var filtersProp = _a.filters, classes = _a.classes, attributesTypesGroups = _a.attributesTypesGroups, onChange = _a.onChange, components = _a.components, children = _a.children, onTogglePopup = _a.onTogglePopup, isFiltersAppliedProp = _a.isFiltersApplied, dataReltioId = _a.dataReltioId, onFilterAttributeChange = _a.onFilterAttributeChange, onCancel = _a.onCancel, onClear = _a.onClear, onApply = _a.onApply;
|
|
42
|
+
var filtersProp = _a.filters, classes = _a.classes, attributesTypesGroups = _a.attributesTypesGroups, attributesTypesGroupFilter = _a.attributesTypesGroupFilter, onChange = _a.onChange, components = _a.components, children = _a.children, onTogglePopup = _a.onTogglePopup, isFiltersAppliedProp = _a.isFiltersApplied, dataReltioId = _a.dataReltioId, onFilterAttributeChange = _a.onFilterAttributeChange, onCancel = _a.onCancel, onClear = _a.onClear, onApply = _a.onApply;
|
|
43
43
|
var styles = (0, styles_1.useStyles)();
|
|
44
44
|
var buttonRef = (0, react_1.useRef)();
|
|
45
45
|
var _b = (0, react_1.useState)(false), isOpen = _b[0], setIsOpen = _b[1];
|
|
@@ -87,7 +87,7 @@ var AttributesFiltersButton = function (_a) {
|
|
|
87
87
|
react_1.default.createElement(Typography_1.default, { variant: "h6" }, ui_i18n_1.default.text('Filter')),
|
|
88
88
|
react_1.default.createElement("div", { className: styles.filtersBuilderWrapper },
|
|
89
89
|
children,
|
|
90
|
-
react_1.default.createElement(AttributesFiltersBuilder_1.AttributesFiltersBuilder, { attributesTypesGroups: attributesTypesGroups, filters: filters, onChange: setFilters, components: components, onFilterAttributeChange: onFilterAttributeChange, classes: classes })),
|
|
90
|
+
react_1.default.createElement(AttributesFiltersBuilder_1.AttributesFiltersBuilder, { attributesTypesGroups: attributesTypesGroups, attributesTypesGroupFilter: attributesTypesGroupFilter, filters: filters, onChange: setFilters, components: components, onFilterAttributeChange: onFilterAttributeChange, classes: classes })),
|
|
91
91
|
react_1.default.createElement(Divider_1.default, { className: styles.divider }),
|
|
92
92
|
react_1.default.createElement(ActionButtons_1.ActionButtons, { onApply: applyButtonHandler, onCancel: cancelButtonHandler, onClear: clearAllButtonHandler })))));
|
|
93
93
|
};
|
|
@@ -82,8 +82,8 @@ var ColumnFilter = function (_a) {
|
|
|
82
82
|
var filterOptions = filterOptionValues.map(function (value) { return ({ value: value, label: getFilterLabel(value) }); });
|
|
83
83
|
return (react_1.default.createElement("div", { ref: containerRef, className: styles.columnFilter, "data-reltio-id": "column-filter" },
|
|
84
84
|
filter && (react_1.default.createElement(FilterChip_1.FilterChip, { filterValue: filter.value, filterOption: filterOptions.find((0, ramda_1.propEq)('value', filter.filter)), onDelete: clearFilter, dataTypeDefinition: getFilterDataTypeDefinition(filter.filter) })),
|
|
85
|
-
react_1.default.createElement(IconButton_1.default, { className: styles.dropDownButton, onClick: openFilterPopup, disableFocusRipple: true, size: "large" },
|
|
86
|
-
react_1.default.createElement(ArrowDropDown_1.default, null)),
|
|
85
|
+
!dataTypeDefinition.masking && (react_1.default.createElement(IconButton_1.default, { className: styles.dropDownButton, onClick: openFilterPopup, disableFocusRipple: true, size: "large" },
|
|
86
|
+
react_1.default.createElement(ArrowDropDown_1.default, null))),
|
|
87
87
|
react_1.default.createElement(Popover_1.default, { PaperProps: {
|
|
88
88
|
style: {
|
|
89
89
|
width: "".concat(containerRef.current ? containerRef.current.getBoundingClientRect().width : 0, "px")
|
|
@@ -40,15 +40,23 @@ exports.useProfileActivitiesLoader = void 0;
|
|
|
40
40
|
var react_1 = require("react");
|
|
41
41
|
var mdm_sdk_1 = require("@reltio/mdm-sdk");
|
|
42
42
|
var filters_1 = require("../utils/filters");
|
|
43
|
+
var hooks_1 = require("../../../contexts/MdmModuleContext/hooks");
|
|
43
44
|
var useProfileActivitiesLoader = function (_a) {
|
|
44
45
|
var filter = _a.filter, max = _a.max, offset = _a.offset, entityUri = _a.entityUri;
|
|
46
|
+
var metadata = (0, hooks_1.useMdmMetadata)();
|
|
45
47
|
return (0, react_1.useCallback)(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
|
-
var filterString, data, total;
|
|
48
|
+
var filterString, options, data, total;
|
|
47
49
|
return __generator(this, function (_a) {
|
|
48
50
|
switch (_a.label) {
|
|
49
51
|
case 0:
|
|
50
52
|
filterString = (0, filters_1.buildActivitiesFilterString)(filter);
|
|
51
|
-
|
|
53
|
+
options = (0, mdm_sdk_1.addMetadataSpecificGetProfileActivitiesOptions)(metadata, {
|
|
54
|
+
filter: filterString,
|
|
55
|
+
max: max,
|
|
56
|
+
offset: offset,
|
|
57
|
+
entityUri: entityUri
|
|
58
|
+
});
|
|
59
|
+
return [4 /*yield*/, (0, mdm_sdk_1.getProfileActivities)(options)];
|
|
52
60
|
case 1:
|
|
53
61
|
data = _a.sent();
|
|
54
62
|
return [4 /*yield*/, (0, mdm_sdk_1.getProfileActivitiesTotal)({ filter: filterString, entityUri: entityUri })];
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { SearchFilter } from '@reltio/mdm-sdk';
|
|
3
|
-
import { AttributeSelectionInfo, AttributesFilterComponentsClasses, AttributesTypesGroup } from '../types';
|
|
2
|
+
import { Metadata, SearchFilter } from '@reltio/mdm-sdk';
|
|
3
|
+
import { AttributeSelectionInfo, AttributeSelectorItemsGroup, AttributesFilterComponentsClasses, AttributesTypesGroup } from '../types';
|
|
4
4
|
type Props = {
|
|
5
5
|
classes?: AttributesFilterComponentsClasses;
|
|
6
6
|
filters: SearchFilter[];
|
|
7
7
|
onChange: (filters: SearchFilter[]) => void;
|
|
8
8
|
attributesTypesGroups: AttributesTypesGroup[];
|
|
9
|
+
attributesTypesGroupFilter?: (metadata: Metadata, attributeSelectorItemsGroup: AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[];
|
|
9
10
|
components?: {
|
|
10
11
|
ValuesEditor?: React.ElementType;
|
|
11
12
|
FilterSelector?: React.ElementType;
|
|
@@ -13,5 +14,5 @@ type Props = {
|
|
|
13
14
|
};
|
|
14
15
|
onFilterAttributeChange?: (attrSelectInfo: AttributeSelectionInfo) => void;
|
|
15
16
|
};
|
|
16
|
-
declare const _default: React.MemoExoticComponent<({ classes, attributesTypesGroups, filters, onChange, components, onFilterAttributeChange }: Props) => JSX.Element>;
|
|
17
|
+
declare const _default: React.MemoExoticComponent<({ classes, attributesTypesGroups, attributesTypesGroupFilter, filters, onChange, components, onFilterAttributeChange }: Props) => JSX.Element>;
|
|
17
18
|
export default _default;
|
|
@@ -32,7 +32,7 @@ import { AttributesValuesEditor } from '../AttributesValuesEditor';
|
|
|
32
32
|
import { useStyles } from './styles';
|
|
33
33
|
var EMPTY_FILTER = { fieldName: null, filter: null, operator: SearchOperator.and, values: [] };
|
|
34
34
|
var AttributesFiltersBuilder = function (_a) {
|
|
35
|
-
var _b = _a.classes, classes = _b === void 0 ? {} : _b, attributesTypesGroups = _a.attributesTypesGroups, filters = _a.filters, onChange = _a.onChange, _c = _a.components, components = _c === void 0 ? {} : _c, onFilterAttributeChange = _a.onFilterAttributeChange;
|
|
35
|
+
var _b = _a.classes, classes = _b === void 0 ? {} : _b, attributesTypesGroups = _a.attributesTypesGroups, attributesTypesGroupFilter = _a.attributesTypesGroupFilter, filters = _a.filters, onChange = _a.onChange, _c = _a.components, components = _c === void 0 ? {} : _c, onFilterAttributeChange = _a.onFilterAttributeChange;
|
|
36
36
|
var _d = components, CustomValuesEditor = _d.ValuesEditor, CustomFilterSelector = _d.FilterSelector, _e = _d.LogicalOperator, LogicalOperator = _e === void 0 ? EmptyStub : _e;
|
|
37
37
|
var styles = useStyles();
|
|
38
38
|
var actualFilters = useRef(filters);
|
|
@@ -55,7 +55,7 @@ var AttributesFiltersBuilder = function (_a) {
|
|
|
55
55
|
var closestEntityTypeAncestorUri = findClosestCommonAncestor(metadata, entityTypesUris);
|
|
56
56
|
return getEntityType(metadata, closestEntityTypeAncestorUri);
|
|
57
57
|
}, [attributesTypesGroups, metadata]);
|
|
58
|
-
var attributeSelectorItemsGroups = useMemo(function () { return getAttributeSelectorItems(attributesTypesGroups,
|
|
58
|
+
var attributeSelectorItemsGroups = useMemo(function () { return getAttributeSelectorItems(metadata, attributesTypesGroups, attributesTypesGroupFilter); }, [attributesTypesGroups, metadata]);
|
|
59
59
|
var rowsData = useMemo(function () { return (filters.length ? getRowsDataFromFilters(filters, attributeSelectorItemsGroups) : []); }, [attributeSelectorItemsGroups, filters]);
|
|
60
60
|
attributesCountRef.current = rowsData.length;
|
|
61
61
|
useEffect(function () {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AttributeType, Metadata, SearchFilter } from '@reltio/mdm-sdk';
|
|
2
2
|
import { AttributeSelectorItem, AttributeSelectorItemsGroup, AttributesTypesGroup } from '../types';
|
|
3
3
|
import { FilterOption } from './types';
|
|
4
|
-
export declare const getAttributeSelectorItems: (attributesTypesGroups: AttributesTypesGroup[], metadata: Metadata) => AttributeSelectorItemsGroup[];
|
|
4
|
+
export declare const getAttributeSelectorItems: (metadata: Metadata, attributesTypesGroups: AttributesTypesGroup[], attributesTypesGroupFilter: (metadata: Metadata, attributeSelectorItemsGroup: AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[];
|
|
5
5
|
export declare const findValue: (options: FilterOption[], filter: string) => FilterOption;
|
|
6
6
|
export declare const getRowsDataFromFilters: (filters: SearchFilter[], attributesGroupArr: AttributeSelectorItemsGroup[]) => {
|
|
7
7
|
attribute: AttributeSelectorItem;
|
|
@@ -48,8 +48,8 @@ var createAttributesConfig = function (metadata, attrNode, entityTypeUri, parent
|
|
|
48
48
|
}
|
|
49
49
|
return resConfig;
|
|
50
50
|
};
|
|
51
|
-
export var getAttributeSelectorItems = function (attributesTypesGroups,
|
|
52
|
-
|
|
51
|
+
export var getAttributeSelectorItems = function (metadata, attributesTypesGroups, attributesTypesGroupFilter) {
|
|
52
|
+
var attributeSelectorItemsGroup = attributesTypesGroups.map(function (_a) {
|
|
53
53
|
var id = _a.id, title = _a.title, attributeTypes = _a.attributeTypes;
|
|
54
54
|
var entityType = getEntityType(metadata, getEntityTypeFromAttrTypes(attributeTypes));
|
|
55
55
|
return {
|
|
@@ -61,6 +61,9 @@ export var getAttributeSelectorItems = function (attributesTypesGroups, metadata
|
|
|
61
61
|
})
|
|
62
62
|
};
|
|
63
63
|
});
|
|
64
|
+
return attributesTypesGroupFilter
|
|
65
|
+
? attributesTypesGroupFilter(metadata, attributeSelectorItemsGroup)
|
|
66
|
+
: attributeSelectorItemsGroup;
|
|
64
67
|
};
|
|
65
68
|
var findAttributeSelectorItem = function (fieldName, attributesGroup) {
|
|
66
69
|
var attrGroup;
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { SearchFilter } from '@reltio/mdm-sdk';
|
|
3
|
-
import { AttributeSelectionInfo, AttributesFilterComponentsClasses, AttributesTypesGroup } from '../types';
|
|
2
|
+
import { Metadata, SearchFilter } from '@reltio/mdm-sdk';
|
|
3
|
+
import { AttributeSelectionInfo, AttributeSelectorItemsGroup, AttributesFilterComponentsClasses, AttributesTypesGroup } from '../types';
|
|
4
4
|
type Props = {
|
|
5
5
|
classes?: AttributesFilterComponentsClasses;
|
|
6
6
|
filters: SearchFilter[];
|
|
7
7
|
onChange: (filters: SearchFilter[]) => void;
|
|
8
8
|
attributesTypesGroups: AttributesTypesGroup[];
|
|
9
|
+
attributesTypesGroupFilter?: (metadata: Metadata, attributeSelectorItemsGroup: AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[];
|
|
9
10
|
components?: {
|
|
10
11
|
ValuesEditor?: React.ElementType;
|
|
11
12
|
FilterSelector?: React.ElementType;
|
|
@@ -20,5 +21,5 @@ type Props = {
|
|
|
20
21
|
onCancel?: () => void;
|
|
21
22
|
onApply?: () => void;
|
|
22
23
|
};
|
|
23
|
-
declare const _default: React.MemoExoticComponent<({ filters: filtersProp, classes, attributesTypesGroups, onChange, components, children, onTogglePopup, isFiltersApplied: isFiltersAppliedProp, dataReltioId, onFilterAttributeChange, onCancel, onClear, onApply }: Props) => JSX.Element>;
|
|
24
|
+
declare const _default: React.MemoExoticComponent<({ filters: filtersProp, classes, attributesTypesGroups, attributesTypesGroupFilter, onChange, components, children, onTogglePopup, isFiltersApplied: isFiltersAppliedProp, dataReltioId, onFilterAttributeChange, onCancel, onClear, onApply }: Props) => JSX.Element>;
|
|
24
25
|
export default _default;
|
|
@@ -11,7 +11,7 @@ import { AttributesFiltersBuilder } from '../AttributesFiltersBuilder';
|
|
|
11
11
|
import { ActionButtons } from './components/ActionButtons/';
|
|
12
12
|
import { useStyles } from './styles';
|
|
13
13
|
var AttributesFiltersButton = function (_a) {
|
|
14
|
-
var filtersProp = _a.filters, classes = _a.classes, attributesTypesGroups = _a.attributesTypesGroups, onChange = _a.onChange, components = _a.components, children = _a.children, onTogglePopup = _a.onTogglePopup, isFiltersAppliedProp = _a.isFiltersApplied, dataReltioId = _a.dataReltioId, onFilterAttributeChange = _a.onFilterAttributeChange, onCancel = _a.onCancel, onClear = _a.onClear, onApply = _a.onApply;
|
|
14
|
+
var filtersProp = _a.filters, classes = _a.classes, attributesTypesGroups = _a.attributesTypesGroups, attributesTypesGroupFilter = _a.attributesTypesGroupFilter, onChange = _a.onChange, components = _a.components, children = _a.children, onTogglePopup = _a.onTogglePopup, isFiltersAppliedProp = _a.isFiltersApplied, dataReltioId = _a.dataReltioId, onFilterAttributeChange = _a.onFilterAttributeChange, onCancel = _a.onCancel, onClear = _a.onClear, onApply = _a.onApply;
|
|
15
15
|
var styles = useStyles();
|
|
16
16
|
var buttonRef = useRef();
|
|
17
17
|
var _b = useState(false), isOpen = _b[0], setIsOpen = _b[1];
|
|
@@ -59,7 +59,7 @@ var AttributesFiltersButton = function (_a) {
|
|
|
59
59
|
React.createElement(Typography, { variant: "h6" }, i18n.text('Filter')),
|
|
60
60
|
React.createElement("div", { className: styles.filtersBuilderWrapper },
|
|
61
61
|
children,
|
|
62
|
-
React.createElement(AttributesFiltersBuilder, { attributesTypesGroups: attributesTypesGroups, filters: filters, onChange: setFilters, components: components, onFilterAttributeChange: onFilterAttributeChange, classes: classes })),
|
|
62
|
+
React.createElement(AttributesFiltersBuilder, { attributesTypesGroups: attributesTypesGroups, attributesTypesGroupFilter: attributesTypesGroupFilter, filters: filters, onChange: setFilters, components: components, onFilterAttributeChange: onFilterAttributeChange, classes: classes })),
|
|
63
63
|
React.createElement(Divider, { className: styles.divider }),
|
|
64
64
|
React.createElement(ActionButtons, { onApply: applyButtonHandler, onCancel: cancelButtonHandler, onClear: clearAllButtonHandler })))));
|
|
65
65
|
};
|
|
@@ -53,8 +53,8 @@ export var ColumnFilter = function (_a) {
|
|
|
53
53
|
var filterOptions = filterOptionValues.map(function (value) { return ({ value: value, label: getFilterLabel(value) }); });
|
|
54
54
|
return (React.createElement("div", { ref: containerRef, className: styles.columnFilter, "data-reltio-id": "column-filter" },
|
|
55
55
|
filter && (React.createElement(FilterChip, { filterValue: filter.value, filterOption: filterOptions.find(propEq('value', filter.filter)), onDelete: clearFilter, dataTypeDefinition: getFilterDataTypeDefinition(filter.filter) })),
|
|
56
|
-
React.createElement(IconButton, { className: styles.dropDownButton, onClick: openFilterPopup, disableFocusRipple: true, size: "large" },
|
|
57
|
-
React.createElement(ArrowDropDownIcon, null)),
|
|
56
|
+
!dataTypeDefinition.masking && (React.createElement(IconButton, { className: styles.dropDownButton, onClick: openFilterPopup, disableFocusRipple: true, size: "large" },
|
|
57
|
+
React.createElement(ArrowDropDownIcon, null))),
|
|
58
58
|
React.createElement(Popover, { PaperProps: {
|
|
59
59
|
style: {
|
|
60
60
|
width: "".concat(containerRef.current ? containerRef.current.getBoundingClientRect().width : 0, "px")
|
|
@@ -35,17 +35,25 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
}
|
|
36
36
|
};
|
|
37
37
|
import { useCallback } from 'react';
|
|
38
|
-
import { getProfileActivities, getProfileActivitiesTotal } from '@reltio/mdm-sdk';
|
|
38
|
+
import { addMetadataSpecificGetProfileActivitiesOptions, getProfileActivities, getProfileActivitiesTotal } from '@reltio/mdm-sdk';
|
|
39
39
|
import { buildActivitiesFilterString } from '../utils/filters';
|
|
40
|
+
import { useMdmMetadata } from '../../../contexts/MdmModuleContext/hooks';
|
|
40
41
|
export var useProfileActivitiesLoader = function (_a) {
|
|
41
42
|
var filter = _a.filter, max = _a.max, offset = _a.offset, entityUri = _a.entityUri;
|
|
43
|
+
var metadata = useMdmMetadata();
|
|
42
44
|
return useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
43
|
-
var filterString, data, total;
|
|
45
|
+
var filterString, options, data, total;
|
|
44
46
|
return __generator(this, function (_a) {
|
|
45
47
|
switch (_a.label) {
|
|
46
48
|
case 0:
|
|
47
49
|
filterString = buildActivitiesFilterString(filter);
|
|
48
|
-
|
|
50
|
+
options = addMetadataSpecificGetProfileActivitiesOptions(metadata, {
|
|
51
|
+
filter: filterString,
|
|
52
|
+
max: max,
|
|
53
|
+
offset: offset,
|
|
54
|
+
entityUri: entityUri
|
|
55
|
+
});
|
|
56
|
+
return [4 /*yield*/, getProfileActivities(options)];
|
|
49
57
|
case 1:
|
|
50
58
|
data = _a.sent();
|
|
51
59
|
return [4 /*yield*/, getProfileActivitiesTotal({ filter: filterString, entityUri: entityUri })];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reltio/components",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.1937",
|
|
4
4
|
"license": "SEE LICENSE IN LICENSE FILE",
|
|
5
5
|
"main": "./cjs/index.js",
|
|
6
6
|
"module": "./esm/index.js",
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"@fluentui/react-context-selector": "^9.1.26",
|
|
9
9
|
"@react-google-maps/api": "2.7.0",
|
|
10
10
|
"@react-sigma/core": "3.4.0",
|
|
11
|
-
"@reltio/mdm-sdk": "^1.4.
|
|
11
|
+
"@reltio/mdm-sdk": "^1.4.1851",
|
|
12
12
|
"d3-cloud": "^1.2.5",
|
|
13
13
|
"d3-geo": "^2.0.1",
|
|
14
14
|
"d3-hierarchy": "^2.0.0",
|