@reltio/components 1.4.1776 → 1.4.1777

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.
Files changed (3) hide show
  1. package/cjs/components/RelationEditor/RelationEditor.js +13 -3
  2. package/esm/components/RelationEditor/RelationEditor.js +14 -4
  3. package/package.json +2 -2
package/cjs/components/RelationEditor/RelationEditor.js CHANGED
@@ -87,6 +87,7 @@ var RelationEditor = function (_a) {
87
87
  var authoringItems = (0, contexts_1.useMdmAuthoringItemsByEntityType)(mainEntity === null || mainEntity === void 0 ? void 0 : mainEntity.type);
88
88
  var mainEntityUri = (0, contexts_1.useMdmEntityUri)();
89
89
  var error = (0, mdm_sdk_1.getRelationEditorActiveError)(connection, profileErrors);
90
+ var allRelationEditorErrors = (0, mdm_sdk_1.getAllRelationEditorActiveErrors)(connection, profileErrors);
90
91
  var modifiedEntity = isTempEntity ? mdmModifiedEntity : null;
91
92
  var allModifiedEntities = isTempEntity ? mdmAllModifiedEntities : null;
92
93
  var _d = (0, hooks_1.useScrollToAttributeError)({ highlightedError: highlightedError, isSimple: true }), ref = _d.ref, errorClassName = _d.errorClassName;
@@ -156,7 +157,6 @@ var RelationEditor = function (_a) {
156
157
  errorsSet(errors);
157
158
  return errors.length === 0;
158
159
  }, [connection, metadata, allModifiedEntities, errorsSet, mainEntityUri, config]);
159
- var resetErrors = (0, react_1.useCallback)(function () { return errorsSet([]); }, [errorsSet]);
160
160
  var onApply = (0, react_1.useCallback)((0, ramda_1.pipe)((0, ramda_1.always)(connection), (0, ramda_1.when)(validate, (0, ramda_1.pipe)(mdm_sdk_1.omitMarks, updateModifiedEntityLabel, applyAction(config.id), (0, ramda_1.always)((0, ramda_1.differenceWith)(ramda_1.equals, relatedTempEntitiesUrisHistory.current, relatedTempEntities.map((0, ramda_1.prop)('uri')))), (0, ramda_1.forEach)(deleteModifiedEntity), handleClose))), [connection, config, updateModifiedEntityLabel, validate, relatedTempEntities]);
161
161
  var onCancel = (0, react_1.useCallback)(function () {
162
162
  if (modifiedEntity !== initialModifiedEntity) {
@@ -174,9 +174,19 @@ var RelationEditor = function (_a) {
174
174
  var entitiesUrisToDelete = (0, ramda_1.differenceWith)(ramda_1.equals, relatedTempEntitiesUrisHistory.current, initialTempEntities.map((0, ramda_1.prop)('uri')));
175
175
  entitiesUrisToDelete.forEach(deleteModifiedEntity);
176
176
  initialTempEntities.forEach(setModifiedEntity);
177
- resetErrors();
177
+ var filteredErrors = profileErrors.filter(function (profileError) { return !allRelationEditorErrors.some(function (error) { return (0, mdm_sdk_1.getErrorId)(error) === (0, mdm_sdk_1.getErrorId)(profileError); }); });
178
+ errorsSet(filteredErrors);
178
179
  handleClose();
179
- }, [handleClose, setModifiedEntity, deleteModifiedEntity, resetErrors, modifiedEntity, initialModifiedEntity]);
180
+ }, [
181
+ handleClose,
182
+ setModifiedEntity,
183
+ deleteModifiedEntity,
184
+ modifiedEntity,
185
+ initialModifiedEntity,
186
+ allRelationEditorErrors,
187
+ errorsSet,
188
+ profileErrors
189
+ ]);
180
190
  var onAddAttributes = (0, react_1.useCallback)(function (params) { return addAttributes(params.map(function (param) { return (__assign(__assign({}, param), { viewId: config.id })); })); }, [config.id, addAttributes]);
181
191
  var onChangeAttribute = (0, react_1.useCallback)(function (params) { return modifyAttribute(__assign(__assign({}, params), { viewId: config.id })); }, [config.id, modifyAttribute]);
182
192
  var onDeleteAttribute = (0, react_1.useCallback)(function (params) { return removeAttribute(__assign(__assign({}, params), { viewId: config.id })); }, [config.id, removeAttribute]);
package/esm/components/RelationEditor/RelationEditor.js CHANGED
@@ -15,7 +15,7 @@ import classnames from 'classnames';
15
15
  import { always, assoc, concat, differenceWith, equals, forEach, map, path, pick, pipe, prop, propEq, when, uniq, curry } from 'ramda';
16
16
  import Button from '@mui/material/Button';
17
17
  import Typography from '@mui/material/Typography';
