@reltio/components 1.4.1173 → 1.4.1176

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.
Files changed (45) hide show
  1. package/cjs/components/ModeSwitcherSelect/styles.d.ts +1 -1
  2. package/cjs/components/activityLog/ActivityFilterEditor/ActivityFilterEditor.js +16 -32
  3. package/cjs/components/activityLog/ActivityFilterEditor/ActivitySelector.js +5 -2
  4. package/cjs/components/activityLog/ActivityFilterEditor/DateRangeSelector.js +1 -1
  5. package/cjs/components/activityLog/ActivityFilterEditor/EntityChangedSelectors.d.ts +10 -0
  6. package/cjs/components/activityLog/ActivityFilterEditor/EntityChangedSelectors.js +27 -0
  7. package/cjs/components/activityLog/ActivityFilterEditor/EntityTypesSelector.d.ts +9 -0
  8. package/cjs/components/activityLog/ActivityFilterEditor/EntityTypesSelector.js +29 -0
  9. package/cjs/components/activityLog/ActivityFilterEditor/SourceSelector.js +1 -1
  10. package/cjs/components/activityLog/ActivityFilterEditor/styles.d.ts +1 -1
  11. package/cjs/components/activityLog/ActivityFilterEditor/styles.js +18 -7
  12. package/cjs/components/activityLog/ActivityLogFilter/helpers.js +4 -3
  13. package/cjs/components/activityLog/ActivityLogFilter/styles.js +2 -1
  14. package/cjs/components/activityLog/types/ActivitiesFilter.d.ts +2 -1
  15. package/cjs/components/activityLog/utils/filters.js +4 -0
  16. package/cjs/hooks/useAPI/API.d.ts +1 -1
  17. package/cjs/hooks/useAPI/API.js +105 -32
  18. package/cjs/hooks/useAPI/helpers.d.ts +1 -0
  19. package/cjs/hooks/useAPI/helpers.js +7 -3
  20. package/cjs/hooks/useAPI/types.d.ts +1 -0
  21. package/cjs/hooks/useAPI/useAPI.js +3 -1
  22. package/cjs/hooks/useCustomScripts.js +2 -0
  23. package/esm/components/ModeSwitcherSelect/styles.d.ts +1 -1
  24. package/esm/components/activityLog/ActivityFilterEditor/ActivityFilterEditor.js +16 -32
  25. package/esm/components/activityLog/ActivityFilterEditor/ActivitySelector.js +5 -2
  26. package/esm/components/activityLog/ActivityFilterEditor/DateRangeSelector.js +1 -1
  27. package/esm/components/activityLog/ActivityFilterEditor/EntityChangedSelectors.d.ts +10 -0
  28. package/esm/components/activityLog/ActivityFilterEditor/EntityChangedSelectors.js +22 -0
  29. package/esm/components/activityLog/ActivityFilterEditor/EntityTypesSelector.d.ts +9 -0
  30. package/esm/components/activityLog/ActivityFilterEditor/EntityTypesSelector.js +24 -0
  31. package/esm/components/activityLog/ActivityFilterEditor/SourceSelector.js +1 -1
  32. package/esm/components/activityLog/ActivityFilterEditor/styles.d.ts +1 -1
  33. package/esm/components/activityLog/ActivityFilterEditor/styles.js +18 -7
  34. package/esm/components/activityLog/ActivityLogFilter/helpers.js +5 -4
  35. package/esm/components/activityLog/ActivityLogFilter/styles.js +2 -1
  36. package/esm/components/activityLog/types/ActivitiesFilter.d.ts +2 -1
  37. package/esm/components/activityLog/utils/filters.js +4 -0
  38. package/esm/hooks/useAPI/API.d.ts +1 -1
  39. package/esm/hooks/useAPI/API.js +106 -33
  40. package/esm/hooks/useAPI/helpers.d.ts +1 -0
  41. package/esm/hooks/useAPI/helpers.js +5 -2
  42. package/esm/hooks/useAPI/types.d.ts +1 -0
  43. package/esm/hooks/useAPI/useAPI.js +3 -1
  44. package/esm/hooks/useCustomScripts.js +2 -0
  45. package/package.json +3 -3
@@ -1 +1 @@
1
- export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"root" | "outlined" | "menuItem" | "currentValue" | "arrowIcon" | "currentValueIcon" | "currentValueText" | "firstMenuItemButton" | "menuItemInner" | "menuItemIcon" | "menuItemLabel" | "menuItemDescription">;
1
+ export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"root" | "outlined" | "menuItem" | "arrowIcon" | "currentValue" | "currentValueIcon" | "currentValueText" | "firstMenuItemButton" | "menuItemInner" | "menuItemIcon" | "menuItemLabel" | "menuItemDescription">;
@@ -1,15 +1,4 @@
1
1
  "use strict";
2
- var __assign = (this && this.__assign) || function () {
3
- __assign = Object.assign || function(t) {
4
- for (var s, i = 1, n = arguments.length; i < n; i++) {
5
- s = arguments[i];
6
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
7
- t[p] = s[p];
8
- }
9
- return t;
10
- };
11
- return __assign.apply(this, arguments);
12
- };
13
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
14
3
  if (k2 === undefined) k2 = k;
15
4
  Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
@@ -34,49 +23,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
34
23
  };
35
24
  Object.defineProperty(exports, "__esModule", { value: true });
36
25
  var react_1 = __importStar(require("react"));
26
+ var ramda_1 = require("ramda");
37
27
  var react_redux_1 = require("react-redux");
