@reltio/components 1.4.2243 → 1.4.2245

package/cjs/features/workflow/helpers/validation.js

@@ -233,13 +233,13 @@ var getRequiredAttributeUris = function (metadata, typeUri) {
     return requiredAttrTypes.map(function (attr) { return attr.uri; });
 };
 var createRequiredError = function (_a) {
-    var attributeType = _a.attributeType, attributeTypeUri = _a.attributeTypeUri, parentUri = _a.parentUri, lineIds = _a.lineIds, metadata = _a.metadata, entityUri = _a.entityUri, entitiesMap = _a.entitiesMap, valueUri = _a.valueUri;
+    var attributeType = _a.attributeType, attributeTypeUri = _a.attributeTypeUri, parentUri = _a.parentUri, lineIds = _a.lineIds, metadata = _a.metadata, entityUri = _a.entityUri, entitiesMap = _a.entitiesMap, valueUri = _a.valueUri, _b = _a.errorType, errorType = _b === void 0 ? mdm_sdk_1.ErrorType.missed : _b, _c = _a.message, message = _c === void 0 ? ui_i18n_1.default.text('Attribute is required') : _c;
     var error = (0, mdm_sdk_1.buildError)({
-        type: mdm_sdk_1.ErrorType.missed,
+        type: errorType,
         attributeType: attributeType,
         attributeTypeUri: attributeTypeUri,
         parentUri: parentUri,
-        message: ui_i18n_1.default.text('Attribute is required'),
+        message: message,
         source: mdm_sdk_1.ErrorSource.local,
         uri: lineIds[0]
     });
@@ -259,27 +259,37 @@ var createRequiredError = function (_a) {
 var validateRequiredComplexAttributes = function (_a) {
     var _b;
     var metadata = _a.metadata, change = _a.change, userChanges = _a.userChanges, entityUri = _a.entityUri;
-    if (userChanges.length === 0 || change.type === mdm_sdk_1.DCRTypes.DELETE_ATTRIBUTE) {
+    if (change.type === mdm_sdk_1.DCRTypes.DELETE_ATTRIBUTE) {
         return [];
     }
     var valueHolder = change.type === mdm_sdk_1.DCRTypes.CREATE_ENTITY || change.type === mdm_sdk_1.DCRTypes.CREATE_RELATIONSHIP ? 'attributes' : 'value';
     var rootAttributeTypeUri = change.refAttributeType || change.attributeType || change.objectType;
+    if (!rootAttributeTypeUri) {
+        return [];
+    }
     var attributeType = (0, mdm_sdk_1.findAttributeTypeByUri)(metadata, rootAttributeTypeUri);
     var isReferenceType = (0, mdm_sdk_1.isReference)(attributeType);
-    var entityTypeUri = isReferenceType ? attributeType.relationshipTypeURI : getEntityTypeUriFromChange(change);
-    var requiredAttributeUris = getRequiredAttributeUris(metadata, entityTypeUri);
     var calculateLineIdFromPath = function (path) {
         if (path === void 0) { path = ''; }
         var entityId = entityUri.split('/').pop() || '';
         return "".concat(entityId, "/").concat(change.id, "/newValue").concat(path ? "/".concat(path) : '');
     };
+    var entityTypeUri = isReferenceType ? attributeType.relationshipTypeURI : getEntityTypeUriFromChange(change);
+    var requiredAttributeUris = getRequiredAttributeUris(metadata, entityTypeUri);
     var checkIsChangeRejected = function (path) {
         var _a, _b, _c;
         var searchLineId = calculateLineIdFromPath(path);
         var lineUserChanges = userChanges.find(function (userChange) { return userChange.lineId === searchLineId; });
         return (((_a = lineUserChanges === null || lineUserChanges === void 0 ? void 0 : lineUserChanges.data) === null || _a === void 0 ? void 0 : _a.isRejected) || (lineUserChanges && (0, mdm_sdk_1.isEmptyValue)((_c = (_b = lineUserChanges === null || lineUserChanges === void 0 ? void 0 : lineUserChanges.data) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.value)));
     };
+    var checkHasUserValue = function (path) {
+        var _a, _b;
+        var searchLineId = calculateLineIdFromPath(path);
+        var lineUserChange = userChanges.find(function (userChange) { return userChange.lineId === searchLineId; });
+        return Boolean(lineUserChange && !(0, mdm_sdk_1.isEmptyValue)((_b = (_a = lineUserChange.data) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.value));
+    };
     var collectErrors = function (attributes) {
+        var _a;
         var errors = [];
         var visitValue = function (value, path) {
             var isRejected = checkIsChangeRejected(path.slice(0, -1).join('/'));
@@ -289,6 +299,9 @@ var validateRequiredComplexAttributes = function (_a) {
             if (isRejected) {
                 return false;
             }
+            if (value === undefined) {
+                return checkHasUserValue(path.slice(0, -1).join('/'));
+            }
             var anyFieldHasValue = false;
             Object.entries(value).forEach(function (_a) {
                 var fieldName = _a[0], subAttributes = _a[1];
@@ -326,6 +339,18 @@ var validateRequiredComplexAttributes = function (_a) {
                 lineIds: [calculateLineIdFromPath()]
             }));
         }
+        if (isReferenceType && change.type === mdm_sdk_1.DCRTypes.INSERT_ATTRIBUTE) {
+            var refEntity = (_a = change.newValue) === null || _a === void 0 ? void 0 : _a.refEntity;
+            if (!(refEntity === null || refEntity === void 0 ? void 0 : refEntity.objectURI)) {
+                errors.push(createRequiredError({
+                    attributeType: attributeType,
+                    attributeTypeUri: attributeType.uri,
+                    lineIds: [calculateLineIdFromPath()],
+                    errorType: mdm_sdk_1.ErrorType.missedRefEntity,
+                    message: ui_i18n_1.default.text('Entity is required')
+                }));
+            }
+        }
         return errors;
     };
     return collectErrors((_b = change.newValue) === null || _b === void 0 ? void 0 : _b[valueHolder]);

package/cjs/features/workflow/hooks/useApplyDcrChanges.d.ts

@@ -1,3 +1,3 @@
-import { ChangeRequest } from '@reltio/mdm-sdk';
-import { BeforeActionOutcome } from '../types';
+import { type ChangeRequest } from '@reltio/mdm-sdk';
+import type { BeforeActionOutcome } from '../types';
 export declare const useApplyDcrChanges: (dcr: ChangeRequest) => () => Promise<BeforeActionOutcome>;

package/cjs/features/workflow/hooks/useApplyDcrChanges.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -43,21 +54,47 @@ var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var ramda_1 = require("ramda");
 var MdmModuleContext_1 = require("../../../contexts/MdmModuleContext");
 var ChangeRequestEditorContext_1 = require("../contexts/ChangeRequestEditorContext");
+var AddedAttributesContext_1 = require("../contexts/AddedAttributesContext");
+var mergeAddedAttributesWithDCRChanges_1 = require("../ChangeRequestEditor/helpers/mergeAddedAttributesWithDCRChanges");
 var dcr_1 = require("../helpers/dcr");
 var useDCRValidation_1 = require("./useDCRValidation");
 var withChangeRequestId = function (dcrUri) { return function (url) {
     return url + (url.includes('?') ? '&' : '?') + "changeRequestId=".concat(encodeURIComponent(dcrUri.split('/')[1]));
 }; };
+var executeBatch = function (promises, errorMessage) { return __awaiter(void 0, void 0, void 0, function () {
+    var results, failures;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (promises.length === 0)
+                    return [2 /*return*/, null];
+                return [4 /*yield*/, (0, mdm_sdk_1.promiseAllSettled)(promises)];
+            case 1:
+                results = _a.sent();
+                failures = results.filter(function (result) { return result.status === 'rejected'; });
+                if (failures.length) {
+                    return [2 /*return*/, {
+                            proceed: false,
+                            error: new Error("".concat(errorMessage, ": ").concat(failures.map(function (r) { return r.reason; }).join(', ')))
+                        }];
+                }
+                return [2 /*return*/, null];
+        }
+    });
+}); };
 var useApplyDcrChanges = function (dcr) {
     var getLinesByChangeId = (0, react_context_selector_1.useContextSelector)(ChangeRequestEditorContext_1.ChangeRequestEditorContext, function (context) { return context.getLinesByChangeId; });
+    var addedAttributes = (0, react_context_selector_1.useContextSelector)(AddedAttributesContext_1.AddedAttributesContext, function (ctx) { return ctx.getAddedAttributes(); });
     var metadata = (0, MdmModuleContext_1.useMdmMetadata)();
-    var getErrors = (0, useDCRValidation_1.useDCRValidation)(dcr);
+    var entity = (0, MdmModuleContext_1.useMdmEntity)();
+    var changes = (0, react_1.useMemo)(function () { var _a; return (0, mergeAddedAttributesWithDCRChanges_1.mergeAddedAttributesWithDCRChanges)((_a = dcr === null || dcr === void 0 ? void 0 : dcr.changes) !== null && _a !== void 0 ? _a : {}, addedAttributes, false); }, [dcr === null || dcr === void 0 ? void 0 : dcr.changes, addedAttributes]);
+    var getErrors = (0, useDCRValidation_1.useDCRValidation)(__assign(__assign({}, dcr), { changes: changes }));
     var applyDcrChanges = (0, react_1.useCallback)(function () { return __awaiter(void 0, void 0, void 0, function () {
-        var errors, _a, rejectedChangeIds, updatedChanges, deleteEntityAttributes, deleteRelationAttributes, deleteChangeResults, deleteEntityAttributesResults, deleteRelationAttributesResults, deleteChangeFailures, error_1, deleteEntityAttributesFailures, deleteRelationAttributesFailures;
+        var errors, _a, rejectedChangeIds, updatedChanges, deleteEntityAttributes, deleteRelationAttributes, insertEntityAttributes, insertRelationAttributes, uriPreprocessor_1, deleteChangesError, error_1, deleteEntityAttrsError, insertEntityAttrsError, deleteRelationAttrsError, insertRelationAttrsError;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    if (!(dcr === null || dcr === void 0 ? void 0 : dcr.changes)) return [3 /*break*/, 12];
+                    if (!(dcr === null || dcr === void 0 ? void 0 : dcr.uri)) return [3 /*break*/, 11];
                     return [4 /*yield*/, getErrors()];
                 case 1:
                     errors = _b.sent();
@@ -66,90 +103,70 @@ var useApplyDcrChanges = function (dcr) {
                                 proceed: false
                             }];
                     }
-                    _a = (0, dcr_1.buildDCRSavePlan)(dcr.changes, getLinesByChangeId, metadata), rejectedChangeIds = _a.rejectedChangeIds, updatedChanges = _a.updatedChanges, deleteEntityAttributes = _a.deleteEntityAttributes, deleteRelationAttributes = _a.deleteRelationAttributes;
-                    deleteChangeResults = [];
-                    deleteEntityAttributesResults = [];
-                    deleteRelationAttributesResults = [];
-                    if (!(rejectedChangeIds.length > 0)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, mdm_sdk_1.promiseAllSettled)(rejectedChangeIds.map(function (changeId) {
-                            return (0, mdm_sdk_1.deleteChangeRequestItem)({ dcrUri: dcr.uri, changeItemId: changeId });
-                        }))];
+                    _a = (0, dcr_1.buildDCRSavePlan)(changes, getLinesByChangeId, metadata), rejectedChangeIds = _a.rejectedChangeIds, updatedChanges = _a.updatedChanges, deleteEntityAttributes = _a.deleteEntityAttributes, deleteRelationAttributes = _a.deleteRelationAttributes, insertEntityAttributes = _a.insertEntityAttributes, insertRelationAttributes = _a.insertRelationAttributes;
+                    uriPreprocessor_1 = withChangeRequestId(dcr.uri);
+                    return [4 /*yield*/, executeBatch(rejectedChangeIds.map(function (changeId) { return (0, mdm_sdk_1.deleteChangeRequestItem)({ dcrUri: dcr.uri, changeItemId: changeId }); }), 'Failed to delete DCR change(s)')];
                 case 2:
-                    deleteChangeResults = _b.sent();
+                    deleteChangesError = _b.sent();
+                    if (deleteChangesError)
+                        return [2 /*return*/, deleteChangesError];
+                    if (!!(0, ramda_1.isEmpty)(updatedChanges)) return [3 /*break*/, 6];
                     _b.label = 3;
                 case 3:
-                    deleteChangeFailures = deleteChangeResults.filter(function (result) { return result.status === 'rejected'; });
-                    if (deleteChangeFailures.length) {
-                        return [2 /*return*/, {
-                                proceed: false,
-                                error: new Error("Failed to delete DCR change(s): ".concat(deleteChangeFailures.map(function (result) { return result.reason; }).join(', ')))
-                            }];
-                    }
-                    if (!!(0, ramda_1.isEmpty)(updatedChanges)) return [3 /*break*/, 7];
-                    _b.label = 4;
-                case 4:
-                    _b.trys.push([4, 6, , 7]);
+                    _b.trys.push([3, 5, , 6]);
                     return [4 /*yield*/, (0, mdm_sdk_1.updateChangeRequest)({ dcrUri: dcr.uri, payload: updatedChanges })];
-                case 5:
+                case 4:
                     _b.sent();
-                    return [3 /*break*/, 7];
-                case 6:
+                    return [3 /*break*/, 6];
+                case 5:
                     error_1 = _b.sent();
                     return [2 /*return*/, {
                             proceed: false,
                             error: error_1
                         }];
+                case 6: return [4 /*yield*/, executeBatch(Object.entries(deleteEntityAttributes).map(function (_a) {
+                        var entityUri = _a[0], diff = _a[1];
+                        return (0, mdm_sdk_1.entityCumulativeUpdate)({ uri: entityUri, diff: diff, uriPreprocessor: uriPreprocessor_1 });
+                    }), 'Failed to delete entity attributes')];
                 case 7:
-                    if (!!(0, ramda_1.isEmpty)(deleteEntityAttributes)) return [3 /*break*/, 9];
-                    return [4 /*yield*/, (0, mdm_sdk_1.promiseAllSettled)(Object.entries(deleteEntityAttributes).map(function (_a) {
+                    deleteEntityAttrsError = _b.sent();
+                    if (deleteEntityAttrsError)
+                        return [2 /*return*/, deleteEntityAttrsError];
+                    return [4 /*yield*/, executeBatch(Object.entries(insertEntityAttributes).map(function (_a) {
                             var entityUri = _a[0], diff = _a[1];
-                            return (0, mdm_sdk_1.entityCumulativeUpdate)({
-                                uri: entityUri,
-                                diff: diff,
-                                uriPreprocessor: withChangeRequestId(dcr.uri)
-                            });
-                        }))];
+                            var mergedDiff = entityUri === (entity === null || entity === void 0 ? void 0 : entity.uri) ? (0, dcr_1.mergeExistingRolesAndTags)(diff, entity) : diff;
+                            return (0, mdm_sdk_1.entityCumulativeUpdate)({ uri: entityUri, diff: mergedDiff, uriPreprocessor: uriPreprocessor_1 });
+                        }), 'Failed to insert entity attributes')];
                 case 8:
-                    deleteEntityAttributesResults = _b.sent();
-                    _b.label = 9;
+                    insertEntityAttrsError = _b.sent();
+                    if (insertEntityAttrsError)
+                        return [2 /*return*/, insertEntityAttrsError];
+                    return [4 /*yield*/, executeBatch(Object.entries(deleteRelationAttributes).map(function (_a) {
+                            var relationUri = _a[0], diff = _a[1];
+                            return (0, mdm_sdk_1.updateRelationWithDiff)({ uri: relationUri, diff: diff, uriPreprocessor: uriPreprocessor_1 });
+                        }), 'Failed to delete relation attributes')];
                 case 9:
-                    deleteEntityAttributesFailures = deleteEntityAttributesResults.filter(function (result) { return result.status === 'rejected'; });
-                    if (deleteEntityAttributesFailures.length) {
-                        return [2 /*return*/, {
-                                proceed: false,
-                                error: new Error("Failed to delete entity attributes: ".concat(deleteEntityAttributesFailures.map(function (result) { return result.reason; }).join(', ')))
-                            }];
-                    }
-                    if (!!(0, ramda_1.isEmpty)(deleteRelationAttributes)) return [3 /*break*/, 11];
-                    return [4 /*yield*/, (0, mdm_sdk_1.promiseAllSettled)(Object.entries(deleteRelationAttributes).map(function (_a) {
+                    deleteRelationAttrsError = _b.sent();
+                    if (deleteRelationAttrsError)
+                        return [2 /*return*/, deleteRelationAttrsError];
+                    return [4 /*yield*/, executeBatch(Object.entries(insertRelationAttributes).map(function (_a) {
                             var relationUri = _a[0], diff = _a[1];
-                            return (0, mdm_sdk_1.updateRelationWithDiff)({
-                                uri: relationUri,
-                                diff: diff,
-                                uriPreprocessor: withChangeRequestId(dcr.uri)
-                            });
-                        }))];
+                            return (0, mdm_sdk_1.updateRelationWithDiff)({ uri: relationUri, diff: diff, uriPreprocessor: uriPreprocessor_1 });
+                        }), 'Failed to insert relation attributes')];
                 case 10:
-                    deleteRelationAttributesResults = _b.sent();
-                    _b.label = 11;
-                case 11:
-                    deleteRelationAttributesFailures = deleteRelationAttributesResults.filter(function (result) { return result.status === 'rejected'; });
-                    if (deleteRelationAttributesFailures.length) {
-                        return [2 /*return*/, {
-                                proceed: false,
-                                error: new Error("Failed to delete relation attributes: ".concat(deleteRelationAttributesFailures.map(function (result) { return result.reason; }).join(', ')))
-                            }];
-                    }
+                    insertRelationAttrsError = _b.sent();
+                    if (insertRelationAttrsError)
+                        return [2 /*return*/, insertRelationAttrsError];
                     return [2 /*return*/, {
                             proceed: true
                         }];
-                case 12: return [2 /*return*/, {
+                case 11: return [2 /*return*/, {
                         proceed: false,
                         error: new Error('No changes to apply')
                     }];
             }
         });
-    }); }, [dcr, getLinesByChangeId, metadata, getErrors]);
+    }); }, [dcr === null || dcr === void 0 ? void 0 : dcr.uri, getLinesByChangeId, metadata, getErrors, changes, entity]);
     return applyDcrChanges;
 };
 exports.useApplyDcrChanges = useApplyDcrChanges;

