@reltio/components 1.4.1293 → 1.4.1295

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 (13) hide show
  1. package/cjs/components/activityLog/ActivityLog/ActivityLog.js +4 -1
  2. package/cjs/components/activityLog/ActivityLog/items/ActivityItem/ActivityItem.js +1 -2
  3. package/cjs/components/activityLog/activities/ActivitiesFactory.js +2 -0
  4. package/cjs/components/activityLog/activities/fields/PotentialMatchField.js +1 -0
  5. package/cjs/components/activityLog/utils/activities.d.ts +1 -1
  6. package/cjs/components/activityLog/utils/activities.js +11 -2
  7. package/esm/components/activityLog/ActivityLog/ActivityLog.js +6 -3
  8. package/esm/components/activityLog/ActivityLog/items/ActivityItem/ActivityItem.js +2 -3
  9. package/esm/components/activityLog/activities/ActivitiesFactory.js +2 -0
  10. package/esm/components/activityLog/activities/fields/PotentialMatchField.js +1 -0
  11. package/esm/components/activityLog/utils/activities.d.ts +1 -1
  12. package/esm/components/activityLog/utils/activities.js +10 -2
  13. package/package.json +3 -3
package/cjs/components/activityLog/ActivityLog/ActivityLog.js CHANGED
@@ -44,7 +44,10 @@ var ActivityLog = function (_a) {
44
44
  setGroupedItems(ramda_1.adjust(index, ramda_1.evolve({ collapsed: ramda_1.not })));
45
45
  };
46
46
  react_1.useEffect(function () {
47
- ramda_1.pipe(ramda_1.filter(activities_1.isValidActivity), helpers_1.buildGroupedItems, setGroupedItems)(activities);
47
+ ramda_1.pipe(ramda_1.map(activities_1.removeIgnoredItems), ramda_1.filter(function (_a) {
48
+ var itemsTotal = _a.itemsTotal;
49
+ return itemsTotal !== 0;
50
+ }), helpers_1.buildGroupedItems, setGroupedItems)(activities);
48
51
  }, [activities]);
49
52
  var flatItems = react_1.useMemo(function () { return helpers_1.flattenGroupedItems(groupedItems); }, [groupedItems]);
