npm - @reltio/components - Versions diffs - 1.4.1889 → 1.4.1891 - Mend

@reltio/components 1.4.1889 → 1.4.1891

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 (13) hide show

package/cjs/features/workflow/hooks/useWorkflowActions.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { WorkflowTaskData } from '@reltio/mdm-sdk';
 import { TaskAction } from '../types';
-type Props = Pick<WorkflowTaskData, 'taskId' | 'possibleActions' | 'assignee' | 'isOpen'>;
-export declare const useWorkflowActions: ({ possibleActions, assignee, taskId, isOpen }: Props) => {
+type Task = Partial<Pick<WorkflowTaskData, 'taskId' | 'possibleActions' | 'assignee' | 'isOpen'>>;
+export declare const useWorkflowActions: (task: Task, onActionSuccess?: (action: string) => void) => {
     actions: TaskAction[];
     actionRequestIsInProgress: boolean;
 };

package/cjs/features/workflow/hooks/useWorkflowActions.js CHANGED Viewed

@@ -7,14 +7,15 @@ var errors_1 = require("../helpers/errors");
 var common_1 = require("../helpers/common");
 var WorkflowTasksContext_1 = require("../../../contexts/WorkflowTasksContext");
 var MdmModuleContext_1 = require("../../../contexts/MdmModuleContext");
-var useWorkflowActions = function (_a) {
-    var possibleActions = _a.possibleActions, assignee = _a.assignee, taskId = _a.taskId, isOpen = _a.isOpen;
-    var onActionSuccess = ((0, react_1.useContext)(WorkflowTasksContext_1.WorkflowTasksContext) || {}).onActionSuccess;
+var useWorkflowActions = function (task, onActionSuccess) {
+    var _a = task !== null && task !== void 0 ? task : {}, possibleActions = _a.possibleActions, assignee = _a.assignee, taskId = _a.taskId, isOpen = _a.isOpen;
+    var workflowTasks = (0, react_1.useContext)(WorkflowTasksContext_1.WorkflowTasksContext);
     var workflowPath = (0, MdmModuleContext_1.useMdmWorkflowPath)();
     var environment = (0, MdmModuleContext_1.useMdmWorkflowEnvironmentUrl)();
     var tenant = (0, MdmModuleContext_1.useMdmTenant)();
     var username = (0, MdmModuleContext_1.useMdmUsername)();
     var _b = (0, react_1.useState)(false), actionRequestIsInProgress = _b[0], setActionRequestIsInProgress = _b[1];
+    var handleActionSuccess = onActionSuccess !== null && onActionSuccess !== void 0 ? onActionSuccess : workflowTasks === null || workflowTasks === void 0 ? void 0 : workflowTasks.onActionSuccess;
     var performTaskAction = (0, react_1.useCallback)(function (action) { return function (comment) {
         if (workflowPath && taskId) {
             setActionRequestIsInProgress(true);
@@ -28,14 +29,14 @@ var useWorkflowActions = function (_a) {
                 processInstanceComment: processInstanceComment
             })
                 .then(function () {
-                onActionSuccess === null || onActionSuccess === void 0 ? void 0 : onActionSuccess(action);
+                handleActionSuccess === null || handleActionSuccess === void 0 ? void 0 : handleActionSuccess(action);
             })
                 .catch(errors_1.showWorkflowError)
                 .finally(function () {
                 setActionRequestIsInProgress(false);
             });
         }
-    }; }, [workflowPath, taskId, environment, tenant, onActionSuccess]);
+    }; }, [workflowPath, taskId, environment, tenant, handleActionSuccess]);
     var actions = (0, react_1.useMemo)(function () {
         return username === assignee && (0, common_1.isOpenTask)(isOpen)
             ? (possibleActions || []).map(function (_a) {

package/cjs/hooks/useChangedAttributes/useChangedAttributes.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
 import { RecordAttributesType } from '@reltio/mdm-sdk';
-export declare const useChangedAttributes: (attributes: RecordAttributesType, controlAttributes: string[]) => string[];
+export declare const useChangedAttributes: (entityUri: string, attributes: RecordAttributesType, controlAttributes: string[]) => string[];

package/cjs/hooks/useChangedAttributes/useChangedAttributes.js CHANGED Viewed

@@ -11,17 +11,18 @@ var getValues = function (controlAttribute, attributes) {
     return (0, ramda_1.flatten)((0, mdm_sdk_1.getOvAttributeValuesByPathWithUri)(attrPath, attributes));
 };
 var getValuesHash = (0, ramda_1.pipe)((0, ramda_1.pluck)('value'), (0, ramda_1.join)('-'));
-var useChangedAttributes = function (attributes, controlAttributes) {
+var useChangedAttributes = function (entityUri, attributes, controlAttributes) {
+    var previousEntityUri = (0, react_1.useRef)();
     var previousAttributesValues = (0, react_1.useRef)();
     var attributeValues = (0, react_1.useMemo)(function () {
         return controlAttributes.reduce(function (values, controlAttribute) {
             values[controlAttribute] = (0, ramda_1.pipe)(getValues, getValuesHash)(controlAttribute, attributes);
             return values;
-        }, {}) || [];
+        }, {});
     }, [controlAttributes, attributes]);
     var changedAttributes = (0, react_1.useMemo)(function () {
         var attributeUris = Object.keys(attributeValues);
-        return previousAttributesValues.current
+        return previousEntityUri.current === entityUri && previousAttributesValues.current
             ? attributeUris.reduce(function (changedAttributes, attributeUri) {
                 var attributeValue = attributeValues[attributeUri];
                 var previousAttributeValue = previousAttributesValues.current[attributeUri];
@@ -30,7 +31,8 @@ var useChangedAttributes = function (attributes, controlAttributes) {
                     : changedAttributes;
             }, []) || []
             : attributeUris;
-    }, [attributeValues]);
+    }, [entityUri, attributeValues]);
+    previousEntityUri.current = entityUri;
     previousAttributesValues.current = attributeValues;
     return changedAttributes;
 };

package/cjs/hooks/useHiddenAttributes/useHiddenAttributes.js CHANGED Viewed

@@ -38,7 +38,7 @@ var useHiddenAttributes = function () {
         });
     }, [ruleBasedAttributes]);
     var newControlAttributes = (0, react_1.useMemo)(function () { return (0, ramda_1.pipe)((0, ramda_1.pluck)('controlAttributes'), ramda_1.flatten, ramda_1.uniq)(parsedRuleBasedAttributes); }, [parsedRuleBasedAttributes]);