package/cjs/features/workflow/types.d.ts

@@ -1,9 +1,14 @@
-import { AttributeType, DCRAttributeValue, DCROperationTypes, DCRRelationInfo, EnrichedChangeValue, TRelationType, ChangeValue, SimpleAttributeValue, PrimitiveValue } from '@reltio/mdm-sdk';
+import type { AttributeType, DCRAttributeValue, DCROperationTypes, DCRRelationInfo, EnrichedChangeValue, TRelationType, ChangeValue, SimpleAttributeValue, PrimitiveValue, RecordImageAttributeValue } from '@reltio/mdm-sdk';
 export type TaskAction = {
     text: string;
     onClick: (comment: string) => void;
 };
 export type RelationAttributeValue = DCRAttributeValue & DCRRelationInfo;
+export type DiffDisplayOptions = {
+    showLabel: boolean;
+    showAddButton: boolean;
+    hasSameAttributeSiblings: boolean;
+};
 export type Diff = {
     level: number;
     label: string;
@@ -15,6 +20,11 @@ export type Diff = {
     operation?: DCROperationTypes;
     isReferenceSubAttribute?: boolean;
     lineIds?: string[];
+    addedId?: string;
+    displayOptions?: DiffDisplayOptions;
+    attributePath?: string;
+    refAttributeType?: string;
+    refObjectURI?: string;
 };
 export type Title = {
     label: string;
@@ -24,7 +34,7 @@ export type BeforeActionOutcome = {
     error?: unknown;
 };
 export type LineDataValue = SimpleAttributeValue | {
-    value: string[] | PrimitiveValue;
+    value: string[] | PrimitiveValue | RecordImageAttributeValue;
 };
 export type LineData = {
     value?: LineDataValue;

package/features/activity-log/ActivityLog/ActivityLog.test.js

@@ -52,6 +52,7 @@ import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { MdmModuleProvider } from '../../../contexts/MdmModuleContext';
 import { ActivityLog } from './ActivityLog';
+import { CLIENT_TYPES } from './constants';
 describe('Activity log tests', function () {
     mockResizeObserver();
     var activities = [
@@ -445,6 +446,33 @@ describe('Activity log tests', function () {
             }
         });
     }); });
+    it('displays client type label when clientType is in CLIENT_TYPES', function () {
+        var activityWithKnownClientType = [
+            {
+                uri: 'activities/client-type-known',
+                user: 'agent.user',
+                label: 'USER_LOGIN',
+                description: 'User agent.user was logged in',
+                timestamp: 1622625987531,
+                items: [
+                    {
+                        id: 'client-type-item',
+                        user: 'agent.user',
+                        method: 'POST',
+                        url: '/reltio/api/test/activities',
+                        clientType: 'Match_Resolution_Agent',
+                        timestamp: 1622625987531
+                    }
+                ],
+                itemsTotal: 1
+            }
+        ];
+        setUp({ activities: activityWithKnownClientType });
+        var activityItem = screen.getAllByTestId('activity-log-item')[0];
+        expect(activityItem).toHaveTextContent(CLIENT_TYPES.Match_Resolution_Agent);
+        expect(activityItem).toHaveTextContent(i18n.text('via'));
+        expect(activityItem).toHaveTextContent(i18n.text('agent'));
+    });
     it('should not fail for activities without items', function () {
         var activitiesWithoutItems = [
             {

package/features/activity-log/ActivityLog/components/ActivityItem/ActivityItem.js

@@ -1,20 +1,31 @@
 import React from 'react';
+import classnames from 'classnames';
 import i18n from 'ui-i18n';
-import { getActivityType, splitActivityByType } from '../../../utils/activities';
-import { ActivitiesFactory } from '../../../ActivitiesFactory';
 import { ErrorBoundary } from '../../../../../ErrorBoundary';
+import { ActivitiesFactory } from '../../../ActivitiesFactory';
 import { ActivityTitle } from '../../../ActivityTitle';
-import { useStyles } from './styles';
+import { getActivityType, splitActivityByType } from '../../../utils/activities';
+import { CLIENT_TYPES } from '../../constants';
+import styles from './ActivityItem.module.css';
 export var ActivityItem = function (_a) {
+    var _b, _c;
     var item = _a.item;
-    var styles = useStyles();
     var type = getActivityType(item);
     var activities = splitActivityByType(item);
+    var clientTypeName = CLIENT_TYPES[(_c = (_b = item.items) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.clientType];
     return (React.createElement("div", { className: styles.activityItem, "data-reltio-id": "activity-log-item" },
         React.createElement("div", { className: styles.activityIcon }, ActivitiesFactory.getIcon(type)),
         React.createElement("div", { className: styles.activityInfo },
             React.createElement("div", { className: styles.userContainer },
                 React.createElement("span", { className: styles.activityUser }, item.user),
+                clientTypeName ? (React.createElement("span", { className: classnames(styles.activityUser, styles.activityUserClient) },
+                    "(",
+                    i18n.text('via'),
+                    " ",
+                    clientTypeName,
+                    " ",
+                    i18n.text('agent'),
+                    ")")) : null,
                 React.createElement("span", { className: styles.date }, i18n.date(item.timestamp, 'LT'))),
             activities.map(function (activity, index) {
                 var activityType = getActivityType(activity);

package/features/activity-log/ActivityLog/components/ActivityItem/ActivityItem.module.css.js

@@ -0,0 +1,9 @@
+const styles = {"activityItem":"ActivityItem-activityItem--c5xTq","activityIcon":"ActivityItem-activityIcon--rHySh","userContainer":"ActivityItem-userContainer--cEXoW","activityInfo":"ActivityItem-activityInfo--9s7Vx","activityUser":"ActivityItem-activityUser--NsEvM","activityUserClient":"ActivityItem-activityUserClient--Zirlu","activityEvent":"ActivityItem-activityEvent--6s1wq","date":"ActivityItem-date--fvRDG"};
+if (typeof document !== 'undefined') {
+    const head = document.head || document.getElementsByTagName('head')[0]
+    const style = document.createElement('style');
+    style.type = 'text/css'
+    style.innerHTML = `.ActivityItem-activityItem--c5xTq{box-sizing:border-box;display:flex;min-height:40px;padding:10px 16px 5px 0}.ActivityItem-activityIcon--rHySh{align-items:center;background:var(--mui-palette-primary-main);border:1px solid #fff;border-radius:50%;display:flex;flex-shrink:0;height:24px;justify-content:center;margin-left:-13px;margin-right:15px;width:24px}.ActivityItem-activityIcon--rHySh svg{fill:#fff;font-size:14px}.ActivityItem-userContainer--cEXoW{display:flex}.ActivityItem-activityInfo--9s7Vx{flex:1;overflow:hidden;position:relative}.ActivityItem-activityUser--NsEvM{color:var(--mui-palette-text-secondary);font-size:13px;line-height:15px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ActivityItem-activityUserClient--Zirlu{margin-left:.25em}.ActivityItem-activityEvent--6s1wq{margin-top:5px}.ActivityItem-date--fvRDG{color:var(--mui-palette-text-primary);flex-shrink:0;font-size:12px;line-height:16px;margin-left:auto;padding-left:8px}`;
+    head.appendChild(style);
+}
+export default styles;

package/features/activity-log/ActivityLog/constants.d.ts

@@ -0,0 +1,17 @@
+export declare const CLIENT_TYPES: {
+    Match_Resolution_Agent: string;
+    Unmerge_Remediation_Agent: string;
+    Data_Exploration_Agent: string;
+    Intelligent_Workflow_Assignment_Agent: string;
+    Global_Menu_Item_Assignment_Agent: string;
+    Menu_Item_Characteristics_Enrichment_Agent: string;
+    Address_Enrichment_Agent: string;
+    Product_Recommendation_Agent: string;
+    Hierarchy_Management_Agent: string;
+    Data_Quality_Service_Agent: string;
+    Agent_Dev_Template: string;
+    Match_Explanation_Analyzer: string;
+    Reltio_On_Reltio_Agent: string;
+    External_Party_Resolution_Agent: string;
+    Segmentation_Agent: string;
+};

package/features/activity-log/ActivityLog/constants.js

@@ -0,0 +1,17 @@
+export var CLIENT_TYPES = {
+    Match_Resolution_Agent: 'MRA',
+    Unmerge_Remediation_Agent: 'URA',
+    Data_Exploration_Agent: 'DEA',
+    Intelligent_Workflow_Assignment_Agent: 'IAWA',
+    Global_Menu_Item_Assignment_Agent: 'GMIAA',
+    Menu_Item_Characteristics_Enrichment_Agent: 'MICEA',
+    Address_Enrichment_Agent: 'AEA',
+    Product_Recommendation_Agent: 'PRA',
+    Hierarchy_Management_Agent: 'EHRA',
+    Data_Quality_Service_Agent: 'DQSA',
+    Agent_Dev_Template: 'DEV',
+    Match_Explanation_Analyzer: 'MEA',
+    Reltio_On_Reltio_Agent: 'RORA',
+    External_Party_Resolution_Agent: 'EPRA',
+    Segmentation_Agent: 'SA'
+};

package/features/workflow/ChangeRequestEditor/ChangeRequestEditor.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ChangeRequest, WorkflowTaskData, GroupedObjectsInfo } from '@reltio/mdm-sdk';
+import type { ChangeRequest, WorkflowTaskData, GroupedObjectsInfo } from '@reltio/mdm-sdk';
 type Props = {
     dcr: ChangeRequest;
     task: WorkflowTaskData;

package/features/workflow/ChangeRequestEditor/ChangeRequestEditor.js

@@ -1,21 +1,32 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 import React, { useMemo } from 'react';
-import { clone } from 'ramda';
 import i18n from 'ui-i18n';
 import Typography from '@mui/material/Typography';
-import { addLineIdToValue } from './helpers/helpers';
+import { useContextSelector } from '@fluentui/react-context-selector';
 import SvgSuggestedChanges from '../../../icons/SuggestedChanges';
 import { EntityChangesGroup, SkeletonEntityChangesGroupLoader } from './components/EntityChangesGroup';
+import { mergeAddedAttributesWithDCRChanges } from './helpers/mergeAddedAttributesWithDCRChanges';
+import { AddedAttributesContext } from '../contexts/AddedAttributesContext';
 import styles from './ChangeRequestEditor.module.css';
 export var ChangeRequestEditor = function (_a) {
     var dcr = _a.dcr, task = _a.task, groupedObjects = _a.groupedObjects;
+    var addedAttributes = useContextSelector(AddedAttributesContext, function (ctx) { return ctx.getAddedAttributes(); });
     var enrichedDCR = useMemo(function () {
-        if (dcr === null || dcr === void 0 ? void 0 : dcr.changes) {
-            var cloned = clone(dcr);
-            cloned.changes = addLineIdToValue(cloned.changes);
-            return cloned;
-        }
-        return null;
-    }, [dcr]);
+        if (!(dcr === null || dcr === void 0 ? void 0 : dcr.changes))
+            return null;
+        var enrichedChanges = mergeAddedAttributesWithDCRChanges(dcr.changes, addedAttributes);
+        return __assign(__assign({}, dcr), { changes: enrichedChanges });
+    }, [dcr, addedAttributes]);
     var dcrLoaded = !!enrichedDCR && groupedObjects.length > 0;
     return (React.createElement("div", { className: styles.container },
         React.createElement("div", { className: styles.header },

package/features/workflow/ChangeRequestEditor/components/AddSameAttributeButton/AddSameAttributeButton.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import type { Diff } from '../../../types';
+type Props = {
+    change: Diff;
+};
+export declare const AddSameAttributeButton: ({ change }: Props) => React.JSX.Element;
+export {};

package/features/workflow/ChangeRequestEditor/components/AddSameAttributeButton/AddSameAttributeButton.js

@@ -0,0 +1,37 @@
+import React, { useCallback } from 'react';
+import i18n from 'ui-i18n';
+import { useContextSelector } from '@fluentui/react-context-selector';
+import AddIcon from '@mui/icons-material/Add';
+import { AddedAttributesContext } from '../../../contexts/AddedAttributesContext';
+import { SmallIconButton } from '../../../../../SmallIconButton';
+import { extractLineIds } from '../../../helpers/merge';
+import { getAddedId, getObjectIdFromLineId, getParentAddedId, getParentChangeOverrides, getParentLineId, isRootAddedAttribute } from '../../helpers/addedAttributes';
+export var AddSameAttributeButton = function (_a) {
+    var _b, _c;
+    var change = _a.change;
+    var attributeType = change.attributeType, lineIds = change.lineIds;
+    var lineId = (_b = lineIds === null || lineIds === void 0 ? void 0 : lineIds[0]) !== null && _b !== void 0 ? _b : (_c = extractLineIds(change === null || change === void 0 ? void 0 : change.newValue)) === null || _c === void 0 ? void 0 : _c[0];
+    var addedId = getAddedId(change);
+    var addAddedAttributes = useContextSelector(AddedAttributesContext, function (ctx) { return ctx.addAddedAttributes; });
+    var handleAdd = useCallback(function () {
+        if (!attributeType || !lineId)
+            return;
+        var changeOverrides = getParentChangeOverrides(change);
+        if (isRootAddedAttribute(lineId)) {
+            addAddedAttributes({
+                attributeTypes: [attributeType],
+                objectUri: getObjectIdFromLineId(lineId),
+                changeOverrides: changeOverrides
+            });
+        }
+        else {
+            addAddedAttributes({
+                attributeTypes: [attributeType],
+                parentLineId: getParentLineId(lineId),
+                parentId: addedId ? getParentAddedId(addedId) : undefined,
+                changeOverrides: changeOverrides
+            });
+        }
+    }, [attributeType, lineId, addedId, change, addAddedAttributes]);
+    return React.createElement(SmallIconButton, { icon: AddIcon, onClick: handleAdd, title: i18n.text('Add'), size: "S" });
+};

package/features/workflow/ChangeRequestEditor/components/ChangeItemLabel/ChangeItemLabel.js

@@ -2,6 +2,7 @@ import React from 'react';
 import classnames from 'classnames';
 import { useCssVariableStyles } from '../../../../../hooks/useCssVariableStyles';
 import { RequiredMark } from '../../../../../RequiredMark';
+import { ExpandedValueTooltip } from '../../../../../ExpandedValueTooltip';
 import styles from './ChangeItemLabel.module.css';
 export var ChangeItemLabel = function (_a) {
     var _b;
@@ -12,6 +13,7 @@ export var ChangeItemLabel = function (_a) {
         '--level': level
     });
     return (React.createElement("div", { className: classnames(styles.changeLabel, className), style: variableStyles }, showLabel && (React.createElement(React.Fragment, null,
-        label,
+        React.createElement(ExpandedValueTooltip, { value: label },
+            React.createElement("div", { className: styles.labelText }, label)),
         isRequired && React.createElement(RequiredMark, null)))));
 };

package/features/workflow/ChangeRequestEditor/components/ChangeItemLabel/ChangeItemLabel.module.css.js

@@ -1,9 +1,9 @@
-const styles = {"changeLabel":"ChangeItemLabel-changeLabel--L-2ks"};
+const styles = {"changeLabel":"ChangeItemLabel-changeLabel--L-2ks","labelText":"ChangeItemLabel-labelText--f3kcC"};
 if (typeof document !== 'undefined') {
     const head = document.head || document.getElementsByTagName('head')[0]
     const style = document.createElement('style');
     style.type = 'text/css'
-    style.innerHTML = `.ChangeItemLabel-changeLabel--L-2ks{color:var(--mui-palette-text-secondary);font-size:14px;font-weight:400;letter-spacing:.24px;padding-left:calc(var(--level, 0)*16px)}`;
+    style.innerHTML = `.ChangeItemLabel-changeLabel--L-2ks{align-items:center;color:var(--mui-palette-text-secondary);display:flex;font-size:14px;font-weight:400;letter-spacing:.24px;overflow:hidden;padding-left:calc(var(--level, 0)*16px)}.ChangeItemLabel-labelText--f3kcC{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}`;
     head.appendChild(style);
 }
 export default styles;

package/features/workflow/ChangeRequestEditor/components/ChangeItemRow/ChangeItemRow.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { GroupedObjectsInfo } from '@reltio/mdm-sdk';
-import { Diff } from '../../../types';
+import { type GroupedObjectsInfo } from '@reltio/mdm-sdk';
+import type { Diff } from '../../../types';
 type Props = {
     change: Diff;
     entityInfo: GroupedObjectsInfo['entity'];