@reltio/components 1.4.2253 → 1.4.2255

package/features/workflow/ChangeRequestEditor/helpers/changesList.test-data.js

@@ -0,0 +1,153 @@
+import { DCROperationTypes, DCRTypes } from '@reltio/mdm-sdk';
+export var referenceAttributeType = {
+    uri: 'configuration/entityTypes/HCP/attributes/Affiliations',
+    name: 'Affiliations',
+    label: 'HCP to HCA Affiliations',
+    type: 'Reference',
+    referencedEntityTypeURI: 'configuration/entityTypes/HCA',
+    relationshipTypeURI: 'configuration/relationTypes/HCPtoHCA'
+};
+export var referenceAttributeValue = {
+    id: '0HocGCj',
+    value: {
+        RefFirstLevelNested: [
+            {
+                id: '2Cf73Q29',
+                value: {
+                    FirstLevelNestedSub2: [
+                        {
+                            id: '2ph3wL7h',
+                            value: {
+                                id: '0aDhfxd',
+                                refObjectURI: 'relations/0HocGCj',
+                                type: DCRTypes.UPDATE_ATTRIBUTE,
+                                objectType: 'configuration/entityTypes/HCP',
+                                attributePath: 'RefFirstLevelNested/2Cf73Q29/FirstLevelNestedSub2/2ph3wL7h',
+                                oldValue: { value: '555756', lineIds: ['BAliEK2/0aDhfxd/oldValue'] },
+                                newValue: { value: '5557563462', lineIds: ['BAliEK2/0aDhfxd/newValue'] },
+                                attributeType: 'configuration/relationTypes/HCPtoHCA/attributes/RefFirstLevelNested/attributes/FirstLevelNestedSub2',
+                                refAttributeType: 'configuration/entityTypes/HCP/attributes/Affiliations/attributes/RefFirstLevelNested/attributes/FirstLevelNestedSub2',
+                                lineIds: ['BAliEK2/0aDhfxd']
+                            }
+                        }
+                    ]
+                }
+            }
+        ]
+    },
+    refObjectURI: 'relations/0HocGCj'
+};
+export var affiliationsChangeRow = {
+    level: 0,
+    label: 'HCP to HCA Affiliations',
+    attributeType: referenceAttributeType,
+    attributeValue: referenceAttributeValue,
+    operation: DCROperationTypes.EDITED,
+    isReferenceSubAttribute: false
+};
+var nestedAttributeType = function (name) {
+    return ({
+        uri: "configuration/entityTypes/HCP/attributes/".concat(name),
+        name: name,
+        label: name,
+        type: 'Nested'
+    });
+};
+var firstLevelNestedSub2FloatType = {
+    uri: 'configuration/relationTypes/HCPtoHCA/attributes/RefFirstLevelNested/attributes/FirstLevelNestedSub2',
+    name: 'FirstLevelNestedSub2',
+    label: 'float',
+    type: 'Float'
+};
+export var deepNestedParentFromChildChanges = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '2ph3uHFx', value: { FirstLevelNestedSub2: [] } },
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    },
+    {
+        level: 2,
+        label: 'FirstLevelNestedSub2',
+        attributeType: firstLevelNestedSub2FloatType,
+        attributePath: 'DeepNested/2ph3uHFx/FirstLevelNestedSub2/2ph3uPmT',
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+export var deepNestedInnerChangeRow = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: {
+            id: '4FcgXO5o',
+            value: {
+                attributePath: 'DeepNested/4FcgXO5o/SecondLevelNested',
+                refAttributeType: 'configuration/entityTypes/HCP/attributes/Address/attributes/DeepNested/attributes/SecondLevelNested',
+                refObjectURI: 'relations/0LbuUWU'
+            }
+        },
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+export var addressDeepNestedThreeLevelChanges = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '4FcgXO5o', value: { SecondLevelNested: [] } },
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    },
+    {
+        level: 2,
+        label: 'SecondLevelNested',
+        attributeType: nestedAttributeType('SecondLevelNested'),
+        attributeValue: { id: '2v13QcOX', value: { FirstLevelNestedSubatr3: [] } },
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    },
+    {
+        level: 3,
+        label: 'FirstLevelNestedSubatr3',
+        attributeType: nestedAttributeType('FirstLevelNestedSubatr3'),
+        attributePath: 'DeepNested/4FcgXO5o/SecondLevelNested/2v13QcOX/FirstLevelNestedSubatr3/2v13Qgen',
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+export var addressDeepNestedRefPropagationChanges = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '2ph3uHFx', value: { FirstLevelNestedSub2: [] } },
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    },
+    {
+        level: 2,
+        label: 'FirstLevelNestedSub2',
+        attributeType: firstLevelNestedSub2FloatType,
+        attributePath: 'DeepNested/2ph3uHFx/FirstLevelNestedSub2/2ph3uPmT',
+        refAttributeType: 'configuration/entityTypes/HCP/attributes/Address/attributes/DeepNested/attributes/FirstLevelNestedSub2',
+        refObjectURI: 'relations/0LbuUWU',
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+export var deepNestedRowWithExistingPath = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '2ph3uHFx', value: { FirstLevelNestedSub2: [] } },
+        attributePath: 'DeepNested/2ph3uHFx',
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };

package/features/workflow/ChangeRequestEditor/helpers/changesList.test.js

@@ -9,8 +9,18 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { DataTypes, DCROperationTypes } from '@reltio/mdm-sdk';
 import { prepareChangesList } from './changesList';
+import { addressDeepNestedRefPropagationChanges, addressDeepNestedThreeLevelChanges, affiliationsChangeRow, deepNestedInnerChangeRow, deepNestedParentFromChildChanges, deepNestedRowWithExistingPath } from './changesList.test-data';
 var createDiff = function (overrides) {
     if (overrides === void 0) { overrides = {}; }
     return (__assign({ level: 0, label: 'Test', attributeType: {
@@ -198,4 +208,46 @@ describe('prepareChangesList', function () {
             expect((_b = result[1].displayOptions) === null || _b === void 0 ? void 0 : _b.hasSameAttributeSiblings).toBe(false);
         });
     });
+    describe('fillParentPaths', function () {
+        it('fills parent without attributePath from descendant when value is not inner DCR change', function () {
+            var result = prepareChangesList(deepNestedParentFromChildChanges());
+            expect(result[0].attributePath).toBe('DeepNested/2ph3uHFx');
+        });
+        it('fills nested-in-nested parents without paths when only leaf has attributePath (reverse pass)', function () {
+            var result = prepareChangesList(addressDeepNestedThreeLevelChanges());
+            expect(result[0].attributePath).toBe('DeepNested/4FcgXO5o');
+            expect(result[1].attributePath).toBe('DeepNested/4FcgXO5o/SecondLevelNested/2v13QcOX');
+        });
+        it('fills path from attributeValue.value when inner change carries attributePath', function () {
+            var result = prepareChangesList(deepNestedInnerChangeRow());
+            expect(result[0].attributePath).toBe('DeepNested/4FcgXO5o/SecondLevelNested');
+            expect(result[0].refAttributeType).toBe('configuration/entityTypes/HCP/attributes/Address/attributes/DeepNested/attributes/SecondLevelNested');
+            expect(result[0].refObjectURI).toBe('relations/0LbuUWU');
+        });
+        it('fills parent path and ref fields via descendant when inner change path is absent', function () {
+            var result = prepareChangesList(addressDeepNestedRefPropagationChanges());
+            expect(result[0].attributePath).toBe('DeepNested/2ph3uHFx');
+            expect(result[0].refAttributeType).toBe('configuration/entityTypes/HCP/attributes/Address/attributes/DeepNested');
+            expect(result[0].refObjectURI).toBe('relations/0LbuUWU');
+        });
+        it('does not change attributePath when already set on complex row', function () {
+            var result = prepareChangesList(deepNestedRowWithExistingPath());
+            expect(result[0].attributePath).toBe('DeepNested/2ph3uHFx');
+        });
+        it('leaves reference row paths unset and still fills following nested rows', function () {
+            var _a, _b, _c;
+            var affOnly = prepareChangesList([affiliationsChangeRow]);
+            expect(affOnly).toHaveLength(1);
+            var aff = affOnly[0];
+            expect(aff.attributePath).toBeUndefined();
+            expect((_a = aff.displayOptions) === null || _a === void 0 ? void 0 : _a.showLabel).toBe(false);
+            expect((_b = aff.displayOptions) === null || _b === void 0 ? void 0 : _b.showAddButton).toBe(false);
+            expect((_c = aff.displayOptions) === null || _c === void 0 ? void 0 : _c.hasSameAttributeSiblings).toBe(false);
+            var combined = prepareChangesList(__spreadArray([affiliationsChangeRow], deepNestedParentFromChildChanges(), true));
+            expect(combined).toHaveLength(3);
+            expect(combined[0].attributePath).toBeUndefined();
+            expect(combined[1].attributePath).toBe('DeepNested/2ph3uHFx');
+            expect(combined[0].operation).toBe(DCROperationTypes.EDITED);
+        });
+    });
 });

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

@@ -1,6 +1,6 @@
 import { type DCRChanges, type EnrichedDCRChanges, type GroupedObjectsInfo, type Metadata, type SimpleAttributeValue, type TEntityType } from '@reltio/mdm-sdk';
-export declare const isSimpleAttributeValue: (value: unknown) => value is SimpleAttributeValue;
 import type { Diff, Title } from '../../types';
+export declare const isSimpleAttributeValue: (value: unknown) => value is SimpleAttributeValue;
 export declare const isEditableChange: (change: Diff, entityInfo: GroupedObjectsInfo["entity"]) => boolean;
 export declare const addLineIdToValue: (data: DCRChanges | EnrichedDCRChanges) => EnrichedDCRChanges;
 export declare const isDiffChange: (change: Diff | Title) => change is Diff;

package/features/workflow/ChangeRequestEditor/helpers/helpers.js

@@ -11,6 +11,7 @@ var __assign = (this && this.__assign) || function () {
 };
 import { clone, has, isNil } from 'ramda';
 import { DCROperationTypes, DCRTypes, isComplexAttribute, isImage, isRelationTypeUri, MetadataPermissions, checkMetadataPermission, isRoleAttrType, isTagAttrType, checkSubAttributesPermissions } from '@reltio/mdm-sdk';
+import { isPrimitiveValue } from '../../helpers/common';
 export var isSimpleAttributeValue = function (value) {
     return value !== null && typeof value === 'object' && 'value' in value;
 };
@@ -24,9 +25,6 @@ export var isEditableChange = function (change, entityInfo) {
         !isRelationTypeUri(currentAttributeTypeUri);
     return !!currentAttributeTypeUri && !isExistingReferenceEntityChange && !isNil(change.newValue);
 };
-var isPrimitiveValue = function (value) {
-    return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean';
-};
 var addLineIdRecursively = function (value, basePath) {
     if (value == null)
         return value;

package/features/workflow/ReviewDCRDialog/ReviewDCRDialog.d.ts

@@ -6,6 +6,7 @@ type Props = {
     dcr: ChangeRequest;
     task: WorkflowTaskData;
     groupedObjects: GroupedObjectsInfo[];
+    onReloadDcr?: () => void;
 };
-export declare const ReviewDCRDialog: ({ open, onClose, dcr, task, groupedObjects }: Props) => React.JSX.Element;
+export declare const ReviewDCRDialog: ({ open, onClose, dcr, task, groupedObjects, onReloadDcr }: Props) => React.JSX.Element;
 export {};

package/features/workflow/ReviewDCRDialog/ReviewDCRDialog.js

@@ -1,8 +1,9 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import Dialog from '@mui/material/Dialog';
 import DialogTitle from '@mui/material/DialogTitle';
 import DialogContent from '@mui/material/DialogContent';
 import Typography from '@mui/material/Typography';
+import { useContextSelector } from '@fluentui/react-context-selector';
 import { SmallIconButtonWithTooltip } from '../../../SmallIconButton';
 import CloseIcon from '@mui/icons-material/Close';
 import i18n from 'ui-i18n';
@@ -19,13 +20,22 @@ import { DCRSummaryInfo } from './components/DCRSummaryInfo/DCRSummaryInfo';
 import { ChangeRequestEditor } from '../ChangeRequestEditor';
 import { useApplyDcrChanges } from '../hooks/useApplyDcrChanges';
 import { DCRErrorsPanel } from './DCRErrorsPanel/DCRErrorsPanel';
+import { AddedAttributesContext } from '../contexts/AddedAttributesContext';
+import { ChangeRequestEditorContext } from '../contexts/ChangeRequestEditorContext';
 import styles from './ReviewDCRDialog.module.css';
 export var ReviewDCRDialog = function (_a) {
-    var open = _a.open, onClose = _a.onClose, dcr = _a.dcr, task = _a.task, groupedObjects = _a.groupedObjects;
+    var open = _a.open, onClose = _a.onClose, dcr = _a.dcr, task = _a.task, groupedObjects = _a.groupedObjects, onReloadDcr = _a.onReloadDcr;
     var entity = useMdmEntity();
     var checkWorkflowPermission = useWorkflowCheckPermission();
     var canViewComments = checkWorkflowPermission('VIEW_PROCESS_INSTANCE_COMMENTS');
     var applyDcrChanges = useApplyDcrChanges(dcr);
+    var resetAddedAttributes = useContextSelector(AddedAttributesContext, function (ctx) { return ctx.resetState; });
+    var resetEditorState = useContextSelector(ChangeRequestEditorContext, function (ctx) { return ctx.resetState; });
+    var handleError = useCallback(function () {
+        resetAddedAttributes();
+        resetEditorState();
+        onReloadDcr === null || onReloadDcr === void 0 ? void 0 : onReloadDcr();
+    }, [resetAddedAttributes, resetEditorState, onReloadDcr]);
     var _b = useWorkflowActions({
         task: {
             taskId: task.taskId,
@@ -33,7 +43,8 @@ export var ReviewDCRDialog = function (_a) {
             assignee: task.assignee,
             isOpen: task.isOpen
         },
-        beforeAction: applyDcrChanges
+        beforeAction: applyDcrChanges,
+        onError: handleError
     }), workflowActions = _b.actions, actionRequestIsInProgress = _b.actionRequestIsInProgress;
     return (React.createElement(Dialog, { open: open, onClose: onClose, fullScreen: true },
         React.createElement(DialogTitle, { className: styles.dialogTitle },

package/features/workflow/WorkflowTaskCard/components/DataChangeRequestTaskCard/DataChangeRequestTaskCard.js

@@ -26,7 +26,7 @@ export var DataChangeRequestTaskCard = function (_a) {
     var _b = useState(false), isReviewDCRDialogOpen = _b[0], setIsReviewDCRDialogOpen = _b[1];
     var objectURIs = task.objectURIs, assignee = task.assignee;
     var dcrUri = getDCRUri(objectURIs);
-    var _c = useChangeRequest(dcrUri), dcr = _c.dcr, groupedObjects = _c.groupedObjects;
+    var _c = useChangeRequest(dcrUri), dcr = _c.dcr, groupedObjects = _c.groupedObjects, reloadDcr = _c.reloadDcr;
     var handleReviewDCR = useCallback(function () {
         setIsReviewDCRDialogOpen(true);
     }, []);
@@ -44,5 +44,5 @@ export var DataChangeRequestTaskCard = function (_a) {
             React.createElement(ChangeRequestEditorProvider, null,
                 React.createElement(ScrollToElementProvider, null,
                     React.createElement(ScrollToAddedAttributeProvider, null,
-                        React.createElement(ReviewDCRDialog, { open: isReviewDCRDialogOpen, onClose: handleCloseReviewDCRDialog, dcr: dcr, groupedObjects: groupedObjects, task: task }))))))));
+                        React.createElement(ReviewDCRDialog, { open: isReviewDCRDialogOpen, onClose: handleCloseReviewDCRDialog, dcr: dcr, groupedObjects: groupedObjects, task: task, onReloadDcr: reloadDcr }))))))));
 };

