@reltio/components 1.4.2202 → 1.4.2204

package/features/workflow/ReviewDCRDialog/ReviewDCRDialog.js

@@ -3,7 +3,7 @@ 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 { SmallIconButton } from '../../../SmallIconButton';
+import { SmallIconButtonWithTooltip } from '../../../SmallIconButton';
 import CloseIcon from '@mui/icons-material/Close';
 import i18n from 'ui-i18n';
 import { useWorkflowCheckPermission } from '../hooks/useWorkflowCheckPermission';
@@ -35,7 +35,7 @@ export var ReviewDCRDialog = function (_a) {
             React.createElement("div", { className: styles.titleContent },
                 React.createElement(Typography, { variant: "h6", className: styles.titleText }, i18n.text('Review DCR')),
                 React.createElement(WorkflowActionButtons, { workflowActions: workflowActions, actionRequestIsInProgress: actionRequestIsInProgress, preferredAction: task.preferredAction })),
-            React.createElement(SmallIconButton, { onClick: onClose, className: styles.closeButton, "aria-label": "close", icon: CloseIcon })),
+            React.createElement(SmallIconButtonWithTooltip, { tooltipTitle: i18n.text('Close'), "aria-label": i18n.text('Close'), icon: CloseIcon, onClick: onClose, className: styles.closeButton, size: "L" })),
         React.createElement(DialogContent, { classes: { root: styles.content } },
             React.createElement("div", { className: styles.leftSection },
                 React.createElement(ProfileBand, { entity: entity, className: styles.profileBandRoot, classes: { profileBand: styles.profileBand } }),

package/features/workflow/ReviewDCRDialog/ReviewDCRDialog.module.css.js

@@ -3,7 +3,7 @@ if (typeof document !== 'undefined') {
     const head = document.head || document.getElementsByTagName('head')[0]
     const style = document.createElement('style');
     style.type = 'text/css'
-    style.innerHTML = `.ReviewDCRDialog-dialogTitle--xCXtj{align-items:center;border-bottom:1px solid #e0e0e0;display:flex;justify-content:space-between;padding:12px 16px 8px}.ReviewDCRDialog-titleContent--Hh2KH{align-items:center;display:flex;flex:1;justify-content:space-between;position:relative}.ReviewDCRDialog-titleText--ME8s4{flex:1;margin:0;padding-left:48px}.ReviewDCRDialog-closeButton--YMAEf{color:#666;left:15px;position:absolute}.ReviewDCRDialog-closeButton--YMAEf:hover{background-color:var(--mui-palette-action-hover);color:var(--mui-palette-text-primary)}.ReviewDCRDialog-content--qvUva{display:flex;min-height:400px;padding:0!important;width:100%}.ReviewDCRDialog-leftSection--5MELW{border-right:1px solid #e0e0e0;display:flex;flex-direction:column;padding:0 16px;width:100%}.ReviewDCRDialog-profileBand--7r6Xy{margin-left:-16px}.ReviewDCRDialog-profileBandRoot--G7p1m{box-shadow:none;margin-bottom:0}.ReviewDCRDialog-editableSection--v-D7a{border:1px solid #d9d9d9;border-radius:0 0 8px 8px;margin-bottom:16px;padding:8px 16px 14px}.ReviewDCRDialog-editableGrid--auc-d{display:grid;gap:24px;grid-template-columns:repeat(auto-fit,minmax(250px,1fr));margin-bottom:12px}.ReviewDCRDialog-editableItem--isGwv{display:flex;flex-direction:column}.ReviewDCRDialog-priorityField--LQ1n3{min-width:200px}.ReviewDCRDialog-changesSection--qj2OK{flex-grow:1;margin-bottom:16px;position:relative}.ReviewDCRDialog-commentsRootContainer--g2f7m{margin:10px 0 16px 10px;min-width:323px;width:323px}.ReviewDCRDialog-commentsContainer--OApOx{flex-grow:1;max-height:100%}`;
+    style.innerHTML = `.ReviewDCRDialog-dialogTitle--xCXtj{align-items:center;border-bottom:1px solid #e0e0e0;display:flex;justify-content:space-between;padding:12px 16px 8px}.ReviewDCRDialog-titleContent--Hh2KH{align-items:center;display:flex;flex:1;height:37px;justify-content:space-between;position:relative}.ReviewDCRDialog-titleText--ME8s4{flex:1;margin:0;padding-left:48px}.ReviewDCRDialog-closeButton--YMAEf{color:#666;left:15px;position:absolute}.ReviewDCRDialog-closeButton--YMAEf:hover{background-color:var(--mui-palette-action-hover);color:var(--mui-palette-text-primary)}.ReviewDCRDialog-content--qvUva{display:flex;min-height:400px;padding:0!important;width:100%}.ReviewDCRDialog-leftSection--5MELW{border-right:1px solid #e0e0e0;display:flex;flex-direction:column;padding:0 16px;width:100%}.ReviewDCRDialog-profileBand--7r6Xy{margin-left:-16px}.ReviewDCRDialog-profileBandRoot--G7p1m{box-shadow:none;margin-bottom:0}.ReviewDCRDialog-editableSection--v-D7a{border:1px solid #d9d9d9;border-radius:0 0 8px 8px;margin-bottom:16px;padding:8px 16px 14px}.ReviewDCRDialog-editableGrid--auc-d{display:grid;gap:24px;grid-template-columns:repeat(auto-fit,minmax(250px,1fr));margin-bottom:12px}.ReviewDCRDialog-editableItem--isGwv{display:flex;flex-direction:column}.ReviewDCRDialog-priorityField--LQ1n3{min-width:200px}.ReviewDCRDialog-changesSection--qj2OK{flex-grow:1;margin-bottom:16px;position:relative}.ReviewDCRDialog-commentsRootContainer--g2f7m{margin:10px 0 16px 10px;min-width:323px;width:323px}.ReviewDCRDialog-commentsContainer--OApOx{flex-grow:1;max-height:100%}`;
     head.appendChild(style);
 }
 export default styles;

package/features/workflow/ReviewDCRDialog/components/DCRChangesSummary/DCRChangesSummary.module.css.js

@@ -3,7 +3,7 @@ if (typeof document !== 'undefined') {
     const head = document.head || document.getElementsByTagName('head')[0]
     const style = document.createElement('style');
     style.type = 'text/css'
-    style.innerHTML = `.DCRChangesSummary-changesSummary--31gR-{align-items:center;display:flex;gap:22px}.DCRChangesSummary-changeItem---XfYP{align-items:center;display:flex;flex-direction:column;gap:4px;position:relative}.DCRChangesSummary-changeItem---XfYP:not(:last-child):after{background-color:#d9d9d9;bottom:2px;content:"";height:20px;position:absolute;right:-12px;top:2px;width:1px}.DCRChangesSummary-changeNumber--vZxc4{font-size:16px;font-weight:500;line-height:1}.DCRChangesSummary-changeLabel--tDXS6{color:var(--mui-palette-text-primary);font-size:13px;text-transform:capitalize}.DCRChangesSummary-edited--KFivZ{color:#eb9d08}.DCRChangesSummary-added--KGdGw{color:#599e0e}.DCRChangesSummary-deleted--TWgS5{color:#eb5757}.DCRChangesSummary-ignored--Q2Q8R{color:var(--mui-palette-primary-light)}`;
+    style.innerHTML = `.DCRChangesSummary-changesSummary--31gR-{align-items:center;display:flex;gap:22px}.DCRChangesSummary-changeItem---XfYP{align-items:center;display:flex;flex-direction:column;gap:4px;position:relative}.DCRChangesSummary-changeItem---XfYP:not(:last-child):after{background-color:#d9d9d9;bottom:2px;content:"";height:20px;position:absolute;right:-12px;top:2px;width:1px}.DCRChangesSummary-changeNumber--vZxc4{font-size:16px;font-weight:500;line-height:1}.DCRChangesSummary-changeLabel--tDXS6{color:var(--mui-palette-text-primary);font-size:13px}.DCRChangesSummary-changeLabel--tDXS6:first-letter{text-transform:uppercase}.DCRChangesSummary-edited--KFivZ{color:#eb9d08}.DCRChangesSummary-added--KGdGw{color:#599e0e}.DCRChangesSummary-deleted--TWgS5{color:#eb5757}.DCRChangesSummary-ignored--Q2Q8R{color:var(--mui-palette-primary-light)}`;
     head.appendChild(style);
 }
 export default styles;

package/features/workflow/ReviewDCRDialog/components/DCRSummaryInfo/DCRSummaryInfo.module.css.js

@@ -3,7 +3,7 @@ if (typeof document !== 'undefined') {
     const head = document.head || document.getElementsByTagName('head')[0]
     const style = document.createElement('style');
     style.type = 'text/css'
-    style.innerHTML = `.DCRSummaryInfo-requestSummary--FUaA0{align-items:flex-start;background-color:rgba(0,0,0,.03);border-radius:8px;display:flex;justify-content:space-between;padding:16px 8px 12px}.DCRSummaryInfo-summaryLeft--Y79jA{align-items:flex-start;display:flex;gap:16px}.DCRSummaryInfo-summaryIcon--VlZsg{padding-top:4px}.DCRSummaryInfo-summaryContent--BdPl7{display:flex;flex-direction:column;gap:3px}.DCRSummaryInfo-summaryTitle--77exU{font-size:16px;font-weight:500;margin:0}.DCRSummaryInfo-summaryDetails--u5ije{display:flex;flex-wrap:wrap;font-size:12px;gap:8px}.DCRSummaryInfo-summaryItem--DbTdR{color:var(--mui-palette-text-primary);font-size:13px;margin:0}.DCRSummaryInfo-summaryItemName--l7hYO{color:var(--mui-palette-text-secondary)}.DCRSummaryInfo-summaryItemDate--EQpJ0{margin-left:-4px}.DCRSummaryInfo-summaryRight--9pEaH{align-items:center;display:flex;padding:3px 9px}`;
+    style.innerHTML = `.DCRSummaryInfo-requestSummary--FUaA0{align-items:flex-start;background-color:rgba(0,0,0,.03);border-radius:8px 8px 0 0;display:flex;justify-content:space-between;padding:16px 8px 12px}.DCRSummaryInfo-summaryLeft--Y79jA{align-items:flex-start;display:flex;gap:16px}.DCRSummaryInfo-summaryIcon--VlZsg{padding-top:4px}.DCRSummaryInfo-summaryContent--BdPl7{display:flex;flex-direction:column;gap:3px}.DCRSummaryInfo-summaryTitle--77exU{font-size:16px;font-weight:500;margin:0}.DCRSummaryInfo-summaryDetails--u5ije{display:flex;flex-wrap:wrap;font-size:12px;gap:8px}.DCRSummaryInfo-summaryItem--DbTdR{color:var(--mui-palette-text-primary);font-size:13px;margin:0}.DCRSummaryInfo-summaryItemName--l7hYO{color:var(--mui-palette-text-secondary)}.DCRSummaryInfo-summaryItemDate--EQpJ0{margin-left:-4px}.DCRSummaryInfo-summaryRight--9pEaH{align-items:center;display:flex;padding:3px 9px}`;
     head.appendChild(style);
 }
 export default styles;

package/features/workflow/helpers/attributes.js

@@ -89,13 +89,15 @@ var getReferenceAttributeChange = function (metadata, attributeType, attributeVa
     ];
 };
 var getDiffParameters = function (_a) {
-    var newValue = _a.newValue, oldValue = _a.oldValue, type = _a.type;
-    return type === DCRTypes.UPDATE_ATTRIBUTE ? { type: type, newValue: newValue, oldValue: oldValue } : { type: type, newValue: oldValue || newValue };
+    var newValue = _a.newValue, oldValue = _a.oldValue, type = _a.type, newPinOrIgnoreValue = _a.newPinOrIgnoreValue;
+    return type === DCRTypes.UPDATE_ATTRIBUTE
+        ? { type: type, newValue: newValue, oldValue: oldValue, newPinOrIgnoreValue: newPinOrIgnoreValue }
+        : { type: type, newValue: oldValue || newValue, newPinOrIgnoreValue: newPinOrIgnoreValue };
 };
 var getSimpleAttributeChange = function (attributeType, attributeValue, level, isReferenceSubAttribute) {
     if (isReferenceSubAttribute === void 0) { isReferenceSubAttribute = false; }
-    var _a = getDiffParameters(attributeValue), newValue = _a.newValue, oldValue = _a.oldValue, type = _a.type;
-    var operation = getOperationType(type, oldValue);
+    var _a = getDiffParameters(attributeValue), newValue = _a.newValue, oldValue = _a.oldValue, type = _a.type, newPinOrIgnoreValue = _a.newPinOrIgnoreValue;
+    var operation = getOperationType(type, newPinOrIgnoreValue);
     var label = (attributeType === null || attributeType === void 0 ? void 0 : attributeType.label) || (attributeType === null || attributeType === void 0 ? void 0 : attributeType.name);
     return {
         attributeType: attributeType,

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

@@ -1,5 +1,5 @@
 import { AttributeType, DCRAttributeValue, DCRObjectsInfo, DCROperationTypes, DCRValue, Metadata, WorkflowDefinition, WorkflowTaskData } from '@reltio/mdm-sdk';
-export declare const getOperationType: (type: string, oldValue?: DCRAttributeValue) => DCROperationTypes;
+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) => {
     objectUri: string;

package/features/workflow/helpers/common.js

@@ -1,7 +1,7 @@
 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 getOperationType = function (type, oldValue) {
+export var getOperationType = function (type, newPinOrIgnoreValue) {
     switch (type) {
         case DCRTypes.CREATE_RELATIONSHIP:
         case DCRTypes.INSERT_ATTRIBUTE:
@@ -14,9 +14,9 @@ export var getOperationType = function (type, oldValue) {
         case DCRTypes.DELETE_RELATIONSHIP:
             return DCROperationTypes.DELETED;
         case DCRTypes.PIN_ATTRIBUTE:
-            return (oldValue === null || oldValue === void 0 ? void 0 : oldValue.pin) ? DCROperationTypes.PIN_DELETED : DCROperationTypes.PINNED;
+            return newPinOrIgnoreValue ? DCROperationTypes.PINNED : DCROperationTypes.PIN_DELETED;
         case DCRTypes.IGNORE_ATTRIBUTE:
-            return (oldValue === null || oldValue === void 0 ? void 0 : oldValue.ignored) ? DCROperationTypes.IGNORE_DELETED : DCROperationTypes.IGNORED;
+            return newPinOrIgnoreValue ? DCROperationTypes.IGNORED : DCROperationTypes.IGNORE_DELETED;
     }
 };
 export var getOperationLabel = function (operation) {

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

@@ -9,10 +9,10 @@ describe('common helpers', function () {
         expect(getOperationType(DCRTypes.UPDATE_ATTRIBUTE)).toBe(DCROperationTypes.EDITED);
         expect(getOperationType(DCRTypes.DELETE_ATTRIBUTE)).toBe(DCROperationTypes.DELETED);
         expect(getOperationType(DCRTypes.DELETE_RELATIONSHIP)).toBe(DCROperationTypes.DELETED);
-        expect(getOperationType(DCRTypes.PIN_ATTRIBUTE, { pin: true })).toBe(DCROperationTypes.PIN_DELETED);
-        expect(getOperationType(DCRTypes.PIN_ATTRIBUTE, { pin: false })).toBe(DCROperationTypes.PINNED);
-        expect(getOperationType(DCRTypes.IGNORE_ATTRIBUTE, { ignored: true })).toBe(DCROperationTypes.IGNORE_DELETED);
-        expect(getOperationType(DCRTypes.IGNORE_ATTRIBUTE, { ignored: false })).toBe(DCROperationTypes.IGNORED);
+        expect(getOperationType(DCRTypes.PIN_ATTRIBUTE, true)).toBe(DCROperationTypes.PINNED);
+        expect(getOperationType(DCRTypes.PIN_ATTRIBUTE, false)).toBe(DCROperationTypes.PIN_DELETED);
+        expect(getOperationType(DCRTypes.IGNORE_ATTRIBUTE, true)).toBe(DCROperationTypes.IGNORED);
+        expect(getOperationType(DCRTypes.IGNORE_ATTRIBUTE, false)).toBe(DCROperationTypes.IGNORE_DELETED);
     });
     it('getOperationLabel behaviour', function () {
         expect(getOperationLabel(DCROperationTypes.ADDED)).toBe('added');

package/features/workflow/helpers/merge.js

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { concat, curry, difference, flatten, isNil, omit, path, pick, pipe, propEq, propOr, reduce } from 'ramda';
+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 { getEntityChanges, getRelationChanges } from './attributes';
 var ATTRIBUTE_DELIMITER = '/';
@@ -108,7 +108,9 @@ var prepareAttribute = function (container, change) {
     for (var i = 0; i < pathArray.length - 1; i = i + 2) {
         var key = pathArray[i];
         var id = pathArray[i + 1];
-        var currentValue = (holder[key] || []).find(propEq('id', id));
+        var currentValue = i === pathArray.length - 2
+            ? (holder[key] || []).find(both(propEq('id', id), pathEq(['value', 'type'], change === null || change === void 0 ? void 0 : change.type)))
+            : (holder[key] || []).find(propEq('id', id));
         if (!isNil(currentValue)) {
             var newLineIds = extractLineIds(change.newValue);
             var oldLineIds = extractLineIds(change.oldValue);

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

@@ -155,6 +155,85 @@ describe('mergeChanges tests', function () {
         ];
         expect(mergeChanges(metadata, changes, objectInfo, [])).toMatchObject([mergedChanges, []]);
     });
+    it('should not merge changes with the same paths, but different types', function () {
+        var _a;
+        var changes = (_a = {},
+            _a[entityUri] = [
+                {
+                    attributePath: 'Identifiers/2BNyTheu/Type/2BNyU2yC',
+                    attributeType: 'configuration/entityTypes/HCA/attributes/Identifiers/attributes/Type',
+                    id: '58dpOzAR',
+                    newPinOrIgnoreValue: false,
+                    oldValue: {
+                        value: 'ValueOld'
+                    },
+                    newValue: {
+                        value: 'ValueNew'
+                    },
+                    type: DCRTypes.UPDATE_ATTRIBUTE
+                },
+                {
+                    attributePath: 'Identifiers/2BNyTheu/Type/2BNyU2yC',
+                    attributeType: 'configuration/entityTypes/HCA/attributes/Identifiers/attributes/Type',
+                    id: '58dpP3Qh',
+                    newPinOrIgnoreValue: true,
+                    oldValue: {
+                        value: 'ValueOld'
+                    },
+                    newValue: {
+                        value: 'ValueOld'
+                    },
+                    type: DCRTypes.IGNORE_ATTRIBUTE
+                }
+            ],
+            _a);
+        var mergedChanges = [
+            {
+                level: 0,
+                label: 'Customer Identity',
+                attributeType: metadata.entityTypes[0].attributes[3],
+                attributeValue: {
+                    id: '2BNyTheu',
+                    value: {
+                        Type: [
+                            {
+                                id: '2BNyU2yC',
+                                value: changes[entityUri][0]
+                            },
+                            {
+                                id: '2BNyU2yC',
+                                value: changes[entityUri][1]
+                            }
+                        ]
+                    }
+                }
+            },
+            {
+                attributeType: metadata.entityTypes[0].attributes[3].attributes[0],
+                newValue: {
+                    value: 'ValueNew'
+                },
+                oldValue: {
+                    value: 'ValueOld'
+                },
+                operation: 'edited',
+                label: 'Identity Type',
+                level: 1,
+                isReferenceSubAttribute: false
+            },
+            {
+                attributeType: metadata.entityTypes[0].attributes[3].attributes[0],
+                newValue: {
+                    value: 'ValueOld'
+                },
+                operation: 'ignored',
+                label: 'Identity Type',
+                level: 1,
+                isReferenceSubAttribute: false
+            }
+        ];
+        expect(mergeChanges(metadata, changes, objectInfo, [])).toMatchObject([mergedChanges, []]);
+    });
     it('should merge special attributes', function () {
         var _a;
         var changes = (_a = {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.2202",
+  "version": "1.4.2204",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./index.js",
@@ -11,7 +11,7 @@
     "@fluentui/react-context-selector": "^9.1.26",
     "@googlemaps/markerclusterer": "^2.5.3",
     "@react-sigma/core": "3.4.0",
-    "@reltio/mdm-sdk": "^1.4.2005",
+    "@reltio/mdm-sdk": "^1.4.2006",
     "@vis.gl/react-google-maps": "^1.3.0",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",

package/cjs/features/activity-log/RecordUpdates/components/DeltaField/styles.d.ts

@@ -1 +0,0 @@
-export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"arrow" | "chip">;

package/cjs/features/activity-log/RecordUpdates/components/DeltaField/styles.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useStyles = void 0;
-var styles_1 = require("@mui/styles");
-exports.useStyles = (0, styles_1.makeStyles)(function (theme) { return ({
-    arrow: {
-        margin: '0 8px',
-        fontSize: 12,
-        color: theme.palette.text.primary
-    },
-    chip: {
-        height: 20,
-        width: 53,
-        fontSize: 10,
-        fontWeight: 500,
-        lineHeight: '16px',
-        marginLeft: 9,
-        flexShrink: 0,
-        textTransform: 'capitalize',
-        '& span': {
-            padding: 0
-        },
-        '&.edited': {
-            color: '#6973C2',
-            borderColor: '#6973C2'
-        },
-        '&.added': {
-            color: '#75C378',
-            borderColor: '#75C378'
-        },
-        '&.deleted': {
-            color: '#F97061',
-            borderColor: '#F97061'
-        }
-    }
-}); });

package/features/activity-log/RecordUpdates/components/DeltaField/styles.d.ts

@@ -1 +0,0 @@
-export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"arrow" | "chip">;

package/features/activity-log/RecordUpdates/components/DeltaField/styles.js

@@ -1,33 +0,0 @@
-import { makeStyles } from '@mui/styles';
-export var useStyles = makeStyles(function (theme) { return ({
-    arrow: {
-        margin: '0 8px',
-        fontSize: 12,
-        color: theme.palette.text.primary
-    },
-    chip: {
-        height: 20,
-        width: 53,
-        fontSize: 10,
-        fontWeight: 500,
-        lineHeight: '16px',
-        marginLeft: 9,
-        flexShrink: 0,
-        textTransform: 'capitalize',
-        '& span': {
-            padding: 0
-        },
-        '&.edited': {
-            color: '#6973C2',
-            borderColor: '#6973C2'
-        },
-        '&.added': {
-            color: '#75C378',
-            borderColor: '#75C378'
-        },
-        '&.deleted': {
-            color: '#F97061',
-            borderColor: '#F97061'
-        }
-    }
-}); });