-    var changedAttributes = (0, useChangedAttributes_1.useChangedAttributes)(entity === null || entity === void 0 ? void 0 : entity.attributes, newControlAttributes);
+    var changedAttributes = (0, useChangedAttributes_1.useChangedAttributes)(entityUri, entity === null || entity === void 0 ? void 0 : entity.attributes, newControlAttributes);
     var showAttributeURIs = (0, react_1.useMemo)(function () {
         return changedAttributes.length ? (0, helpers_1.findShowAttributeURIs)(changedAttributes, parsedRuleBasedAttributes) : [];
     }, [parsedRuleBasedAttributes, changedAttributes]);

package/cjs/hooks/useHiddenAttributes/useHiddenAttributes.test.js CHANGED Viewed

@@ -104,13 +104,22 @@ describe('useHiddenAttributes', function () {
         ]
     };
     var updateHiddenAttributes = jest.fn();
+    var resetHiddenAttributes = jest.fn();
     var setUp = function () { return (0, react_hooks_1.renderHook)(useHiddenAttributes_1.useHiddenAttributes); };
     beforeEach(function () {
         MdmModuleContext_1.useMdmMetadata.mockReturnValue(metadata);
         MdmModuleContext_1.useMdmEntity.mockReturnValue(null);
         MdmModuleContext_1.useMdmModifiedEntity.mockReturnValue(null);
         MdmModuleContext_1.useMdmMode.mockReturnValue(mdm_sdk_1.Mode.Viewing);
-        MdmModuleContext_1.useMdmAction.mockReturnValue(updateHiddenAttributes);
+        MdmModuleContext_1.useMdmAction.mockImplementation(function (action) {
+            if (action === 'updateHiddenAttributes') {
+                return updateHiddenAttributes;
+            }
+            if (action === 'resetHiddenAttributes') {
+                return resetHiddenAttributes;
+            }
+            return jest.fn();
+        });
     });
     afterEach(function () {
         jest.clearAllMocks();
@@ -367,4 +376,91 @@ describe('useHiddenAttributes', function () {
             'configuration/entityTypes/HCP/attributes/Category2'
         ]);
     });