package/features/workflow/contexts/AddedAttributesContext/index.d.ts

@@ -32,6 +32,7 @@ export type AddedAttributesContextType = {
     }) => string[];
     removeAddedAttribute: (id: string) => void;
     updateAddedAttributeRefEntity: (id: string, refEntity: ConnectionEntity) => void;
+    resetState: () => void;
 };
 export declare const AddedAttributesContext: import("@fluentui/react-context-selector").Context<AddedAttributesContextType>;
 export declare const AddedAttributesProvider: ({ children }: {

package/features/workflow/contexts/AddedAttributesContext/index.js

@@ -30,7 +30,8 @@ export var AddedAttributesContext = createContext({
     getAddedAttributes: undefined,
     addAddedAttributes: undefined,
     removeAddedAttribute: undefined,
-    updateAddedAttributeRefEntity: undefined
+    updateAddedAttributeRefEntity: undefined,
+    resetState: undefined
 });
 var getInitialAttributeValue = function (attrType) {
     if (isComplexAttribute(attrType) || isImage(attrType))
@@ -115,11 +116,15 @@ export var AddedAttributesProvider = function (_a) {
     var updateAddedAttributeRefEntity = useCallback(function (id, refEntity) {
         setState(function (prev) { return prev.map(function (attr) { return (attr.id === id ? __assign(__assign({}, attr), { refEntity: refEntity }) : attr); }); });
     }, []);
+    var resetState = useCallback(function () {
+        setState([]);
+    }, []);
     var value = useMemo(function () { return ({
         getAddedAttributes: getAddedAttributes,
         addAddedAttributes: addAddedAttributes,
         removeAddedAttribute: removeAddedAttribute,
-        updateAddedAttributeRefEntity: updateAddedAttributeRefEntity
-    }); }, [getAddedAttributes, addAddedAttributes, removeAddedAttribute, updateAddedAttributeRefEntity]);
+        updateAddedAttributeRefEntity: updateAddedAttributeRefEntity,
+        resetState: resetState
+    }); }, [getAddedAttributes, addAddedAttributes, removeAddedAttribute, updateAddedAttributeRefEntity, resetState]);
     return React.createElement(AddedAttributesContext.Provider, { value: value }, children);
 };

