@reltio/components 1.4.1374 → 1.4.1375

package/cjs/components/activityLog/activities/fields/DeltaField.js

@@ -20,20 +20,24 @@ var DeltaField = function (_a) {
     var styles = (0, styles_1.useStyles)();
     var commonStyles = (0, commonStyles_1.useCommonStyles)();
     var metadata = (0, react_redux_1.useSelector)(mdm_module_1.default.selectors.getMetadata);
+    var attributePresentations = (0, react_redux_1.useSelector)(mdm_module_1.default.selectors.getAttributePresentations);
     var attribute = (0, mdm_sdk_1.findAttributeTypeByUri)(metadata, delta.attributeType);
     var newValue = (_b = delta.newValue) === null || _b === void 0 ? void 0 : _b.value;
     var oldValue = (_c = delta.oldValue) === null || _c === void 0 ? void 0 : _c.value;
     var value = oldValue || newValue;
     var deltaLabel = types_1.DeltaTypes[delta.type];
+    var converter = function (value) {
+        return (0, activities_1.stringifyDeltaValue)(value, delta.attributeType, metadata, attributePresentations);
+    };
     return (react_1.default.createElement("div", { className: commonStyles.field },
         react_1.default.createElement("span", { className: commonStyles.fieldName },
             (attribute === null || attribute === void 0 ? void 0 : attribute.label) || (attribute === null || attribute === void 0 ? void 0 : attribute.name),
             ":"),
         react_1.default.createElement("span", null,
-            value && (0, activities_1.stringifyDeltaValue)(value),
+            value && converter(value),
             newValue && oldValue && (react_1.default.createElement(react_1.default.Fragment, null,
                 react_1.default.createElement(ArrowForward_1.default, { className: styles.arrow }),
-                (0, activities_1.stringifyDeltaValue)(newValue)))),
+                converter(newValue)))),
         deltaLabel && (react_1.default.createElement(Chip_1.default, { variant: "outlined", label: deltaLabel, className: (0, classnames_1.default)(styles.chip, deltaLabel) }))));
 };
 exports.default = DeltaField;

package/cjs/components/activityLog/types/DeltaValue.d.ts

@@ -2,7 +2,7 @@ declare type DeltaObject = {
     [key: string]: DeltaValue[];
 };
 export declare type DeltaValue = {
-    value?: string | DeltaObject;
+    value?: string | DeltaObject | null;
     ov: boolean;
     id: string;
     sources?: string[];

package/cjs/components/activityLog/utils/activities.d.ts

@@ -1,7 +1,8 @@
+import { Metadata, AttributePresentations } from '@reltio/mdm-sdk';
 import { ActivityData, ActivityTypes, DeltaValue } from '../types';
 export declare const getActivityType: (activity: ActivityData) => any;
 export declare const isValidActivityType: (type: string) => boolean;
 export declare const removeIgnoredItems: (activity: ActivityData) => ActivityData;
 export declare const splitActivityByType: (activity: ActivityData) => any;
-export declare const stringifyDeltaValue: (delta: string | Record<string, DeltaValue[]> | DeltaValue | DeltaValue[]) => any;
+export declare const stringifyDeltaValue: (deltaValue: DeltaValue['value'], attributeTypeUri: string, metadata: Metadata, attributePresentations: AttributePresentations) => any;
 export declare const getActivityLabel: (type: ActivityTypes) => string;

package/cjs/components/activityLog/utils/activities.js

@@ -15,6 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getActivityLabel = exports.stringifyDeltaValue = exports.splitActivityByType = exports.removeIgnoredItems = exports.isValidActivityType = exports.getActivityType = void 0;
+var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var ramda_1 = require("ramda");
 var ui_i18n_1 = __importDefault(require("ui-i18n"));
 var types_1 = require("../types");
@@ -44,22 +45,24 @@ var splitActivityByType = function (activity) {
     }, (0, ramda_1.map)(function (items) { return (__assign(__assign({}, activity), { items: items, itemsTotal: items.length })); }), function () { return [activity]; }))(activity);
 };
 exports.splitActivityByType = splitActivityByType;