18
- import { createTemporaryEntity, findRelatedTemporaryEntities, getActivenessAttributes, getCreatableAttributeTypes, getEntityType, getErrorMessage, getErrorId, omitMarks, relationEditorAttributeTypesSelectionStrategy, validateConnection, updateConnectionEntityLabel, isTempUri, isEmptyValue, getRelationAttributesList, getDefaultRelationTypeObject, getInOutRelations, isSuggestMode, isAttributeTypeError, getRelationUriFromConnection, getRelationEditorActiveError, getRelationAttributesFromConnection, getEntityUriFromConnection, evaluateErrorPath, AttributeValuePathItemType } from '@reltio/mdm-sdk';
18
+ import { createTemporaryEntity, findRelatedTemporaryEntities, getActivenessAttributes, getCreatableAttributeTypes, getEntityType, getErrorMessage, getErrorId, omitMarks, relationEditorAttributeTypesSelectionStrategy, validateConnection, updateConnectionEntityLabel, isTempUri, isEmptyValue, getRelationAttributesList, getDefaultRelationTypeObject, getInOutRelations, isSuggestMode, isAttributeTypeError, getRelationUriFromConnection, getRelationEditorActiveError, getRelationAttributesFromConnection, getEntityUriFromConnection, evaluateErrorPath, AttributeValuePathItemType, getAllRelationEditorActiveErrors } from '@reltio/mdm-sdk';
19
19
  import ConnectionRelationTypeSelector from '../ConnectionRelationTypeSelector/ConnectionRelationTypeSelector';
20
20
  import ErrorWrapper from '../ErrorWrapper/ErrorWrapper';
21
21
  import EntitySelector from '../attributes/editMode/EntitySelector/EntitySelector';
@@ -59,6 +59,7 @@ var RelationEditor = function (_a) {
59
59
  var authoringItems = useMdmAuthoringItemsByEntityType(mainEntity === null || mainEntity === void 0 ? void 0 : mainEntity.type);
60
60
  var mainEntityUri = useMdmEntityUri();
61
61
  var error = getRelationEditorActiveError(connection, profileErrors);
62
+ var allRelationEditorErrors = getAllRelationEditorActiveErrors(connection, profileErrors);
62
63
  var modifiedEntity = isTempEntity ? mdmModifiedEntity : null;
63
64
  var allModifiedEntities = isTempEntity ? mdmAllModifiedEntities : null;
64
65
  var _d = useScrollToAttributeError({ highlightedError: highlightedError, isSimple: true }), ref = _d.ref, errorClassName = _d.errorClassName;
@@ -128,7 +129,6 @@ var RelationEditor = function (_a) {
128
129
  errorsSet(errors);
129
130
  return errors.length === 0;
130
131
  }, [connection, metadata, allModifiedEntities, errorsSet, mainEntityUri, config]);
131
- var resetErrors = useCallback(function () { return errorsSet([]); }, [errorsSet]);
132
132
  var onApply = useCallback(pipe(always(connection), when(validate, pipe(omitMarks, updateModifiedEntityLabel, applyAction(config.id), always(differenceWith(equals, relatedTempEntitiesUrisHistory.current, relatedTempEntities.map(prop('uri')))), forEach(deleteModifiedEntity), handleClose))), [connection, config, updateModifiedEntityLabel, validate, relatedTempEntities]);
133
133
  var onCancel = useCallback(function () {
134
134
  if (modifiedEntity !== initialModifiedEntity) {
@@ -146,9 +146,19 @@ var RelationEditor = function (_a) {
146
146
  var entitiesUrisToDelete = differenceWith(equals, relatedTempEntitiesUrisHistory.current, initialTempEntities.map(prop('uri')));
147
147
  entitiesUrisToDelete.forEach(deleteModifiedEntity);
148
148
  initialTempEntities.forEach(setModifiedEntity);
149
- resetErrors();
149
+ var filteredErrors = profileErrors.filter(function (profileError) { return !allRelationEditorErrors.some(function (error) { return getErrorId(error) === getErrorId(profileError); }); });
150
+ errorsSet(filteredErrors);
150
151
  handleClose();
151
- }, [handleClose, setModifiedEntity, deleteModifiedEntity, resetErrors, modifiedEntity, initialModifiedEntity]);
152
+ }, [
153
+ handleClose,
154
+ setModifiedEntity,
155
+ deleteModifiedEntity,
156
+ modifiedEntity,
157
+ initialModifiedEntity,
158
+ allRelationEditorErrors,
159
+ errorsSet,
160
+ profileErrors
161
+ ]);
152
162
  var onAddAttributes = useCallback(function (params) { return addAttributes(params.map(function (param) { return (__assign(__assign({}, param), { viewId: config.id })); })); }, [config.id, addAttributes]);
153
163
  var onChangeAttribute = useCallback(function (params) { return modifyAttribute(__assign(__assign({}, params), { viewId: config.id })); }, [config.id, modifyAttribute]);
154
164
  var onDeleteAttribute = useCallback(function (params) { return removeAttribute(__assign(__assign({}, params), { viewId: config.id })); }, [config.id, removeAttribute]);
package/package.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "name": "@reltio/components",
3
- "version": "1.4.1776",
3
+ "version": "1.4.1777",
4
4
  "license": "SEE LICENSE IN LICENSE FILE",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
7
7
  "dependencies": {
8
8
  "@fluentui/react-context-selector": "^9.1.26",
9
9
  "@react-google-maps/api": "2.7.0",
10
- "@reltio/mdm-sdk": "^1.4.1750",
10
+ "@reltio/mdm-sdk": "^1.4.1751",
11
11
  "classnames": "^2.2.5",
12
12
  "d3-cloud": "^1.2.5",
13
13
  "d3-geo": "^2.0.1",