+    it('does not reset hidden attributes when switching from viewing mode to editing', function () {
+        var entity = {
+            type: 'configuration/entityTypes/HCP',
+            uri: 'entities/uri_e',
+            attributes: {
+                Category1: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri1',
+                        value: 'category1_value1'
+                    }
+                ],
+                Category2: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri2',
+                        value: 'category2_value1'
+                    }
+                ],
+                Category3: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri3',
+                        value: 'category3_value1'
+                    }
+                ],
+                Category4: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri4',
+                        value: 'category4_value1'
+                    }
+                ]
+            }
+        };
+        MdmModuleContext_1.useMdmMode.mockReturnValue(mdm_sdk_1.Mode.Viewing);
+        MdmModuleContext_1.useMdmEntity.mockReturnValue(entity);
+        MdmModuleContext_1.useMdmModifiedEntity.mockReturnValue(null);
+        resetHiddenAttributes.mockClear();
+        var rerender = setUp().rerender;
+        expect(updateHiddenAttributes).toHaveBeenCalledWith(entity.uri, []);
+        MdmModuleContext_1.useMdmMode.mockReturnValue(mdm_sdk_1.Mode.Editing);
+        rerender();
+        expect(resetHiddenAttributes).not.toHaveBeenCalled();
+        resetHiddenAttributes.mockClear();
+        MdmModuleContext_1.useMdmModifiedEntity.mockReturnValue(entity);
+        rerender();
+        expect(resetHiddenAttributes).not.toHaveBeenCalled();
+    });
+    it('updates hidden attributes when saving new entity (switching from editing mode to viewing)', function () {
+        var entity = {
+            type: 'configuration/entityTypes/HCP',
+            uri: 'entities/uri_e_temporary',
+            attributes: {
+                Category1: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri1',
+                        value: 'category1_value1'
+                    }
+                ],
+                Category2: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri2',
+                        value: 'category2_value1'
+                    }
+                ],
+                Category3: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri3',
+                        value: 'category3_value1'
+                    }
+                ],
+                Category4: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri4',
+                        value: 'category4_value1'
+                    }
+                ]
+            }
+        };
+        MdmModuleContext_1.useMdmMode.mockReturnValue(mdm_sdk_1.Mode.Editing);
+        MdmModuleContext_1.useMdmEntity.mockReturnValue(null);
+        MdmModuleContext_1.useMdmModifiedEntity.mockReturnValue(entity);
+        var rerender = setUp().rerender;
+        expect(updateHiddenAttributes).toHaveBeenCalledWith(entity.uri, []);
+        MdmModuleContext_1.useMdmMode.mockReturnValue(mdm_sdk_1.Mode.Viewing);
+        MdmModuleContext_1.useMdmEntity.mockReturnValue(__assign(__assign({}, entity), { uri: 'entities/uri_e_permanent' }));
+        rerender();
+        expect(resetHiddenAttributes).toHaveBeenCalled();
+        expect(updateHiddenAttributes).toHaveBeenCalledWith('entities/uri_e_permanent', []);
+    });
 });

package/esm/features/workflow/hooks/useWorkflowActions.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { WorkflowTaskData } from '@reltio/mdm-sdk';
 import { TaskAction } from '../types';
