cozy-client 60.12.2 → 60.13.0

package/dist/CozyClient.js

@@ -3126,7 +3126,7 @@ var CozyClient = /*#__PURE__*/function () {
 CozyClient.hooks = CozyClient.hooks || {};
 CozyClient.fetchPolicies = _policies.default; //COZY_CLIENT_VERSION_PACKAGE in replaced by babel. See babel config
 
-CozyClient.version = "60.12.2";
+CozyClient.version = "60.13.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/hooks/useFetchHomeShortcuts.js

@@ -55,7 +55,7 @@ var useFetchHomeShortcuts = function useFetchHomeShortcuts() {
   })),
       shortcuts = _useQuery.data;
 
-  return shortcuts;
+  return shortcuts || [];
 };
 
 var _default = useFetchHomeShortcuts;

package/dist/store/documents.js

@@ -31,7 +31,20 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-var deepmergeFn = (0, _deepmerge.default)();
+// By default, deepmerge concatenate array values.
+// We do not want concatenation and we do not know how to do partial updates
+// so we decide to keep the array of the new data.
+// In deepmerge semantics, source object is applied on target object
+var replaceByClonedSource = function replaceByClonedSource(options) {
+  var clone = options.clone;
+  return function (target, source) {
+    return clone(source);
+  };
+};
+
+var deepmergeFn = (0, _deepmerge.default)({
+  mergeArray: replaceByClonedSource
+});
 
 var storeDocument = function storeDocument(state, document) {
   var type = document._type;

package/dist/store/documents.spec.js

@@ -112,6 +112,78 @@ describe('extractAndMerge', () => {
     expect(returnedDatas).toEqual(manuallyMergedData)
   })
 
+  it('should select new value from data', () => {
+    const returnedDatas = extractAndMergeDocument(
+      // data
+      [
+        {
+          _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+          _type: 'io.cozy.files',
+          blibli: 'new value'
+        }
+      ],
+      // updatedStateWithIncluded
+      {
+        'io.cozy.files': {
+          b6ff135b34e041ffb2d4a4865f3e235f: {
+            _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+            _type: 'io.cozy.files',
+            blibli: 'old value'
+          }
+        }
+      }
+    )
+
+    const manuallyMergedData = {
+      'io.cozy.files': {
+        b6ff135b34e041ffb2d4a4865f3e235f: {
+          _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+          _type: 'io.cozy.files',
+          blibli: 'new value'
+        }
+      }
+    }
+    expect(returnedDatas).toEqual(manuallyMergedData)
+  })
+
+  it('should not concatenate arrays', () => {
+    const returnedDatas = extractAndMergeDocument(
+      // data
+      [
+        {
+          _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+          _type: 'io.cozy.files',
+          blibli: 'a new field',
+          tags: ['b']
+        }
+      ],
+      // updatedStateWithIncluded
+      {
+        'io.cozy.files': {
+          b6ff135b34e041ffb2d4a4865f3e235f: {
+            _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+            _type: 'io.cozy.files',
+            blublu: 'another new field',
+            tags: ['a']
+          }
+        }
+      }
+    )
+
+    const manuallyMergedData = {
+      'io.cozy.files': {
+        b6ff135b34e041ffb2d4a4865f3e235f: {
+          _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+          _type: 'io.cozy.files',
+          blibli: 'a new field',
+          blublu: 'another new field',
+          tags: ['b']
+        }
+      }
+    }
+    expect(returnedDatas).toEqual(manuallyMergedData)
+  })
+
   it(
     'should assign a new object for doctype of document to update' +
       'in order to allow selector to recompute their data when documents are updated',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "60.12.2",
+  "version": "60.13.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -74,5 +74,5 @@
     "react-native-ios11-devicecheck": "^0.0.3"
   },
   "sideEffects": false,
-  "gitHead": "907fa311e677875d470634ee0c62c8b91dc51add"
+  "gitHead": "4f2002995a7e321591cbf56b4d4235cd062457ce"
 }