38
28
  var mdm_module_1 = __importDefault(require("@reltio/mdm-module"));
39
29
  var ui_i18n_1 = __importDefault(require("ui-i18n"));
40
- var classnames_1 = __importDefault(require("classnames"));
41
30
  var Button_1 = __importDefault(require("@material-ui/core/Button"));
31
+ var Divider_1 = __importDefault(require("@material-ui/core/Divider"));
42
32
  var types_1 = require("../types");
43
33
  var getSelectorActivityTypes_1 = require("./utils/getSelectorActivityTypes");
44
34
  var ActivitySelector_1 = __importDefault(require("./ActivitySelector"));
45
- var AttributeSelector_1 = __importDefault(require("../../AttributeSelector/AttributeSelector"));
46
- var SourceSelector_1 = __importDefault(require("./SourceSelector"));
47
35
  var UserSelector_1 = __importDefault(require("../../UserSelector/UserSelector"));
48
36
  var DateRangeSelector_1 = __importDefault(require("./DateRangeSelector"));
37
+ var EntityChangedSelectors_1 = __importDefault(require("./EntityChangedSelectors"));
49
38
  var hooks_1 = require("../../../hooks");
50
- var ramda_1 = require("ramda");
51
39
  var styles_1 = require("./styles");
52
40
  var ActivityFilterEditor = function (_a) {
53
41
  var value = _a.value, open = _a.open, entityType = _a.entityType, onApply = _a.onApply, onCancel = _a.onCancel, onClear = _a.onClear;
54
42
  var styles = styles_1.useStyles();
55
43
  var metadata = react_redux_1.useSelector(mdm_module_1.default.selectors.getMetadata);
56
- var _b = react_1.useState(value), currentValue = _b[0], setCurrentValue = _b[1];
57
- var clearCurrentValue = function () { return setCurrentValue(null); };
44
+ var _b = react_1.useState(value), currentFilter = _b[0], setCurrentFilter = _b[1];
45
+ var clearCurrentFilter = function () { return setCurrentFilter(null); };
58
46
  var handlePropChange = ramda_1.curry(function (propName, value) {
59
- setCurrentValue(function (filterValue) {
60
- var _a;
61
- return (__assign(__assign({}, filterValue), (_a = {}, _a[propName] = value, _a)));
62
- });
47
+ setCurrentFilter(ramda_1.pipe(ramda_1.when(ramda_1.always(propName === 'entityTypes'), ramda_1.assoc('attributes', [])), ramda_1.when(ramda_1.always(propName === 'activities'), ramda_1.mergeLeft({ attributes: [], entityTypes: [], sources: [] })), ramda_1.assoc(propName, value)));
63
48
  });
64
49
  hooks_1.useDidUpdateEffect(function () {
65
- setCurrentValue(value);
50
+ setCurrentFilter(value);
66
51
  }, [value]);
67
- var _c = currentValue || {}, _d = _c.activities, activities = _d === void 0 ? [] : _d, _e = _c.attributes, attributes = _e === void 0 ? [] : _e, _f = _c.sources, sources = _f === void 0 ? [] : _f, _g = _c.dateRange, dateRange = _g === void 0 ? null : _g, _h = _c.users, users = _h === void 0 ? [] : _h;
68
- var hasEntityChanged = activities.includes(types_1.ActivityTypes.ENTITY_CHANGED);
69
- var ActivityFilterRenderer = (react_1.default.createElement(react_1.default.Fragment, null,
52
+ var _c = currentFilter || {}, _d = _c.activities, activities = _d === void 0 ? [] : _d, _e = _c.dateRange, dateRange = _e === void 0 ? null : _e, _f = _c.users, users = _f === void 0 ? [] : _f;
53
+ var isEntityChangedActivity = activities.length === 1 && activities.includes(types_1.ActivityTypes.ENTITY_CHANGED);
54
+ return open ? (react_1.default.createElement("div", { className: styles.container },
70
55
  react_1.default.createElement(ActivitySelector_1.default, { activityTypes: getSelectorActivityTypes_1.getSelectorActivityTypes(metadata, entityType), selectedActivityTypes: activities, onChange: handlePropChange('activities') }),
71
- hasEntityChanged && entityType && (react_1.default.createElement(react_1.default.Fragment, null,
72
- react_1.default.createElement(AttributeSelector_1.default, { selectedAttributes: attributes, entityType: entityType, onChange: handlePropChange('attributes'), className: styles.borderBottom, disableUnderline: true }),
73
- react_1.default.createElement(SourceSelector_1.default, { selectedSources: sources, onChange: handlePropChange('sources') }))),
56
+ isEntityChangedActivity && (react_1.default.createElement(EntityChangedSelectors_1.default, { filter: currentFilter, entityType: entityType, onPropChange: handlePropChange })),
57
+ react_1.default.createElement(Divider_1.default, { light: true, className: styles.divider }),
74
58
  react_1.default.createElement(DateRangeSelector_1.default, { value: dateRange, onChange: handlePropChange('dateRange') }),
59
+ react_1.default.createElement(Divider_1.default, { light: true, className: styles.divider }),
75
60
  react_1.default.createElement(UserSelector_1.default, { selectedUsers: users, onChange: handlePropChange('users'), disableUnderline: true }),
76
- react_1.default.createElement("div", { className: classnames_1.default(styles.borderBottom, styles.filterControls) },
77
- react_1.default.createElement(Button_1.default, { onClick: ramda_1.pipe(clearCurrentValue, onClear), className: styles.clearButton }, ui_i18n_1.default.text('Clear all')),
61
+ react_1.default.createElement("div", { className: styles.filterControls },
62
+ react_1.default.createElement(Button_1.default, { onClick: ramda_1.pipe(clearCurrentFilter, onClear), className: styles.clearButton }, ui_i18n_1.default.text('Clear all')),
78
63
  react_1.default.createElement(Button_1.default, { onClick: onCancel }, ui_i18n_1.default.text('Cancel')),
79
- react_1.default.createElement(Button_1.default, { color: "primary", onClick: function () { return onApply(currentValue); } }, ui_i18n_1.default.text('Apply')))));
80
- return open && react_1.default.createElement("div", { className: styles.container }, ActivityFilterRenderer);
64
+ react_1.default.createElement(Button_1.default, { color: "primary", onClick: function () { return onApply(currentFilter); } }, ui_i18n_1.default.text('Apply'))))) : null;
81
65
  };