-type Props = Pick<WorkflowTaskData, 'taskId' | 'possibleActions' | 'assignee' | 'isOpen'>;
-export declare const useWorkflowActions: ({ possibleActions, assignee, taskId, isOpen }: Props) => {
+type Task = Partial<Pick<WorkflowTaskData, 'taskId' | 'possibleActions' | 'assignee' | 'isOpen'>>;
+export declare const useWorkflowActions: (task: Task, onActionSuccess?: (action: string) => void) => {
     actions: TaskAction[];
     actionRequestIsInProgress: boolean;
 };

package/esm/features/workflow/hooks/useWorkflowActions.js CHANGED Viewed

@@ -4,14 +4,15 @@ import { showWorkflowError } from '../helpers/errors';
 import { isOpenTask } from '../helpers/common';
 import { WorkflowTasksContext } from '../../../contexts/WorkflowTasksContext';
 import { useMdmTenant, useMdmUsername, useMdmWorkflowEnvironmentUrl, useMdmWorkflowPath } from '../../../contexts/MdmModuleContext';
-export var useWorkflowActions = function (_a) {
-    var possibleActions = _a.possibleActions, assignee = _a.assignee, taskId = _a.taskId, isOpen = _a.isOpen;
-    var onActionSuccess = (useContext(WorkflowTasksContext) || {}).onActionSuccess;
+export var useWorkflowActions = function (task, onActionSuccess) {
+    var _a = task !== null && task !== void 0 ? task : {}, possibleActions = _a.possibleActions, assignee = _a.assignee, taskId = _a.taskId, isOpen = _a.isOpen;
+    var workflowTasks = useContext(WorkflowTasksContext);
     var workflowPath = useMdmWorkflowPath();
     var environment = useMdmWorkflowEnvironmentUrl();
     var tenant = useMdmTenant();
     var username = useMdmUsername();
     var _b = useState(false), actionRequestIsInProgress = _b[0], setActionRequestIsInProgress = _b[1];
+    var handleActionSuccess = onActionSuccess !== null && onActionSuccess !== void 0 ? onActionSuccess : workflowTasks === null || workflowTasks === void 0 ? void 0 : workflowTasks.onActionSuccess;
     var performTaskAction = useCallback(function (action) { return function (comment) {
         if (workflowPath && taskId) {
             setActionRequestIsInProgress(true);
@@ -25,14 +26,14 @@ export var useWorkflowActions = function (_a) {
                 processInstanceComment: processInstanceComment
             })
                 .then(function () {
-                onActionSuccess === null || onActionSuccess === void 0 ? void 0 : onActionSuccess(action);
+                handleActionSuccess === null || handleActionSuccess === void 0 ? void 0 : handleActionSuccess(action);
             })
                 .catch(showWorkflowError)
                 .finally(function () {
                 setActionRequestIsInProgress(false);
             });
         }
-    }; }, [workflowPath, taskId, environment, tenant, onActionSuccess]);
+    }; }, [workflowPath, taskId, environment, tenant, handleActionSuccess]);
     var actions = useMemo(function () {
         return username === assignee && isOpenTask(isOpen)
             ? (possibleActions || []).map(function (_a) {

package/esm/hooks/useChangedAttributes/useChangedAttributes.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
 import { RecordAttributesType } from '@reltio/mdm-sdk';
-export declare const useChangedAttributes: (attributes: RecordAttributesType, controlAttributes: string[]) => string[];
+export declare const useChangedAttributes: (entityUri: string, attributes: RecordAttributesType, controlAttributes: string[]) => string[];

package/esm/hooks/useChangedAttributes/useChangedAttributes.js CHANGED Viewed

@@ -8,17 +8,18 @@ var getValues = function (controlAttribute, attributes) {
     return flatten(getOvAttributeValuesByPathWithUri(attrPath, attributes));
 };
 var getValuesHash = pipe(pluck('value'), join('-'));
-export var useChangedAttributes = function (attributes, controlAttributes) {
+export var useChangedAttributes = function (entityUri, attributes, controlAttributes) {
+    var previousEntityUri = useRef();
     var previousAttributesValues = useRef();
     var attributeValues = useMemo(function () {
         return controlAttributes.reduce(function (values, controlAttribute) {
             values[controlAttribute] = pipe(getValues, getValuesHash)(controlAttribute, attributes);
             return values;
-        }, {}) || [];
+        }, {});
     }, [controlAttributes, attributes]);
     var changedAttributes = useMemo(function () {
         var attributeUris = Object.keys(attributeValues);
-        return previousAttributesValues.current
+        return previousEntityUri.current === entityUri && previousAttributesValues.current
             ? attributeUris.reduce(function (changedAttributes, attributeUri) {
                 var attributeValue = attributeValues[attributeUri];
                 var previousAttributeValue = previousAttributesValues.current[attributeUri];
@@ -27,7 +28,8 @@ export var useChangedAttributes = function (attributes, controlAttributes) {
                     : changedAttributes;
             }, []) || []
             : attributeUris;
-    }, [attributeValues]);
+    }, [entityUri, attributeValues]);
+    previousEntityUri.current = entityUri;
     previousAttributesValues.current = attributeValues;
     return changedAttributes;
 };

package/esm/hooks/useHiddenAttributes/useHiddenAttributes.js CHANGED Viewed

@@ -35,7 +35,7 @@ export var useHiddenAttributes = function () {
         });
     }, [ruleBasedAttributes]);
     var newControlAttributes = useMemo(function () { return pipe(pluck('controlAttributes'), flatten, uniq)(parsedRuleBasedAttributes); }, [parsedRuleBasedAttributes]);
-    var changedAttributes = useChangedAttributes(entity === null || entity === void 0 ? void 0 : entity.attributes, newControlAttributes);
+    var changedAttributes = useChangedAttributes(entityUri, entity === null || entity === void 0 ? void 0 : entity.attributes, newControlAttributes);
     var showAttributeURIs = useMemo(function () {
         return changedAttributes.length ? findShowAttributeURIs(changedAttributes, parsedRuleBasedAttributes) : [];
     }, [parsedRuleBasedAttributes, changedAttributes]);