-var stringifyDeltaValue = function (delta) {
-    if ((0, ramda_1.isNil)(delta)) {
+var stringifyDeltaValue = function (deltaValue, attributeTypeUri, metadata, attributePresentations) {
+    var attributeType = (0, mdm_sdk_1.findAttributeTypeByUri)(metadata, attributeTypeUri);
+    var dataTypeDefinition = (0, mdm_sdk_1.getAttrDataTypeDefinition)(attributeType);
+    var formatValue = (0, mdm_sdk_1.formatDataTypeValue)({ attributePresentations: attributePresentations, dataTypeDefinition: dataTypeDefinition });
+    if ((0, ramda_1.isNil)(deltaValue)) {
         return '';
     }
-    else if (typeof delta === 'string') {
-        return delta;
-    }
-    else if (Array.isArray(delta)) {
-        return delta.map(exports.stringifyDeltaValue).join(', ');
-    }
-    else if ((0, ramda_1.is)(Object, delta)) {
-        return 'value' in delta ? (0, exports.stringifyDeltaValue)(delta.value) : (0, exports.stringifyDeltaValue)(Object.values(delta));
-    }
-    else {
-        return delta.toString();
+    if (typeof deltaValue === 'string') {
+        return attributeType ? formatValue(deltaValue) : deltaValue;
     }
+    return Object.entries(deltaValue)
+        .flatMap(function (_a) {
+        var attributeTypeName = _a[0], deltaValues = _a[1];
+        return deltaValues.map(function (deltaValue) {
+            return (0, exports.stringifyDeltaValue)(deltaValue.value, (0, mdm_sdk_1.makeAttrTypeUri)(attributeTypeUri, attributeTypeName), metadata, attributePresentations);
+        });
+    })
+        .join(', ');
 };
 exports.stringifyDeltaValue = stringifyDeltaValue;
 var getActivityLabel = function (type) {

package/esm/components/activityLog/activities/fields/DeltaField.js

@@ -15,20 +15,24 @@ var DeltaField = function (_a) {
     var styles = useStyles();
     var commonStyles = useCommonStyles();
     var metadata = useSelector(mdmModule.selectors.getMetadata);
+    var attributePresentations = useSelector(mdmModule.selectors.getAttributePresentations);
     var attribute = findAttributeTypeByUri(metadata, delta.attributeType);
     var newValue = (_b = delta.newValue) === null || _b === void 0 ? void 0 : _b.value;
     var oldValue = (_c = delta.oldValue) === null || _c === void 0 ? void 0 : _c.value;
     var value = oldValue || newValue;
     var deltaLabel = DeltaTypes[delta.type];
+    var converter = function (value) {
+        return stringifyDeltaValue(value, delta.attributeType, metadata, attributePresentations);
+    };
     return (React.createElement("div", { className: commonStyles.field },
         React.createElement("span", { className: commonStyles.fieldName },
             (attribute === null || attribute === void 0 ? void 0 : attribute.label) || (attribute === null || attribute === void 0 ? void 0 : attribute.name),
             ":"),
         React.createElement("span", null,
-            value && stringifyDeltaValue(value),
+            value && converter(value),
             newValue && oldValue && (React.createElement(React.Fragment, null,
                 React.createElement(ArrowForwardIcon, { className: styles.arrow }),
-                stringifyDeltaValue(newValue)))),
+                converter(newValue)))),
         deltaLabel && (React.createElement(Chip, { variant: "outlined", label: deltaLabel, className: classnames(styles.chip, deltaLabel) }))));
 };
 export default DeltaField;

package/esm/components/activityLog/types/DeltaValue.d.ts

@@ -2,7 +2,7 @@ declare type DeltaObject = {
     [key: string]: DeltaValue[];
 };
 export declare type DeltaValue = {
-    value?: string | DeltaObject;
+    value?: string | DeltaObject | null;
     ov: boolean;
     id: string;
     sources?: string[];

package/esm/components/activityLog/utils/activities.d.ts

@@ -1,7 +1,8 @@
+import { Metadata, AttributePresentations } from '@reltio/mdm-sdk';
 import { ActivityData, ActivityTypes, DeltaValue } from '../types';
 export declare const getActivityType: (activity: ActivityData) => any;
 export declare const isValidActivityType: (type: string) => boolean;
 export declare const removeIgnoredItems: (activity: ActivityData) => ActivityData;
 export declare const splitActivityByType: (activity: ActivityData) => any;
-export declare const stringifyDeltaValue: (delta: string | Record<string, DeltaValue[]> | DeltaValue | DeltaValue[]) => any;
+export declare const stringifyDeltaValue: (deltaValue: DeltaValue['value'], attributeTypeUri: string, metadata: Metadata, attributePresentations: AttributePresentations) => any;
 export declare const getActivityLabel: (type: ActivityTypes) => string;

package/esm/components/activityLog/utils/activities.js

@@ -9,7 +9,8 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { filter, groupBy, ifElse, map, path, pipe, propOr, values, is, isNil, includes, reject } from 'ramda';
+import { formatDataTypeValue, findAttributeTypeByUri, makeAttrTypeUri, getAttrDataTypeDefinition } from '@reltio/mdm-sdk';
+import { filter, groupBy, ifElse, map, path, pipe, propOr, values, isNil, includes, reject } from 'ramda';
 import i18n from 'ui-i18n';
 import { ActivityTypes } from '../types';
 var getItemDataType = path(['data', 'type']);
@@ -34,22 +35,24 @@ export var splitActivityByType = function (activity) {
         return length > 1;
     }, map(function (items) { return (__assign(__assign({}, activity), { items: items, itemsTotal: items.length })); }), function () { return [activity]; }))(activity);
 };
