@reltio/components 1.4.845 → 1.4.846

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 (68) hide show
  1. package/components/AttributeSelector/AttributeSelector.d.ts +14 -0
  2. package/components/{activityLog/ActivityFilterEditor → AttributeSelector}/AttributeSelector.js +10 -10
  3. package/components/AttributeSelector/styles.d.ts +4 -0
  4. package/components/AttributeSelector/styles.js +41 -0
  5. package/components/DateIntervalSelector/DateIntervalSelector.d.ts +8 -0
  6. package/components/{activityLog/ActivityFilterEditor/IntervalSelector.js → DateIntervalSelector/DateIntervalSelector.js} +8 -17
  7. package/components/DateIntervalSelector/styles.d.ts +1 -0
  8. package/components/DateIntervalSelector/styles.js +25 -0
  9. package/components/DateRangePicker/styles.d.ts +1 -1
  10. package/components/ImageGalleryDialog/styles.d.ts +1 -1
  11. package/components/UploadImageDialog/ImageByUrlField/styles.d.ts +1 -1
  12. package/components/UserSelector/UserSelector.d.ts +9 -0
  13. package/components/{activityLog/ActivityFilterEditor → UserSelector}/UserSelector.js +6 -6
  14. package/components/UserSelector/styles.d.ts +5 -0
  15. package/components/UserSelector/styles.js +39 -0
  16. package/components/activityLog/ActivityFilterEditor/ActivityFilterEditor.js +4 -4
  17. package/components/activityLog/ActivityFilterEditor/DateRangeSelector.d.ts +3 -3
  18. package/components/activityLog/ActivityFilterEditor/DateRangeSelector.js +6 -6
  19. package/components/activityLog/ActivityFilterEditor/styles.d.ts +1 -1
  20. package/components/activityLog/ActivityFilterEditor/styles.js +3 -32
  21. package/components/activityLog/ActivityLogFilter/helpers.js +1 -1
  22. package/components/activityLog/types/ActivitiesFilter.d.ts +2 -7
  23. package/components/activityLog/types/index.d.ts +1 -3
  24. package/components/activityLog/types/index.js +1 -3
  25. package/components/activityLog/utils/filters.d.ts +2 -2
  26. package/components/activityLog/utils/filters.js +1 -1
  27. package/components/attributes/inline/SimpleAttributeEditor/styles.d.ts +1 -1
  28. package/components/{activityLog/ActivityFilterEditor/ActivityDateRangeEditor.d.ts → editors/CustomDateRangeEditor/CustomDateRangeEditor.d.ts} +3 -3
  29. package/components/{activityLog/ActivityFilterEditor/ActivityDateRangeEditor.js → editors/CustomDateRangeEditor/CustomDateRangeEditor.js} +6 -5
  30. package/components/editors/CustomDateRangeEditor/styles.d.ts +1 -0
  31. package/components/editors/CustomDateRangeEditor/styles.js +25 -0
  32. package/components/editors/DateRangeEditor/styles.d.ts +1 -1
  33. package/components/history/DateRangeSelector/DateRangeSelector.d.ts +9 -0
  34. package/components/history/DateRangeSelector/DateRangeSelector.js +91 -0
  35. package/components/history/DateRangeSelector/styles.d.ts +1 -0
  36. package/components/history/DateRangeSelector/styles.js +22 -0
  37. package/components/history/DateRangeSelector/utils.d.ts +3 -0
  38. package/components/history/DateRangeSelector/utils.js +19 -0
  39. package/components/history/HistoryActivitySelector/HistoryActivitySelector.d.ts +9 -0
  40. package/components/history/HistoryActivitySelector/HistoryActivitySelector.js +27 -0
  41. package/components/history/HistoryActivitySelector/styles.d.ts +4 -0
  42. package/components/history/HistoryActivitySelector/styles.js +42 -0
  43. package/components/history/HistoryActivitySelector/utils.d.ts +3 -0
  44. package/components/history/HistoryActivitySelector/utils.js +23 -0
  45. package/components/history/HistoryFilterButton/HistoryFilterButton.d.ts +10 -0
  46. package/components/history/HistoryFilterButton/HistoryFilterButton.js +87 -0
  47. package/components/history/HistoryFilterButton/styles.d.ts +1 -1
  48. package/components/history/HistoryFilterButton/styles.js +26 -0
  49. package/components/history/HistoryHeader/HistoryHeader.d.ts +6 -1
  50. package/components/history/HistoryHeader/HistoryHeader.js +3 -3
  51. package/components/history/index.d.ts +2 -1
  52. package/components/history/index.js +13 -2
  53. package/components/history/types/HistoryFilter.d.ts +12 -0
  54. package/components/history/types/HistoryFilter.js +9 -0
  55. package/components/history/types/index.d.ts +2 -0
  56. package/components/history/types/index.js +5 -0
  57. package/package.json +3 -3
  58. package/types/index.d.ts +17 -0
  59. package/types/index.js +7 -0
  60. package/components/activityLog/ActivityFilterEditor/AttributeSelector.d.ts +0 -10
  61. package/components/activityLog/ActivityFilterEditor/IntervalSelector.d.ts +0 -8
  62. package/components/activityLog/ActivityFilterEditor/UserSelector.d.ts +0 -7
  63. package/components/activityLog/types/AttributeOption.d.ts +0 -8
  64. package/components/activityLog/types/AttributeOption.js +0 -2
  65. package/components/activityLog/types/DateRangeTypes.d.ts +0 -5
  66. package/components/activityLog/types/DateRangeTypes.js +0 -9
  67. package/components/history/HistoryFilterButton/HistoryFilterBitton.d.ts +0 -3
  68. package/components/history/HistoryFilterButton/HistoryFilterBitton.js +0 -14
