@reltio/components 1.4.2206 → 1.4.2207
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cjs/contexts/WorkflowTasksContext/index.d.ts +1 -0
- package/cjs/features/workflow/ChangeRequestEditor/components/ChangeItemEditor/ChangeItemEditor.js +1 -3
- package/cjs/features/workflow/WorkflowTaskCard/components/DataChangeRequestTaskCard/DataChangeRequestTaskCard.js +6 -2
- package/cjs/features/workflow/helpers/attributes.js +2 -2
- package/cjs/features/workflow/helpers/attributes.test.js +9 -6
- package/cjs/features/workflow/helpers/merge.js +2 -1
- package/contexts/WorkflowTasksContext/index.d.ts +1 -0
- package/features/workflow/ChangeRequestEditor/components/ChangeItemEditor/ChangeItemEditor.js +1 -3
- package/features/workflow/WorkflowTaskCard/components/DataChangeRequestTaskCard/DataChangeRequestTaskCard.js +7 -3
- package/features/workflow/helpers/attributes.js +2 -2
- package/features/workflow/helpers/attributes.test.js +9 -6
- package/features/workflow/helpers/merge.js +2 -1
- package/package.json +2 -2
package/cjs/features/workflow/ChangeRequestEditor/components/ChangeItemEditor/ChangeItemEditor.js
CHANGED
|
@@ -55,7 +55,6 @@ var ChangeItemEditor = function (_a) {
|
|
|
55
55
|
var entityType = (0, mdm_sdk_1.getEntityType)(metadata, entity === null || entity === void 0 ? void 0 : entity.type);
|
|
56
56
|
var isUpdateOperation = change.operation === mdm_sdk_1.DCROperationTypes.EDITED;
|
|
57
57
|
var isAddOperation = change.operation === mdm_sdk_1.DCROperationTypes.ADDED;
|
|
58
|
-
var hasAnyValue = Boolean(change.oldValue || change.newValue);
|
|
59
58
|
var oldValue = (0, mdm_sdk_1.getAttributeValue)(change.oldValue);
|
|
60
59
|
var currentNewValue = !(0, ramda_1.isNil)(lineData === null || lineData === void 0 ? void 0 : lineData.value) && !isParentLineRejected ? lineData.value : change.newValue;
|
|
61
60
|
var newValue = (0, mdm_sdk_1.getAttributeValue)(currentNewValue);
|
|
@@ -63,7 +62,6 @@ var ChangeItemEditor = function (_a) {
|
|
|
63
62
|
var dataTypeDefinition = (0, react_1.useMemo)(function () {
|
|
64
63
|
return change.attributeType && (0, common_1.getDataTypeDefinition)(change.attributeType, newValue || oldValue);
|
|
65
64
|
}, [change.attributeType, newValue, oldValue]);
|
|
66
|
-
var shouldShowOperationChip = hasAnyValue && change.operation;
|
|
67
65
|
var isRolesOrTags = ((_b = change === null || change === void 0 ? void 0 : change.attributeType) === null || _b === void 0 ? void 0 : _b.uri) === mdm_sdk_1.EntityAttrTypes.roles.uri ||
|
|
68
66
|
((_c = change === null || change === void 0 ? void 0 : change.attributeType) === null || _c === void 0 ? void 0 : _c.uri) === mdm_sdk_1.EntityAttrTypes.tags.uri;
|
|
69
67
|
var canEdit = (0, helpers_1.checkCanInitiateChangeRequest)(metadata, entityType, change);
|
|
@@ -89,7 +87,7 @@ var ChangeItemEditor = function (_a) {
|
|
|
89
87
|
shouldShowValueEditor ? (react_1.default.createElement(DCRValueEditor_1.DCRValueEditor, { attributeType: change.attributeType, value: currentNewValue, onChange: handleChange, disabled: !editable || isRejected })) : (hasNewValue && (react_1.default.createElement("div", { className: ChangeItemEditor_module_css_1.default.value },
|
|
90
88
|
react_1.default.createElement(DataTypeValue_1.DataTypeValue, { value: preparedValue, dataTypeDefinition: dataTypeDefinition }))))),
|
|
91
89
|
react_1.default.createElement("div", { className: ChangeItemEditor_module_css_1.default.revertColumn }, showUndoButton && (react_1.default.createElement(SmallIconButton_1.SmallIconButton, { icon: Replay_1.default, onClick: handleRevert, className: ChangeItemEditor_module_css_1.default.revertButton, title: ui_i18n_1.default.text('Undo'), size: "S" }))),
|
|
92
|
-
react_1.default.createElement("div", { className: ChangeItemEditor_module_css_1.default.operationColumn },
|
|
90
|
+
react_1.default.createElement("div", { className: ChangeItemEditor_module_css_1.default.operationColumn }, change.operation && react_1.default.createElement(OperationChip_1.OperationChip, { operation: change.operation, size: "small", variant: "outlined" })),
|
|
93
91
|
react_1.default.createElement("div", { className: ChangeItemEditor_module_css_1.default.statusColumn }, showStatusChips && react_1.default.createElement(StatusChips_1.StatusChips, { showUpdatedChip: isUpdated, showRejectedChip: isLineRejected })),
|
|
94
92
|
react_1.default.createElement("div", { className: ChangeItemEditor_module_css_1.default.rejectColumn }, showRejectButton && (react_1.default.createElement(Button_1.default, { onClick: handleReject, className: (0, classnames_1.default)(ChangeItemEditor_module_css_1.default.rejectButton, classes === null || classes === void 0 ? void 0 : classes.rejectButton), title: ui_i18n_1.default.text('Reject'), size: "medium" }, ui_i18n_1.default.text('Reject'))))));
|
|
95
93
|
};
|
|
@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.DataChangeRequestTaskCard = void 0;
|
|
30
30
|
var react_1 = __importStar(require("react"));
|
|
31
|
+
var ramda_1 = require("ramda");
|
|
31
32
|
var DcrTaskIcon_1 = __importDefault(require("../../../../../icons/DcrTaskIcon"));
|
|
32
33
|
var MdmModuleContext_1 = require("../../../../../contexts/MdmModuleContext");
|
|
33
34
|
var GenericWorkflowTaskCard_1 = require("../GenericWorkflowTaskCard");
|
|
@@ -37,9 +38,12 @@ var useChangeRequest_1 = require("../../../hooks/useChangeRequest");
|
|
|
37
38
|
var common_1 = require("../../../helpers/common");
|
|
38
39
|
var ReviewDCRDialog_1 = require("../../../ReviewDCRDialog");
|
|
39
40
|
var ReviewDCRButton_1 = require("../../../ReviewDCRButton");
|
|
41
|
+
var WorkflowTasksContext_1 = require("../../../../../contexts/WorkflowTasksContext");
|
|
40
42
|
var DataChangeRequestTaskCard = function (_a) {
|
|
41
43
|
var task = _a.task;
|
|
44
|
+
var reviewDCREnabledByEntityType = ((0, react_1.useContext)(WorkflowTasksContext_1.WorkflowTasksContext) || {}).reviewDCR;
|
|
42
45
|
var reviewDCREnabled = (0, MdmModuleContext_1.useMdmReviewDCREnabled)();
|
|
46
|
+
var isReviewDCREnabled = (0, ramda_1.isNil)(reviewDCREnabledByEntityType) ? reviewDCREnabled : reviewDCREnabledByEntityType;
|
|
43
47
|
var username = (0, MdmModuleContext_1.useMdmUsername)();
|
|
44
48
|
var _b = (0, react_1.useState)(false), isReviewDCRDialogOpen = _b[0], setIsReviewDCRDialogOpen = _b[1];
|
|
45
49
|
var objectURIs = task.objectURIs, assignee = task.assignee;
|
|
@@ -51,8 +55,8 @@ var DataChangeRequestTaskCard = function (_a) {
|
|
|
51
55
|
var handleCloseReviewDCRDialog = (0, react_1.useCallback)(function () {
|
|
52
56
|
setIsReviewDCRDialogOpen(false);
|
|
53
57
|
}, []);
|
|
54
|
-
var showReviewDCRButton =
|
|
55
|
-
var showReviewDialog = isReviewDCRDialogOpen && (showReviewDCRButton ||
|
|
58
|
+
var showReviewDCRButton = isReviewDCREnabled && assignee == username;
|
|
59
|
+
var showReviewDialog = isReviewDCRDialogOpen && (showReviewDCRButton || isReviewDCREnabled);
|
|
56
60
|
var customActionsSlot = (0, react_1.useMemo)(function () { return showReviewDCRButton && react_1.default.createElement(ReviewDCRButton_1.ReviewDCRButton, { onClick: handleReviewDCR }); }, [showReviewDCRButton, handleReviewDCR]);
|
|
57
61
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
58
62
|
react_1.default.createElement(GenericWorkflowTaskCard_1.GenericWorkflowTaskCard, { task: task, Icon: DcrTaskIcon_1.default, customActionsSlot: customActionsSlot }, dcr &&
|
|
@@ -116,7 +116,7 @@ exports.getEntityChanges = (0, ramda_1.curry)(function (metadata, entityInfo, ch
|
|
|
116
116
|
var attrTypes = (0, attributesView_1.getFilteredAttrTypes)(metadata, entityInfo.type, [], []);
|
|
117
117
|
return getAttributesList(metadata, attrTypes, changes);
|
|
118
118
|
});
|
|
119
|
-
exports.getRelationChanges = (0, ramda_1.curry)(function (metadata, relationInfo, changes, changeType) {
|
|
119
|
+
exports.getRelationChanges = (0, ramda_1.curry)(function (metadata, relationInfo, changes, changeType, relationChangeLineIds) {
|
|
120
120
|
var addRelationOperationIfNeeded = function (changes, changeType) {
|
|
121
121
|
if (changeType === mdm_sdk_1.DCRTypes.CREATE_RELATIONSHIP || (0, mdm_sdk_1.isEmptyValue)(changes)) {
|
|
122
122
|
var operation = (0, common_1.getOperationType)(changeType);
|
|
@@ -127,7 +127,7 @@ exports.getRelationChanges = (0, ramda_1.curry)(function (metadata, relationInfo
|
|
|
127
127
|
var relationType = (0, mdm_sdk_1.getRelationType)(metadata, relationInfo.type);
|
|
128
128
|
var attrTypes = (0, mdm_sdk_1.getRelationAttributesList)(metadata, relationInfo.type);
|
|
129
129
|
return (0, ramda_1.flatten)([
|
|
130
|
-
__assign({ level: 1, label: (0, ramda_1.propOr)('', 'label', relationType), attributeType: null, relationType: relationType, attributeValue: __assign(__assign({}, relationInfo), changes), lineIds: changes === null || changes === void 0 ? void 0 : changes.lineIds }, addRelationOperationIfNeeded(changes, changeType)),
|
|
130
|
+
__assign({ level: 1, label: (0, ramda_1.propOr)('', 'label', relationType), attributeType: null, relationType: relationType, attributeValue: __assign(__assign({}, relationInfo), changes), lineIds: (changes === null || changes === void 0 ? void 0 : changes.lineIds) || relationChangeLineIds }, addRelationOperationIfNeeded(changes, changeType)),
|
|
131
131
|
getAttributesList(metadata, attrTypes, changes, 2)
|
|
132
132
|
]);
|
|
133
133
|
});
|
|
@@ -141,13 +141,14 @@ describe('attributes helpers tests', function () {
|
|
|
141
141
|
]
|
|
142
142
|
};
|
|
143
143
|
it('should not show operation for relation title', function () {
|
|
144
|
-
expect((0, attributes_1.getRelationChanges)(metadata_test_data_1.metadata, relationInfo, changes, mdm_sdk_1.DCRTypes.INSERT_ATTRIBUTE)).toEqual([
|
|
144
|
+
expect((0, attributes_1.getRelationChanges)(metadata_test_data_1.metadata, relationInfo, changes, mdm_sdk_1.DCRTypes.INSERT_ATTRIBUTE, ['lineIds'])).toEqual([
|
|
145
145
|
{
|
|
146
146
|
attributeType: null,
|
|
147
147
|
relationType: metadata_test_data_1.metadata.relationTypes[1],
|
|
148
148
|
attributeValue: __assign(__assign({}, relationInfo), changes),
|
|
149
149
|
label: metadata_test_data_1.metadata.relationTypes[1].label,
|
|
150
|
-
level: 1
|
|
150
|
+
level: 1,
|
|
151
|
+
lineIds: ['lineIds']
|
|
151
152
|
},
|
|
152
153
|
{
|
|
153
154
|
attributeType: mdm_sdk_1.EntityAttrTypes.startDate,
|
|
@@ -168,14 +169,15 @@ describe('attributes helpers tests', function () {
|
|
|
168
169
|
]);
|
|
169
170
|
});
|
|
170
171
|
it('should show operation for relation title if it is new', function () {
|
|
171
|
-
expect((0, attributes_1.getRelationChanges)(metadata_test_data_1.metadata, relationInfo, changes, mdm_sdk_1.DCRTypes.CREATE_RELATIONSHIP)).toEqual([
|
|
172
|
+
expect((0, attributes_1.getRelationChanges)(metadata_test_data_1.metadata, relationInfo, changes, mdm_sdk_1.DCRTypes.CREATE_RELATIONSHIP, ['lineIds'])).toEqual([
|
|
172
173
|
{
|
|
173
174
|
attributeType: null,
|
|
174
175
|
relationType: metadata_test_data_1.metadata.relationTypes[1],
|
|
175
176
|
attributeValue: __assign(__assign({}, relationInfo), changes),
|
|
176
177
|
label: metadata_test_data_1.metadata.relationTypes[1].label,
|
|
177
178
|
level: 1,
|
|
178
|
-
operation: mdm_sdk_1.DCROperationTypes.ADDED
|
|
179
|
+
operation: mdm_sdk_1.DCROperationTypes.ADDED,
|
|
180
|
+
lineIds: ['lineIds']
|
|
179
181
|
},
|
|
180
182
|
{
|
|
181
183
|
attributeType: mdm_sdk_1.EntityAttrTypes.startDate,
|
|
@@ -196,14 +198,15 @@ describe('attributes helpers tests', function () {
|
|
|
196
198
|
]);
|
|
197
199
|
});
|
|
198
200
|
it('should show operation for relation title if it was deleted and changes are empty', function () {
|
|
199
|
-
expect((0, attributes_1.getRelationChanges)(metadata_test_data_1.metadata, relationInfo, {}, mdm_sdk_1.DCRTypes.DELETE_RELATIONSHIP)).toEqual([
|
|
201
|
+
expect((0, attributes_1.getRelationChanges)(metadata_test_data_1.metadata, relationInfo, {}, mdm_sdk_1.DCRTypes.DELETE_RELATIONSHIP, ['lineIds'])).toEqual([
|
|
200
202
|
{
|
|
201
203
|
attributeType: null,
|
|
202
204
|
relationType: metadata_test_data_1.metadata.relationTypes[1],
|
|
203
205
|
attributeValue: relationInfo,
|
|
204
206
|
label: metadata_test_data_1.metadata.relationTypes[1].label,
|
|
205
207
|
level: 1,
|
|
206
|
-
operation: mdm_sdk_1.DCROperationTypes.DELETED
|
|
208
|
+
operation: mdm_sdk_1.DCROperationTypes.DELETED,
|
|
209
|
+
lineIds: ['lineIds']
|
|
207
210
|
}
|
|
208
211
|
]);
|
|
209
212
|
});
|
|
@@ -256,7 +256,8 @@ var mergeChanges = function (metadata, changes, entityInfo, relationsInfo) {
|
|
|
256
256
|
], changesTree);
|
|
257
257
|
var relationsChanges = (0, ramda_1.flatten)(relationsInfo.map(function (relationInfo, index) {
|
|
258
258
|
var changeType = (0, ramda_1.path)([relationInfo.uri, 0, 'type'], changes);
|
|
259
|
-
|
|
259
|
+
var relationChangeLineIds = (0, ramda_1.path)([relationInfo.uri, 0, 'lineIds'], changes);
|
|
260
|
+
return (0, attributes_1.getRelationChanges)(metadata, relationInfo, relationsTrees[index], changeType, relationChangeLineIds);
|
|
260
261
|
}));
|
|
261
262
|
return [entityChanges, relationsChanges];
|
|
262
263
|
};
|
package/features/workflow/ChangeRequestEditor/components/ChangeItemEditor/ChangeItemEditor.js
CHANGED
|
@@ -26,7 +26,6 @@ export var ChangeItemEditor = function (_a) {
|
|
|
26
26
|
var entityType = getEntityType(metadata, entity === null || entity === void 0 ? void 0 : entity.type);
|
|
27
27
|
var isUpdateOperation = change.operation === DCROperationTypes.EDITED;
|
|
28
28
|
var isAddOperation = change.operation === DCROperationTypes.ADDED;
|
|
29
|
-
var hasAnyValue = Boolean(change.oldValue || change.newValue);
|
|
30
29
|
var oldValue = getAttributeValue(change.oldValue);
|
|
31
30
|
var currentNewValue = !isNil(lineData === null || lineData === void 0 ? void 0 : lineData.value) && !isParentLineRejected ? lineData.value : change.newValue;
|
|
32
31
|
var newValue = getAttributeValue(currentNewValue);
|
|
@@ -34,7 +33,6 @@ export var ChangeItemEditor = function (_a) {
|
|
|
34
33
|
var dataTypeDefinition = useMemo(function () {
|
|
35
34
|
return change.attributeType && getDataTypeDefinition(change.attributeType, newValue || oldValue);
|
|
36
35
|
}, [change.attributeType, newValue, oldValue]);
|
|
37
|
-
var shouldShowOperationChip = hasAnyValue && change.operation;
|
|
38
36
|
var isRolesOrTags = ((_b = change === null || change === void 0 ? void 0 : change.attributeType) === null || _b === void 0 ? void 0 : _b.uri) === EntityAttrTypes.roles.uri ||
|
|
39
37
|
((_c = change === null || change === void 0 ? void 0 : change.attributeType) === null || _c === void 0 ? void 0 : _c.uri) === EntityAttrTypes.tags.uri;
|
|
40
38
|
var canEdit = checkCanInitiateChangeRequest(metadata, entityType, change);
|
|
@@ -60,7 +58,7 @@ export var ChangeItemEditor = function (_a) {
|
|
|
60
58
|
shouldShowValueEditor ? (React.createElement(DCRValueEditor, { attributeType: change.attributeType, value: currentNewValue, onChange: handleChange, disabled: !editable || isRejected })) : (hasNewValue && (React.createElement("div", { className: styles.value },
|
|
61
59
|
React.createElement(DataTypeValue, { value: preparedValue, dataTypeDefinition: dataTypeDefinition }))))),
|
|
62
60
|
React.createElement("div", { className: styles.revertColumn }, showUndoButton && (React.createElement(SmallIconButton, { icon: ReplayIcon, onClick: handleRevert, className: styles.revertButton, title: i18n.text('Undo'), size: "S" }))),
|
|
63
|
-
React.createElement("div", { className: styles.operationColumn },
|
|
61
|
+
React.createElement("div", { className: styles.operationColumn }, change.operation && React.createElement(OperationChip, { operation: change.operation, size: "small", variant: "outlined" })),
|
|
64
62
|
React.createElement("div", { className: styles.statusColumn }, showStatusChips && React.createElement(StatusChips, { showUpdatedChip: isUpdated, showRejectedChip: isLineRejected })),
|
|
65
63
|
React.createElement("div", { className: styles.rejectColumn }, showRejectButton && (React.createElement(Button, { onClick: handleReject, className: classnames(styles.rejectButton, classes === null || classes === void 0 ? void 0 : classes.rejectButton), title: i18n.text('Reject'), size: "medium" }, i18n.text('Reject'))))));
|
|
66
64
|
};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import React, { useCallback, useMemo, useState } from 'react';
|
|
1
|
+
import React, { useCallback, useContext, useMemo, useState } from 'react';
|
|
2
|
+
import { isNil } from 'ramda';
|
|
2
3
|
import DcrTaskIcon from '../../../../../icons/DcrTaskIcon';
|
|
3
4
|
import { useMdmReviewDCREnabled, useMdmUsername } from '../../../../../contexts/MdmModuleContext';
|
|
4
5
|
import { GenericWorkflowTaskCard } from '../GenericWorkflowTaskCard';
|
|
@@ -8,9 +9,12 @@ import { useChangeRequest } from '../../../hooks/useChangeRequest';
|
|
|
8
9
|
import { getDCRUri } from '../../../helpers/common';
|
|
9
10
|
import { ReviewDCRDialog } from '../../../ReviewDCRDialog';
|
|
10
11
|
import { ReviewDCRButton } from '../../../ReviewDCRButton';
|
|
12
|
+
import { WorkflowTasksContext } from '../../../../../contexts/WorkflowTasksContext';
|
|
11
13
|
export var DataChangeRequestTaskCard = function (_a) {
|
|
12
14
|
var task = _a.task;
|
|
15
|
+
var reviewDCREnabledByEntityType = (useContext(WorkflowTasksContext) || {}).reviewDCR;
|
|
13
16
|
var reviewDCREnabled = useMdmReviewDCREnabled();
|
|
17
|
+
var isReviewDCREnabled = isNil(reviewDCREnabledByEntityType) ? reviewDCREnabled : reviewDCREnabledByEntityType;
|
|
14
18
|
var username = useMdmUsername();
|
|
15
19
|
var _b = useState(false), isReviewDCRDialogOpen = _b[0], setIsReviewDCRDialogOpen = _b[1];
|
|
16
20
|
var objectURIs = task.objectURIs, assignee = task.assignee;
|
|
@@ -22,8 +26,8 @@ export var DataChangeRequestTaskCard = function (_a) {
|
|
|
22
26
|
var handleCloseReviewDCRDialog = useCallback(function () {
|
|
23
27
|
setIsReviewDCRDialogOpen(false);
|
|
24
28
|
}, []);
|
|
25
|
-
var showReviewDCRButton =
|
|
26
|
-
var showReviewDialog = isReviewDCRDialogOpen && (showReviewDCRButton ||
|
|
29
|
+
var showReviewDCRButton = isReviewDCREnabled && assignee == username;
|
|
30
|
+
var showReviewDialog = isReviewDCRDialogOpen && (showReviewDCRButton || isReviewDCREnabled);
|
|
27
31
|
var customActionsSlot = useMemo(function () { return showReviewDCRButton && React.createElement(ReviewDCRButton, { onClick: handleReviewDCR }); }, [showReviewDCRButton, handleReviewDCR]);
|
|
28
32
|
return (React.createElement(React.Fragment, null,
|
|
29
33
|
React.createElement(GenericWorkflowTaskCard, { task: task, Icon: DcrTaskIcon, customActionsSlot: customActionsSlot }, dcr &&
|
|
@@ -113,7 +113,7 @@ export var getEntityChanges = curry(function (metadata, entityInfo, changes) {
|
|
|
113
113
|
var attrTypes = getFilteredAttrTypes(metadata, entityInfo.type, [], []);
|
|
114
114
|
return getAttributesList(metadata, attrTypes, changes);
|
|
115
115
|
});
|
|
116
|
-
export var getRelationChanges = curry(function (metadata, relationInfo, changes, changeType) {
|
|
116
|
+
export var getRelationChanges = curry(function (metadata, relationInfo, changes, changeType, relationChangeLineIds) {
|
|
117
117
|
var addRelationOperationIfNeeded = function (changes, changeType) {
|
|
118
118
|
if (changeType === DCRTypes.CREATE_RELATIONSHIP || isEmptyValue(changes)) {
|
|
119
119
|
var operation = getOperationType(changeType);
|
|
@@ -124,7 +124,7 @@ export var getRelationChanges = curry(function (metadata, relationInfo, changes,
|
|
|
124
124
|
var relationType = getRelationType(metadata, relationInfo.type);
|
|
125
125
|
var attrTypes = getRelationAttributesList(metadata, relationInfo.type);
|
|
126
126
|
return flatten([
|
|
127
|
-
__assign({ level: 1, label: propOr('', 'label', relationType), attributeType: null, relationType: relationType, attributeValue: __assign(__assign({}, relationInfo), changes), lineIds: changes === null || changes === void 0 ? void 0 : changes.lineIds }, addRelationOperationIfNeeded(changes, changeType)),
|
|
127
|
+
__assign({ level: 1, label: propOr('', 'label', relationType), attributeType: null, relationType: relationType, attributeValue: __assign(__assign({}, relationInfo), changes), lineIds: (changes === null || changes === void 0 ? void 0 : changes.lineIds) || relationChangeLineIds }, addRelationOperationIfNeeded(changes, changeType)),
|
|
128
128
|
getAttributesList(metadata, attrTypes, changes, 2)
|
|
129
129
|
]);
|
|
130
130
|
});
|
|
@@ -139,13 +139,14 @@ describe('attributes helpers tests', function () {
|
|
|
139
139
|
]
|
|
140
140
|
};
|
|
141
141
|
it('should not show operation for relation title', function () {
|
|
142
|
-
expect(getRelationChanges(metadata, relationInfo, changes, DCRTypes.INSERT_ATTRIBUTE)).toEqual([
|
|
142
|
+
expect(getRelationChanges(metadata, relationInfo, changes, DCRTypes.INSERT_ATTRIBUTE, ['lineIds'])).toEqual([
|
|
143
143
|
{
|
|
144
144
|
attributeType: null,
|
|
145
145
|
relationType: metadata.relationTypes[1],
|
|
146
146
|
attributeValue: __assign(__assign({}, relationInfo), changes),
|
|
147
147
|
label: metadata.relationTypes[1].label,
|
|
148
|
-
level: 1
|
|
148
|
+
level: 1,
|
|
149
|
+
lineIds: ['lineIds']
|
|
149
150
|
},
|
|
150
151
|
{
|
|
151
152
|
attributeType: EntityAttrTypes.startDate,
|
|
@@ -166,14 +167,15 @@ describe('attributes helpers tests', function () {
|
|
|
166
167
|
]);
|
|
167
168
|
});
|
|
168
169
|
it('should show operation for relation title if it is new', function () {
|
|
169
|
-
expect(getRelationChanges(metadata, relationInfo, changes, DCRTypes.CREATE_RELATIONSHIP)).toEqual([
|
|
170
|
+
expect(getRelationChanges(metadata, relationInfo, changes, DCRTypes.CREATE_RELATIONSHIP, ['lineIds'])).toEqual([
|
|
170
171
|
{
|
|
171
172
|
attributeType: null,
|
|
172
173
|
relationType: metadata.relationTypes[1],
|
|
173
174
|
attributeValue: __assign(__assign({}, relationInfo), changes),
|
|
174
175
|
label: metadata.relationTypes[1].label,
|
|
175
176
|
level: 1,
|
|
176
|
-
operation: DCROperationTypes.ADDED
|
|
177
|
+
operation: DCROperationTypes.ADDED,
|
|
178
|
+
lineIds: ['lineIds']
|
|
177
179
|
},
|
|
178
180
|
{
|
|
179
181
|
attributeType: EntityAttrTypes.startDate,
|
|
@@ -194,14 +196,15 @@ describe('attributes helpers tests', function () {
|
|
|
194
196
|
]);
|
|
195
197
|
});
|
|
196
198
|
it('should show operation for relation title if it was deleted and changes are empty', function () {
|
|
197
|
-
expect(getRelationChanges(metadata, relationInfo, {}, DCRTypes.DELETE_RELATIONSHIP)).toEqual([
|
|
199
|
+
expect(getRelationChanges(metadata, relationInfo, {}, DCRTypes.DELETE_RELATIONSHIP, ['lineIds'])).toEqual([
|
|
198
200
|
{
|
|
199
201
|
attributeType: null,
|
|
200
202
|
relationType: metadata.relationTypes[1],
|
|
201
203
|
attributeValue: relationInfo,
|
|
202
204
|
label: metadata.relationTypes[1].label,
|
|
203
205
|
level: 1,
|
|
204
|
-
operation: DCROperationTypes.DELETED
|
|
206
|
+
operation: DCROperationTypes.DELETED,
|
|
207
|
+
lineIds: ['lineIds']
|
|
205
208
|
}
|
|
206
209
|
]);
|
|
207
210
|
});
|
|
@@ -252,7 +252,8 @@ export var mergeChanges = function (metadata, changes, entityInfo, relationsInfo
|
|
|
252
252
|
], changesTree);
|
|
253
253
|
var relationsChanges = flatten(relationsInfo.map(function (relationInfo, index) {
|
|
254
254
|
var changeType = path([relationInfo.uri, 0, 'type'], changes);
|
|
255
|
-
|
|
255
|
+
var relationChangeLineIds = path([relationInfo.uri, 0, 'lineIds'], changes);
|
|
256
|
+
return getRelationChanges(metadata, relationInfo, relationsTrees[index], changeType, relationChangeLineIds);
|
|
256
257
|
}));
|
|
257
258
|
return [entityChanges, relationsChanges];
|
|
258
259
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reltio/components",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.2207",
|
|
4
4
|
"license": "SEE LICENSE IN LICENSE FILE",
|
|
5
5
|
"main": "./cjs/index.js",
|
|
6
6
|
"module": "./index.js",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"@fluentui/react-context-selector": "^9.1.26",
|
|
12
12
|
"@googlemaps/markerclusterer": "^2.5.3",
|
|
13
13
|
"@react-sigma/core": "3.4.0",
|
|
14
|
-
"@reltio/mdm-sdk": "^1.4.
|
|
14
|
+
"@reltio/mdm-sdk": "^1.4.2009",
|
|
15
15
|
"@vis.gl/react-google-maps": "^1.3.0",
|
|
16
16
|
"d3-cloud": "^1.2.5",
|
|
17
17
|
"d3-geo": "^2.0.1",
|