@reltio/components 1.4.1234 → 1.4.1237

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 (9) hide show
  1. package/cjs/components/SourceIcon/SourceIcon.js +6 -5
  2. package/cjs/components/activityLog/ActivityLogFilter/ActivityLogFilter.js +1 -10
  3. package/cjs/components/activityLog/utils/filters.d.ts +1 -1
  4. package/cjs/components/activityLog/utils/filters.js +16 -14
  5. package/esm/components/SourceIcon/SourceIcon.js +6 -5
  6. package/esm/components/activityLog/ActivityLogFilter/ActivityLogFilter.js +1 -10
  7. package/esm/components/activityLog/utils/filters.d.ts +1 -1
  8. package/esm/components/activityLog/utils/filters.js +14 -12
  9. package/package.json +3 -3
package/cjs/components/SourceIcon/SourceIcon.js CHANGED
@@ -3,17 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- var mdm_module_1 = __importDefault(require("@reltio/mdm-module"));
7
- var mdm_sdk_1 = require("@reltio/mdm-sdk");
8
6
  var react_1 = __importDefault(require("react"));
9
7
  var react_redux_1 = require("react-redux");
8
+ var mdm_module_1 = __importDefault(require("@reltio/mdm-module"));
9
+ var mdm_sdk_1 = require("@reltio/mdm-sdk");
10
10
  var AvatarWithFallback_1 = __importDefault(require("../AvatarWithFallback/AvatarWithFallback"));
11
11
  var SOURCE_URL = 'https://s3.amazonaws.com/reltio.images/api';
12
12
  var SourceIcon = function (_a) {
13
13
  var sourceType = _a.sourceType, className = _a.className, classes = _a.classes;
14
14
  var metadata = react_redux_1.useSelector(mdm_module_1.default.selectors.getMetadata);
15
- var _b = mdm_sdk_1.findSourceSystemByUri(metadata, sourceType), uri = _b.uri, icon = _b.icon;
16
- var avatarText = mdm_sdk_1.getSourceSystemLabel(metadata, uri)[0];
17
- return (react_1.default.createElement(AvatarWithFallback_1.default, { className: className, avatarText: avatarText, icon: icon ? mdm_sdk_1.getAbsoluteImageUrl(SOURCE_URL, icon) : null, variant: "square", rootClasses: classes }));
15
+ var _b = mdm_sdk_1.findSourceSystemByUri(metadata, sourceType) || {}, uri = _b.uri, icon = _b.icon;
16
+ var avatarText = uri ? mdm_sdk_1.getSourceSystemLabel(metadata, uri)[0] : '';
17
+ var sourceIcon = icon ? mdm_sdk_1.getAbsoluteImageUrl(SOURCE_URL, icon) : null;
18
+ return (react_1.default.createElement(AvatarWithFallback_1.default, { className: className, avatarText: avatarText, icon: sourceIcon, variant: "square", rootClasses: classes }));
18
19
  };
19
20
  exports.default = SourceIcon;
package/cjs/components/activityLog/ActivityLogFilter/ActivityLogFilter.js CHANGED
@@ -38,26 +38,17 @@ var react_redux_1 = require("react-redux");
38
38
  var ActivityLogFilterHeader_1 = __importDefault(require("./ActivityLogFilterHeader"));
39
39
  var ActivityFilterEditor_1 = __importDefault(require("../ActivityFilterEditor/ActivityFilterEditor"));
40
40
  var ActivityExportButton_1 = __importDefault(require("../ActivityExportButton/ActivityExportButton"));
41
- var filters_1 = require("../utils/filters");
42
41
  var mdm_module_1 = __importDefault(require("@reltio/mdm-module"));