@@ -0,0 +1,14 @@
1
+ /// <reference types="react" />
2
+ import { AttributeOption } from '../../types';
3
+ import { TEntityType } from '@reltio/mdm-sdk';
4
+ declare type Props = {
5
+ entityType: TEntityType;
6
+ selectedAttributes: AttributeOption[];
7
+ className?: string;
8
+ onChange?: (attributes: AttributeOption[]) => void;
9
+ title?: string;
10
+ disableUnderline?: boolean;
11
+ menuPlacement?: string;
12
+ };
13
+ declare const AttributeSelector: ({ entityType, selectedAttributes, className, onChange, title, disableUnderline, menuPlacement }: Props) => JSX.Element;
14
+ export default AttributeSelector;
@@ -52,13 +52,13 @@ var react_redux_1 = require("react-redux");
52
52
  var mdm_module_1 = __importDefault(require("@reltio/mdm-module"));
53
53
  var mdm_sdk_1 = require("@reltio/mdm-sdk");
54
54
  var Typography_1 = __importDefault(require("@material-ui/core/Typography"));
55
- var MultiSelect_1 = __importDefault(require("../../ReactSelect/MultiSelect"));
56
- var MultiValue_1 = __importDefault(require("../../ReactSelect/commonComponents/MultiValue"));
57
- var DropdownIndicatorWithIconButton_1 = __importDefault(require("../../commonReactSelectComponents/DropdownIndicatorWithIconButton"));
58
- var AttributeListItem_1 = __importDefault(require("../../AttributeListItem/AttributeListItem"));
55
+ var MultiSelect_1 = __importDefault(require("../ReactSelect/MultiSelect"));
56
+ var MultiValue_1 = __importDefault(require("../ReactSelect/commonComponents/MultiValue"));
57
+ var DropdownIndicatorWithIconButton_1 = __importDefault(require("../commonReactSelectComponents/DropdownIndicatorWithIconButton"));
58
+ var AttributeListItem_1 = __importDefault(require("../AttributeListItem/AttributeListItem"));
59
59
  var styles_1 = require("./styles");
60
60
  var AttributeSelector = function (_a) {
61
- var selectedAttributes = _a.selectedAttributes, entityType = _a.entityType, onChange = _a.onChange;
61
+ var entityType = _a.entityType, selectedAttributes = _a.selectedAttributes, className = _a.className, onChange = _a.onChange, title = _a.title, disableUnderline = _a.disableUnderline, _b = _a.menuPlacement, menuPlacement = _b === void 0 ? 'bottom' : _b;
62
62
  var metadata = react_redux_1.useSelector(mdm_module_1.default.selectors.getMetadata);
63
63
  var styles = styles_1.useStyles();
64
64
  var prepareItems = react_1.useCallback(function (data, level, prevLabel) {
@@ -79,7 +79,7 @@ var AttributeSelector = function (_a) {
79
79
  return acc.concat(subAttributes ? prepareItems(subAttributes, level + 1, chipLabel) : []);
80
80
  }, []);
81
81
  }, [metadata]);
82
- var options = react_1.useMemo(function () { return prepareItems(entityType === null || entityType === void 0 ? void 0 : entityType.attributes); }, [entityType, prepareItems]);
82
+ var options = react_1.useMemo(function () { return prepareItems((entityType === null || entityType === void 0 ? void 0 : entityType.attributes) || []); }, [entityType, prepareItems]);
83
83
  var CustomOption = function (_a) {
84
84
  var isFocused = _a.isFocused, isSelected = _a.isSelected, data = _a.data, label = _a.label, innerProps = _a.innerProps;
85
85
  return (react_1.default.createElement("div", __assign({}, innerProps),
@@ -89,15 +89,15 @@ var AttributeSelector = function (_a) {
89
89
  var data = _a.data, props = __rest(_a, ["data"]);
90
90
  return (react_1.default.createElement(MultiValue_1.default, __assign({}, props), data.chipLabel));
91
91
  };
92
- return (react_1.default.createElement("div", { className: styles.borderBottom },
93
- react_1.default.createElement(Typography_1.default, { className: classnames_1.default(styles.filterSubtitle, styles.labels), variant: 'subtitle1' }, ui_i18n_1.default.text('Attribute')),
92
+ return (react_1.default.createElement("div", { className: classnames_1.default(styles.root, className) },
93
+ react_1.default.createElement(Typography_1.default, { className: styles.title, variant: 'subtitle1' }, title || ui_i18n_1.default.text('Attribute')),
94
94
  react_1.default.createElement(MultiSelect_1.default, { value: selectedAttributes, options: options, TextFieldProps: {
95
- InputProps: { disableUnderline: true },
95
+ InputProps: { disableUnderline: disableUnderline },
96
96
  classes: { root: styles.dropDownInput }
97
97
  }, components: {
98
98
  DropdownIndicator: DropdownIndicatorWithIconButton_1.default,
99
99
  MultiValue: CustomMultiValue,
100
100
  Option: CustomOption
101
- }, onChange: ramda_1.pipe(ramda_1.defaultTo([]), onChange), styles: styles_1.customStyles, classes: styles, menuPlacement: "bottom" })));
101
+ }, onChange: ramda_1.pipe(ramda_1.defaultTo([]), onChange), styles: styles_1.customStyles, classes: styles, menuPlacement: menuPlacement })));
102
102
  };
