@reltio/components 1.4.2171 → 1.4.2173
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/AddressAutocompleteEditor/AddressAutocompleteEditor.js +6 -4
- package/AddressAutocompleteEditor/AddressAutocompleteEditor.module.css.js +2 -2
- package/AddressAutocompleteEditor/AddressAutocompleteEditor.test.js +2 -1
- package/cjs/AddressAutocompleteEditor/AddressAutocompleteEditor.js +6 -4
- package/cjs/AddressAutocompleteEditor/AddressAutocompleteEditor.module.css.js +2 -2
- package/cjs/AddressAutocompleteEditor/AddressAutocompleteEditor.test.js +2 -1
- package/cjs/features/activity-log/utils/filters.js +2 -2
- package/cjs/features/history/helpers/filters.js +2 -2
- package/cjs/hooks/useSegmentsLoader/useSegmentsLoader.js +1 -2
- package/features/activity-log/utils/filters.js +4 -4
- package/features/history/helpers/filters.js +3 -3
- package/hooks/useSegmentsLoader/useSegmentsLoader.js +2 -3
- package/package.json +2 -2
|
@@ -234,14 +234,16 @@ export var AddressAutocompleteEditor = function (_a) {
|
|
|
234
234
|
setOpen(false);
|
|
235
235
|
}, []);
|
|
236
236
|
var renderOption = useCallback(function (props, option) {
|
|
237
|
-
var _a;
|
|
238
237
|
if (option.id === EMPTY_OPTION_ID) {
|
|
239
238
|
return null;
|
|
240
239
|
}
|
|
241
240
|
var isContainer = option.type === AddressType.Container;
|
|
242
|
-
return (React.createElement(ListItemButton, __assign({}, props, { className: classnames(
|
|
243
|
-
React.createElement(
|
|
244
|
-
React.createElement(
|
|
241
|
+
return (React.createElement(ListItemButton, __assign({}, props, { className: classnames(props.className, styles.option), component: "li", disabled: loading }),
|
|
242
|
+
React.createElement("div", { className: styles.optionTextWrapper },
|
|
243
|
+
React.createElement(ExpandedValueTooltip, { value: option.fullAddress },
|
|
244
|
+
React.createElement(Typography, { variant: "body2", component: "span", className: styles.optionText }, option.fullAddress)),
|
|
245
|
+
option.description && isContainer && (React.createElement(ExpandedValueTooltip, { value: option.description },
|
|
246
|
+
React.createElement(Typography, { variant: "caption", component: "span", className: styles.description }, option.description)))),
|
|
245
247
|
isContainer && (React.createElement("div", { className: styles.containerForwardIcon },
|
|
246
248
|
React.createElement(ChevronRightIcon, null)))));
|
|
247
249
|
}, [loading]);
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
const styles = {"root":"AddressAutocompleteEditor-root--1FDrD","textFieldRoot":"AddressAutocompleteEditor-textFieldRoot--udDvK","textFieldInput":"AddressAutocompleteEditor-textFieldInput--Xf-Cf","underline":"AddressAutocompleteEditor-underline--ZNYqN","countryHeader":"AddressAutocompleteEditor-countryHeader--k5tRp","headerCountries":"AddressAutocompleteEditor-headerCountries--WoYl5","headerHelper":"AddressAutocompleteEditor-headerHelper--XPT5S","loadingState":"AddressAutocompleteEditor-loadingState--PRwRK","emptyState":"AddressAutocompleteEditor-emptyState--s8M04","option":"AddressAutocompleteEditor-option--3hah-","popupContainer":"AddressAutocompleteEditor-popupContainer--360Kv","listbox":"AddressAutocompleteEditor-listbox--cZCpg","optionText":"AddressAutocompleteEditor-optionText--IcsBw","containerForwardIcon":"AddressAutocompleteEditor-containerForwardIcon--Ke5rd","backToAllResults":"AddressAutocompleteEditor-backToAllResults--2wqzi","backToAllResultsButton":"AddressAutocompleteEditor-backToAllResultsButton--T5R-3","loadingProgress":"AddressAutocompleteEditor-loadingProgress--AfWtc"};
|
|
1
|
+
const styles = {"root":"AddressAutocompleteEditor-root--1FDrD","textFieldRoot":"AddressAutocompleteEditor-textFieldRoot--udDvK","textFieldInput":"AddressAutocompleteEditor-textFieldInput--Xf-Cf","underline":"AddressAutocompleteEditor-underline--ZNYqN","countryHeader":"AddressAutocompleteEditor-countryHeader--k5tRp","headerCountries":"AddressAutocompleteEditor-headerCountries--WoYl5","headerHelper":"AddressAutocompleteEditor-headerHelper--XPT5S","loadingState":"AddressAutocompleteEditor-loadingState--PRwRK","emptyState":"AddressAutocompleteEditor-emptyState--s8M04","option":"AddressAutocompleteEditor-option--3hah-","popupContainer":"AddressAutocompleteEditor-popupContainer--360Kv","listbox":"AddressAutocompleteEditor-listbox--cZCpg","optionTextWrapper":"AddressAutocompleteEditor-optionTextWrapper--frQ5S","optionText":"AddressAutocompleteEditor-optionText--IcsBw","description":"AddressAutocompleteEditor-description--QLj8Z","containerForwardIcon":"AddressAutocompleteEditor-containerForwardIcon--Ke5rd","backToAllResults":"AddressAutocompleteEditor-backToAllResults--2wqzi","backToAllResultsButton":"AddressAutocompleteEditor-backToAllResultsButton--T5R-3","loadingProgress":"AddressAutocompleteEditor-loadingProgress--AfWtc"};
|
|
2
2
|
if (typeof document !== 'undefined') {
|
|
3
3
|
const head = document.head || document.getElementsByTagName('head')[0]
|
|
4
4
|
const style = document.createElement('style');
|
|
5
5
|
style.type = 'text/css'
|
|
6
|
-
style.innerHTML = `.AddressAutocompleteEditor-root--1FDrD{width:100%}.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-textFieldRoot--udDvK{font-size:14px;padding:0}:is(.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-textFieldRoot--udDvK) .AddressAutocompleteEditor-textFieldInput--Xf-Cf{height:19px;line-height:19px;padding:10px 12px 11px!important}:is(.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-underline--ZNYqN):before{display:none}.AddressAutocompleteEditor-countryHeader--k5tRp{padding:12px 12px 8px}.AddressAutocompleteEditor-countryHeader--k5tRp .AddressAutocompleteEditor-headerCountries--WoYl5{font-size:12px;letter-spacing:0;margin-bottom:4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.AddressAutocompleteEditor-countryHeader--k5tRp .AddressAutocompleteEditor-headerHelper--XPT5S{font-size:10px;letter-spacing:0}.AddressAutocompleteEditor-loadingState--PRwRK{padding:16px;text-align:center}.AddressAutocompleteEditor-emptyState--s8M04{padding:8px}.AddressAutocompleteEditor-option--3hah-{padding:4px 12px}.AddressAutocompleteEditor-popupContainer--360Kv{min-width:170px}.AddressAutocompleteEditor-listbox--cZCpg{margin:0;max-height:300px;overflow-y:auto;padding:0}.AddressAutocompleteEditor-listbox--cZCpg li:first-child{border-top:1px solid rgba(0,0,0,.12);padding-top:7px}.AddressAutocompleteEditor-optionText--IcsBw{font-size:
|
|
6
|
+
style.innerHTML = `.AddressAutocompleteEditor-root--1FDrD{width:100%}.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-textFieldRoot--udDvK{font-size:14px;padding:0}:is(.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-textFieldRoot--udDvK) .AddressAutocompleteEditor-textFieldInput--Xf-Cf{height:19px;line-height:19px;padding:10px 12px 11px!important}:is(.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-underline--ZNYqN):before{display:none}.AddressAutocompleteEditor-countryHeader--k5tRp{padding:12px 12px 8px}.AddressAutocompleteEditor-countryHeader--k5tRp .AddressAutocompleteEditor-headerCountries--WoYl5{font-size:12px;letter-spacing:0;margin-bottom:4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.AddressAutocompleteEditor-countryHeader--k5tRp .AddressAutocompleteEditor-headerHelper--XPT5S{font-size:10px;letter-spacing:0}.AddressAutocompleteEditor-loadingState--PRwRK{padding:16px;text-align:center}.AddressAutocompleteEditor-emptyState--s8M04{padding:8px}.AddressAutocompleteEditor-option--3hah-{padding:4px 12px}.AddressAutocompleteEditor-popupContainer--360Kv{min-width:170px}.AddressAutocompleteEditor-listbox--cZCpg{margin:0;max-height:300px;overflow-y:auto;padding:0}.AddressAutocompleteEditor-listbox--cZCpg li:first-child{border-top:1px solid rgba(0,0,0,.12);padding-top:7px}.AddressAutocompleteEditor-optionTextWrapper--frQ5S{align-items:baseline;display:flex;flex:1;min-width:0;--option-font-size:14px;--option-line-height:16px}.AddressAutocompleteEditor-optionTextWrapper--frQ5S .AddressAutocompleteEditor-optionText--IcsBw{font-size:var(--option-font-size);letter-spacing:.24px;line-height:var(--option-line-height);overflow:hidden;padding:4px 0;text-overflow:ellipsis;white-space:nowrap}.AddressAutocompleteEditor-optionTextWrapper--frQ5S .AddressAutocompleteEditor-description--QLj8Z{color:var(--mui-palette-text-secondary);font-size:var(--option-font-size);line-height:var(--option-line-height);overflow:hidden;padding-left:4px;text-overflow:ellipsis;white-space:nowrap}.AddressAutocompleteEditor-containerForwardIcon--Ke5rd{color:var(--mui-palette-text-secondary);height:24px}.AddressAutocompleteEditor-backToAllResults--2wqzi{border-top:1px solid rgba(0,0,0,.12)}.AddressAutocompleteEditor-backToAllResultsButton--T5R-3{letter-spacing:0}.AddressAutocompleteEditor-loadingProgress--AfWtc{left:0;position:absolute;right:0;top:0}`;
|
|
7
7
|
head.appendChild(style);
|
|
8
8
|
}
|
|
9
9
|
export default styles;
|
|
@@ -98,7 +98,7 @@ var mockAddressContainerSearchResults = [
|
|
|
98
98
|
Id: 'container-1',
|
|
99
99
|
Type: AddressType.Container,
|
|
100
100
|
Text: 'Container Option',
|
|
101
|
-
Description: 'Container'
|
|
101
|
+
Description: 'Container Description'
|
|
102
102
|
}
|
|
103
103
|
];
|
|
104
104
|
var mockAddressDetails = [
|
|
@@ -415,6 +415,7 @@ describe('AddressAutocompleteEditor', function () {
|
|
|
415
415
|
case 2:
|
|
416
416
|
_a.sent();
|
|
417
417
|
expect(screen.getByText('Container Option')).toBeInTheDocument();
|
|
418
|
+
expect(screen.getByText('Container Description')).toBeInTheDocument();
|
|
418
419
|
option = screen.getByText('Container Option');
|
|
419
420
|
return [4 /*yield*/, user.click(option)];
|
|
420
421
|
case 3:
|
|
@@ -263,14 +263,16 @@ var AddressAutocompleteEditor = function (_a) {
|
|
|
263
263
|
setOpen(false);
|
|
264
264
|
}, []);
|
|
265
265
|
var renderOption = (0, react_1.useCallback)(function (props, option) {
|
|
266
|
-
var _a;
|
|
267
266
|
if (option.id === EMPTY_OPTION_ID) {
|
|
268
267
|
return null;
|
|
269
268
|
}
|
|
270
269
|
var isContainer = option.type === mdm_sdk_1.AddressType.Container;
|
|
271
|
-
return (react_1.default.createElement(ListItemButton_1.default, __assign({}, props, { className: (0, classnames_1.default)(
|
|
272
|
-
react_1.default.createElement(
|
|
273
|
-
react_1.default.createElement(
|
|
270
|
+
return (react_1.default.createElement(ListItemButton_1.default, __assign({}, props, { className: (0, classnames_1.default)(props.className, AddressAutocompleteEditor_module_css_1.default.option), component: "li", disabled: loading }),
|
|
271
|
+
react_1.default.createElement("div", { className: AddressAutocompleteEditor_module_css_1.default.optionTextWrapper },
|
|
272
|
+
react_1.default.createElement(ExpandedValueTooltip_1.ExpandedValueTooltip, { value: option.fullAddress },
|
|
273
|
+
react_1.default.createElement(Typography_1.default, { variant: "body2", component: "span", className: AddressAutocompleteEditor_module_css_1.default.optionText }, option.fullAddress)),
|
|
274
|
+
option.description && isContainer && (react_1.default.createElement(ExpandedValueTooltip_1.ExpandedValueTooltip, { value: option.description },
|
|
275
|
+
react_1.default.createElement(Typography_1.default, { variant: "caption", component: "span", className: AddressAutocompleteEditor_module_css_1.default.description }, option.description)))),
|
|
274
276
|
isContainer && (react_1.default.createElement("div", { className: AddressAutocompleteEditor_module_css_1.default.containerForwardIcon },
|
|
275
277
|
react_1.default.createElement(ChevronRight_1.default, null)))));
|
|
276
278
|
}, [loading]);
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
const styles = {"root":"AddressAutocompleteEditor-root--1FDrD","textFieldRoot":"AddressAutocompleteEditor-textFieldRoot--udDvK","textFieldInput":"AddressAutocompleteEditor-textFieldInput--Xf-Cf","underline":"AddressAutocompleteEditor-underline--ZNYqN","countryHeader":"AddressAutocompleteEditor-countryHeader--k5tRp","headerCountries":"AddressAutocompleteEditor-headerCountries--WoYl5","headerHelper":"AddressAutocompleteEditor-headerHelper--XPT5S","loadingState":"AddressAutocompleteEditor-loadingState--PRwRK","emptyState":"AddressAutocompleteEditor-emptyState--s8M04","option":"AddressAutocompleteEditor-option--3hah-","popupContainer":"AddressAutocompleteEditor-popupContainer--360Kv","listbox":"AddressAutocompleteEditor-listbox--cZCpg","optionText":"AddressAutocompleteEditor-optionText--IcsBw","containerForwardIcon":"AddressAutocompleteEditor-containerForwardIcon--Ke5rd","backToAllResults":"AddressAutocompleteEditor-backToAllResults--2wqzi","backToAllResultsButton":"AddressAutocompleteEditor-backToAllResultsButton--T5R-3","loadingProgress":"AddressAutocompleteEditor-loadingProgress--AfWtc"};
|
|
1
|
+
const styles = {"root":"AddressAutocompleteEditor-root--1FDrD","textFieldRoot":"AddressAutocompleteEditor-textFieldRoot--udDvK","textFieldInput":"AddressAutocompleteEditor-textFieldInput--Xf-Cf","underline":"AddressAutocompleteEditor-underline--ZNYqN","countryHeader":"AddressAutocompleteEditor-countryHeader--k5tRp","headerCountries":"AddressAutocompleteEditor-headerCountries--WoYl5","headerHelper":"AddressAutocompleteEditor-headerHelper--XPT5S","loadingState":"AddressAutocompleteEditor-loadingState--PRwRK","emptyState":"AddressAutocompleteEditor-emptyState--s8M04","option":"AddressAutocompleteEditor-option--3hah-","popupContainer":"AddressAutocompleteEditor-popupContainer--360Kv","listbox":"AddressAutocompleteEditor-listbox--cZCpg","optionTextWrapper":"AddressAutocompleteEditor-optionTextWrapper--frQ5S","optionText":"AddressAutocompleteEditor-optionText--IcsBw","description":"AddressAutocompleteEditor-description--QLj8Z","containerForwardIcon":"AddressAutocompleteEditor-containerForwardIcon--Ke5rd","backToAllResults":"AddressAutocompleteEditor-backToAllResults--2wqzi","backToAllResultsButton":"AddressAutocompleteEditor-backToAllResultsButton--T5R-3","loadingProgress":"AddressAutocompleteEditor-loadingProgress--AfWtc"};
|
|
2
2
|
if (typeof document !== 'undefined') {
|
|
3
3
|
const head = document.head || document.getElementsByTagName('head')[0]
|
|
4
4
|
const style = document.createElement('style');
|
|
5
5
|
style.type = 'text/css'
|
|
6
|
-
style.innerHTML = `.AddressAutocompleteEditor-root--1FDrD{width:100%}.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-textFieldRoot--udDvK{font-size:14px;padding:0}:is(.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-textFieldRoot--udDvK) .AddressAutocompleteEditor-textFieldInput--Xf-Cf{height:19px;line-height:19px;padding:10px 12px 11px!important}:is(.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-underline--ZNYqN):before{display:none}.AddressAutocompleteEditor-countryHeader--k5tRp{padding:12px 12px 8px}.AddressAutocompleteEditor-countryHeader--k5tRp .AddressAutocompleteEditor-headerCountries--WoYl5{font-size:12px;letter-spacing:0;margin-bottom:4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.AddressAutocompleteEditor-countryHeader--k5tRp .AddressAutocompleteEditor-headerHelper--XPT5S{font-size:10px;letter-spacing:0}.AddressAutocompleteEditor-loadingState--PRwRK{padding:16px;text-align:center}.AddressAutocompleteEditor-emptyState--s8M04{padding:8px}.AddressAutocompleteEditor-option--3hah-{padding:4px 12px}.AddressAutocompleteEditor-popupContainer--360Kv{min-width:170px}.AddressAutocompleteEditor-listbox--cZCpg{margin:0;max-height:300px;overflow-y:auto;padding:0}.AddressAutocompleteEditor-listbox--cZCpg li:first-child{border-top:1px solid rgba(0,0,0,.12);padding-top:7px}.AddressAutocompleteEditor-optionText--IcsBw{font-size:
|
|
6
|
+
style.innerHTML = `.AddressAutocompleteEditor-root--1FDrD{width:100%}.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-textFieldRoot--udDvK{font-size:14px;padding:0}:is(.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-textFieldRoot--udDvK) .AddressAutocompleteEditor-textFieldInput--Xf-Cf{height:19px;line-height:19px;padding:10px 12px 11px!important}:is(.AddressAutocompleteEditor-root--1FDrD .AddressAutocompleteEditor-underline--ZNYqN):before{display:none}.AddressAutocompleteEditor-countryHeader--k5tRp{padding:12px 12px 8px}.AddressAutocompleteEditor-countryHeader--k5tRp .AddressAutocompleteEditor-headerCountries--WoYl5{font-size:12px;letter-spacing:0;margin-bottom:4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.AddressAutocompleteEditor-countryHeader--k5tRp .AddressAutocompleteEditor-headerHelper--XPT5S{font-size:10px;letter-spacing:0}.AddressAutocompleteEditor-loadingState--PRwRK{padding:16px;text-align:center}.AddressAutocompleteEditor-emptyState--s8M04{padding:8px}.AddressAutocompleteEditor-option--3hah-{padding:4px 12px}.AddressAutocompleteEditor-popupContainer--360Kv{min-width:170px}.AddressAutocompleteEditor-listbox--cZCpg{margin:0;max-height:300px;overflow-y:auto;padding:0}.AddressAutocompleteEditor-listbox--cZCpg li:first-child{border-top:1px solid rgba(0,0,0,.12);padding-top:7px}.AddressAutocompleteEditor-optionTextWrapper--frQ5S{align-items:baseline;display:flex;flex:1;min-width:0;--option-font-size:14px;--option-line-height:16px}.AddressAutocompleteEditor-optionTextWrapper--frQ5S .AddressAutocompleteEditor-optionText--IcsBw{font-size:var(--option-font-size);letter-spacing:.24px;line-height:var(--option-line-height);overflow:hidden;padding:4px 0;text-overflow:ellipsis;white-space:nowrap}.AddressAutocompleteEditor-optionTextWrapper--frQ5S .AddressAutocompleteEditor-description--QLj8Z{color:var(--mui-palette-text-secondary);font-size:var(--option-font-size);line-height:var(--option-line-height);overflow:hidden;padding-left:4px;text-overflow:ellipsis;white-space:nowrap}.AddressAutocompleteEditor-containerForwardIcon--Ke5rd{color:var(--mui-palette-text-secondary);height:24px}.AddressAutocompleteEditor-backToAllResults--2wqzi{border-top:1px solid rgba(0,0,0,.12)}.AddressAutocompleteEditor-backToAllResultsButton--T5R-3{letter-spacing:0}.AddressAutocompleteEditor-loadingProgress--AfWtc{left:0;position:absolute;right:0;top:0}`;
|
|
7
7
|
head.appendChild(style);
|
|
8
8
|
}
|
|
9
9
|
module.exports = styles;
|
|
@@ -103,7 +103,7 @@ var mockAddressContainerSearchResults = [
|
|
|
103
103
|
Id: 'container-1',
|
|
104
104
|
Type: mdm_sdk_1.AddressType.Container,
|
|
105
105
|
Text: 'Container Option',
|
|
106
|
-
Description: 'Container'
|
|
106
|
+
Description: 'Container Description'
|
|
107
107
|
}
|
|
108
108
|
];
|
|
109
109
|
var mockAddressDetails = [
|
|
@@ -420,6 +420,7 @@ describe('AddressAutocompleteEditor', function () {
|
|
|
420
420
|
case 2:
|
|
421
421
|
_a.sent();
|
|
422
422
|
expect(react_2.screen.getByText('Container Option')).toBeInTheDocument();
|
|
423
|
+
expect(react_2.screen.getByText('Container Description')).toBeInTheDocument();
|
|
423
424
|
option = react_2.screen.getByText('Container Option');
|
|
424
425
|
return [4 /*yield*/, user.click(option)];
|
|
425
426
|
case 3:
|
|
@@ -28,7 +28,7 @@ var getFilterClauseBuilder = (0, ramda_1.cond)([
|
|
|
28
28
|
[(0, ramda_1.equals)('entityUri'), function () { return mdm_sdk_1.buildEntityUriFilterClause; }],
|
|
29
29
|
[(0, ramda_1.equals)('rawFilter'), function () { return ramda_1.identity; }]
|
|
30
30
|
]);
|
|
31
|
-
exports.buildActivitiesFilterString = (0, ramda_1.pipe)((0, ramda_1.defaultTo)({}),
|
|
31
|
+
exports.buildActivitiesFilterString = (0, ramda_1.pipe)((0, ramda_1.defaultTo)({}), mdm_sdk_1.rejectEmptyValues, ramda_1.toPairs, (0, ramda_1.append)(['rawFilter', "not equals(user, 'collaboration-service')"]), (0, ramda_1.map)(function (_a) {
|
|
32
32
|
var key = _a[0], value = _a[1];
|
|
33
33
|
return getFilterClauseBuilder(key)(value);
|
|
34
|
-
}),
|
|
34
|
+
}), mdm_sdk_1.rejectEmptyValues, (0, ramda_1.map)(mdm_sdk_1.wrapInBrackets), (0, ramda_1.join)(' and '));
|
|
@@ -20,11 +20,11 @@ var convertHistoryTypes = (0, ramda_1.chain)((0, ramda_1.cond)([
|
|
|
20
20
|
]));
|
|
21
21
|
var buildActivityFilterClause = (0, ramda_1.pipe)((0, ramda_1.defaultTo)([]), convertHistoryTypes, (0, ramda_1.concat)([types_1.ActivityTypes.ENTITY_CREATED, types_1.ActivityTypes.ENTITY_REMOVED, types_1.ActivityTypes.ENTITY_LOST_MERGE]), (0, mdm_sdk_1.multiValueFilter)(function (value) { return "equals(type, '".concat(value, "')"); }));
|
|
22
22
|
var buildAttributeFilterClause = function (attribute) { return "changes(".concat((0, mdm_sdk_1.escapeQueryValue)(attribute.value), ")"); };
|
|
23
|
-
exports.buildHistoryFilterString = (0, ramda_1.pipe)((0, ramda_1.defaultTo)({}),
|
|
23
|
+
exports.buildHistoryFilterString = (0, ramda_1.pipe)((0, ramda_1.defaultTo)({}), mdm_sdk_1.rejectEmptyValues, (0, ramda_1.evolve)({
|
|
24
24
|
users: (0, mdm_sdk_1.multiValueFilter)(mdm_sdk_1.buildUserFilterClause),
|
|
25
25
|
attributes: (0, mdm_sdk_1.multiValueFilter)(buildAttributeFilterClause),
|
|
26
26
|
dateRange: mdm_sdk_1.buildDateRangeFilterClause
|
|
27
|
-
}), (0, ramda_1.over)((0, ramda_1.lensProp)('activities'), buildActivityFilterClause), ramda_1.values,
|
|
27
|
+
}), (0, ramda_1.over)((0, ramda_1.lensProp)('activities'), buildActivityFilterClause), ramda_1.values, mdm_sdk_1.rejectEmptyValues, (0, ramda_1.append)("not equals(user, 'collaboration-service')"), (0, ramda_1.map)(mdm_sdk_1.wrapInBrackets), (0, ramda_1.join)(' and '));
|
|
28
28
|
var isDefaultFilter = function (filter) {
|
|
29
29
|
return (0, ramda_1.pipe)((0, ramda_1.evolve)({ activities: (0, ramda_1.difference)(constants_1.DEFAULT_HISTORY_FILTER.activities) }), (0, ramda_1.reject)((0, ramda_1.either)(ramda_1.isNil, ramda_1.isEmpty)), ramda_1.isEmpty)(filter || {});
|
|
30
30
|
};
|
|
@@ -49,7 +49,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
49
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
50
|
exports.useSegmentsLoader = void 0;
|
|
51
51
|
var react_1 = require("react");
|
|
52
|
-
var ramda_1 = require("ramda");
|
|
53
52
|
var mdm_sdk_1 = require("@reltio/mdm-sdk");
|
|
54
53
|
var types_1 = require("../../types");
|
|
55
54
|
var errors_1 = require("../../helpers/errors");
|
|
@@ -63,7 +62,7 @@ var useSegmentsLoader = function (_a) {
|
|
|
63
62
|
var hasSearchValue = Boolean((filters === null || filters === void 0 ? void 0 : filters.searchValue) && filters.searchValue.length > 0);
|
|
64
63
|
var filterString = (0, mdm_sdk_1.buildSegmentsFilterString)(filters);
|
|
65
64
|
var params = (0, react_1.useMemo)(function () {
|
|
66
|
-
return (0,
|
|
65
|
+
return (0, mdm_sdk_1.rejectEmptyValues)(__assign({ sort: sort, order: order, max: rowsPerPage, offset: page * rowsPerPage, filter: filterString, parentId: parentId }, (hasSearchValue || (hasActiveFilter && !isFolderMoveMode) ? { fetchAll: true } : {})));
|
|
67
66
|
}, [sort, order, rowsPerPage, page, filterString, parentId, hasActiveFilter, hasSearchValue, isFolderMoveMode]);
|
|
68
67
|
var loadRequest = (0, react_1.useCallback)(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
69
68
|
var signal, response, error_1;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { append, cond, defaultTo, equals, identity, join, map, pipe,
|
|
1
|
+
import { append, cond, defaultTo, equals, identity, join, map, pipe, toPairs } from 'ramda';
|
|
2
2
|
import { ActivityTypes } from '../types';
|
|
3
|
-
import {
|
|
3
|
+
import { rejectEmptyValues, wrapInBrackets, multiValueFilter, buildUserFilterClause, buildSourceFilterClause, buildEntityTypeFilterClause, buildDateRangeFilterClause, buildEntityUriFilterClause } from '@reltio/mdm-sdk';
|
|
4
4
|
var buildActivityFilterClause = function (activityType) {
|
|
5
5
|
if (activityType.startsWith('USER_') ||
|
|
6
6
|
activityType.startsWith('COMMENT_') ||
|
|
@@ -25,7 +25,7 @@ var getFilterClauseBuilder = cond([
|
|
|
25
25
|
[equals('entityUri'), function () { return buildEntityUriFilterClause; }],
|
|
26
26
|
[equals('rawFilter'), function () { return identity; }]
|
|
27
27
|
]);
|
|
28
|
-
export var buildActivitiesFilterString = pipe(defaultTo({}),
|
|
28
|
+
export var buildActivitiesFilterString = pipe(defaultTo({}), rejectEmptyValues, toPairs, append(['rawFilter', "not equals(user, 'collaboration-service')"]), map(function (_a) {
|
|
29
29
|
var key = _a[0], value = _a[1];
|
|
30
30
|
return getFilterClauseBuilder(key)(value);
|
|
31
|
-
}),
|
|
31
|
+
}), rejectEmptyValues, map(wrapInBrackets), join(' and '));
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { difference, either, isNil, isEmpty, pipe, defaultTo, reject, map, join, cond, equals, append, concat, chain, evolve, values, over, lensProp } from 'ramda';
|
|
2
|
-
import {
|
|
2
|
+
import { rejectEmptyValues, escapeQueryValue, wrapInBrackets, multiValueFilter, buildUserFilterClause, buildDateRangeFilterClause } from '@reltio/mdm-sdk';
|
|
3
3
|
import { ActivityTypes } from '../../activity-log/types';
|
|
4
4
|
import { HistoryActivityType } from '../types';
|
|
5
5
|
import { DEFAULT_HISTORY_FILTER } from '../constants';
|
|
@@ -17,11 +17,11 @@ var convertHistoryTypes = chain(cond([
|
|
|
17
17
|
]));
|
|
18
18
|
var buildActivityFilterClause = pipe(defaultTo([]), convertHistoryTypes, concat([ActivityTypes.ENTITY_CREATED, ActivityTypes.ENTITY_REMOVED, ActivityTypes.ENTITY_LOST_MERGE]), multiValueFilter(function (value) { return "equals(type, '".concat(value, "')"); }));
|
|
19
19
|
var buildAttributeFilterClause = function (attribute) { return "changes(".concat(escapeQueryValue(attribute.value), ")"); };
|
|
20
|
-
export var buildHistoryFilterString = pipe(defaultTo({}),
|
|
20
|
+
export var buildHistoryFilterString = pipe(defaultTo({}), rejectEmptyValues, evolve({
|
|
21
21
|
users: multiValueFilter(buildUserFilterClause),
|
|
22
22
|
attributes: multiValueFilter(buildAttributeFilterClause),
|
|
23
23
|
dateRange: buildDateRangeFilterClause
|
|
24
|
-
}), over(lensProp('activities'), buildActivityFilterClause), values,
|
|
24
|
+
}), over(lensProp('activities'), buildActivityFilterClause), values, rejectEmptyValues, append("not equals(user, 'collaboration-service')"), map(wrapInBrackets), join(' and '));
|
|
25
25
|
export var isDefaultFilter = function (filter) {
|
|
26
26
|
return pipe(evolve({ activities: difference(DEFAULT_HISTORY_FILTER.activities) }), reject(either(isNil, isEmpty)), isEmpty)(filter || {});
|
|
27
27
|
};
|
|
@@ -46,8 +46,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
46
46
|
}
|
|
47
47
|
};
|
|
48
48
|
import { useCallback, useEffect, useMemo, useState } from 'react';
|
|
49
|
-
import {
|
|
50
|
-
import { getSegments, isAbortError, isEmptyValue, buildSegmentsFilterString, isActiveSegmentsFilter } from '@reltio/mdm-sdk';
|
|
49
|
+
import { getSegments, isAbortError, rejectEmptyValues, buildSegmentsFilterString, isActiveSegmentsFilter } from '@reltio/mdm-sdk';
|
|
51
50
|
import { RequestStates } from '../../types';
|
|
52
51
|
import { showDefaultErrorMessage } from '../../helpers/errors';
|
|
53
52
|
export var useSegmentsLoader = function (_a) {
|
|
@@ -60,7 +59,7 @@ export var useSegmentsLoader = function (_a) {
|
|
|
60
59
|
var hasSearchValue = Boolean((filters === null || filters === void 0 ? void 0 : filters.searchValue) && filters.searchValue.length > 0);
|
|
61
60
|
var filterString = buildSegmentsFilterString(filters);
|
|
62
61
|
var params = useMemo(function () {
|
|
63
|
-
return
|
|
62
|
+
return rejectEmptyValues(__assign({ sort: sort, order: order, max: rowsPerPage, offset: page * rowsPerPage, filter: filterString, parentId: parentId }, (hasSearchValue || (hasActiveFilter && !isFolderMoveMode) ? { fetchAll: true } : {})));
|
|
64
63
|
}, [sort, order, rowsPerPage, page, filterString, parentId, hasActiveFilter, hasSearchValue, isFolderMoveMode]);
|
|
65
64
|
var loadRequest = useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
66
65
|
var signal, response, error_1;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reltio/components",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.2173",
|
|
4
4
|
"license": "SEE LICENSE IN LICENSE FILE",
|
|
5
5
|
"main": "./cjs/index.js",
|
|
6
6
|
"module": "./index.js",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"@fluentui/react-context-selector": "^9.1.26",
|
|
12
12
|
"@googlemaps/markerclusterer": "^2.5.3",
|
|
13
13
|
"@react-sigma/core": "3.4.0",
|
|
14
|
-
"@reltio/mdm-sdk": "^1.4.
|
|
14
|
+
"@reltio/mdm-sdk": "^1.4.1985",
|
|
15
15
|
"@vis.gl/react-google-maps": "^1.3.0",
|
|
16
16
|
"d3-cloud": "^1.2.5",
|
|
17
17
|
"d3-geo": "^2.0.1",
|