43
42
  var ActivityLogFilter = function (_a) {
44
43
  var value = _a.value, entityType = _a.entityType, entityUri = _a.entityUri, onChange = _a.onChange, exportTypes = _a.exportTypes;
45
44
  var initialValue = react_1.useRef(value);
46
45
  var canExport = react_redux_1.useSelector(mdm_module_1.default.selectors.getCanUserMakeActivitiesExport);
47
46
  var _b = react_1.useState(false), isEditorOpen = _b[0], setIsEditorOpen = _b[1];
48
- var handleApply = function (filterValue) {
49
- if (!filters_1.isDateRangeValid(filterValue.dateRange)) {
50
- onChange(initialValue.current);
51
- }
52
- else {
53
- onChange(filterValue);
54
- }
55
- };
56
47
  var handleClear = function () { return onChange(__assign({}, initialValue.current)); };
57
48
  var handleCancel = function () { return setIsEditorOpen(false); };
58
49
  var handleToggleFilter = function () { return setIsEditorOpen(function (isEditorOpen) { return !isEditorOpen; }); };
59
50
  return (react_1.default.createElement(react_1.default.Fragment, null,
60
51
  react_1.default.createElement(ActivityLogFilterHeader_1.default, { onToggle: handleToggleFilter, filters: value }, canExport && react_1.default.createElement(ActivityExportButton_1.default, { filters: __assign(__assign({}, value), { entityUri: entityUri }), exportTypes: exportTypes })),
61
- react_1.default.createElement(ActivityFilterEditor_1.default, { value: value, open: isEditorOpen, entityType: entityType, onApply: handleApply, onCancel: handleCancel, onClear: handleClear })));
52
+ react_1.default.createElement(ActivityFilterEditor_1.default, { value: value, open: isEditorOpen, entityType: entityType, onApply: onChange, onCancel: handleCancel, onClear: handleClear })));
62
53
  };
63
54
  exports.default = ActivityLogFilter;
package/cjs/components/activityLog/utils/filters.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { DateRangeFilter } from '../../../types';
2
- export declare const buildActivitiesFilterString: any;
3
2
  export declare const isDateRangeValid: (value: DateRangeFilter) => boolean;
3
+ export declare const buildActivitiesFilterString: any;
package/cjs/components/activityLog/utils/filters.js CHANGED
@@ -3,11 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.isDateRangeValid = exports.buildActivitiesFilterString = void 0;
6
+ exports.buildActivitiesFilterString = exports.isDateRangeValid = void 0;
7
7
  var ramda_1 = require("ramda");
8
8
  var moment_1 = __importDefault(require("moment"));
9
9
  var types_1 = require("../../../types");
10
10
  var mdm_sdk_1 = require("@reltio/mdm-sdk");
11
+ var isDateRangeValid = function (value) {
12
+ if (value.type === types_1.DateRangeTypes.AGO || value.type === types_1.DateRangeTypes.WITHIN) {
13
+ var _a = value.period, amount = _a[0], unit = _a[1];
14
+ return ramda_1.type(amount) === 'Number' && ramda_1.type(unit) === 'String' && amount > 0;
15
+ }
16
+ else if (value.type === types_1.DateRangeTypes.BETWEEN) {
17
+ var _b = value.period, startDate = _b[0], endDate = _b[1];
18
+ return startDate instanceof Date && endDate instanceof Date;
19
+ }
20
+ };
21
+ exports.isDateRangeValid = isDateRangeValid;
11
22
  var wrapInBrackets = function (str) { return "(" + str + ")"; };
12
23
  var multiValueFilter = function (filterClauseFn) { return function (values) { return values.map(filterClauseFn).join(' or '); }; };
13
24
  var buildUserFilterClause = function (user) { return "equals(user, '" + mdm_sdk_1.escapeQueryValue(user) + "')"; };
@@ -32,8 +43,10 @@ var durationToTimestamp = function (period) {
32
43
  var amount = period[0], unit = period[1];
33
44
  return moment_1.default().subtract(amount, unit).valueOf();
34
45
  };