-export var stringifyDeltaValue = function (delta) {
-    if (isNil(delta)) {
+export var stringifyDeltaValue = function (deltaValue, attributeTypeUri, metadata, attributePresentations) {
+    var attributeType = findAttributeTypeByUri(metadata, attributeTypeUri);
+    var dataTypeDefinition = getAttrDataTypeDefinition(attributeType);
+    var formatValue = formatDataTypeValue({ attributePresentations: attributePresentations, dataTypeDefinition: dataTypeDefinition });
+    if (isNil(deltaValue)) {
         return '';
     }
-    else if (typeof delta === 'string') {
-        return delta;
-    }
-    else if (Array.isArray(delta)) {
-        return delta.map(stringifyDeltaValue).join(', ');
-    }
-    else if (is(Object, delta)) {
-        return 'value' in delta ? stringifyDeltaValue(delta.value) : stringifyDeltaValue(Object.values(delta));
-    }
-    else {
-        return delta.toString();
+    if (typeof deltaValue === 'string') {
+        return attributeType ? formatValue(deltaValue) : deltaValue;
     }
+    return Object.entries(deltaValue)
+        .flatMap(function (_a) {
+        var attributeTypeName = _a[0], deltaValues = _a[1];
+        return deltaValues.map(function (deltaValue) {
+            return stringifyDeltaValue(deltaValue.value, makeAttrTypeUri(attributeTypeUri, attributeTypeName), metadata, attributePresentations);
+        });
+    })
+        .join(', ');
 };
 export var getActivityLabel = function (type) {
     var _a;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.1374",
+  "version": "1.4.1375",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
   "dependencies": {
     "@date-io/moment": "^1.3.5",
     "@react-google-maps/api": "2.7.0",
-    "@reltio/mdm-module": "^1.4.1374",
-    "@reltio/mdm-sdk": "^1.4.1374",
+    "@reltio/mdm-module": "^1.4.1375",
+    "@reltio/mdm-sdk": "^1.4.1375",
     "classnames": "^2.2.5",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",