@reltio/components 1.4.2253 → 1.4.2255

package/features/workflow/helpers/metadata.test-data.js

@@ -261,5 +261,14 @@ export var getMetadata = function () { return ({
                 }
             ]
         }
+    ],
+    roles: [
+        {
+            uri: 'configuration/roles/DirectorofNursing',
+            label: 'Director of Nursing',
+            description: 'Director of Nursing'
+        },
+        { uri: 'configuration/roles/MedicalAssistant', label: 'Medical Assistant', description: 'Medical Assistant' },
+        { uri: 'configuration/roles/LabDirectors', label: 'Lab Directors', description: 'Lab Directors' }
     ]
 }); };

package/features/workflow/helpers/validation.js

@@ -21,6 +21,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 import { clone } from 'ramda';
 import i18n from 'ui-i18n';
 import { findAttributeTypeByUri, DCRTypes, getRequiredAttributeTypesByTypeUri, buildError, ErrorType, getParentUri, findAttributeValuesByTypeUri, isEmptyValue, isOv, isIgnored, ErrorSource, evaluateErrorPath, isReference } from '@reltio/mdm-sdk';
+import { isPrimitiveValue } from './common';
 var ALLOWED_CHANGE_TYPES = [
     DCRTypes.UPDATE_ATTRIBUTE,
     DCRTypes.INSERT_ATTRIBUTE,
@@ -256,7 +257,7 @@ var validateRequiredComplexAttributes = function (_a) {
         return [];
     }
     var valueHolder = change.type === DCRTypes.CREATE_ENTITY || change.type === DCRTypes.CREATE_RELATIONSHIP ? 'attributes' : 'value';
-    var rootAttributeTypeUri = change.refAttributeType || change.attributeType || change.objectType;
+    var rootAttributeTypeUri = change.attributeType || change.refAttributeType || change.objectType;
     if (!rootAttributeTypeUri) {
         return [];
     }
@@ -286,7 +287,7 @@ var validateRequiredComplexAttributes = function (_a) {
         var errors = [];
         var visitValue = function (value, path) {
             var isRejected = checkIsChangeRejected(path.slice(0, -1).join('/'));
-            if (typeof value === 'string') {
+            if (isPrimitiveValue(value)) {
                 return !isRejected;
             }
             if (isRejected) {

package/features/workflow/helpers/validation.test-data.d.ts

@@ -10,5 +10,6 @@ export declare const getUserChanges: () => UserChange[];
 export declare const getUserChangesRejectSubnestedAttributes: () => UserChange[];
 export declare const getUserChangesRejectSubnestedRelationAttributes: () => UserChange[];
 export declare const getUserChangesSubnestedEmpty: () => UserChange[];
+export declare const getChangesWithBooleanPrimitiveValue: () => DCRChanges;
 export declare const getUserChangesNewEntity: () => UserChange[];
 export {};

package/features/workflow/helpers/validation.test-data.js

@@ -478,6 +478,38 @@ export var getUserChangesSubnestedEmpty = function () { return [
         }
     }
 ]; };
+export var getChangesWithBooleanPrimitiveValue = function () { return ({
+    'entities/entityUri1': [
+        {
+            id: '0SBn7Oa',
+            type: DCRTypes.INSERT_ATTRIBUTE,
+            createdTime: 1761922840650,
+            createdBy: 'ivan.kositsin',
+            objectType: 'configuration/entityTypes/HCP',
+            attributePath: 'Specialities',
+            newValue: {
+                value: {
+                    SpecialityStatus: [
+                        {
+                            value: 'ACTIVE'
+                        }
+                    ],
+                    PrimarySpecialityInd: [
+                        {
+                            value: false
+                        }
+                    ]
+                }
+            },
+            crosswalk: {
+                type: 'configuration/sources/Reltio',
+                value: 'entityUri1'
+            },
+            newPinOrIgnoreValue: false,
+            attributeType: 'configuration/entityTypes/HCP/attributes/Specialities'
+        }
+    ]
+}); };
 export var getUserChangesNewEntity = function () { return [
     {
         lineId: 'entityUri2/0IEiwoe/newValue/attributes/Name/0',

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

@@ -1,6 +1,6 @@
 import { getValidationErrors } from './validation';
 import { getMetadata } from './metadata.test-data';
-import { getChanges, getEntitiesOrRelations, getUserChanges, getUserChangesRejectSubnestedAttributes, getUserChangesRejectSubnestedRelationAttributes, getUserChangesSubnestedEmpty, getUserChangesNewEntity } from './validation.test-data';
+import { getChanges, getChangesWithBooleanPrimitiveValue, getEntitiesOrRelations, getUserChanges, getUserChangesRejectSubnestedAttributes, getUserChangesRejectSubnestedRelationAttributes, getUserChangesSubnestedEmpty, getUserChangesNewEntity } from './validation.test-data';
 import { findAttributeTypeByUri } from '@reltio/mdm-sdk';
 describe('getValidationErrors', function () {
     it('should validate required attributes with user changes', function () {
@@ -213,6 +213,16 @@ describe('getValidationErrors', function () {
             }
         ]);
     });
+    it('should not report a missing required boolean attribute when its value is primitive false', function () {
+        var metadata = getMetadata();
+        var result = getValidationErrors({
+            changes: getChangesWithBooleanPrimitiveValue(),
+            userChanges: [],
+            entitiesOrRelations: getEntitiesOrRelations(),
+            metadata: metadata
+        });
+        expect(result).toEqual([]);
+    });
     it('should validate required attributes in new entity', function () {
         var metadata = getMetadata();
         var result = getValidationErrors({

package/features/workflow/hooks/useChangeRequest.d.ts

@@ -2,4 +2,5 @@ import { ChangeRequest, GroupedObjectsInfo } from '@reltio/mdm-sdk';
 export declare const useChangeRequest: (dcrUri: string) => {
     dcr: ChangeRequest;
     groupedObjects: GroupedObjectsInfo[];
+    reloadDcr: () => void;
 };

package/features/workflow/hooks/useChangeRequest.js

@@ -25,8 +25,8 @@ export var useChangeRequest = function (dcrUri) {
         }
         return safePromise(getEntitiesByUris(entityUris, { searchOptions: 'ovOnly', defaultMaxValues: 1 }));
     }, []); // eslint-disable-line
-    useEffect(function () {
-        getDataChangeRequest(dcrUri)
+    var loadDcr = useCallback(function () {
+        safePromise(getDataChangeRequest(dcrUri))
             .then(function (dcr) {
             var changes = dcr.changes, objectsInfo = dcr.objectsInfo;
             var objectsWithChanges = extractObjectsFromChangeRequest(changes, objectsInfo);
@@ -37,7 +37,7 @@ export var useChangeRequest = function (dcrUri) {
             requestEntities(entityUris)
                 .then(function (entities) {
                 var relationsObjectsWithRequestedEntities = relationsObjectsWithoutEntity.map(function (relationsObject, index) {
-                    return __assign(__assign({}, relationsObject), { entity: entities[index] });
+                    return __assign(__assign({}, relationsObject), { entity: __assign(__assign({}, entities[index]), { isExist: true }) });
                 });
                 pipe(flatten, reduce(concatEntityRelationsObjects, {}), values, setGroupedObjects)([
                     entityObjectsWithRelations,
@@ -49,6 +49,9 @@ export var useChangeRequest = function (dcrUri) {
             setDcr(dcr);
         })
             .catch(showErrorMessage);
-    }, [dcrUri, requestEntities]);
-    return { dcr: dcr, groupedObjects: groupedObjects };
+    }, [dcrUri, requestEntities, safePromise]);
+    useEffect(function () {
+        loadDcr();
+    }, [loadDcr]);
+    return { dcr: dcr, groupedObjects: groupedObjects, reloadDcr: loadDcr };
 };

package/features/workflow/hooks/useChangeRequest.test.js

@@ -127,7 +127,8 @@ describe('useChangeRequest tests', function () {
         expect(getEntitiesByUris).not.toHaveBeenCalled();
         expect(result.current).toEqual({
             dcr: null,
-            groupedObjects: []
+            groupedObjects: [],
+            reloadDcr: expect.any(Function)
         });
     });
     it('should return empty parameters if dcrUri is undefined', function () {
@@ -136,7 +137,8 @@ describe('useChangeRequest tests', function () {
         expect(getEntitiesByUris).not.toHaveBeenCalled();
         expect(result.current).toEqual({
             dcr: null,
-            groupedObjects: []
+            groupedObjects: [],
+            reloadDcr: expect.any(Function)
         });
     });
     it('should go to error message in case of getDataChangeRequest error', function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -159,7 +161,8 @@ describe('useChangeRequest tests', function () {
                     });
                     expect(result.current).toEqual({
                         dcr: null,
-                        groupedObjects: []
+                        groupedObjects: [],
+                        reloadDcr: expect.any(Function)
                     });
                     return [2 /*return*/];
             }
@@ -198,7 +201,8 @@ describe('useChangeRequest tests', function () {
                     });
                     expect(result.current).toEqual({
                         dcr: dcr,
-                        groupedObjects: []
+                        groupedObjects: [],
+                        reloadDcr: expect.any(Function)
                     });
                     return [2 /*return*/];
             }
@@ -234,6 +238,7 @@ describe('useChangeRequest tests', function () {
                     expect(ErrorPopup.addError).not.toHaveBeenCalled();
                     expect(result.current).toEqual({
                         dcr: dcr,
+                        reloadDcr: expect.any(Function),
                         groupedObjects: [
                             {
                                 entity: {
@@ -267,7 +272,8 @@ describe('useChangeRequest tests', function () {
                             },
                             {
                                 entity: {
-                                    uri: 'entities/151gdPs5'
+                                    uri: 'entities/151gdPs5',
+                                    isExist: true
                                 },
                                 relations: [
                                     {

package/features/workflow/hooks/useWorkflowActions.d.ts

@@ -4,9 +4,10 @@ type Task = Partial<Pick<WorkflowTaskData, 'taskId' | 'possibleActions' | 'assig
 type Props = {
     task: Task;
     onActionSuccess?: (action: string) => void;
+    onError?: () => void;
     beforeAction?: () => Promise<BeforeActionOutcome>;
 };
-export declare const useWorkflowActions: ({ task, onActionSuccess, beforeAction }: Props) => {
+export declare const useWorkflowActions: ({ task, onActionSuccess, onError, beforeAction }: Props) => {
     actions: TaskAction[];
     actionRequestIsInProgress: boolean;
 };

package/features/workflow/hooks/useWorkflowActions.js

@@ -43,7 +43,7 @@ import { useMdmTenant, useMdmUsername, useMdmWorkflowEnvironmentUrl, useMdmWorkf
 import { useCommentDialog } from '../../../contexts/CommentDialogContext';
 import { showDefaultErrorMessage } from '../../../helpers/errors';
 export var useWorkflowActions = function (_a) {
-    var task = _a.task, onActionSuccess = _a.onActionSuccess, beforeAction = _a.beforeAction;
+    var task = _a.task, onActionSuccess = _a.onActionSuccess, onError = _a.onError, beforeAction = _a.beforeAction;
     var _b = task !== null && task !== void 0 ? task : {}, possibleActions = _b.possibleActions, assignee = _b.assignee, taskId = _b.taskId, isOpen = _b.isOpen;
     var workflowTasks = useContext(WorkflowTasksContext);
     var workflowPath = useMdmWorkflowPath();
@@ -82,6 +82,7 @@ export var useWorkflowActions = function (_a) {
                         if (!outcome.proceed) {
                             if (outcome.error) {
                                 showDefaultErrorMessage(outcome.error);
+                                onError === null || onError === void 0 ? void 0 : onError();
                             }
                             setActionRequestIsInProgress(false);
                             return [2 /*return*/];
@@ -90,6 +91,7 @@ export var useWorkflowActions = function (_a) {
                     case 5:
                         error_1 = _a.sent();
                         showDefaultErrorMessage(error_1);
+                        onError === null || onError === void 0 ? void 0 : onError();
                         setActionRequestIsInProgress(false);
                         return [2 /*return*/];
                     case 6:
@@ -104,7 +106,10 @@ export var useWorkflowActions = function (_a) {
                             .then(function () {
                             handleActionSuccess === null || handleActionSuccess === void 0 ? void 0 : handleActionSuccess(action);
                         })
-                            .catch(showWorkflowError)
+                            .catch(function (error) {
+                            showWorkflowError(error);
+                            onError === null || onError === void 0 ? void 0 : onError();
+                        })
                             .finally(function () {
                             setActionRequestIsInProgress(false);
                         });
@@ -113,7 +118,7 @@ export var useWorkflowActions = function (_a) {
                 }
             });
         }); };
-    }, [workflowPath, taskId, environment, tenant, handleActionSuccess, showCommentDialog, beforeAction]);
+    }, [workflowPath, taskId, environment, tenant, handleActionSuccess, showCommentDialog, beforeAction, onError]);
     var actions = useMemo(function () {
         return username === assignee && isOpenTask(isOpen)
             ? (possibleActions || []).map(function (_a) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.2253",
+  "version": "1.4.2255",
   "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.2037",
+    "@reltio/mdm-sdk": "^1.4.2038",
     "@vis.gl/react-google-maps": "^1.3.0",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",