35
- var buildDateRangeFilterClause = function (_a) {
36
- var type = _a.type, period = _a.period;
46
+ var buildDateRangeFilterClause = function (dateRange) {
47
+ var period = dateRange.period, type = dateRange.type;
48
+ if (!exports.isDateRangeValid(dateRange))
49
+ return '';
37
50
  switch (type) {
38
51
  case types_1.DateRangeTypes.WITHIN: {
39
52
  return "gte(timestamp, " + durationToTimestamp(period) + ")";
@@ -71,14 +84,3 @@ exports.buildActivitiesFilterString = ramda_1.pipe(ramda_1.defaultTo({}), ramda_
71
84
  var key = _a[0], value = _a[1];
72
85
  return getFilterClauseBuilder(key)(value);
73
86
  }), ramda_1.reject(mdm_sdk_1.isEmptyValue), ramda_1.map(wrapInBrackets), ramda_1.join(' and '));
74
- var isDateRangeValid = function (value) {
75
- if (value.type === types_1.DateRangeTypes.AGO || value.type === types_1.DateRangeTypes.WITHIN) {
76
- var _a = value.period, amount = _a[0], unit = _a[1];
77
- return ramda_1.type(amount) === 'Number' && ramda_1.type(unit) === 'String' && amount > 0;
78
- }
79
- else if (value.type === types_1.DateRangeTypes.BETWEEN) {
80
- var _b = value.period, startDate = _b[0], endDate = _b[1];
81
- return startDate instanceof Date && endDate instanceof Date;
82
- }
83
- };
84
- exports.isDateRangeValid = isDateRangeValid;
package/esm/components/SourceIcon/SourceIcon.js CHANGED
@@ -1,14 +1,15 @@
1
- import mdmModule from '@reltio/mdm-module';
2
- import { findSourceSystemByUri, getAbsoluteImageUrl, getSourceSystemLabel } from '@reltio/mdm-sdk';
3
1
  import React from 'react';
4
2
  import { useSelector } from 'react-redux';
3
+ import mdmModule from '@reltio/mdm-module';
4
+ import { findSourceSystemByUri, getAbsoluteImageUrl, getSourceSystemLabel } from '@reltio/mdm-sdk';
5
5
  import AvatarWithFallback from '../AvatarWithFallback/AvatarWithFallback';
6
6
  var SOURCE_URL = 'https://s3.amazonaws.com/reltio.images/api';
7
7
  var SourceIcon = function (_a) {
8
8
  var sourceType = _a.sourceType, className = _a.className, classes = _a.classes;
9
9
  var metadata = useSelector(mdmModule.selectors.getMetadata);
10
- var _b = findSourceSystemByUri(metadata, sourceType), uri = _b.uri, icon = _b.icon;
11
- var avatarText = getSourceSystemLabel(metadata, uri)[0];
12
- return (React.createElement(AvatarWithFallback, { className: className, avatarText: avatarText, icon: icon ? getAbsoluteImageUrl(SOURCE_URL, icon) : null, variant: "square", rootClasses: classes }));
10
+ var _b = findSourceSystemByUri(metadata, sourceType) || {}, uri = _b.uri, icon = _b.icon;
11
+ var avatarText = uri ? getSourceSystemLabel(metadata, uri)[0] : '';
12
+ var sourceIcon = icon ? getAbsoluteImageUrl(SOURCE_URL, icon) : null;
13
+ return (React.createElement(AvatarWithFallback, { className: className, avatarText: avatarText, icon: sourceIcon, variant: "square", rootClasses: classes }));
13
14
  };
14
15
  export default SourceIcon;
package/esm/components/activityLog/ActivityLogFilter/ActivityLogFilter.js CHANGED
@@ -14,26 +14,17 @@ import { useSelector } from 'react-redux';
14
14
  import ActivityLogFilterHeader from './ActivityLogFilterHeader';
15
15
  import ActivityFilterEditor from '../ActivityFilterEditor/ActivityFilterEditor';
16
16
  import ActivityExportButton from '../ActivityExportButton/ActivityExportButton';
17
- import { isDateRangeValid } from '../utils/filters';
18
17
  import mdmModule from '@reltio/mdm-module';
19
18
  var ActivityLogFilter = function (_a) {
20
19
  var value = _a.value, entityType = _a.entityType, entityUri = _a.entityUri, onChange = _a.onChange, exportTypes = _a.exportTypes;
21
20
  var initialValue = useRef(value);
22
21
  var canExport = useSelector(mdmModule.selectors.getCanUserMakeActivitiesExport);
23
22
  var _b = useState(false), isEditorOpen = _b[0], setIsEditorOpen = _b[1];
24
- var handleApply = function (filterValue) {
25
- if (!isDateRangeValid(filterValue.dateRange)) {
26
- onChange(initialValue.current);
27
- }
28
- else {
29
- onChange(filterValue);
30
- }
31
- };
32
23
  var handleClear = function () { return onChange(__assign({}, initialValue.current)); };
33
24
  var handleCancel = function () { return setIsEditorOpen(false); };
34
25
  var handleToggleFilter = function () { return setIsEditorOpen(function (isEditorOpen) { return !isEditorOpen; }); };
35
26
  return (React.createElement(React.Fragment, null,
36
27
  React.createElement(ActivityLogFilterHeader, { onToggle: handleToggleFilter, filters: value }, canExport && React.createElement(ActivityExportButton, { filters: __assign(__assign({}, value), { entityUri: entityUri }), exportTypes: exportTypes })),
37
- React.createElement(ActivityFilterEditor, { value: value, open: isEditorOpen, entityType: entityType, onApply: handleApply, onCancel: handleCancel, onClear: handleClear })));
28
+ React.createElement(ActivityFilterEditor, { value: value, open: isEditorOpen, entityType: entityType, onApply: onChange, onCancel: handleCancel, onClear: handleClear })));
38
29
  };