50
53
  var renderRow = react_1.useCallback(function (_a) {
package/cjs/components/activityLog/ActivityLog/items/ActivityItem/ActivityItem.js CHANGED
@@ -7,14 +7,13 @@ var react_1 = __importDefault(require("react"));
7
7
  var Typography_1 = __importDefault(require("@material-ui/core/Typography"));
8
8
  var activities_1 = require("../../../utils/activities");
9
9
  var ActivitiesFactory_1 = __importDefault(require("../../../activities/ActivitiesFactory"));
10
- var ramda_1 = require("ramda");
11
10
  var styles_1 = require("./styles");
12
11
  var ui_i18n_1 = __importDefault(require("ui-i18n"));
13
12
  var ActivityItem = function (_a) {
14
13
  var item = _a.item;
15
14
  var styles = styles_1.useStyles();
16
15
  var type = activities_1.getActivityType(item);
17
- var activities = ramda_1.pipe(activities_1.splitActivityByType, ramda_1.filter(activities_1.isValidActivity))(item);
16
+ var activities = activities_1.splitActivityByType(item);
18
17
  return (react_1.default.createElement("div", { className: styles.activityItem },
19
18
  react_1.default.createElement("div", { className: styles.activityIcon }, ActivitiesFactory_1.default.getIcon(type)),
20
19
  react_1.default.createElement("div", { className: styles.activityInfo },
package/cjs/components/activityLog/activities/ActivitiesFactory.js CHANGED
@@ -38,6 +38,7 @@ var ActivitiesFactory = /** @class */ (function () {
38
38
  case types_1.ActivityTypes.COMMENT_UPDATED:
39
39
  return react_1.default.createElement(CommentActivity_1.default, { data: data, type: type });
40
40
  case types_1.ActivityTypes.ENTITIES_MERGED_MANUALLY:
41
+ case types_1.ActivityTypes.ENTITIES_MERGED:
41
42
  case types_1.ActivityTypes.ENTITIES_MERGED_ON_THE_FLY:
42
43
  case types_1.ActivityTypes.ENTITIES_SPLITTED:
43
44
  case types_1.ActivityTypes.ENTITY_LOST_MERGE:
@@ -89,6 +90,7 @@ var ActivitiesFactory = /** @class */ (function () {
89
90
  case types_1.ActivityTypes.ENTITIES_SPLITTED:
90
91
  return react_1.default.createElement(UnMerge_1.default, null);
91
92
  case types_1.ActivityTypes.ENTITIES_MERGED_MANUALLY:
93
+ case types_1.ActivityTypes.ENTITIES_MERGED:
92
94
  case types_1.ActivityTypes.ENTITIES_MERGED_ON_THE_FLY:
93
95
  case types_1.ActivityTypes.ENTITY_LOST_MERGE:
94
96
  return react_1.default.createElement(Merge_1.default, null);
package/cjs/components/activityLog/activities/fields/PotentialMatchField.js CHANGED
@@ -20,6 +20,7 @@ var getFieldName = function (type) {
20
20
  _a[types_1.ActivityTypes.NOT_MATCHES_SET] = ui_i18n_1.default.text('Were set'),
21
21
  _a[types_1.ActivityTypes.NOT_MATCHES_RESET] = ui_i18n_1.default.text('Were reset'),
22
22
  _a[types_1.ActivityTypes.ENTITIES_MERGED_MANUALLY] = ui_i18n_1.default.text('Merged with'),
23
+ _a[types_1.ActivityTypes.ENTITIES_MERGED] = ui_i18n_1.default.text('Merged automatically with'),
23
24
  _a[types_1.ActivityTypes.ENTITIES_SPLITTED] = ui_i18n_1.default.text('Un-merged with'),
24
25
  _a);
25
26
  return labels[type] || '';
package/cjs/components/activityLog/utils/activities.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { ActivityData, ActivityTypes, DeltaValue } from '../types';
2
2
  export declare const getActivityType: (activity: ActivityData) => any;
3
3
  export declare const isValidActivityType: (type: string) => boolean;
4
- export declare const isValidActivity: any;
4
+ export declare const removeIgnoredItems: (activity: ActivityData) => ActivityData;
5
5
  export declare const splitActivityByType: (activity: ActivityData) => any;
6
6
  export declare const stringifyDeltaValue: (delta: string | Record<string, DeltaValue[]> | DeltaValue | DeltaValue[]) => any;
7
7
  export declare const getActivityLabel: (type: ActivityTypes) => string;
package/cjs/components/activityLog/utils/activities.js CHANGED
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  return (mod && mod.__esModule) ? mod : { "default": mod };
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.getActivityLabel = exports.stringifyDeltaValue = exports.splitActivityByType = exports.isValidActivity = exports.isValidActivityType = exports.getActivityType = void 0;
17
+ exports.getActivityLabel = exports.stringifyDeltaValue = exports.splitActivityByType = exports.removeIgnoredItems = exports.isValidActivityType = exports.getActivityType = void 0;
18
18
  var ramda_1 = require("ramda");
19
19
  var ui_i18n_1 = __importDefault(require("ui-i18n"));
20
20
  var types_1 = require("../types");
@@ -27,7 +27,16 @@ var getActivityType = function (activity) {
27
27
  exports.getActivityType = getActivityType;
28
28
  var isValidActivityType = function (type) { return ramda_1.pipe(ramda_1.values, ramda_1.includes(type))(types_1.ActivityTypes); };
29
29
  exports.isValidActivityType = isValidActivityType;
30
- exports.isValidActivity = ramda_1.pipe(exports.getActivityType, exports.isValidActivityType);
30
+ var removeIgnoredItems = function (activity) {
31
+ var items = activity.items, label = activity.label;
32
+ var isImplementedItem = function (item) { return exports.isValidActivityType(getItemDataType(item) || label); };
33
+ var filteredItems = ramda_1.filter(isImplementedItem)(items);
34
+ if (items.length !== filteredItems.length) {
35
+ console.error('Activities not implemented:', ramda_1.reject(isImplementedItem)(items));
36
+ }
37
+ return __assign(__assign({}, activity), { items: filteredItems, itemsTotal: filteredItems.length });
38
+ };
39
+ exports.removeIgnoredItems = removeIgnoredItems;
31
40
  var splitActivityByType = function (activity) {
32
41
  return ramda_1.pipe(ramda_1.propOr([], 'items'), ramda_1.groupBy(getItemDataType), ramda_1.values, ramda_1.ifElse(function (_a) {
33
42
  var length = _a.length;
package/esm/components/activityLog/ActivityLog/ActivityLog.js CHANGED
@@ -4,8 +4,8 @@ import BasicTablePagination from '../../BasicTableView/BasicTablePagination/Basi
4
4
  import i18n from 'ui-i18n';
5
5
  import AutoSizeList from '../../AutoSizeList/AutoSizeList';
6
6
  import { buildGroupedItems, flattenGroupedItems, getItemKey, isGroupItem } from './helpers';
7
- import { adjust, evolve, filter, not, pipe } from 'ramda';
8
- import { isValidActivity } from '../utils/activities';
7
+ import { adjust, evolve, filter, map, not, pipe } from 'ramda';
8
+ import { removeIgnoredItems } from '../utils/activities';
9
9
  import GroupItem from './items/GroupItem/GroupItem';
10
10
  import ActivityItem from './items/ActivityItem/ActivityItem';
11
11
  import classnames from 'classnames';
@@ -20,7 +20,10 @@ var ActivityLog = function (_a) {
20
20
  setGroupedItems(adjust(index, evolve({ collapsed: not })));
21
21
  };
22
22
  useEffect(function () {
23
- pipe(filter(isValidActivity), buildGroupedItems, setGroupedItems)(activities);
23
+ pipe(map(removeIgnoredItems), filter(function (_a) {
24
+ var itemsTotal = _a.itemsTotal;
25
+ return itemsTotal !== 0;
26
+ }), buildGroupedItems, setGroupedItems)(activities);
24
27
  }, [activities]);
25
28
  var flatItems = useMemo(function () { return flattenGroupedItems(groupedItems); }, [groupedItems]);
26
29
  var renderRow = useCallback(function (_a) {
package/esm/components/activityLog/ActivityLog/items/ActivityItem/ActivityItem.js CHANGED
@@ -1,15 +1,14 @@
1
1
  import React from 'react';
2
2
  import Typography from '@material-ui/core/Typography';
3
- import { getActivityType, isValidActivity, splitActivityByType } from '../../../utils/activities';
3
+ import { getActivityType, splitActivityByType } from '../../../utils/activities';
4
4
  import ActivitiesFactory from '../../../activities/ActivitiesFactory';
5
- import { filter, pipe } from 'ramda';
6
5
  import { useStyles } from './styles';
7
6
  import i18n from 'ui-i18n';
8
7
  var ActivityItem = function (_a) {
9
8
  var item = _a.item;
10
9
  var styles = useStyles();
11
10
  var type = getActivityType(item);
12
- var activities = pipe(splitActivityByType, filter(isValidActivity))(item);
11
+ var activities = splitActivityByType(item);
13
12
  return (React.createElement("div", { className: styles.activityItem },
14
13
  React.createElement("div", { className: styles.activityIcon }, ActivitiesFactory.getIcon(type)),
15
14
  React.createElement("div", { className: styles.activityInfo },
package/esm/components/activityLog/activities/ActivitiesFactory.js CHANGED
@@ -33,6 +33,7 @@ var ActivitiesFactory = /** @class */ (function () {
33
33
  case ActivityTypes.COMMENT_UPDATED:
34
34
  return React.createElement(CommentActivity, { data: data, type: type });
35
35
  case ActivityTypes.ENTITIES_MERGED_MANUALLY:
36
+ case ActivityTypes.ENTITIES_MERGED:
36
37
  case ActivityTypes.ENTITIES_MERGED_ON_THE_FLY:
37
38
  case ActivityTypes.ENTITIES_SPLITTED:
38
39
  case ActivityTypes.ENTITY_LOST_MERGE:
@@ -84,6 +85,7 @@ var ActivitiesFactory = /** @class */ (function () {
84
85
  case ActivityTypes.ENTITIES_SPLITTED:
85
86
  return React.createElement(UnMergeIcon, null);
86
87
  case ActivityTypes.ENTITIES_MERGED_MANUALLY:
88
+ case ActivityTypes.ENTITIES_MERGED:
87
89
  case ActivityTypes.ENTITIES_MERGED_ON_THE_FLY:
88
90
  case ActivityTypes.ENTITY_LOST_MERGE:
89
91
  return React.createElement(MergeIcon, null);
package/esm/components/activityLog/activities/fields/PotentialMatchField.js CHANGED
@@ -15,6 +15,7 @@ var getFieldName = function (type) {
15
15
  _a[ActivityTypes.NOT_MATCHES_SET] = i18n.text('Were set'),
16
16
  _a[ActivityTypes.NOT_MATCHES_RESET] = i18n.text('Were reset'),
17
17
  _a[ActivityTypes.ENTITIES_MERGED_MANUALLY] = i18n.text('Merged with'),
18
+ _a[ActivityTypes.ENTITIES_MERGED] = i18n.text('Merged automatically with'),
18
19
  _a[ActivityTypes.ENTITIES_SPLITTED] = i18n.text('Un-merged with'),
19
20
  _a);
20
21
  return labels[type] || '';
package/esm/components/activityLog/utils/activities.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { ActivityData, ActivityTypes, DeltaValue } from '../types';
2
2
  export declare const getActivityType: (activity: ActivityData) => any;
3
3
  export declare const isValidActivityType: (type: string) => boolean;
4
- export declare const isValidActivity: any;
4
+ export declare const removeIgnoredItems: (activity: ActivityData) => ActivityData;
5
5
  export declare const splitActivityByType: (activity: ActivityData) => any;
6
6
  export declare const stringifyDeltaValue: (delta: string | Record<string, DeltaValue[]> | DeltaValue | DeltaValue[]) => any;
7
7
  export declare const getActivityLabel: (type: ActivityTypes) => string;
package/esm/components/activityLog/utils/activities.js CHANGED
@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
9
9
  };
10
10
  return __assign.apply(this, arguments);
11
11
  };
12
- import { groupBy, ifElse, map, path, pipe, propOr, values, is, isNil, includes } from 'ramda';
12
+ import { filter, groupBy, ifElse, map, path, pipe, propOr, values, is, isNil, includes, reject } from 'ramda';
13
13
  import i18n from 'ui-i18n';
14
14
  import { ActivityTypes } from '../types';
15
15
  var getItemDataType = path(['data', 'type']);
@@ -19,7 +19,15 @@ export var getActivityType = function (activity) {
19
19
  return getItemDataType(firstItem) || label;
20
20
  };
21
21
  export var isValidActivityType = function (type) { return pipe(values, includes(type))(ActivityTypes); };
22
- export var isValidActivity = pipe(getActivityType, isValidActivityType);
22
+ export var removeIgnoredItems = function (activity) {
23
+ var items = activity.items, label = activity.label;
24
+ var isImplementedItem = function (item) { return isValidActivityType(getItemDataType(item) || label); };
25
+ var filteredItems = filter(isImplementedItem)(items);
26
+ if (items.length !== filteredItems.length) {
27
+ console.error('Activities not implemented:', reject(isImplementedItem)(items));
28
+ }
29
+ return __assign(__assign({}, activity), { items: filteredItems, itemsTotal: filteredItems.length });
30
+ };
23
31
  export var splitActivityByType = function (activity) {
24
32
  return pipe(propOr([], 'items'), groupBy(getItemDataType), values, ifElse(function (_a) {
25
33
  var length = _a.length;
package/package.json CHANGED
@@ -1,14 +1,14 @@
1
1
  {
2
2
  "name": "@reltio/components",
3
- "version": "1.4.1293",
3
+ "version": "1.4.1295",
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.1293",
11
- "@reltio/mdm-sdk": "^1.4.1293",
10
+ "@reltio/mdm-module": "^1.4.1295",
11
+ "@reltio/mdm-sdk": "^1.4.1295",
12
12
  "classnames": "^2.2.5",
13
13
  "d3-cloud": "^1.2.5",
14
14
  "d3-geo": "^2.0.1",