package/esm/hooks/useHiddenAttributes/useHiddenAttributes.test.js CHANGED Viewed

@@ -102,13 +102,22 @@ describe('useHiddenAttributes', function () {
         ]
     };
     var updateHiddenAttributes = jest.fn();
+    var resetHiddenAttributes = jest.fn();
     var setUp = function () { return renderHook(useHiddenAttributes); };
     beforeEach(function () {
         useMdmMetadata.mockReturnValue(metadata);
         useMdmEntity.mockReturnValue(null);
         useMdmModifiedEntity.mockReturnValue(null);
         useMdmMode.mockReturnValue(Mode.Viewing);
-        useMdmAction.mockReturnValue(updateHiddenAttributes);
+        useMdmAction.mockImplementation(function (action) {
+            if (action === 'updateHiddenAttributes') {
+                return updateHiddenAttributes;
+            }
+            if (action === 'resetHiddenAttributes') {
+                return resetHiddenAttributes;
+            }
+            return jest.fn();
+        });
     });
     afterEach(function () {
         jest.clearAllMocks();
@@ -365,4 +374,91 @@ describe('useHiddenAttributes', function () {
             'configuration/entityTypes/HCP/attributes/Category2'
         ]);
     });
+    it('does not reset hidden attributes when switching from viewing mode to editing', function () {
+        var entity = {
+            type: 'configuration/entityTypes/HCP',
+            uri: 'entities/uri_e',
+            attributes: {
+                Category1: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri1',
+                        value: 'category1_value1'
+                    }
+                ],
+                Category2: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri2',
+                        value: 'category2_value1'
+                    }
+                ],
+                Category3: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri3',
+                        value: 'category3_value1'
+                    }
+                ],
+                Category4: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri4',
+                        value: 'category4_value1'
+                    }
+                ]
+            }
+        };
+        useMdmMode.mockReturnValue(Mode.Viewing);
+        useMdmEntity.mockReturnValue(entity);
+        useMdmModifiedEntity.mockReturnValue(null);
+        resetHiddenAttributes.mockClear();
+        var rerender = setUp().rerender;
+        expect(updateHiddenAttributes).toHaveBeenCalledWith(entity.uri, []);
+        useMdmMode.mockReturnValue(Mode.Editing);
+        rerender();
+        expect(resetHiddenAttributes).not.toHaveBeenCalled();
+        resetHiddenAttributes.mockClear();
+        useMdmModifiedEntity.mockReturnValue(entity);
+        rerender();
+        expect(resetHiddenAttributes).not.toHaveBeenCalled();
+    });
+    it('updates hidden attributes when saving new entity (switching from editing mode to viewing)', function () {
+        var entity = {
+            type: 'configuration/entityTypes/HCP',
+            uri: 'entities/uri_e_temporary',
+            attributes: {
+                Category1: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri1',
+                        value: 'category1_value1'
+                    }
+                ],
+                Category2: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri2',
+                        value: 'category2_value1'
+                    }
+                ],
+                Category3: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri3',
+                        value: 'category3_value1'
+                    }
+                ],
+                Category4: [
+                    {
+                        uri: 'entities/uri_e/attributes/uri4',
+                        value: 'category4_value1'
+                    }
+                ]
+            }
+        };
+        useMdmMode.mockReturnValue(Mode.Editing);
+        useMdmEntity.mockReturnValue(null);
+        useMdmModifiedEntity.mockReturnValue(entity);
+        var rerender = setUp().rerender;
+        expect(updateHiddenAttributes).toHaveBeenCalledWith(entity.uri, []);
+        useMdmMode.mockReturnValue(Mode.Viewing);
+        useMdmEntity.mockReturnValue(__assign(__assign({}, entity), { uri: 'entities/uri_e_permanent' }));
+        rerender();
+        expect(resetHiddenAttributes).toHaveBeenCalled();
+        expect(updateHiddenAttributes).toHaveBeenCalledWith('entities/uri_e_permanent', []);
+    });
 });

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.1889",
+  "version": "1.4.1891",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -8,7 +8,7 @@
     "@fluentui/react-context-selector": "^9.1.26",
     "@react-google-maps/api": "2.7.0",
     "@react-sigma/core": "3.4.0",
-    "@reltio/mdm-sdk": "^1.4.1823",
+    "@reltio/mdm-sdk": "^1.4.1824",
     "classnames": "^2.2.5",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",