39
30
  export default ActivityLogFilter;
package/esm/components/activityLog/utils/filters.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { DateRangeFilter } from '../../../types';
2
- export declare const buildActivitiesFilterString: any;
3
2
  export declare const isDateRangeValid: (value: DateRangeFilter) => boolean;
3
+ export declare const buildActivitiesFilterString: any;
package/esm/components/activityLog/utils/filters.js CHANGED
@@ -2,6 +2,16 @@ import { cond, defaultTo, equals, join, map, pipe, reject, toPairs, type } from
2
2
  import moment from 'moment';
3
3
  import { DateRangeTypes } from '../../../types';
4
4
  import { escapeQueryValue, isEmptyValue } from '@reltio/mdm-sdk';
5
+ export var isDateRangeValid = function (value) {
6
+ if (value.type === DateRangeTypes.AGO || value.type === DateRangeTypes.WITHIN) {
7
+ var _a = value.period, amount = _a[0], unit = _a[1];
8
+ return type(amount) === 'Number' && type(unit) === 'String' && amount > 0;
9
+ }
10
+ else if (value.type === DateRangeTypes.BETWEEN) {
11
+ var _b = value.period, startDate = _b[0], endDate = _b[1];
12
+ return startDate instanceof Date && endDate instanceof Date;
13
+ }
14
+ };
5
15
  var wrapInBrackets = function (str) { return "(" + str + ")"; };
6
16
  var multiValueFilter = function (filterClauseFn) { return function (values) { return values.map(filterClauseFn).join(' or '); }; };
7
17
  var buildUserFilterClause = function (user) { return "equals(user, '" + escapeQueryValue(user) + "')"; };
@@ -26,8 +36,10 @@ var durationToTimestamp = function (period) {
26
36
  var amount = period[0], unit = period[1];
27
37
  return moment().subtract(amount, unit).valueOf();
28
38
  };
29
- var buildDateRangeFilterClause = function (_a) {
30
- var type = _a.type, period = _a.period;
39
+ var buildDateRangeFilterClause = function (dateRange) {
40
+ var period = dateRange.period, type = dateRange.type;
41
+ if (!isDateRangeValid(dateRange))
42
+ return '';
31
43
  switch (type) {
32
44
  case DateRangeTypes.WITHIN: {
33
45
  return "gte(timestamp, " + durationToTimestamp(period) + ")";
@@ -65,13 +77,3 @@ export var buildActivitiesFilterString = pipe(defaultTo({}), reject(isEmptyValue
65
77
  var key = _a[0], value = _a[1];
66
78
  return getFilterClauseBuilder(key)(value);
67
79
  }), reject(isEmptyValue), map(wrapInBrackets), join(' and '));
68
- export var isDateRangeValid = function (value) {
69
- if (value.type === DateRangeTypes.AGO || value.type === DateRangeTypes.WITHIN) {
70
- var _a = value.period, amount = _a[0], unit = _a[1];
71
- return type(amount) === 'Number' && type(unit) === 'String' && amount > 0;
72
- }
73
- else if (value.type === DateRangeTypes.BETWEEN) {
74
- var _b = value.period, startDate = _b[0], endDate = _b[1];
75
- return startDate instanceof Date && endDate instanceof Date;
76
- }
77
- };
package/package.json CHANGED
@@ -1,14 +1,14 @@
1
1
  {
2
2
  "name": "@reltio/components",
3
- "version": "1.4.1234",
3
+ "version": "1.4.1237",
4
4
  "license": "SEE LICENSE IN LICENSE FILE",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
7
7
  "dependencies": {
8
8
  "@date-io/moment": "^1.3.5",
9
9
  "@react-google-maps/api": "2.7.0",
10
- "@reltio/mdm-module": "^1.4.1234",
11
- "@reltio/mdm-sdk": "^1.4.1234",
10
+ "@reltio/mdm-module": "^1.4.1237",
11
+ "@reltio/mdm-sdk": "^1.4.1237",
12
12
  "classnames": "^2.2.5",
13
13
  "d3-cloud": "^1.2.5",
14
14
  "d3-geo": "^2.0.1",