package/features/workflow/contexts/ChangeRequestEditorContext/index.d.ts

@@ -27,6 +27,7 @@ export type ChangeRequestEditorContextType = {
         error: AttributeError;
         lineIds: string[];
     }[];
+    resetState: () => void;
 };
 export declare const ChangeRequestEditorContext: import("@fluentui/react-context-selector").Context<ChangeRequestEditorContextType>;
 export declare const ChangeRequestEditorProvider: ({ children }: {

package/features/workflow/contexts/ChangeRequestEditorContext/index.js

@@ -14,7 +14,8 @@ export var ChangeRequestEditorContext = createContext({
     getAllChanges: undefined,
     setErrors: undefined,
     getErrorByLineId: undefined,
-    getErrors: undefined
+    getErrors: undefined,
+    resetState: undefined
 });
 var emptyArray = [];
 var removeLineDataFromMap = function (map, lineIds) {
@@ -134,6 +135,10 @@ export var ChangeRequestEditorProvider = function (_a) {
     var getErrors = useCallback(function () {
         return errors;
     }, [errors]);
+    var resetState = useCallback(function () {
+        setLineDataMap(new Map());
+        setErrors([]);
+    }, []);
     var contextValue = {
         updateChange: updateChange,
         getLineData: getLineData,
@@ -147,7 +152,8 @@ export var ChangeRequestEditorProvider = function (_a) {
         getAllChanges: getAllChanges,
         setErrors: setErrors,
         getErrorByLineId: getErrorByLineId,
-        getErrors: getErrors
+        getErrors: getErrors,
+        resetState: resetState
     };
     return React.createElement(ChangeRequestEditorContext.Provider, { value: contextValue }, children);
 };

package/features/workflow/helpers/attributes.js

@@ -54,7 +54,7 @@ var dcrAttributesFactory = function (metadata, attributeType, attributeValue, le
     switch (attributeType.type) {
         case DataTypes.TYPE_NESTED:
         case DataTypes.TYPE_IMAGE:
-            return getNestedAttributeChange(metadata, attributeType, attributeValue, level);
+            return getNestedAttributeChange(metadata, attributeType, attributeValue, level, isReferenceSubAttribute);
         case DataTypes.TYPE_REFERENCE:
             return getReferenceAttributeChange(metadata, attributeType, attributeValue, level);
         default: {
@@ -74,14 +74,15 @@ var extractAddedId = function (attributeValue) {
     var innerChange = attributeValue.value;
     return ((_d = (_b = (_a = innerChange === null || innerChange === void 0 ? void 0 : innerChange.newValue) === null || _a === void 0 ? void 0 : _a.addedId) !== null && _b !== void 0 ? _b : (_c = attributeValue.newValue) === null || _c === void 0 ? void 0 : _c.addedId) !== null && _d !== void 0 ? _d : attributeValue.addedId);
 };
-var getNestedAttributeChange = function (metadata, attributeType, attributeValue, level) {
+var getNestedAttributeChange = function (metadata, attributeType, attributeValue, level, isReferenceSubAttribute) {
+    if (isReferenceSubAttribute === void 0) { isReferenceSubAttribute = false; }
     var attributeTypeList = getAttributeTypeSubAttributes({}, attributeType);
     var label = getLabel((attributeType === null || attributeType === void 0 ? void 0 : attributeType.label) || (attributeType === null || attributeType === void 0 ? void 0 : attributeType.name));
     var lineIds = extractLineIds(attributeValue);
     var addedId = extractAddedId(attributeValue);
     return [
-        __assign({ level: level, label: label, attributeType: attributeType, attributeValue: attributeValue, lineIds: lineIds }, (addedId && { addedId: addedId })),
-        getAttributesList(metadata, attributeTypeList, attributeValue.value, level + 1)
+        __assign(__assign({ level: level, label: label, attributeType: attributeType, attributeValue: attributeValue, lineIds: lineIds }, (isReferenceSubAttribute && { isReferenceSubAttribute: isReferenceSubAttribute })), (addedId && { addedId: addedId })),
+        getAttributesList(metadata, attributeTypeList, attributeValue.value, level + 1, isReferenceSubAttribute)
     ];
 };
 var getReferenceAttributeChange = function (metadata, attributeType, attributeValue, level) {

package/features/workflow/helpers/attributes.test.js

@@ -123,6 +123,61 @@ describe('attributes helpers tests', function () {
             }
         ]);
     });
+    it('should mark a nested attribute and its sub-attributes inside a reference attribute as isReferenceSubAttribute=true', function () {
+        var metadata = getMetadata();
+        var objectInfo = {
+            isExist: true,
+            label: 'HCA',
+            secondaryLabel: '',
+            type: 'configuration/entityTypes/HCA',
+            uri: 'entities/1hRTSKE5'
+        };
+        var changes = {
+            Address: [
+                {
+                    value: {
+                        AdditionalAttributes: [
+                            {
+                                value: {
+                                    AttributeType: [
+                                        {
+                                            value: {
+                                                newValue: { value: 'TypeA' },
+                                                type: DCRTypes.INSERT_ATTRIBUTE
+                                            }
+                                        }
+                                    ]
+                                }
+                            }
+                        ]
+                    }
+                }
+            ]
+        };
+        expect(getEntityChanges(metadata, objectInfo, changes)).toEqual([
+            {
+                attributeType: metadata.entityTypes[0].attributes[4],
+                attributeValue: changes.Address[0],
+                label: 'Address',
+                level: 0
+            },
+            {
+                attributeType: metadata.relationTypes[0].attributes[0],
+                attributeValue: changes.Address[0].value.AdditionalAttributes[0],
+                label: 'Additional Attributes',
+                level: 1,
+                isReferenceSubAttribute: true
+            },
+            {
+                attributeType: metadata.relationTypes[0].attributes[0].attributes[0],
+                label: 'Attribute Type',
+                level: 2,
+                newValue: changes.Address[0].value.AdditionalAttributes[0].value.AttributeType[0].value.newValue,
+                operation: DCROperationTypes.ADDED,
+                isReferenceSubAttribute: true
+            }
+        ]);
+    });
     describe('getRelationsChanges behaviour', function () {
         var relationInfo = {
             endObjectLabel: '',

package/features/workflow/helpers/common.d.ts

@@ -1,4 +1,5 @@
-import { AttributeType, DCRAttributeValue, DCRObjectsInfo, DCROperationTypes, DCRValue, Metadata, WorkflowDefinition, WorkflowTaskData } from '@reltio/mdm-sdk';
+import { AttributeType, DCRAttributeValue, DCRObjectsInfo, DCROperationTypes, DCRValue, Metadata, PrimitiveValue, WorkflowDefinition, WorkflowTaskData } from '@reltio/mdm-sdk';
+export declare const isPrimitiveValue: (value: unknown) => value is PrimitiveValue;
 export declare const getOperationType: (type: string, newPinOrIgnoreValue?: boolean) => DCROperationTypes;
 export declare const getOperationLabel: (operation: DCROperationTypes) => string;
 export declare const getAttributeDescription: (attrType: AttributeType, value: DCRAttributeValue, currentEntityUri: string, objectsInfo?: DCRObjectsInfo) => {

package/features/workflow/helpers/common.js

@@ -1,6 +1,9 @@
 import { allPass, always, equals, evolve, filter, has, identity, isNil, length, nth, pipe, prop, propEq, split, startsWith, unless, when } from 'ramda';
 import i18n from 'ui-i18n';
 import { DataTypes, DCROperationTypes, DCRTypes, EntityAttrTypes, getAttrDataTypeDefinition, getRoleLabel, isUrl } from '@reltio/mdm-sdk';
+export var isPrimitiveValue = function (value) {
+    return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean';
+};
 export var getOperationType = function (type, newPinOrIgnoreValue) {
     switch (type) {
         case DCRTypes.CREATE_RELATIONSHIP:

package/features/workflow/helpers/dcr.js

@@ -21,6 +21,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 import { createEntryDeleteAttribute, DCRTypes, EventType, findAttributeTypeByUri, getReferencedEntityTypeUriFromAttrType, isEmptyValue, isEntityUri, isNested, isRelationTypeUri, isRelationUri } from '@reltio/mdm-sdk';
 import { allPass, append, assocPath, concat, curry, dissocPath, equals, filter, flatten, fromPairs, groupBy, has, hasPath, isEmpty, isNil, keys, map, partition, path, pathOr, pipe, pluck, prop, propOr, toPairs, values, uniq, uniqBy, when } from 'ramda';
 import { ADDED_CHANGE_ID_PREFIX } from '../contexts/AddedAttributesContext';
+import { isPrimitiveValue } from './common';
 var isAddedChange = function (changeId) { return changeId === null || changeId === void 0 ? void 0 : changeId.startsWith(ADDED_CHANGE_ID_PREFIX); };
 var normalizeReferenceValueForApi = function (val, change, metadata) {
     var attrType = findAttributeTypeByUri(metadata, change.attributeType);
@@ -101,7 +102,7 @@ export var isCreateEntityOperation = function (dcr) {
     return dcr.type === DCRTypes.CREATE_ENTITY;
 };
 var cleanValueRecursively = function (value) {
-    if (isNil(value) || typeof value === 'string' || isEmpty(value)) {
+    if (isNil(value) || isPrimitiveValue(value) || isEmpty(value)) {
         return value;
     }
     var cleanedProperties = map(function (propertyValues) {

package/features/workflow/helpers/dcr.test.js

@@ -280,6 +280,53 @@ describe('dcr helpers tests', function () {
                     ]
                 } }));
         });
+        it('should preserve primitive boolean defaultValue for added attribute when no lineData exists', function () {
+            var changes = {
+                'entities/456': [
+                    {
+                        id: 'added|bool1',
+                        type: DCRTypes.INSERT_ATTRIBUTE,
+                        attributePath: 'PrimaryAffiliationIndicator',
+                        attributeType: 'configuration/entityTypes/HCP/attributes/PrimaryAffiliationIndicator',
+                        newValue: { value: false }
+                    }
+                ]
+            };
+            var result = buildDCRSavePlan(changes, noLineData, emptyMetadata);
+            expect(result).toEqual(__assign(__assign({}, emptyPlan), { insertEntityAttributes: {
+                    'entities/456': [
+                        {
+                            type: 'INSERT_ATTRIBUTE',
+                            uri: 'entities/456/attributes/PrimaryAffiliationIndicator',
+                            newValue: [{ value: false }]
+                        }
+                    ]
+                } }));
+        });
+        it('should send user-edited boolean value for added attribute', function () {
+            var changes = {
+                'entities/456': [
+                    {
+                        id: 'added|bool2',
+                        type: DCRTypes.INSERT_ATTRIBUTE,
+                        attributePath: 'PrimaryAffiliationIndicator',
+                        attributeType: 'configuration/entityTypes/HCP/attributes/PrimaryAffiliationIndicator',
+                        newValue: { value: false }
+                    }
+                ]
+            };
+            var lineData = [['456/added|bool2/newValue', { value: { value: 'true' } }]];
+            var result = buildDCRSavePlan(changes, function (changeId) { return (changeId === 'added|bool2' ? lineData : []); }, emptyMetadata);
+            expect(result).toEqual(__assign(__assign({}, emptyPlan), { insertEntityAttributes: {
+                    'entities/456': [
+                        {
+                            type: 'INSERT_ATTRIBUTE',
+                            uri: 'entities/456/attributes/PrimaryAffiliationIndicator',
+                            newValue: [{ value: 'true' }]
+                        }
+                    ]
+                } }));
+        });
         it('should preserve lookup sub-attribute with lookupCode inside nested parent', function () {
             var metadata = {
                 entityTypes: [

package/features/workflow/helpers/merge.js

@@ -10,7 +10,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { both, concat, curry, difference, flatten, isNil, omit, path, pathEq, pick, pipe, propEq, propOr, reduce } from 'ramda';
-import { DCRTypes, EntityAttrTypes, generateTempUri, getRoleLabel, isEmptyValue } from '@reltio/mdm-sdk';
+import { DCRTypes, EntityAttrTypes, generateTempUri, isEmptyValue } from '@reltio/mdm-sdk';
 import { getEntityChanges, getRelationChanges } from './attributes';
 var ATTRIBUTE_DELIMITER = '/';
 var SPECIAL_ATTRIBUTES_NAMES = [
@@ -166,7 +166,7 @@ var createEntityOrRelation = function (metadata, value) {
         newObject[EntityAttrTypes.roles.name] = [
             {
                 type: DCRTypes.INSERT_ATTRIBUTE,
-                newValue: __assign({ value: addedId ? [] : roles.map(getRoleLabel(metadata)), lineIds: lineIds && ["".concat(lineIds[0], "/").concat(EntityAttrTypes.roles.name)] }, (addedId && { addedId: addedId }))
+                newValue: __assign({ value: addedId ? [] : roles, lineIds: lineIds && ["".concat(lineIds[0], "/").concat(EntityAttrTypes.roles.name)] }, (addedId && { addedId: addedId }))
             }
         ];
     }

package/features/workflow/helpers/merge.test.js

@@ -389,4 +389,38 @@ describe('mergeChanges tests', function () {
         var mergedChanges = mergeChanges(metadata, changes, objectInfo, [])[0];
         expect((_c = (_b = mergedChanges[0]) === null || _b === void 0 ? void 0 : _b.newValue) === null || _c === void 0 ? void 0 : _c.lineIds).toEqual(['line-2', 'line-4']);
     });
+    it('should keep role URIs in CREATE_ENTITY changes without mapping to labels', function () {
+        var _a;
+        var _b;
+        var metadata = getMetadata();
+        var roleUris = [
+            'configuration/roles/DirectorofNursing',
+            'configuration/roles/MedicalAssistant',
+            'configuration/roles/LabDirectors'
+        ];
+        var changes = (_a = {},
+            _a[entityUri] = [
+                {
+                    id: 'create1',
+                    type: DCRTypes.CREATE_ENTITY,
+                    objectType: 'configuration/entityTypes/HCA',
+                    newValue: {
+                        uri: entityUri,
+                        type: 'configuration/entityTypes/HCA',
+                        attributes: {
+                            ActivationDate: [{ value: '2024-01-01' }]
+                        },
+                        roles: roleUris,
+                        crosswalks: [{ type: 'configuration/sources/Reltio', value: '1hRTSKE5', dataProvider: true }],
+                        analyticsAttributes: {}
+                    }
+                }
+            ],
+            _a);
+        var entityChanges = mergeChanges(metadata, changes, objectInfo, [])[0];
+        var rolesDiff = entityChanges.find(function (d) { var _a; return ((_a = d.attributeType) === null || _a === void 0 ? void 0 : _a.uri) === EntityAttrTypes.roles.uri; });
+        expect(rolesDiff).toBeDefined();
+        var rolesNewValue = (_b = rolesDiff.newValue) === null || _b === void 0 ? void 0 : _b.value;
+        expect(rolesNewValue).toEqual(roleUris);
+    });
 });