103
103
  exports.default = AttributeSelector;
@@ -0,0 +1,4 @@
1
+ export declare const customStyles: {
2
+ input: (currentStyles: any) => any;
3
+ };
4
+ export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"option" | "title" | "root" | "dropDownInput" | "noOptionsMessage">;
@@ -0,0 +1,41 @@
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
+ Object.defineProperty(exports, "__esModule", { value: true });
14
+ exports.useStyles = exports.customStyles = void 0;
15
+ var styles_1 = require("@material-ui/core/styles");
16
+ exports.customStyles = {
17
+ input: function (currentStyles) { return (__assign(__assign({}, currentStyles), { fontSize: '14px' })); }
18
+ };
19
+ exports.useStyles = styles_1.makeStyles({
20
+ root: {
21
+ flex: 1
22
+ },
23
+ title: {
24
+ paddingBottom: '10px',
25
+ paddingLeft: '5px',
26
+ fontSize: '14px'
27
+ },
28
+ dropDownInput: {
29
+ width: '100%',
30
+ justifyContent: 'center',
31
+ backgroundColor: 'rgba(0, 0, 0, 0.03)',
32
+ borderTop: '4px'
33
+ },
34
+ option: {
35
+ fontSize: '14px',
36
+ height: '32px'
37
+ },
38
+ noOptionsMessage: {
39
+ fontSize: '14px'
40
+ }
41
+ });
@@ -0,0 +1,8 @@
1
+ /// <reference types="react" />
2
+ declare type Props = {
3
+ interval: [number, string];
4
+ onChange: ([number, string]: [any, any]) => void;
5
+ onFocus?: () => void;
6
+ };
7
+ declare const DateIntervalSelector: ({ interval: [value, unit], onChange, onFocus }: Props) => JSX.Element;
8
+ export default DateIntervalSelector;
@@ -5,12 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  var react_1 = __importDefault(require("react"));
7
7
  var ramda_1 = require("ramda");
8
- var classnames_1 = __importDefault(require("classnames"));
9
8
  var ui_i18n_1 = __importDefault(require("ui-i18n"));
10
9
  var capitalize_1 = __importDefault(require("@material-ui/core/utils/capitalize"));
11
10
  var TextField_1 = __importDefault(require("@material-ui/core/TextField"));
12
- var SimpleDropDownSelector_1 = __importDefault(require("../../SimpleDropDownSelector/SimpleDropDownSelector"));
13
- var utils_1 = require("../../../core/utils");
11
+ var SimpleDropDownSelector_1 = __importDefault(require("../SimpleDropDownSelector/SimpleDropDownSelector"));
12
+ var utils_1 = require("../../core/utils");
14
13
  var styles_1 = require("./styles");