82
66
  exports.default = ActivityFilterEditor;
@@ -8,6 +8,7 @@ var ui_i18n_1 = __importDefault(require("ui-i18n"));
8
8
  var ramda_1 = require("ramda");
9
9
  var classnames_1 = __importDefault(require("classnames"));
10
10
  var Typography_1 = __importDefault(require("@material-ui/core/Typography"));
11
+ var ActivityTypes_1 = require("../types/ActivityTypes");
11
12
  var MultiSelect_1 = __importDefault(require("../../ReactSelect/MultiSelect"));
12
13
  var DropdownIndicatorWithIconButton_1 = __importDefault(require("../../commonReactSelectComponents/DropdownIndicatorWithIconButton"));
13
14
  var activities_1 = require("../utils/activities");
@@ -17,14 +18,16 @@ var ActivitySelector = function (_a) {
17
18
  var styles = styles_1.useStyles();
18
19
  var valueToOption = function (value) { return ({ value: value, label: activities_1.getActivityLabel(value) }); };
19
20
  var prepareValues = function (values) { return values.map(valueToOption); };
21
+ var showHint = selectedActivityTypes.length > 1 && selectedActivityTypes.includes(ActivityTypes_1.ActivityTypes.ENTITY_CHANGED);
20
22
  var options = ramda_1.pipe(ramda_1.sortBy(function (option) { return activities_1.getActivityLabel(option); }), prepareValues)(activityTypes);
21
- return (react_1.default.createElement("div", { className: styles.borderBottom },
23
+ return (react_1.default.createElement("div", { className: styles.selectorWrapper },
22
24
  react_1.default.createElement(Typography_1.default, { className: classnames_1.default(styles.filterSubtitle, styles.labels), variant: 'subtitle1' }, ui_i18n_1.default.text('Activity')),
23
25
  react_1.default.createElement(MultiSelect_1.default, { value: prepareValues(selectedActivityTypes), onChange: ramda_1.pipe(ramda_1.defaultTo([]), ramda_1.pluck('value'), onChange), options: options, TextFieldProps: {
24
26
  InputProps: { disableUnderline: true },
25
27
  classes: { root: styles.dropDownInput }
26
28
  }, components: {
27
29
  DropdownIndicator: DropdownIndicatorWithIconButton_1.default
28
- }, styles: styles_1.customStyles, classes: styles, menuPlacement: "bottom" })));
30
+ }, styles: styles_1.customStyles, classes: styles, menuPlacement: "bottom" }),
31
+ showHint && (react_1.default.createElement("span", { className: styles.selectorHint }, ui_i18n_1.default.text('One at a time! Select a single Activity and any of its filters -OR- multiple Activities with no filters.')))));
29
32
  };
30
33
  exports.default = ActivitySelector;
@@ -103,7 +103,7 @@ var DateRangeSelector = function (_a) {
103
103
  setAgoInterval(emptyInterval);
104
104
  }
105
105
  }, [value]);
