@reltio/components 1.4.2221 → 1.4.2225
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/ExportDialog/ExportDialog.test.js +4 -4
- package/cjs/ExportDialog/ExportDialog.test.js +4 -4
- package/cjs/features/activity-log/ActivityExportButton/ActivityExportButton.js +1 -2
- package/cjs/features/activity-log/ActivityLogFilter/ActivityLogFilter.test.js +9 -9
- package/cjs/features/workflow/helpers/attributes.js +4 -1
- package/cjs/features/workflow/helpers/attributes.test.js +1 -1
- package/cjs/features/workflow/helpers/dcr.js +7 -11
- package/cjs/hooks/useInternalExport/useInternalExport.js +5 -3
- package/features/activity-log/ActivityExportButton/ActivityExportButton.js +1 -2
- package/features/activity-log/ActivityLogFilter/ActivityLogFilter.test.js +9 -9
- package/features/workflow/helpers/attributes.js +4 -1
- package/features/workflow/helpers/attributes.test.js +1 -1
- package/features/workflow/helpers/dcr.js +7 -11
- package/hooks/useInternalExport/useInternalExport.js +5 -3
- package/package.json +2 -2
|
@@ -222,14 +222,14 @@ describe('ExportDialog tests', function () {
|
|
|
222
222
|
options: {
|
|
223
223
|
fileFormat: ExportDataFormat.CSV,
|
|
224
224
|
dateFormat: 'readable',
|
|
225
|
-
filter: defaultProps.filter,
|
|
226
225
|
activeness: ActivityFilter.ALL,
|
|
227
226
|
options: 'parallelExecution,searchByOv',
|
|
228
227
|
name: 'Untitled Export Job 11252025_09:10_HCP',
|
|
229
228
|
select: 'attributes.FirstName,attributes.LastName'
|
|
230
229
|
},
|
|
231
230
|
includeType: ['configuration/entityTypes/HCP'],
|
|
232
|
-
headerOrder: ExportHeaderOrder.Select
|
|
231
|
+
headerOrder: ExportHeaderOrder.Select,
|
|
232
|
+
filter: defaultProps.filter
|
|
233
233
|
}));
|
|
234
234
|
expect(exportData).toHaveBeenCalledWith(expect.objectContaining({
|
|
235
235
|
exportPath: '/nui/export',
|
|
@@ -237,14 +237,14 @@ describe('ExportDialog tests', function () {
|
|
|
237
237
|
options: {
|
|
238
238
|
fileFormat: ExportDataFormat.CSV,
|
|
239
239
|
dateFormat: 'readable',
|
|
240
|
-
filter: defaultProps.filter,
|
|
241
240
|
activeness: ActivityFilter.ALL,
|
|
242
241
|
options: 'parallelExecution,searchByOv',
|
|
243
242
|
name: 'Untitled Export Job 11252025_09:10_entities',
|
|
244
243
|
sendHidden: false
|
|
245
244
|
},
|
|
246
245
|
includeType: ['configuration/entityTypes/HCO'],
|
|
247
|
-
headerOrder: ExportHeaderOrder.Default
|
|
246
|
+
headerOrder: ExportHeaderOrder.Default,
|
|
247
|
+
filter: defaultProps.filter
|
|
248
248
|
}));
|
|
249
249
|
expect(defaultProps.onLoadingChange).toHaveBeenCalledWith(false);
|
|
250
250
|
expect(defaultProps.onClose).toHaveBeenCalled();
|
|
@@ -227,14 +227,14 @@ describe('ExportDialog tests', function () {
|
|
|
227
227
|
options: {
|
|
228
228
|
fileFormat: mdm_sdk_1.ExportDataFormat.CSV,
|
|
229
229
|
dateFormat: 'readable',
|
|
230
|
-
filter: defaultProps.filter,
|
|
231
230
|
activeness: mdm_sdk_1.ActivityFilter.ALL,
|
|
232
231
|
options: 'parallelExecution,searchByOv',
|
|
233
232
|
name: 'Untitled Export Job 11252025_09:10_HCP',
|
|
234
233
|
select: 'attributes.FirstName,attributes.LastName'
|
|
235
234
|
},
|
|
236
235
|
includeType: ['configuration/entityTypes/HCP'],
|
|
237
|
-
headerOrder: mdm_sdk_1.ExportHeaderOrder.Select
|
|
236
|
+
headerOrder: mdm_sdk_1.ExportHeaderOrder.Select,
|
|
237
|
+
filter: defaultProps.filter
|
|
238
238
|
}));
|
|
239
239
|
expect(mdm_sdk_1.exportData).toHaveBeenCalledWith(expect.objectContaining({
|
|
240
240
|
exportPath: '/nui/export',
|
|
@@ -242,14 +242,14 @@ describe('ExportDialog tests', function () {
|
|
|
242
242
|
options: {
|
|
243
243
|
fileFormat: mdm_sdk_1.ExportDataFormat.CSV,
|
|
244
244
|
dateFormat: 'readable',
|
|
245
|
-
filter: defaultProps.filter,
|
|
246
245
|
activeness: mdm_sdk_1.ActivityFilter.ALL,
|
|
247
246
|
options: 'parallelExecution,searchByOv',
|
|
248
247
|
name: 'Untitled Export Job 11252025_09:10_entities',
|
|
249
248
|
sendHidden: false
|
|
250
249
|
},
|
|
251
250
|
includeType: ['configuration/entityTypes/HCO'],
|
|
252
|
-
headerOrder: mdm_sdk_1.ExportHeaderOrder.Default
|
|
251
|
+
headerOrder: mdm_sdk_1.ExportHeaderOrder.Default,
|
|
252
|
+
filter: defaultProps.filter
|
|
253
253
|
}));
|
|
254
254
|
expect(defaultProps.onLoadingChange).toHaveBeenCalledWith(false);
|
|
255
255
|
expect(defaultProps.onClose).toHaveBeenCalled();
|
|
@@ -49,10 +49,9 @@ var ActivityExportButton = function (_a) {
|
|
|
49
49
|
var _c = (0, react_1.useState)(false), showSnackbar = _c[0], setShowSnackbar = _c[1];
|
|
50
50
|
var handleClickExport = (0, react_1.useCallback)(function (type) {
|
|
51
51
|
var options = {
|
|
52
|
-
filter: (0, filters_1.buildActivitiesFilterString)(filters),
|
|
53
52
|
fileFormat: type
|
|
54
53
|
};
|
|
55
|
-
(0, mdm_sdk_1.exportActivities)({ exportPath: exportPath, tenant: tenant, options: options })
|
|
54
|
+
(0, mdm_sdk_1.exportActivities)({ exportPath: exportPath, tenant: tenant, options: options, filter: (0, filters_1.buildActivitiesFilterString)(filters) })
|
|
56
55
|
.then(function () { return setShowSnackbar(true); })
|
|
57
56
|
.catch(onError);
|
|
58
57
|
}, [filters, tenant, exportPath]);
|
|
@@ -279,10 +279,10 @@ describe('Activity log filter tests', function () {
|
|
|
279
279
|
expect(mdm_sdk_1.exportActivities).toHaveBeenCalledWith({
|
|
280
280
|
exportPath: '/nui/export',
|
|
281
281
|
options: {
|
|
282
|
-
fileFormat: undefined
|
|
283
|
-
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
282
|
+
fileFormat: undefined
|
|
284
283
|
},
|
|
285
|
-
tenant: 'alenat'
|
|
284
|
+
tenant: 'alenat',
|
|
285
|
+
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
286
286
|
});
|
|
287
287
|
alert = react_2.screen.getByRole('alert');
|
|
288
288
|
(0, react_2.within)(alert).getByText('Export operation is currently in progress. You will receive an email notification once completed. Go to Export Application to view the status.');
|
|
@@ -309,10 +309,10 @@ describe('Activity log filter tests', function () {
|
|
|
309
309
|
expect(mdm_sdk_1.exportActivities).toHaveBeenCalledWith({
|
|
310
310
|
exportPath: '/nui/export',
|
|
311
311
|
options: {
|
|
312
|
-
fileFormat: 'json'
|
|
313
|
-
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
312
|
+
fileFormat: 'json'
|
|
314
313
|
},
|
|
315
|
-
tenant: 'alenat'
|
|
314
|
+
tenant: 'alenat',
|
|
315
|
+
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
316
316
|
});
|
|
317
317
|
alert = react_2.screen.getByRole('alert');
|
|
318
318
|
(0, react_2.within)(alert).getByText('Export operation is currently in progress. You will receive an email notification once completed. Go to Export Application to view the status.');
|
|
@@ -337,10 +337,10 @@ describe('Activity log filter tests', function () {
|
|
|
337
337
|
expect(mdm_sdk_1.exportActivities).toHaveBeenCalledWith({
|
|
338
338
|
exportPath: '/nui/export',
|
|
339
339
|
options: {
|
|
340
|
-
fileFormat: 'csv'
|
|
341
|
-
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
340
|
+
fileFormat: 'csv'
|
|
342
341
|
},
|
|
343
|
-
tenant: 'alenat'
|
|
342
|
+
tenant: 'alenat',
|
|
343
|
+
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
344
344
|
});
|
|
345
345
|
expect(errors_1.showErrorMessage).toHaveBeenCalledWith({ errorMessage: 'Something went wrong' }, { defaultMessage: "Can't export activities", title: 'Error' });
|
|
346
346
|
expect(react_2.screen.queryByRole('alert')).not.toBeInTheDocument();
|
|
@@ -122,8 +122,11 @@ exports.getRelationChanges = (0, ramda_1.curry)(function (metadata, relationInfo
|
|
|
122
122
|
};
|
|
123
123
|
var relationType = (0, mdm_sdk_1.getRelationType)(metadata, relationInfo.type);
|
|
124
124
|
var attrTypes = (0, mdm_sdk_1.getRelationAttributesList)(metadata, relationInfo.type);
|
|
125
|
+
var lineIds = changeType === mdm_sdk_1.DCRTypes.CREATE_RELATIONSHIP || changeType === mdm_sdk_1.DCRTypes.DELETE_RELATIONSHIP
|
|
126
|
+
? (changes === null || changes === void 0 ? void 0 : changes.lineIds) || relationChangeLineIds
|
|
127
|
+
: undefined;
|
|
125
128
|
return (0, ramda_1.flatten)([
|
|
126
|
-
__assign({ level: 1, label: (0, ramda_1.propOr)('', 'label', relationType), attributeType: null, relationType: relationType, attributeValue: __assign(__assign({}, relationInfo), changes), lineIds:
|
|
129
|
+
__assign({ level: 1, label: (0, ramda_1.propOr)('', 'label', relationType), attributeType: null, relationType: relationType, attributeValue: __assign(__assign({}, relationInfo), changes), lineIds: lineIds }, addRelationOperationIfNeeded(changes, changeType)),
|
|
127
130
|
getAttributesList(metadata, attrTypes, changes, 2)
|
|
128
131
|
]);
|
|
129
132
|
});
|
|
@@ -150,7 +150,7 @@ describe('attributes helpers tests', function () {
|
|
|
150
150
|
attributeValue: __assign(__assign({}, relationInfo), changes),
|
|
151
151
|
label: metadata.relationTypes[1].label,
|
|
152
152
|
level: 1,
|
|
153
|
-
lineIds:
|
|
153
|
+
lineIds: undefined
|
|
154
154
|
},
|
|
155
155
|
{
|
|
156
156
|
attributeType: mdm_sdk_1.EntityAttrTypes.startDate,
|
|
@@ -82,18 +82,18 @@ var cleanValueRecursively = function (value) {
|
|
|
82
82
|
return (0, ramda_1.filter)(function (propertyValues) { return !(0, ramda_1.isEmpty)(propertyValues); }, cleanedProperties);
|
|
83
83
|
};
|
|
84
84
|
var cleanChange = function (change) {
|
|
85
|
-
var _a, _b
|
|
85
|
+
var _a, _b;
|
|
86
86
|
if (Array.isArray(change.newValue)) {
|
|
87
87
|
return change;
|
|
88
88
|
}
|
|
89
|
-
if ((0,
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
89
|
+
if (typeof change.newValue === 'object' && (0, ramda_1.hasPath)(['newValue', 'value'], change)) {
|
|
90
|
+
var cleanedValue = cleanValueRecursively((_a = change.newValue) === null || _a === void 0 ? void 0 : _a.value);
|
|
91
|
+
return (0, ramda_1.assocPath)(['newValue', 'value'], cleanedValue, change);
|
|
92
|
+
}
|
|
93
|
+
if (typeof change.newValue === 'object' && (0, ramda_1.hasPath)(['newValue', 'attributes'], change)) {
|
|
94
94
|
var cleanedAttributes = cleanValueRecursively((_b = change.newValue) === null || _b === void 0 ? void 0 : _b.attributes);
|
|
95
95
|
var changeWithCleanedAttributes = (0, ramda_1.assocPath)(['newValue', 'attributes'], cleanedAttributes, change);
|
|
96
|
-
if (change.type === mdm_sdk_1.DCRTypes.CREATE_RELATIONSHIP) {
|
|
96
|
+
if ((0, mdm_sdk_1.isRelationTypeUri)(change.objectType) && change.type === mdm_sdk_1.DCRTypes.CREATE_RELATIONSHIP) {
|
|
97
97
|
var cleanByPath = function (valuePath) {
|
|
98
98
|
return (0, ramda_1.when)((0, ramda_1.allPass)([(0, ramda_1.hasPath)(valuePath), (0, ramda_1.pipe)((0, ramda_1.path)(valuePath), ramda_1.isNil)]), (0, ramda_1.dissocPath)(valuePath));
|
|
99
99
|
};
|
|
@@ -101,10 +101,6 @@ var cleanChange = function (change) {
|
|
|
101
101
|
}
|
|
102
102
|
return changeWithCleanedAttributes;
|
|
103
103
|
}
|
|
104
|
-
if (typeof change.newValue === 'object') {
|
|
105
|
-
var cleanedValue = cleanValueRecursively((_c = change.newValue) === null || _c === void 0 ? void 0 : _c.value);
|
|
106
|
-
return (0, ramda_1.assocPath)(['newValue', 'value'], cleanedValue, change);
|
|
107
|
-
}
|
|
108
104
|
return change;
|
|
109
105
|
};
|
|
110
106
|
var calculateValuePath = function (key, change) {
|
|
@@ -142,7 +142,7 @@ var useInternalExport = function (_a) {
|
|
|
142
142
|
if (!exportName || !fileFormat)
|
|
143
143
|
return [2 /*return*/];
|
|
144
144
|
isCsv = [ExportFormat.CSVFlattened, ExportFormat.CSVExploded].includes(fileFormat.value);
|
|
145
|
-
baseOptions = __assign(__assign({ fileFormat: isCsv ? mdm_sdk_1.ExportDataFormat.CSV : mdm_sdk_1.ExportDataFormat.JSON,
|
|
145
|
+
baseOptions = __assign(__assign({ fileFormat: isCsv ? mdm_sdk_1.ExportDataFormat.CSV : mdm_sdk_1.ExportDataFormat.JSON, activeness: activityFilter, options: isSearchByOv ? 'parallelExecution,searchByOv' : 'parallelExecution' }, (fileFormat.value === ExportFormat.CSVExploded ? { exploded: true } : {})), (isCsv ? { dateFormat: 'readable' } : {}));
|
|
146
146
|
tasks = [];
|
|
147
147
|
typesWithSomeColumns = entityTypes.filter(function (uri) { return columnsByEntityType[uri].length > 0; });
|
|
148
148
|
typesWithAllColumns = entityTypes.filter(function (uri) { return columnsByEntityType[uri].length === 0; });
|
|
@@ -155,7 +155,8 @@ var useInternalExport = function (_a) {
|
|
|
155
155
|
tenant: tenant,
|
|
156
156
|
options: options,
|
|
157
157
|
includeType: [entityTypeUri],
|
|
158
|
-
headerOrder: headerOrder
|
|
158
|
+
headerOrder: headerOrder,
|
|
159
|
+
filter: filter
|
|
159
160
|
}));
|
|
160
161
|
jobEntityTypes.push([entityTypeUri]);
|
|
161
162
|
});
|
|
@@ -166,7 +167,8 @@ var useInternalExport = function (_a) {
|
|
|
166
167
|
tenant: tenant,
|
|
167
168
|
options: options,
|
|
168
169
|
includeType: typesWithAllColumns,
|
|
169
|
-
headerOrder: mdm_sdk_1.ExportHeaderOrder.Default
|
|
170
|
+
headerOrder: mdm_sdk_1.ExportHeaderOrder.Default,
|
|
171
|
+
filter: filter
|
|
170
172
|
}));
|
|
171
173
|
jobEntityTypes.push(typesWithAllColumns);
|
|
172
174
|
}
|
|
@@ -20,10 +20,9 @@ export var ActivityExportButton = function (_a) {
|
|
|
20
20
|
var _c = useState(false), showSnackbar = _c[0], setShowSnackbar = _c[1];
|
|
21
21
|
var handleClickExport = useCallback(function (type) {
|
|
22
22
|
var options = {
|
|
23
|
-
filter: buildActivitiesFilterString(filters),
|
|
24
23
|
fileFormat: type
|
|
25
24
|
};
|
|
26
|
-
exportActivities({ exportPath: exportPath, tenant: tenant, options: options })
|
|
25
|
+
exportActivities({ exportPath: exportPath, tenant: tenant, options: options, filter: buildActivitiesFilterString(filters) })
|
|
27
26
|
.then(function () { return setShowSnackbar(true); })
|
|
28
27
|
.catch(onError);
|
|
29
28
|
}, [filters, tenant, exportPath]);
|
|
@@ -274,10 +274,10 @@ describe('Activity log filter tests', function () {
|
|
|
274
274
|
expect(exportActivities).toHaveBeenCalledWith({
|
|
275
275
|
exportPath: '/nui/export',
|
|
276
276
|
options: {
|
|
277
|
-
fileFormat: undefined
|
|
278
|
-
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
277
|
+
fileFormat: undefined
|
|
279
278
|
},
|
|
280
|
-
tenant: 'alenat'
|
|
279
|
+
tenant: 'alenat',
|
|
280
|
+
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
281
281
|
});
|
|
282
282
|
alert = screen.getByRole('alert');
|
|
283
283
|
within(alert).getByText('Export operation is currently in progress. You will receive an email notification once completed. Go to Export Application to view the status.');
|
|
@@ -304,10 +304,10 @@ describe('Activity log filter tests', function () {
|
|
|
304
304
|
expect(exportActivities).toHaveBeenCalledWith({
|
|
305
305
|
exportPath: '/nui/export',
|
|
306
306
|
options: {
|
|
307
|
-
fileFormat: 'json'
|
|
308
|
-
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
307
|
+
fileFormat: 'json'
|
|
309
308
|
},
|
|
310
|
-
tenant: 'alenat'
|
|
309
|
+
tenant: 'alenat',
|
|
310
|
+
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
311
311
|
});
|
|
312
312
|
alert = screen.getByRole('alert');
|
|
313
313
|
within(alert).getByText('Export operation is currently in progress. You will receive an email notification once completed. Go to Export Application to view the status.');
|
|
@@ -332,10 +332,10 @@ describe('Activity log filter tests', function () {
|
|
|
332
332
|
expect(exportActivities).toHaveBeenCalledWith({
|
|
333
333
|
exportPath: '/nui/export',
|
|
334
334
|
options: {
|
|
335
|
-
fileFormat: 'csv'
|
|
336
|
-
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
335
|
+
fileFormat: 'csv'
|
|
337
336
|
},
|
|
338
|
-
tenant: 'alenat'
|
|
337
|
+
tenant: 'alenat',
|
|
338
|
+
filter: "(gte(timestamp, 1626076206900)) and (equals(items.objectUri, 'entities/7Jsn1POn6') or equals(items.startObjectUri, 'entities/7Jsn1POn6') or equals(items.endObjectUri, 'entities/7Jsn1POn6')) and (not equals(user, 'collaboration-service'))"
|
|
339
339
|
});
|
|
340
340
|
expect(showErrorMessage).toHaveBeenCalledWith({ errorMessage: 'Something went wrong' }, { defaultMessage: "Can't export activities", title: 'Error' });
|
|
341
341
|
expect(screen.queryByRole('alert')).not.toBeInTheDocument();
|
|
@@ -119,8 +119,11 @@ export var getRelationChanges = curry(function (metadata, relationInfo, changes,
|
|
|
119
119
|
};
|
|
120
120
|
var relationType = getRelationType(metadata, relationInfo.type);
|
|
121
121
|
var attrTypes = getRelationAttributesList(metadata, relationInfo.type);
|
|
122
|
+
var lineIds = changeType === DCRTypes.CREATE_RELATIONSHIP || changeType === DCRTypes.DELETE_RELATIONSHIP
|
|
123
|
+
? (changes === null || changes === void 0 ? void 0 : changes.lineIds) || relationChangeLineIds
|
|
124
|
+
: undefined;
|
|
122
125
|
return flatten([
|
|
123
|
-
__assign({ level: 1, label: propOr('', 'label', relationType), attributeType: null, relationType: relationType, attributeValue: __assign(__assign({}, relationInfo), changes), lineIds:
|
|
126
|
+
__assign({ level: 1, label: propOr('', 'label', relationType), attributeType: null, relationType: relationType, attributeValue: __assign(__assign({}, relationInfo), changes), lineIds: lineIds }, addRelationOperationIfNeeded(changes, changeType)),
|
|
124
127
|
getAttributesList(metadata, attrTypes, changes, 2)
|
|
125
128
|
]);
|
|
126
129
|
});
|
|
@@ -148,7 +148,7 @@ describe('attributes helpers tests', function () {
|
|
|
148
148
|
attributeValue: __assign(__assign({}, relationInfo), changes),
|
|
149
149
|
label: metadata.relationTypes[1].label,
|
|
150
150
|
level: 1,
|
|
151
|
-
lineIds:
|
|
151
|
+
lineIds: undefined
|
|
152
152
|
},
|
|
153
153
|
{
|
|
154
154
|
attributeType: EntityAttrTypes.startDate,
|
|
@@ -75,18 +75,18 @@ var cleanValueRecursively = function (value) {
|
|
|
75
75
|
return filter(function (propertyValues) { return !isEmpty(propertyValues); }, cleanedProperties);
|
|
76
76
|
};
|
|
77
77
|
var cleanChange = function (change) {
|
|
78
|
-
var _a, _b
|
|
78
|
+
var _a, _b;
|
|
79
79
|
if (Array.isArray(change.newValue)) {
|
|
80
80
|
return change;
|
|
81
81
|
}
|
|
82
|
-
if (
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
82
|
+
if (typeof change.newValue === 'object' && hasPath(['newValue', 'value'], change)) {
|
|
83
|
+
var cleanedValue = cleanValueRecursively((_a = change.newValue) === null || _a === void 0 ? void 0 : _a.value);
|
|
84
|
+
return assocPath(['newValue', 'value'], cleanedValue, change);
|
|
85
|
+
}
|
|
86
|
+
if (typeof change.newValue === 'object' && hasPath(['newValue', 'attributes'], change)) {
|
|
87
87
|
var cleanedAttributes = cleanValueRecursively((_b = change.newValue) === null || _b === void 0 ? void 0 : _b.attributes);
|
|
88
88
|
var changeWithCleanedAttributes = assocPath(['newValue', 'attributes'], cleanedAttributes, change);
|
|
89
|
-
if (change.type === DCRTypes.CREATE_RELATIONSHIP) {
|
|
89
|
+
if (isRelationTypeUri(change.objectType) && change.type === DCRTypes.CREATE_RELATIONSHIP) {
|
|
90
90
|
var cleanByPath = function (valuePath) {
|
|
91
91
|
return when(allPass([hasPath(valuePath), pipe(path(valuePath), isNil)]), dissocPath(valuePath));
|
|
92
92
|
};
|
|
@@ -94,10 +94,6 @@ var cleanChange = function (change) {
|
|
|
94
94
|
}
|
|
95
95
|
return changeWithCleanedAttributes;
|
|
96
96
|
}
|
|
97
|
-
if (typeof change.newValue === 'object') {
|
|
98
|
-
var cleanedValue = cleanValueRecursively((_c = change.newValue) === null || _c === void 0 ? void 0 : _c.value);
|
|
99
|
-
return assocPath(['newValue', 'value'], cleanedValue, change);
|
|
100
|
-
}
|
|
101
97
|
return change;
|
|
102
98
|
};
|
|
103
99
|
var calculateValuePath = function (key, change) {
|
|
@@ -136,7 +136,7 @@ export var useInternalExport = function (_a) {
|
|
|
136
136
|
if (!exportName || !fileFormat)
|
|
137
137
|
return [2 /*return*/];
|
|
138
138
|
isCsv = [ExportFormat.CSVFlattened, ExportFormat.CSVExploded].includes(fileFormat.value);
|
|
139
|
-
baseOptions = __assign(__assign({ fileFormat: isCsv ? ExportDataFormat.CSV : ExportDataFormat.JSON,
|
|
139
|
+
baseOptions = __assign(__assign({ fileFormat: isCsv ? ExportDataFormat.CSV : ExportDataFormat.JSON, activeness: activityFilter, options: isSearchByOv ? 'parallelExecution,searchByOv' : 'parallelExecution' }, (fileFormat.value === ExportFormat.CSVExploded ? { exploded: true } : {})), (isCsv ? { dateFormat: 'readable' } : {}));
|
|
140
140
|
tasks = [];
|
|
141
141
|
typesWithSomeColumns = entityTypes.filter(function (uri) { return columnsByEntityType[uri].length > 0; });
|
|
142
142
|
typesWithAllColumns = entityTypes.filter(function (uri) { return columnsByEntityType[uri].length === 0; });
|
|
@@ -149,7 +149,8 @@ export var useInternalExport = function (_a) {
|
|
|
149
149
|
tenant: tenant,
|
|
150
150
|
options: options,
|
|
151
151
|
includeType: [entityTypeUri],
|
|
152
|
-
headerOrder: headerOrder
|
|
152
|
+
headerOrder: headerOrder,
|
|
153
|
+
filter: filter
|
|
153
154
|
}));
|
|
154
155
|
jobEntityTypes.push([entityTypeUri]);
|
|
155
156
|
});
|
|
@@ -160,7 +161,8 @@ export var useInternalExport = function (_a) {
|
|
|
160
161
|
tenant: tenant,
|
|
161
162
|
options: options,
|
|
162
163
|
includeType: typesWithAllColumns,
|
|
163
|
-
headerOrder: ExportHeaderOrder.Default
|
|
164
|
+
headerOrder: ExportHeaderOrder.Default,
|
|
165
|
+
filter: filter
|
|
164
166
|
}));
|
|
165
167
|
jobEntityTypes.push(typesWithAllColumns);
|
|
166
168
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reltio/components",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.2225",
|
|
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.2020",
|
|
15
15
|
"@vis.gl/react-google-maps": "^1.3.0",
|
|
16
16
|
"d3-cloud": "^1.2.5",
|
|
17
17
|
"d3-geo": "^2.0.1",
|