@reltio/components 1.4.1770 → 1.4.1771

package/cjs/components/RelationEditor/RelationEditor.js

@@ -85,6 +85,7 @@ var RelationEditor = function (_a) {
     var globalSearchRequestOptions = (0, contexts_1.useMdmGlobalSearchRequestOptions)(['ovOnly']);
     var profileErrors = (0, contexts_1.useMdmProfileErrors)();
     var authoringItems = (0, contexts_1.useMdmAuthoringItemsByEntityType)(mainEntity === null || mainEntity === void 0 ? void 0 : mainEntity.type);
+    var mainEntityUri = (0, contexts_1.useMdmEntityUri)();
     var error = (0, mdm_sdk_1.getRelationEditorActiveError)(connection, profileErrors);
     var modifiedEntity = isTempEntity ? mdmModifiedEntity : null;
     var allModifiedEntities = isTempEntity ? mdmAllModifiedEntities : null;
@@ -144,10 +145,15 @@ var RelationEditor = function (_a) {
         }
     }, [config.id, relationUri, setRelationEntity, errorDeactivated, modifiedEntity, deleteModifiedEntity, error]);
     var validate = (0, react_1.useCallback)(function () {
-        var errors = (0, mdm_sdk_1.validateConnection)(metadata, allModifiedEntities, connection);
+        var errors = (0, mdm_sdk_1.validateConnection)(metadata, allModifiedEntities, connection).map(function (error) { return (__assign(__assign({}, error), { path: (0, ramda_1.pipe)(mdm_sdk_1.evaluateErrorPath, (0, ramda_1.map)((0, ramda_1.when)((0, ramda_1.propEq)('type', mdm_sdk_1.AttributeValuePathItemType.relationConnection), (0, ramda_1.assoc)('viewId', config.id))))({
+                entityUri: mainEntityUri,
+                metadata: metadata,
+                connections: [connection],
+                entitiesMap: allModifiedEntities || {}
+            }, error.uri || error.parentUri) })); });
         errorsSet(errors);
         return errors.length === 0;
-    }, [connection, metadata, allModifiedEntities, errorsSet]);
+    }, [connection, metadata, allModifiedEntities, errorsSet, mainEntityUri, config]);
     var resetErrors = (0, react_1.useCallback)(function () { return errorsSet([]); }, [errorsSet]);
     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]);
     var onCancel = (0, react_1.useCallback)(function () {

package/esm/components/RelationEditor/RelationEditor.js

@@ -12,16 +12,16 @@ var __assign = (this && this.__assign) || function () {
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import i18n from 'ui-i18n';
 import classnames from 'classnames';
-import { always, concat, differenceWith, equals, forEach, path, pick, pipe, prop, when, uniq, curry } from 'ramda';
+import { always, assoc, concat, differenceWith, equals, forEach, map, path, pick, pipe, prop, propEq, when, uniq, curry } from 'ramda';
 import Button from '@mui/material/Button';
 import Typography from '@mui/material/Typography';
-import { createTemporaryEntity, findRelatedTemporaryEntities, getActivenessAttributes, getCreatableAttributeTypes, getEntityType, getErrorMessage, getErrorId, omitMarks, relationEditorAttributeTypesSelectionStrategy, validateConnection, updateConnectionEntityLabel, isTempUri, isEmptyValue, getRelationAttributesList, getDefaultRelationTypeObject, getInOutRelations, isSuggestMode, isAttributeTypeError, getRelationUriFromConnection, getRelationEditorActiveError, getRelationAttributesFromConnection, getEntityUriFromConnection } from '@reltio/mdm-sdk';
+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';
 import ConnectionRelationTypeSelector from '../ConnectionRelationTypeSelector/ConnectionRelationTypeSelector';
 import ErrorWrapper from '../ErrorWrapper/ErrorWrapper';
 import EntitySelector from '../attributes/editMode/EntitySelector/EntitySelector';
 import AttributesList from '../attributes/editMode/AttributesList';
 import { withContext } from '../../HOCs';
-import { ConfigPermissionsContextProvider, isHighlightedErrorType, ScrollToElementContext, useMdmAction, useMdmAuthoringItemsByEntityType, useMdmEntity, useMdmGlobalSearchRequestOptions, useMdmInitialConnection, useMdmInitialConnectionTempEntity, useMdmModifiedEntities, useMdmModifiedEntity, useMdmProfileErrors } from '../../contexts';
+import { ConfigPermissionsContextProvider, isHighlightedErrorType, ScrollToElementContext, useMdmAction, useMdmAuthoringItemsByEntityType, useMdmEntity, useMdmGlobalSearchRequestOptions, useMdmInitialConnection, useMdmInitialConnectionTempEntity, useMdmModifiedEntities, useMdmModifiedEntity, useMdmProfileErrors, useMdmEntityUri } from '../../contexts';
 import { useScrollToAttributeError } from '../../hooks';
 import { useStyles } from './styles';
 var areRelatedEntitiesChanged = function (initial, actual) {
@@ -57,6 +57,7 @@ var RelationEditor = function (_a) {
     var globalSearchRequestOptions = useMdmGlobalSearchRequestOptions(['ovOnly']);
     var profileErrors = useMdmProfileErrors();
     var authoringItems = useMdmAuthoringItemsByEntityType(mainEntity === null || mainEntity === void 0 ? void 0 : mainEntity.type);
+    var mainEntityUri = useMdmEntityUri();
     var error = getRelationEditorActiveError(connection, profileErrors);
     var modifiedEntity = isTempEntity ? mdmModifiedEntity : null;
     var allModifiedEntities = isTempEntity ? mdmAllModifiedEntities : null;
@@ -116,10 +117,15 @@ var RelationEditor = function (_a) {
         }
     }, [config.id, relationUri, setRelationEntity, errorDeactivated, modifiedEntity, deleteModifiedEntity, error]);
     var validate = useCallback(function () {
-        var errors = validateConnection(metadata, allModifiedEntities, connection);
+        var errors = validateConnection(metadata, allModifiedEntities, connection).map(function (error) { return (__assign(__assign({}, error), { path: pipe(evaluateErrorPath, map(when(propEq('type', AttributeValuePathItemType.relationConnection), assoc('viewId', config.id))))({
+                entityUri: mainEntityUri,
+                metadata: metadata,
+                connections: [connection],
+                entitiesMap: allModifiedEntities || {}
+            }, error.uri || error.parentUri) })); });
         errorsSet(errors);
         return errors.length === 0;
-    }, [connection, metadata, allModifiedEntities, errorsSet]);
+    }, [connection, metadata, allModifiedEntities, errorsSet, mainEntityUri, config]);
     var resetErrors = useCallback(function () { return errorsSet([]); }, [errorsSet]);
     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]);
     var onCancel = useCallback(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.1770",
+  "version": "1.4.1771",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",