106
- return (react_1.default.createElement("div", { className: styles.borderBottom },
106
+ return (react_1.default.createElement("div", { className: styles.selectorWrapper },
107
107
  react_1.default.createElement(Typography_1.default, { className: classnames_1.default(styles.filterSubtitle, styles.labels), variant: 'subtitle1' }, ui_i18n_1.default.text('Date')),
108
108
  react_1.default.createElement(RadioGroup_1.default, { value: (value === null || value === void 0 ? void 0 : value.type) || null, onChange: ramda_1.pipe(utils_1.getValue, changeType) },
109
109
  react_1.default.createElement("div", { className: styles.dateOptionWithin },
@@ -0,0 +1,10 @@
1
+ /// <reference types="react" />
2
+ import { TEntityType } from '@reltio/mdm-sdk';
3
+ import { ActivitiesFilter } from '../types';
4
+ declare type Props = {
5
+ filter: ActivitiesFilter;
6
+ entityType?: TEntityType;
7
+ onPropChange: (propName: string) => (value: unknown) => void;
8
+ };
9
+ declare const EntityChangedSelectors: ({ filter, entityType, onPropChange }: Props) => JSX.Element;
10
+ export default EntityChangedSelectors;
@@ -0,0 +1,27 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ var react_1 = __importDefault(require("react"));
7
+ var ramda_1 = require("ramda");
8
+ var react_redux_1 = require("react-redux");
9
+ var mdm_module_1 = __importDefault(require("@reltio/mdm-module"));
10
+ var mdm_sdk_1 = require("@reltio/mdm-sdk");
11
+ var AttributeSelector_1 = __importDefault(require("../../AttributeSelector/AttributeSelector"));
12
+ var EntityTypesSelector_1 = __importDefault(require("./EntityTypesSelector"));
13
+ var SourceSelector_1 = __importDefault(require("./SourceSelector"));
14
+ var styles_1 = require("./styles");
15
+ var EntityChangedSelectors = function (_a) {
16
+ var filter = _a.filter, entityType = _a.entityType, onPropChange = _a.onPropChange;
17
+ var styles = styles_1.useStyles();
18
+ var metadata = react_redux_1.useSelector(mdm_module_1.default.selectors.getMetadata);
19
+ var _b = filter || {}, _c = _b.attributes, attributes = _c === void 0 ? [] : _c, _d = _b.sources, sources = _d === void 0 ? [] : _d, _e = _b.entityTypes, entityTypes = _e === void 0 ? [] : _e;
20
+ var closestEntityTypeAncestor = mdm_sdk_1.findClosestCommonAncestor(metadata, ramda_1.map(ramda_1.prop('uri'), entityTypes));
21
+ var attributesEntityType = entityType || mdm_sdk_1.getEntityType(metadata, closestEntityTypeAncestor);
22
+ return (react_1.default.createElement("div", { className: styles.selectorsGroup },
23
+ !entityType && (react_1.default.createElement(EntityTypesSelector_1.default, { entityTypes: metadata.entityTypes, selectedEntityTypes: entityTypes, onChange: onPropChange('entityTypes') })),
24
+ react_1.default.createElement(AttributeSelector_1.default, { selectedAttributes: attributes, entityType: attributesEntityType, onChange: onPropChange('attributes'), className: styles.selectorWrapper, disableUnderline: true }),
25
+ react_1.default.createElement(SourceSelector_1.default, { selectedSources: sources, onChange: onPropChange('sources') })));
26
+ };
27
+ exports.default = EntityChangedSelectors;
@@ -0,0 +1,9 @@
1
+ /// <reference types="react" />
2
+ import { TEntityType } from '@reltio/mdm-sdk';
3
+ declare type Props = {
4
+ entityTypes: TEntityType[];
5
+ selectedEntityTypes: TEntityType[];
6
+ onChange: (entityTypes: TEntityType[]) => void;
7
+ };
8
+ declare const EntityTypesSelector: ({ entityTypes, selectedEntityTypes, onChange }: Props) => JSX.Element;
9
+ export default EntityTypesSelector;
@@ -0,0 +1,29 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ var react_1 = __importDefault(require("react"));
7
+ var ui_i18n_1 = __importDefault(require("ui-i18n"));
8
+ var ramda_1 = require("ramda");
9
+ var classnames_1 = __importDefault(require("classnames"));
10
+ var Typography_1 = __importDefault(require("@material-ui/core/Typography"));
11
+ var MultiSelect_1 = __importDefault(require("../../ReactSelect/MultiSelect"));
12
+ var DropdownIndicatorWithIconButton_1 = __importDefault(require("../../commonReactSelectComponents/DropdownIndicatorWithIconButton"));
13
+ var styles_1 = require("./styles");
14
+ var EntityTypesSelector = function (_a) {
15
+ var entityTypes = _a.entityTypes, selectedEntityTypes = _a.selectedEntityTypes, onChange = _a.onChange;
16
+ var styles = styles_1.useStyles();
17
+ var valueToOption = function (entityType) { return ({ value: entityType.uri, label: entityType.label, entityType: entityType }); };
18
+ var prepareValues = function (values) { return values.map(valueToOption); };
19
+ var options = ramda_1.pipe(ramda_1.sortBy(function (option) { return option.label; }), prepareValues)(entityTypes);
20
+ return (react_1.default.createElement("div", { className: styles.selectorWrapper },
21
+ react_1.default.createElement(Typography_1.default, { className: classnames_1.default(styles.filterSubtitle, styles.labels), variant: 'subtitle1' }, ui_i18n_1.default.text('Type')),
22
+ react_1.default.createElement(MultiSelect_1.default, { value: prepareValues(selectedEntityTypes), onChange: ramda_1.pipe(ramda_1.defaultTo([]), ramda_1.pluck('entityType'), onChange), options: options, TextFieldProps: {
23
+ InputProps: { disableUnderline: true },
24
+ classes: { root: styles.dropDownInput }
25
+ }, components: {
26
+ DropdownIndicator: DropdownIndicatorWithIconButton_1.default
27
+ }, styles: styles_1.customStyles, classes: styles, menuPlacement: "bottom" })));
28
+ };
29
+ exports.default = EntityTypesSelector;
@@ -18,7 +18,7 @@ var SourceSelector = function (_a) {
18
18
  var styles = styles_1.useStyles();
19
19
  var metadata = react_redux_1.useSelector(mdm_module_1.default.selectors.getMetadata);
20
20
  var options = ramda_1.sortBy(function (option) { return option.label; })(metadata.sources);
21
- return (react_1.default.createElement("div", { className: styles.borderBottom },
21
+ return (react_1.default.createElement("div", { className: styles.selectorWrapper },
22
22
  react_1.default.createElement(Typography_1.default, { className: classnames_1.default(styles.filterSubtitle, styles.labels), variant: 'subtitle1' }, ui_i18n_1.default.text('Source')),
23
23
  react_1.default.createElement(MultiSelect_1.default, { value: selectedSources, onChange: ramda_1.pipe(ramda_1.defaultTo([]), onChange), options: options, TextFieldProps: {
24
24
  InputProps: { disableUnderline: true },
@@ -1,4 +1,4 @@
1
1
  export declare const customStyles: {
2
2
  input: (currentStyles: any) => any;
3
3
  };
4
- export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"option" | "labels" | "borderBottom" | "container" | "filterSubtitle" | "agoLabel" | "dateOption" | "dateOptionAgo" | "dateOptionWithin" | "dateOptionLabel" | "dropDownInput" | "filterControls" | "clearButton">;
4
+ export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"option" | "labels" | "container" | "divider" | "filterSubtitle" | "agoLabel" | "dateOption" | "dateOptionAgo" | "dateOptionWithin" | "dateOptionLabel" | "dropDownInput" | "filterControls" | "clearButton" | "selectorWrapper" | "selectorsGroup" | "selectorHint">;
@@ -18,8 +18,8 @@ exports.customStyles = {
18
18
  };
19
19
  exports.useStyles = styles_1.makeStyles({
20
20
  container: {
21
- padding: '24px 10px 0px',
22
- margin: '0 6px'
21
+ padding: '12px 7px 0px',
22
+ borderBottom: 'solid 1px rgba(0, 0, 0, 0.12)'
23
23
  },
24
24
  labels: {
25
25
  fontSize: '14px'
@@ -57,18 +57,29 @@ exports.useStyles = styles_1.makeStyles({
57
57
  },
58
58
  filterControls: {
59
59
  display: 'flex',
60
- paddingTop: '30px'
60
+ paddingTop: '30px',
61
+ marginBottom: 8
61
62
  },
62
63
  clearButton: {
63
64
  marginRight: 'auto'
64
65
  },
65
- borderBottom: {
66
- borderBottom: 'solid 1px rgba(0, 0, 0, 0.12)',
67
- paddingBottom: '10px',
68
- marginBottom: '15px'
66
+ selectorWrapper: {
67
+ marginBottom: '12px'
69
68
  },
70
69
  option: {
71
70
  fontSize: '14px',
72
71
  height: '32px'
72
+ },
73
+ selectorsGroup: {
74
+ display: 'flex',
75
+ flexDirection: 'column'
76
+ },
77
+ selectorHint: {
78
+ fontSize: 12,
79
+ lineHeight: '16px',
80
+ color: 'rgba(0,0,0,0.54)'
81
+ },
82
+ divider: {
83
+ marginBottom: 12
73
84
  }
74
85
  });
@@ -17,8 +17,9 @@ var getFilterLabel = function (filters) {
17
17
  });
18
18
  var activityLabel = ramda_1.pipe(ramda_1.map(activities_1.getActivityLabel), getLabel(ui_i18n_1.default.text('activity'), ui_i18n_1.default.text('activities')))(filters.activities);
19
19
  var userLabel = getLabel(ui_i18n_1.default.text('user'), ui_i18n_1.default.text('users'), filters.users);
20
- var attributesLabel = ramda_1.pipe(ramda_1.defaultTo([]), ramda_1.map(function (attribute) { return attribute.label; }), ramda_1.sortBy(ramda_1.identity), getLabel(ui_i18n_1.default.text('attribute'), ui_i18n_1.default.text('attributes')))(filters.attributes);
21
- var sourcesLabel = ramda_1.pipe(ramda_1.defaultTo([]), ramda_1.map(function (source) { return source.label; }), getLabel(ui_i18n_1.default.text('source'), ui_i18n_1.default.text('sources')))(filters.sources);
20
+ var entityTypesLabel = ramda_1.pipe(ramda_1.defaultTo([]), ramda_1.pluck('label'), ramda_1.sortBy(ramda_1.identity), getLabel(ui_i18n_1.default.text('type'), ui_i18n_1.default.text('types')))(filters.entityTypes);
21
+ var attributesLabel = ramda_1.pipe(ramda_1.defaultTo([]), ramda_1.pluck('label'), ramda_1.sortBy(ramda_1.identity), getLabel(ui_i18n_1.default.text('attribute'), ui_i18n_1.default.text('attributes')))(filters.attributes);
22
+ var sourcesLabel = ramda_1.pipe(ramda_1.defaultTo([]), ramda_1.pluck('label'), getLabel(ui_i18n_1.default.text('source'), ui_i18n_1.default.text('sources')))(filters.sources);
22
23
  var getDateLabel = function (date) {
23
24
  var formatDateValue = function (value) {
24
25
  return "" + mdm_sdk_1.formatDataTypeValue({ dataTypeDefinition: { type: mdm_sdk_1.DataTypes.TYPE_ACTIVENESS_DATE } }, value);
@@ -37,6 +38,6 @@ var getFilterLabel = function (filters) {
37
38
  return null;
38
39
  }
39
40
  };
40
- return ramda_1.pipe(ramda_1.reject(ramda_1.isNil), ramda_1.join(' | '))([activityLabel, attributesLabel, sourcesLabel, getDateLabel(filters.dateRange), userLabel]);
41
+ return ramda_1.pipe(ramda_1.reject(ramda_1.isNil), ramda_1.join(' | '))([activityLabel, entityTypesLabel, attributesLabel, sourcesLabel, getDateLabel(filters.dateRange), userLabel]);
41
42
  };
42
43
  exports.getFilterLabel = getFilterLabel;
@@ -16,6 +16,7 @@ exports.useStyles = styles_1.makeStyles(function () { return ({
16
16
  margin: '4px'
17
17
  },
18
18
  buttonsWrapper: {
19
- marginLeft: 'auto'
19
+ marginLeft: 'auto',
20
+ display: 'flex'
20
21
  }
21
22
  }); });
@@ -1,4 +1,4 @@
1
- import { Source } from '@reltio/mdm-sdk';
1
+ import { Source, TEntityType } from '@reltio/mdm-sdk';
2
2
  import { ActivityTypes } from './ActivityTypes';
3
3
  import { AttributeOption, DateRangeFilter } from '../../../types';
4
4
  export declare type ActivitiesFilter = {
@@ -7,5 +7,6 @@ export declare type ActivitiesFilter = {
7
7
  dateRange: DateRangeFilter;
8
8
  attributes?: AttributeOption[];
9
9
  sources?: Source[];
10
+ entityTypes?: TEntityType[];
10
11
  entityUri?: string;
11
12
  };
@@ -22,6 +22,9 @@ var buildActivityFilterClause = function (activityType) {
22
22
  var buildSourceFilterClause = function (source) {
23
23
  return "equals(items.delta.sources, '" + source.abbreviation + "')";
24
24
  };
25
+ var buildEntityTypeFilterClause = function (entityType) {
26
+ return "equals(items.objectType, '" + entityType.uri + "')";
27
+ };
25
28
  var buildAttributeFilterClause = function (attribute) {
26
29
  return "equals(items.delta.attributeType, '" + attribute.value + "')";
27
30
  };
@@ -60,6 +63,7 @@ var getFilterClauseBuilder = ramda_1.cond([
60
63
  [ramda_1.equals('activities'), function () { return multiValueFilter(buildActivityFilterClause); }],
61
64
  [ramda_1.equals('sources'), function () { return multiValueFilter(buildSourceFilterClause); }],
62
65
  [ramda_1.equals('attributes'), function () { return multiValueFilter(buildAttributeFilterClause); }],
66
+ [ramda_1.equals('entityTypes'), function () { return multiValueFilter(buildEntityTypeFilterClause); }],
63
67
  [ramda_1.equals('dateRange'), function () { return buildDateRangeFilterClause; }],
64
68
  [ramda_1.equals('entityUri'), function () { return buildEntityUriFilterClause; }]
65
69
  ]);
@@ -1,2 +1,2 @@
1
1
  import { ProcessRequestParams } from './types';
2
- export declare const processRequest: ({ name, paramObject, permissions, worker, metadata, config, apiPath, user, workflowPath, entity, tenant, entityUri, query, openSearch, environment, getCurrentPerspectiveId, showPerspective, workflowCheckPermission, setEntityUri }: ProcessRequestParams) => void;
2
+ export declare const processRequest: ({ name, paramObject, permissions, worker, metadata, config, apiPath, servicesPath, user, workflowPath, entity, tenant, entityUri, query, openSearch, environment, getCurrentPerspectiveId, showPerspective, workflowCheckPermission, setEntityUri }: ProcessRequestParams) => void;
@@ -10,9 +10,46 @@ var __assign = (this && this.__assign) || function () {
10
10
  };
11
11
  return __assign.apply(this, arguments);
12
12
  };
13
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
14
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
15
+ return new (P || (P = Promise))(function (resolve, reject) {
16
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
17
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
18
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
19
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
20
+ });
21
+ };
22
+ var __generator = (this && this.__generator) || function (thisArg, body) {
23
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
24
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
25
+ function verb(n) { return function (v) { return step([n, v]); }; }
26
+ function step(op) {
27
+ if (f) throw new TypeError("Generator is already executing.");
28
+ while (_) try {
29
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
30
+ if (y = 0, t) op = [op[0] & 2, t.value];
31
+ switch (op[0]) {
32
+ case 0: case 1: t = op; break;
33
+ case 4: _.label++; return { value: op[1], done: false };
34
+ case 5: _.label++; y = op[1]; op = [0]; continue;
35
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
36
+ default:
37
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
38
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
39
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
40
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
41
+ if (t[2]) _.ops.pop();
42
+ _.trys.pop(); continue;
43
+ }
44
+ op = body.call(thisArg, _);
45
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
46
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
47
+ }
48
+ };
13
49
  Object.defineProperty(exports, "__esModule", { value: true });
14
50
  exports.processRequest = void 0;
15
51
  var mdm_sdk_1 = require("@reltio/mdm-sdk");
52
+ var helpers_1 = require("./helpers");
16
53
  var processFromQuery = function (params, permissions, workflowPath, tenant, environment) {
17
54
  if (!params.processDefinitionId) {
18
55
  return new Promise(function (resolve) { return resolve({ errorMessage: 'processDefinitionId is empty' }); });
@@ -35,37 +72,69 @@ var processFromQuery = function (params, permissions, workflowPath, tenant, envi
35
72
  environment: environment
36
73
  });
37
74
  };
38
- var workflowRequest = function (params, permissions, workflowPath, tenant) {
39
- var url = params.url;
40
- var errors = validateParams(params, permissions);
41
- if (errors) {
42
- return new Promise(function (resolve) { return resolve(errors); });
43
- }
44
- var isExternalUrl = url.includes('http:') || url.includes('https:');
45
- if (!workflowPath && !isExternalUrl) {
46
- return new Promise(function (resolve) { return resolve({ errorMessage: 'Workflow path is not defined' }); });
47
- }
48
- return mdm_sdk_1.sendWorkflowRequest({
49
- url: url,
50
- method: params.method || 'GET',
51
- data: params.data,
52
- tenant: tenant,
53
- headers: params.headers,
54
- workflowPath: workflowPath
75
+ var getHeaders = function (params, signHandler) { return __awaiter(void 0, void 0, void 0, function () {
76
+ var accessToken;
77
+ return __generator(this, function (_a) {
78
+ switch (_a.label) {
79
+ case 0: return [4 /*yield*/, (signHandler === null || signHandler === void 0 ? void 0 : signHandler())];
80
+ case 1:
81
+ accessToken = (_a.sent()).accessToken;
82
+ return [2 /*return*/, accessToken
83
+ ? __assign(__assign({}, params.headers), { Authorization: "Bearer " + accessToken }) : params.headers];
84
+ }
55
85
  });
56
- };
57
- var sendApiRequest = function (params, permissions) {
58
- var errors = validateParams(params, permissions);
59
- if (errors) {
60
- return new Promise(function (resolve) { return resolve(errors); });
61
- }
62
- return mdm_sdk_1.sendRequestFromCustomSandbox({
63
- url: params.url,
64
- method: params.method,
65
- data: params.data,
66
- headers: params.headers
86
+ }); };
87
+ var workflowRequest = function (params, permissions, workflowPath, tenant, signHandler) { return __awaiter(void 0, void 0, void 0, function () {
88
+ var url, errors, isExternalUrl, headers;
89
+ return __generator(this, function (_a) {
90
+ switch (_a.label) {
91
+ case 0:
92
+ url = params.url;
93
+ errors = validateParams(params, permissions);
94
+ if (errors) {
95
+ return [2 /*return*/, errors];
96
+ }
97
+ isExternalUrl = url.includes('http:') || url.includes('https:');
98
+ if (!workflowPath && !isExternalUrl) {
99
+ return [2 /*return*/, { errorMessage: 'Workflow path is not defined' }];
100
+ }
101
+ return [4 /*yield*/, getHeaders(params, signHandler)];
102
+ case 1:
103
+ headers = _a.sent();
104
+ return [4 /*yield*/, mdm_sdk_1.sendWorkflowRequest({
105
+ url: url,
106
+ method: params.method || 'GET',
107
+ data: params.data,
108
+ tenant: tenant,
109
+ headers: headers,
110
+ workflowPath: workflowPath
111
+ })];
112
+ case 2: return [2 /*return*/, _a.sent()];
113
+ }
67
114
  });
68
- };
115
+ }); };
116
+ var sendApiRequest = function (params, permissions, signHandler) { return __awaiter(void 0, void 0, void 0, function () {
117
+ var errors, headers;
118
+ return __generator(this, function (_a) {
119
+ switch (_a.label) {
120
+ case 0:
121
+ errors = validateParams(params, permissions);
122
+ if (errors) {
123
+ return [2 /*return*/, errors];
124
+ }
125
+ return [4 /*yield*/, getHeaders(params, signHandler)];
126
+ case 1:
127
+ headers = _a.sent();
128
+ return [4 /*yield*/, mdm_sdk_1.sendRequestFromCustomSandbox({
129
+ url: params.url,
130
+ method: params.method,
131
+ data: params.data,
132
+ headers: headers
133
+ })];
134
+ case 2: return [2 /*return*/, _a.sent()];
135
+ }
136
+ });
137
+ }); };
69
138
  var validateParams = function (params, permissions) {
70
139
  var url = params.url;
71
140
  if (!url)
@@ -89,7 +158,7 @@ var validateParams = function (params, permissions) {
89
158
  return false;
90
159
  };
91
160
  var processRequest = function (_a) {
92
- var name = _a.name, paramObject = _a.paramObject, permissions = _a.permissions, worker = _a.worker, metadata = _a.metadata, config = _a.config, apiPath = _a.apiPath, user = _a.user, workflowPath = _a.workflowPath, entity = _a.entity, tenant = _a.tenant, entityUri = _a.entityUri, query = _a.query, openSearch = _a.openSearch, environment = _a.environment, getCurrentPerspectiveId = _a.getCurrentPerspectiveId, showPerspective = _a.showPerspective, workflowCheckPermission = _a.workflowCheckPermission, setEntityUri = _a.setEntityUri;
161
+ var name = _a.name, paramObject = _a.paramObject, permissions = _a.permissions, worker = _a.worker, metadata = _a.metadata, config = _a.config, apiPath = _a.apiPath, servicesPath = _a.servicesPath, user = _a.user, workflowPath = _a.workflowPath, entity = _a.entity, tenant = _a.tenant, entityUri = _a.entityUri, query = _a.query, openSearch = _a.openSearch, environment = _a.environment, getCurrentPerspectiveId = _a.getCurrentPerspectiveId, showPerspective = _a.showPerspective, workflowCheckPermission = _a.workflowCheckPermission, setEntityUri = _a.setEntityUri;
93
162
  var handleRequest = function (request) {
94
163
  request
95
164
  .then(function (data) {
@@ -99,14 +168,18 @@ var processRequest = function (_a) {
99
168
  worker.postMessage(__assign({ action: 'response', result: { data: {}, headers: '', status: 0 } }, paramObject.params));
100
169
  });
101
170
  };
171
+ var shouldSignRequest = helpers_1.isNewUI(servicesPath);
172
+ var signHandler = shouldSignRequest
173
+ ? function () { return mdm_sdk_1.getAccessToken({ servicesPath: servicesPath }); }
174
+ : function () { return Promise.resolve({ accessToken: '' }); };
102
175
  switch (name) {
103
176
  case mdm_sdk_1.RequestAction.API: {
104
- var request = sendApiRequest(paramObject.params, permissions);
177
+ var request = sendApiRequest(paramObject.params, permissions, signHandler);
105
178
  handleRequest(request);
106
179
  break;
107
180
  }
108
181
  case mdm_sdk_1.RequestAction.WORKFLOW: {
109
- var request = workflowRequest(paramObject.params, permissions, workflowPath, tenant);
182
+ var request = workflowRequest(paramObject.params, permissions, workflowPath, tenant, signHandler);
110
183
  handleRequest(request);
111
184
  break;
112
185
  }
@@ -1,2 +1,3 @@
1
+ export declare const isNewUI: (path?: string) => boolean;
1
2
  export declare const getWorkerURL: (uiPath: string, tenant: string) => string;
2
3
  export declare const getFullApiPath: (apiPath: string) => string;
@@ -1,8 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getFullApiPath = exports.getWorkerURL = void 0;
3
+ exports.getFullApiPath = exports.getWorkerURL = exports.isNewUI = void 0;
4
+ var isNewUI = function (path) {
5
+ return path === null || path === void 0 ? void 0 : path.includes('/nui');
6
+ };
7
+ exports.isNewUI = isNewUI;
4
8
  var getWorkerURL = function (uiPath, tenant) {
5
- if (uiPath === null || uiPath === void 0 ? void 0 : uiPath.includes('nui')) {
9
+ if (exports.isNewUI(uiPath)) {
6
10
  return uiPath.replace(tenant + "/", '') + "worker_api.js";
7
11
  }
8
12
  else {
@@ -11,7 +15,7 @@ var getWorkerURL = function (uiPath, tenant) {
11
15
  };
12
16
  exports.getWorkerURL = getWorkerURL;
13
17
  var getFullApiPath = function (apiPath) {
14
- if (apiPath === null || apiPath === void 0 ? void 0 : apiPath.includes('nui')) {
18
+ if (exports.isNewUI(apiPath)) {
15
19
  return "" + window.location.origin + apiPath;
16
20
  }
17
21
  else {
@@ -16,6 +16,7 @@ export declare type ProcessRequestParams = {
16
16
  environment: string;
17
17
  entity: any;
18
18
  tenant: any;
19
+ servicesPath: string;
19
20
  entityUri: string;
20
21
  query: any;
21
22
  openSearch: (search: any) => void;
@@ -56,6 +56,7 @@ var useAPI = function (config) {
56
56
  var apiPath = react_redux_1.useSelector(mdm_module_1.default.selectors.getApiPath);
57
57
  var workflowPath = react_redux_1.useSelector(mdm_module_1.default.selectors.getWorkflowPath);
58
58
  var user = react_redux_1.useSelector(mdm_module_1.default.selectors.getUser);
59
+ var servicesPath = react_redux_1.useSelector(mdm_module_1.default.selectors.getServicesPath);
59
60
  var entityUri = react_redux_1.useSelector(mdm_module_1.default.selectors.getEntityUri);
60
61
  var environment = react_redux_1.useSelector(mdm_module_1.default.selectors.getWorkflowEnvironmentUrl);
61
62
  var qxApi = react_1.useContext(contexts_1.SandboxAPIContext);
@@ -165,7 +166,8 @@ var useAPI = function (config) {
165
166
  }
166
167
  case mdm_sdk_1.CustomAction.REQUEST: {
167
168
  API_1.processRequest(__assign({ name: task.params.name, paramObject: task, permissions: config.action.permissions, worker: worker,
168
- metadata: metadata, config: config, user: user, apiPath: helpers_1.getFullApiPath(apiPath), tenant: tenant,
169
+ metadata: metadata, config: config, user: user,
170
+ servicesPath: servicesPath, apiPath: helpers_1.getFullApiPath(apiPath), tenant: tenant,
169
171
  workflowPath: workflowPath,
170
172
  entity: entity,
171
173
  entityUri: entityUri,
@@ -82,6 +82,7 @@ var useCustomScripts = function (config, _a) {
82
82
  var metadata = react_redux_1.useSelector(mdm_module_1.default.selectors.getMetadata) || {};
83
83
  var entity = react_redux_1.useSelector(mdm_module_1.default.selectors.getEntity) || {};
84
84
  var uiPath = react_redux_1.useSelector(mdm_module_1.default.selectors.getUIPath);
85
+ var servicesPath = react_redux_1.useSelector(mdm_module_1.default.selectors.getServicesPath);
85
86
  var reltioPath = react_redux_1.useSelector(mdm_module_1.default.selectors.getReltioPath);
86
87
  var tenant = react_redux_1.useSelector(mdm_module_1.default.selectors.getTenant);
87
88
  var workerUrl = useAPI_1.getWorkerURL(uiPath, tenant);
@@ -117,6 +118,7 @@ var useCustomScripts = function (config, _a) {
117
118
  config: config,
118
119
  user: user,
119
120
  apiPath: apiPath,
121
+ servicesPath: servicesPath,
120
122
  tenant: tenant,
121
123
  workflowPath: workflowPath,
122
124
  entity: entity,
@@ -1 +1 @@
1
- export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"root" | "outlined" | "menuItem" | "currentValue" | "arrowIcon" | "currentValueIcon" | "currentValueText" | "firstMenuItemButton" | "menuItemInner" | "menuItemIcon" | "menuItemLabel" | "menuItemDescription">;
1
+ export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"root" | "outlined" | "menuItem" | "arrowIcon" | "currentValue" | "currentValueIcon" | "currentValueText" | "firstMenuItemButton" | "menuItemInner" | "menuItemIcon" | "menuItemLabel" | "menuItemDescription">;