@reltio/components 1.4.1888 → 1.4.1890

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

@@ -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

@@ -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

@@ -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

@@ -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/hooks/useChangedAttributes/useChangedAttributes.d.ts

@@ -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

@@ -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

@@ -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

@@ -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

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.1888",
+  "version": "1.4.1890",
   "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.1822",
+    "@reltio/mdm-sdk": "^1.4.1823",
     "classnames": "^2.2.5",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",