15
14
  var periods = [
16
15
  ui_i18n_1.default.text('minutes'),
@@ -20,7 +19,7 @@ var periods = [
20
19
  ui_i18n_1.default.text('months'),
21
20
  ui_i18n_1.default.text('years')
22
21
  ];
23
- var IntervalSelector = function (_a) {
22
+ var DateIntervalSelector = function (_a) {
24
23
  var _b = _a.interval, value = _b[0], unit = _b[1], onChange = _a.onChange, onFocus = _a.onFocus;
25
24
  var styles = styles_1.useStyles();
26
25
  var getIntervalFromValue = function (newValue) { return [newValue, unit]; };
@@ -30,22 +29,14 @@ var IntervalSelector = function (_a) {
30
29
  };
31
30
  var onNumberChange = ramda_1.pipe(utils_1.getValue, parseInt, getIntervalFromValue, onChange);
32
31
  var onUnitChange = ramda_1.pipe(getIntervalFromUnit, onChange);
33
- return (react_1.default.createElement("div", { className: styles.intervalContainer },
34
- react_1.default.createElement(TextField_1.default, { type: "number", value: value || '', onChange: onNumberChange, inputProps: { min: 1, onFocus: onFocus }, InputProps: {
35
- classes: {
36
- root: classnames_1.default(styles.input, styles.labels)
37
- }
38
- }, className: classnames_1.default(styles.dateInput, styles.dateInputNumber) }),
39
- react_1.default.createElement(SimpleDropDownSelector_1.default, { label: '', placeholder: capitalize_1.default(unit), className: classnames_1.default(styles.dateInputPeriod), value: { value: unit, label: capitalize_1.default(unit) }, options: periods.map(function (value) { return ({
32
+ return (react_1.default.createElement("div", { className: styles.root },
33
+ react_1.default.createElement(TextField_1.default, { type: "number", value: value || '', onChange: onNumberChange, inputProps: { min: 1, onFocus: onFocus }, InputProps: { classes: { root: styles.input } }, className: styles.inputNumber }),
34
+ react_1.default.createElement(SimpleDropDownSelector_1.default, { label: '', placeholder: capitalize_1.default(unit), className: styles.inputUnit, value: { value: unit, label: capitalize_1.default(unit) }, options: periods.map(function (value) { return ({
40
35
  value: value,
41
36
  label: capitalize_1.default(value)
42
37
  }); }), onChange: onUnitChange, TextFieldProps: {
43
38
  inputProps: { onFocus: onFocus },
44
- InputProps: {
45
- classes: {
46
- root: classnames_1.default(styles.input, styles.labels)
47
- }
48
- }
39
+ InputProps: { classes: { root: styles.input } }
49
40
  } })));
50
41
  };
51
- exports.default = IntervalSelector;
42
+ exports.default = DateIntervalSelector;
@@ -0,0 +1 @@
1
+ export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"input" | "root" | "inputNumber" | "inputUnit">;
@@ -0,0 +1,25 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.useStyles = void 0;
4
+ var styles_1 = require("@material-ui/core/styles");
5
+ exports.useStyles = styles_1.makeStyles({
6
+ root: {
7
+ display: 'flex',
8
+ flex: 1
9
+ },
10
+ input: {
11
+ height: '100%',
12
+ paddingLeft: '12px',
13
+ paddingRight: '8px',
14
+ fontSize: '14px'
15
+ },
16
+ inputNumber: {
17
+ minWidth: '60px',
18
+ marginRight: 10,
19
+ height: '100%',
20
+ backgroundColor: 'rgba(0, 0, 0, 0.03)'
21
+ },
22
+ inputUnit: {
23
+ width: '100%'
24
+ }
25
+ });
@@ -1 +1 @@
1
- export const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"title" | "button" | "header" | "container" | "dateInput" | "actionButtons" | "dateRangeContainer">;
1
+ export const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"title" | "button" | "header" | "container" | "actionButtons" | "dateRangeContainer" | "dateInput">;
@@ -1 +1 @@
1
- export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"content" | "toolbar" | "paper" | "backdrop" | "closeIcon" | "appBar" | "closeButton" | "headerLeft" | "headerCenter" | "headerRight" | "modeSwitcher">;
1
+ export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"content" | "toolbar" | "backdrop" | "paper" | "closeIcon" | "appBar" | "closeButton" | "headerLeft" | "headerCenter" | "headerRight" | "modeSwitcher">;
@@ -1 +1 @@
1
- export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"errorMessage" | "input" | "root" | "paper" | "inputRoot">;
1
+ export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"errorMessage" | "input" | "root" | "inputRoot" | "paper">;
@@ -0,0 +1,9 @@
1
+ /// <reference types="react" />
2
+ declare type Props = {
3
+ selectedUsers: string[];
4
+ onChange: (activities: string[]) => void;
5
+ className?: string;
6
+ disableUnderline?: boolean;
7
+ };
8
+ declare const UserSelector: ({ selectedUsers, onChange, className, disableUnderline }: Props) => JSX.Element;
9
+ export default UserSelector;
@@ -28,13 +28,13 @@ var ui_i18n_1 = __importDefault(require("ui-i18n"));
28
28
  var ramda_1 = require("ramda");
29
29
  var classnames_1 = __importDefault(require("classnames"));
30
30
  var Typography_1 = __importDefault(require("@material-ui/core/Typography"));
31
- var MultiSelect_1 = __importDefault(require("../../ReactSelect/MultiSelect"));
32
- var DropdownIndicatorWithIconButton_1 = __importDefault(require("../../commonReactSelectComponents/DropdownIndicatorWithIconButton"));
31
+ var MultiSelect_1 = __importDefault(require("../ReactSelect/MultiSelect"));
32
+ var DropdownIndicatorWithIconButton_1 = __importDefault(require("../commonReactSelectComponents/DropdownIndicatorWithIconButton"));
33
33
  var mdm_sdk_1 = require("@reltio/mdm-sdk");
34
34
  var mdm_module_1 = __importDefault(require("@reltio/mdm-module"));
35
35
  var styles_1 = require("./styles");
36
36
  var UserSelector = function (_a) {
37
- var selectedUsers = _a.selectedUsers, onChange = _a.onChange;
37
+ var selectedUsers = _a.selectedUsers, onChange = _a.onChange, className = _a.className, disableUnderline = _a.disableUnderline;
38
38
  var styles = styles_1.useStyles();
39
39
  var valueToOption = function (value) { return ({ value: value, label: value }); };
40
40
  var prepareValues = function (values) { return values.map(valueToOption); };
@@ -50,10 +50,10 @@ var UserSelector = function (_a) {
50
50
  }
51
51
  return cachedRequest.current.then(ramda_1.pipe(ramda_1.prop('array'), ramda_1.pluck('username'), filterUsers(inputValue), prepareValues));
52
52
  };
53
- return (react_1.default.createElement("div", null,
54
- react_1.default.createElement(Typography_1.default, { className: classnames_1.default(styles.filterSubtitle, styles.labels), variant: 'subtitle1' }, ui_i18n_1.default.text('User')),
53
+ return (react_1.default.createElement("div", { className: classnames_1.default(styles.root, className) },
54
+ react_1.default.createElement(Typography_1.default, { className: styles.title, variant: 'subtitle1' }, ui_i18n_1.default.text('User')),
55
55
  react_1.default.createElement(MultiSelect_1.default, { value: prepareValues(selectedUsers), onChange: ramda_1.pipe(ramda_1.defaultTo([]), ramda_1.pluck('value'), onChange), defaultOptions: true, getOptions: getOptions, TextFieldProps: {
56
- InputProps: { disableUnderline: true },
56
+ InputProps: { disableUnderline: disableUnderline },
57
57
  className: styles.dropDownInput
58
58
  }, components: {
59
59
  DropdownIndicator: DropdownIndicatorWithIconButton_1.default
@@ -0,0 +1,5 @@
1
+ export declare const customStyles: {
2
+ input: (currentStyles: any) => any;
3
+ loadingMessage: (currentStyles: any) => any;
4
+ };
5
+ export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"option" | "title" | "root" | "dropDownInput">;
@@ -0,0 +1,39 @@
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
+ Object.defineProperty(exports, "__esModule", { value: true });
14
+ exports.useStyles = exports.customStyles = void 0;
15
+ var styles_1 = require("@material-ui/core/styles");
16
+ exports.customStyles = {
17
+ input: function (currentStyles) { return (__assign(__assign({}, currentStyles), { fontSize: '14px' })); },
18
+ loadingMessage: function (currentStyles) { return (__assign(__assign({}, currentStyles), { fontSize: '14px' })); }
19
+ };
20
+ exports.useStyles = styles_1.makeStyles({
21
+ root: {
22
+ flex: 1
23
+ },
24
+ title: {
25
+ paddingBottom: '10px',
26
+ paddingLeft: '5px',
27
+ fontSize: '14px'
28
+ },
29
+ dropDownInput: {
30
+ width: '100%',
31
+ justifyContent: 'center',
32
+ backgroundColor: 'rgba(0, 0, 0, 0.03)',
33
+ borderTop: '4px'
34
+ },
35
+ option: {
36
+ fontSize: '14px',
37
+ height: '32px'
38
+ }
39
+ });
@@ -42,9 +42,9 @@ var Button_1 = __importDefault(require("@material-ui/core/Button"));
42
42
  var types_1 = require("../types");
43
43
  var getSelectorActivityTypes_1 = require("./utils/getSelectorActivityTypes");
44
44
  var ActivitySelector_1 = __importDefault(require("./ActivitySelector"));
45
- var AttributeSelector_1 = __importDefault(require("./AttributeSelector"));
45
+ var AttributeSelector_1 = __importDefault(require("../../AttributeSelector/AttributeSelector"));
46
46
  var SourceSelector_1 = __importDefault(require("./SourceSelector"));
47
- var UserSelector_1 = __importDefault(require("./UserSelector"));
47
+ var UserSelector_1 = __importDefault(require("../../UserSelector/UserSelector"));
48
48
  var DateRangeSelector_1 = __importDefault(require("./DateRangeSelector"));
49
49
  var hooks_1 = require("../../../hooks");
50
50
  var ramda_1 = require("ramda");
@@ -69,10 +69,10 @@ var ActivityFilterEditor = function (_a) {
69
69
  var ActivityFilterRenderer = (react_1.default.createElement(react_1.default.Fragment, null,
70
70
  react_1.default.createElement(ActivitySelector_1.default, { activityTypes: getSelectorActivityTypes_1.getSelectorActivityTypes(metadata, entityType), selectedActivityTypes: activities, onChange: handlePropChange('activities') }),
71
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') }),
72
+ react_1.default.createElement(AttributeSelector_1.default, { selectedAttributes: attributes, entityType: entityType, onChange: handlePropChange('attributes'), className: styles.borderBottom, disableUnderline: true }),
73
73
  react_1.default.createElement(SourceSelector_1.default, { selectedSources: sources, onChange: handlePropChange('sources') }))),
74
74
  react_1.default.createElement(DateRangeSelector_1.default, { value: dateRange, onChange: handlePropChange('dateRange') }),
75
- react_1.default.createElement(UserSelector_1.default, { selectedUsers: users, onChange: handlePropChange('users') }),
75
+ react_1.default.createElement(UserSelector_1.default, { selectedUsers: users, onChange: handlePropChange('users'), disableUnderline: true }),
76
76
  react_1.default.createElement("div", { className: classnames_1.default(styles.borderBottom, styles.filterControls) },
77
77
  react_1.default.createElement(Button_1.default, { onClick: ramda_1.pipe(clearCurrentValue, onClear), className: styles.clearButton }, ui_i18n_1.default.text('Clear all')),
78
78
  react_1.default.createElement(Button_1.default, { onClick: onCancel }, ui_i18n_1.default.text('Cancel')),
@@ -1,8 +1,8 @@
1
1
  /// <reference types="react" />
2
- import { ActivitiesFilterDateRange } from '../types';
2
+ import { DateRangeFilter } from '../../../types';
3
3
  declare type Props = {
4
- value: ActivitiesFilterDateRange;
5
- onChange: (range: ActivitiesFilterDateRange) => void;
4
+ value: DateRangeFilter;
5
+ onChange: (range: DateRangeFilter) => void;
6
6
  };
7
7
  declare const DateRangeSelector: ({ value, onChange }: Props) => JSX.Element;
8
8
  export default DateRangeSelector;
@@ -41,10 +41,10 @@ var FormControlLabel_1 = __importDefault(require("@material-ui/core/FormControlL
41
41
  var Radio_1 = __importDefault(require("@material-ui/core/Radio"));
42
42
  var RadioGroup_1 = __importDefault(require("@material-ui/core/RadioGroup"));
43
43
  var Typography_1 = __importDefault(require("@material-ui/core/Typography"));
44
- var types_1 = require("../types");
45
- var IntervalSelector_1 = __importDefault(require("./IntervalSelector"));
44
+ var types_1 = require("../../../types");
45
+ var DateIntervalSelector_1 = __importDefault(require("../../DateIntervalSelector/DateIntervalSelector"));
46
46
  var utils_1 = require("../../../core/utils");
47
- var ActivityDateRangeEditor_1 = __importDefault(require("./ActivityDateRangeEditor"));
47
+ var CustomDateRangeEditor_1 = __importDefault(require("../../editors/CustomDateRangeEditor/CustomDateRangeEditor"));
48
48
  var hooks_1 = require("../../../hooks");
49
49
  var styles_1 = require("./styles");
50
50
  var emptyDates = [null, null];
@@ -108,13 +108,13 @@ var DateRangeSelector = function (_a) {
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 },
110
110
  react_1.default.createElement(FormControlLabel_1.default, { value: types_1.DateRangeTypes.WITHIN, control: react_1.default.createElement(Radio_1.default, null), label: ui_i18n_1.default.text('Within the last'), classes: { label: classnames_1.default(styles.dateOptionLabel, styles.labels) } }),
111
- react_1.default.createElement(IntervalSelector_1.default, { interval: withinInterval, onChange: changePeriod, onFocus: function () { return changeType(types_1.DateRangeTypes.WITHIN); } })),
111
+ react_1.default.createElement(DateIntervalSelector_1.default, { interval: withinInterval, onChange: changePeriod, onFocus: function () { return changeType(types_1.DateRangeTypes.WITHIN); } })),
112
112
  react_1.default.createElement("div", { className: styles.dateOptionAgo },
113
113
  react_1.default.createElement(FormControlLabel_1.default, { value: types_1.DateRangeTypes.AGO, control: react_1.default.createElement(Radio_1.default, null), label: ui_i18n_1.default.text('More than'), classes: { label: classnames_1.default(styles.dateOptionLabel, styles.labels) } }),
114
- react_1.default.createElement(IntervalSelector_1.default, { interval: agoInterval, onChange: changePeriod, onFocus: function () { return changeType(types_1.DateRangeTypes.AGO); } }),
114
+ react_1.default.createElement(DateIntervalSelector_1.default, { interval: agoInterval, onChange: changePeriod, onFocus: function () { return changeType(types_1.DateRangeTypes.AGO); } }),
115
115
  react_1.default.createElement(Typography_1.default, { className: classnames_1.default(styles.agoLabel, styles.labels), variant: 'subtitle1' }, ui_i18n_1.default.text('Ago'))),
116
116
  react_1.default.createElement("div", { className: styles.dateOption },
117
117
  react_1.default.createElement(FormControlLabel_1.default, { value: types_1.DateRangeTypes.BETWEEN, control: react_1.default.createElement(Radio_1.default, null), label: ui_i18n_1.default.text('Date range'), classes: { label: classnames_1.default(styles.dateOptionLabel, styles.labels) } }),
118
- react_1.default.createElement(ActivityDateRangeEditor_1.default, { values: datesInterval, onChange: changePeriod, onFocus: function () { return changeType(types_1.DateRangeTypes.BETWEEN); } })))));
118
+ react_1.default.createElement(CustomDateRangeEditor_1.default, { values: datesInterval, onChange: changePeriod, onFocus: function () { return changeType(types_1.DateRangeTypes.BETWEEN); } })))));
119
119
  };
120
120
  exports.default = DateRangeSelector;
@@ -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" | "borderBottom" | "input" | "container" | "labels" | "filterSubtitle" | "agoLabel" | "dateOption" | "dateOptionAgo" | "dateOptionWithin" | "dateRangeRoot" | "dateInput" | "dateInputNumber" | "dateInputPeriod" | "dateOptionLabel" | "dropDownInput" | "activityPlaceholder" | "filterControls" | "clearButton" | "paper" | "intervalContainer">;
4
+ export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"option" | "borderBottom" | "container" | "labels" | "filterSubtitle" | "agoLabel" | "dateOption" | "dateOptionAgo" | "dateOptionWithin" | "dateOptionLabel" | "dropDownInput" | "filterControls" | "clearButton">;
@@ -38,31 +38,13 @@ exports.useStyles = styles_1.makeStyles({
38
38
  marginRight: '30px'
39
39
  },
40
40
  dateOptionAgo: {
41
- display: 'flex'
41
+ display: 'flex',
42
+ marginBottom: '10px'
42
43
  },
43
44
  dateOptionWithin: {
44
45
  display: 'flex',
45
46
  marginRight: '30px',
46
- paddingBottom: '10px'
47
- },
48
- dateRangeRoot: {
49
- width: '100%'
50
- },
51
- dateInput: {
52
- backgroundColor: 'rgba(0, 0, 0, 0.03)'
53
- },
54
- dateInputNumber: {
55
- minWidth: '60px',
56
- marginRight: '25px',
57
- height: '100%'
58
- },
59
- input: {
60
- height: '100%',
61
- paddingLeft: '12px',
62
- paddingRight: '8px'
63
- },
64
- dateInputPeriod: {
65
- width: '100%'
47
+ marginBottom: '10px'
66
48
  },
67
49
  dateOptionLabel: {
68
50
  minWidth: '100px'
@@ -73,10 +55,6 @@ exports.useStyles = styles_1.makeStyles({
73
55
  backgroundColor: 'rgba(0, 0, 0, 0.03)',
74
56
  borderTop: '4px'
75
57
  },
76
- activityPlaceholder: {
77
- paddingLeft: '10px',
78
- color: 'rgba(0,0,0,0.87)'
79
- },
80
58
  filterControls: {
81
59
  display: 'flex',
82
60
  paddingTop: '30px'
@@ -84,18 +62,11 @@ exports.useStyles = styles_1.makeStyles({
84
62
  clearButton: {
85
63
  marginRight: 'auto'
86
64
  },
87
- paper: {
88
- minWidth: '112px'
89
- },
90
65
  borderBottom: {
91
66
  borderBottom: 'solid 1px rgba(0, 0, 0, 0.12)',
92
67
  paddingBottom: '10px',
93
68
  marginBottom: '15px'
94
69
  },
95
- intervalContainer: {
96
- display: 'flex',
97
- width: '100%'
98
- },
99
70
  option: {
100
71
  fontSize: '14px',
101
72
  height: '32px'
@@ -7,7 +7,7 @@ exports.getFilterLabel = void 0;
7
7
  var ui_i18n_1 = __importDefault(require("ui-i18n"));
8
8
  var ramda_1 = require("ramda");
9
9
  var mdm_sdk_1 = require("@reltio/mdm-sdk");
10
- var types_1 = require("../types");
10
+ var types_1 = require("../../../types");
11
11
  var activities_1 = require("../utils/activities");
12
12
  var getFilterLabel = function (filters) {
13
13
  var getLabel = ramda_1.curry(function (unit, pluralUnit, values) {
@@ -1,15 +1,10 @@
1
1
  import { Source } from '@reltio/mdm-sdk';
2
2
  import { ActivityTypes } from './ActivityTypes';
3
- import { AttributeOption } from './AttributeOption';
4
- import { DateRangeTypes } from './DateRangeTypes';
5
- export declare type ActivitiesFilterDateRange = {
6
- type: DateRangeTypes;
7
- period: [number, string] | [Date, Date];
8
- };
3
+ import { AttributeOption, DateRangeFilter } from '../../../types';
9
4
  export declare type ActivitiesFilter = {
10
5
  users: string[];
11
6
  activities: ActivityTypes[];
12
- dateRange: ActivitiesFilterDateRange;
7
+ dateRange: DateRangeFilter;
13
8
  attributes?: AttributeOption[];
14
9
  sources?: Source[];
15
10
  entityUri?: string;
@@ -1,9 +1,7 @@
1
- export type { ActivitiesFilter, ActivitiesFilterDateRange } from './ActivitiesFilter';
1
+ export type { ActivitiesFilter } from './ActivitiesFilter';
2
2
  export type { ActivityData } from './ActivityData';
3
3
  export type { ActivityDelta } from './ActivityDelta';
4
4
  export type { ActivityItem } from './ActivityItem';
5
- export type { AttributeOption } from './AttributeOption';
6
5
  export type { DeltaValue } from './DeltaValue';
7
6
  export { ActivityTypes } from './ActivityTypes';
8
7
  export { DeltaTypes } from './DeltaTypes';
9
- export { DateRangeTypes } from './DateRangeTypes';
@@ -1,9 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.DateRangeTypes = exports.DeltaTypes = exports.ActivityTypes = void 0;
3
+ exports.DeltaTypes = exports.ActivityTypes = void 0;
4
4
  var ActivityTypes_1 = require("./ActivityTypes");
5
5
  Object.defineProperty(exports, "ActivityTypes", { enumerable: true, get: function () { return ActivityTypes_1.ActivityTypes; } });
6
6
  var DeltaTypes_1 = require("./DeltaTypes");
7
7
  Object.defineProperty(exports, "DeltaTypes", { enumerable: true, get: function () { return DeltaTypes_1.DeltaTypes; } });
8
- var DateRangeTypes_1 = require("./DateRangeTypes");
9
- Object.defineProperty(exports, "DateRangeTypes", { enumerable: true, get: function () { return DateRangeTypes_1.DateRangeTypes; } });
@@ -1,3 +1,3 @@
1
- import { ActivitiesFilterDateRange } from '../types';
1
+ import { DateRangeFilter } from '../../../types';
2
2
  export declare const buildActivitiesFilterString: any;
3
- export declare const isDateRangeValid: (value: ActivitiesFilterDateRange) => boolean;
3
+ export declare const isDateRangeValid: (value: DateRangeFilter) => boolean;
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.isDateRangeValid = exports.buildActivitiesFilterString = void 0;
7
7
  var ramda_1 = require("ramda");
8
8
  var moment_1 = __importDefault(require("moment"));
9
- var types_1 = require("../types");
9
+ var types_1 = require("../../../types");
10
10
  var mdm_sdk_1 = require("@reltio/mdm-sdk");
11
11
  var wrapInBrackets = function (str) { return "(" + str + ")"; };
12
12
  var multiValueFilter = function (filterClauseFn) { return function (values) { return values.map(filterClauseFn).join(' or '); }; };
@@ -2,5 +2,5 @@ declare type StylesProps = {
2
2
  color: string;
3
3
  containerWidth: number;
4
4
  };
5
- export declare const useStyles: (props: StylesProps) => import("@material-ui/core/styles/withStyles").ClassNameMap<"input" | "paper" | "inputMultiline" | "textField" | "popoverRoot" | "booleanEditor" | "timestampEditor">;
5
+ export declare const useStyles: (props: StylesProps) => import("@material-ui/core/styles/withStyles").ClassNameMap<"input" | "inputMultiline" | "paper" | "textField" | "popoverRoot" | "booleanEditor" | "timestampEditor">;
6
6
  export {};
@@ -3,7 +3,7 @@ declare type DateValues = [Date, Date];
3
3
  declare type Props = {
4
4
  values: DateValues;
5
5
  onChange: (values: DateValues) => void;
6
- onFocus: () => void;
6
+ onFocus?: () => void;
7
7
  };
8
- declare const ActivityDateRangeEditor: ({ values, onChange, onFocus }: Props) => JSX.Element;
9
- export default ActivityDateRangeEditor;
8
+ declare const CustomDateRangeEditor: ({ values, onChange, onFocus }: Props) => JSX.Element;
9
+ export default CustomDateRangeEditor;
@@ -38,7 +38,7 @@ var formatValue = function (value, placeholder) {
38
38
  ? "" + placeholder
39
39
  : "" + mdm_sdk_1.formatDataTypeValue({ dataTypeDefinition: { type: mdm_sdk_1.DataTypes.TYPE_ACTIVENESS_DATE } }, value);
40
40
  };
41
- var ActivityDateRangeEditor = function (_a) {
41
+ var CustomDateRangeEditor = function (_a) {
42
42
  var values = _a.values, onChange = _a.onChange, onFocus = _a.onFocus;
43
43
  var placeholder = localeFormat;
44
44
  var inputRef = react_1.useRef(null);
@@ -55,13 +55,14 @@ var ActivityDateRangeEditor = function (_a) {
55
55
  var onCancel = function () {
56
56
  setOpen(false);
57
57
  };
58
- return (react_1.default.createElement("div", { className: styles.dateRangeRoot },
59
- react_1.default.createElement(TextField_1.default, { fullWidth: true, value: values.map(function (value) { return formatValue(value, placeholder); }).join(' \u2014 '), onClick: handleToggle, variant: "filled", margin: "dense", ref: inputRef, InputProps: {
58
+ return (react_1.default.createElement("div", { className: styles.root },
59
+ react_1.default.createElement(TextField_1.default, { fullWidth: true, value: values.map(function (value) { return formatValue(value, placeholder); }).join(' \u2014 '), onClick: handleToggle, variant: "filled", ref: inputRef, InputProps: {
60
60
  endAdornment: (react_1.default.createElement(DropdownIndicatorWithIconButton_1.default, { selectProps: { classes: styles, menuIsOpen: open }, innerProps: {} })),
61
61
  disableUnderline: ramda_1.isNil(values),
62
62
  readOnly: true,
63
63
  classes: {
64
- root: styles.labels
64
+ root: styles.inputRoot,
65
+ input: styles.input
65
66
  }
66
67
  }, InputLabelProps: {
67
68
  shrink: false
@@ -84,4 +85,4 @@ var ActivityDateRangeEditor = function (_a) {
84
85
  // @ts-ignore
85
86
  values: values, onCancel: onCancel, onApply: onApply, type: mdm_sdk_1.DataTypes.TYPE_ACTIVENESS_DATE }))));
86
87
  };
87
- exports.default = ActivityDateRangeEditor;
88
+ exports.default = CustomDateRangeEditor;
@@ -0,0 +1 @@
1
+ export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"input" | "root" | "dateOptionLabel" | "dropdownIndicator" | "inputRoot" | "paper">;
@@ -0,0 +1,25 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.useStyles = void 0;
4
+ var styles_1 = require("@material-ui/core/styles");
5
+ exports.useStyles = styles_1.makeStyles({
6
+ root: {
7
+ flex: 1
8
+ },
9
+ dropdownIndicator: {
10
+ transition: 'transform .15s ease'
11
+ },
12
+ inputRoot: {
13
+ fontSize: '14px',
14
+ height: 46
15
+ },
16
+ input: {
17
+ padding: '0 12px 0'
18
+ },
19
+ dateOptionLabel: {
20
+ minWidth: '100px'
21
+ },
22
+ paper: {
23
+ minWidth: '112px'
24
+ }
25
+ });
@@ -1 +1 @@
1
- export const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"underline" | "paper" | "dropdownIndicator" | "adornedEnd" | "menuItem" | "menuText" | "inputRoot" | "inputLabel">;
1
+ export const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"underline" | "dropdownIndicator" | "adornedEnd" | "inputRoot" | "paper" | "menuItem" | "menuText" | "inputLabel">;