cozy-client 27.15.3 → 27.17.0

package/dist/CozyClient.js

@@ -2464,7 +2464,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 = "27.15.3";
+CozyClient.version = "27.17.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/models/folder.js

@@ -29,7 +29,8 @@ var MAGIC_FOLDERS = {
   PHOTOS_UPLOAD: "".concat(APP_DOCTYPE, "/").concat(photos, "/upload"),
   NOTES: "".concat(APP_DOCTYPE, "/notes"),
   HOME: "".concat(APP_DOCTYPE, "/home"),
-  PAPERS: "".concat(APP_DOCTYPE, "/").concat(administrative, "/papers")
+  PAPERS: "".concat(APP_DOCTYPE, "/").concat(administrative, "/papers"),
+  COACH_CO2: "".concat(APP_DOCTYPE, "/").concat(administrative, "/coachco2")
 };
 /**
  * Returns a "Magic Folder", given its id. See https://docs.cozy.io/en/cozy-doctypes/docs/io.cozy.apps/#special-iocozyapps-doctypes

package/dist/models/folder.spec.js

@@ -22,6 +22,7 @@ describe('Folder model', () => {
     expect(MAGIC_FOLDERS.NOTES).toBeDefined()
     expect(MAGIC_FOLDERS.HOME).toBeDefined()
     expect(MAGIC_FOLDERS.PAPERS).toBeDefined()
+    expect(MAGIC_FOLDERS.COACH_CO2).toBeDefined()
   })
 
   describe('ensureMagicFolder', () => {

package/dist/store/documents.js

@@ -159,16 +159,16 @@ var getCollectionFromSlice = function getCollectionFromSlice() {
   return Object.values(state[doctype]);
 };
 /*
-  This method has been created in order to get a returned object 
-  in `data` with the full set on information coming potentially from 
-  ìncluded`
+  This method has been created in order to get a returned object
+  in `data` with the full set on information coming potentially from
+  `included`
 
-  This method should be somewhere else. The `document` shall not be 
-  deal with included / data and so on. 
+  This method should be somewhere else. The `document` shall not be
+  dealt with included / data and so on.
 
-  This method takes data and included and merge both sources 
-  together. It should be always up to date. The returned object 
-  will be as full of informations as it can be.
+  This method takes `data` and `included` and merge both sources
+  together. It should be always up-to-date. The returned object
+  will be as full of information as it can be.
 */
 
 
@@ -185,8 +185,8 @@ var extractAndMergeDocument = function extractAndMergeDocument(data, updatedStat
 
   var sortedData = (0, _keyBy.default)(data, _helpers.properId);
   var mergedData = Object.assign({}, updatedStateWithIncluded);
+  mergedData[doctype] = Object.assign({}, updatedStateWithIncluded[doctype]);
   Object.values(sortedData).map(function (data) {
-    if (!mergedData[doctype]) mergedData[doctype] = {};
     var id = (0, _helpers.properId)(data);
 
     if (mergedData[doctype][id]) {

package/dist/store/documents.spec.js

@@ -4,23 +4,25 @@ import {
 } from './documents'
 
 describe('extractAndMerge', () => {
-  it('should return the right data', () => {
-    const data = {
-      0: {
-        id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
-        _id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
-        type: 'io.cozy.files',
-        _type: 'io.cozy.files'
-      },
-      1: {
-        id: 'b6ff135b34e041ffb2d4a4865f3e235f',
-        type: 'io.cozy.files',
-        _type: 'io.cozy.files',
-        _id: 'b6ff135b34e041ffb2d4a4865f3e235f'
-      }
+  const data = {
+    0: {
+      id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
+      _id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
+      type: 'io.cozy.files',
+      _type: 'io.cozy.files',
+      blabla: 'new field'
+    },
+    1: {
+      id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+      type: 'io.cozy.files',
+      _type: 'io.cozy.files',
+      _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+      blibli: 'another new field'
     }
-    const updatedStateWithIncluded = {
-      0: {
+  }
+  const updatedStateWithIncluded = {
+    'io.cozy.files': {
+      b6ff135b34e041ffb2d4a4865f3e0a53: {
         attributes: {
           type: 'file',
           name: 'IMG_0016.PNG',
@@ -38,7 +40,7 @@ describe('extractAndMerge', () => {
         type: 'io.cozy.files',
         _type: 'io.cozy.files'
       },
-      1: {
+      b6ff135b34e041ffb2d4a4865f3e235f: {
         attributes: {
           type: 'file',
           name: 'IMG_0054.PNG',
@@ -57,65 +59,112 @@ describe('extractAndMerge', () => {
         _type: 'io.cozy.files'
       }
     }
+  }
+
+  it('should return the right data', () => {
     const returnedDatas = extractAndMergeDocument(
       data,
       updatedStateWithIncluded
     )
 
     const manuallyMergedData = {
-      '0': {
-        _id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
-        _type: 'io.cozy.files',
-        attributes: {
-          dir_id: '7d2f9c24cd345ce3171bf71f401e80c6',
-          name: 'IMG_0016.PNG',
-          type: 'file'
-        },
-        id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
-        links: { self: '/files/b6ff135b34e041ffb2d4a4865f3e0a53' },
-        meta: { rev: '5-87840eceaab358e38aa8b6bb0d4577b1' },
-        relationships: {
-          parent: {
-            links: { related: '/files/7d2f9c24cd345ce3171bf71f401e80c6' }
-          }
-        },
-        type: 'io.cozy.files'
-      },
-      '1': {
-        _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
-        _type: 'io.cozy.files',
-        attributes: {
-          dir_id: '7d2f9c24cd345ce3171bf71f401e80c6',
-          name: 'IMG_0054.PNG',
-          type: 'file'
-        },
-        id: 'b6ff135b34e041ffb2d4a4865f3e235f',
-        links: { self: '/files/b6ff135b34e041ffb2d4a4865f3e235f' },
-        meta: { rev: '5-ca91c0dc02dafb38eb56070c1d80d62c' },
-        relationships: {
-          parent: {
-            links: { related: '/files/7d2f9c24cd345ce3171bf71f401e80c6' }
-          }
-        },
-        type: 'io.cozy.files'
-      },
       'io.cozy.files': {
         b6ff135b34e041ffb2d4a4865f3e0a53: {
           _id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
           _type: 'io.cozy.files',
+          attributes: {
+            dir_id: '7d2f9c24cd345ce3171bf71f401e80c6',
+            name: 'IMG_0016.PNG',
+            type: 'file'
+          },
+          blabla: 'new field',
           id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
+          links: { self: '/files/b6ff135b34e041ffb2d4a4865f3e0a53' },
+          meta: { rev: '5-87840eceaab358e38aa8b6bb0d4577b1' },
+          relationships: {
+            parent: {
+              links: { related: '/files/7d2f9c24cd345ce3171bf71f401e80c6' }
+            }
+          },
           type: 'io.cozy.files'
         },
         b6ff135b34e041ffb2d4a4865f3e235f: {
           _id: 'b6ff135b34e041ffb2d4a4865f3e235f',
           _type: 'io.cozy.files',
+          attributes: {
+            dir_id: '7d2f9c24cd345ce3171bf71f401e80c6',
+            name: 'IMG_0054.PNG',
+            type: 'file'
+          },
+          blibli: 'another new field',
           id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+          links: { self: '/files/b6ff135b34e041ffb2d4a4865f3e235f' },
+          meta: { rev: '5-ca91c0dc02dafb38eb56070c1d80d62c' },
+          relationships: {
+            parent: {
+              links: { related: '/files/7d2f9c24cd345ce3171bf71f401e80c6' }
+            }
+          },
           type: 'io.cozy.files'
         }
       }
     }
     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',
+    () => {
+      const returnedDatas = extractAndMergeDocument(
+        data,
+        updatedStateWithIncluded
+      )
+
+      // Then
+      expect(
+        returnedDatas['io.cozy.files'] ===
+          updatedStateWithIncluded['io.cozy.files']
+      ).toBeFalsy()
+    }
+  )
+
+  it(
+    'should assign a new object for doctype of document to update' +
+      'even if the mergedData is the same, because reselect createSelector update ' +
+      'according to object reference, not only value',
+    () => {
+      const dataAlreadyIncludedInUpdatedStateWithIncluded = {
+        0: {
+          id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
+          _id: 'b6ff135b34e041ffb2d4a4865f3e0a53',
+          type: 'io.cozy.files',
+          _type: 'io.cozy.files'
+        },
+        1: {
+          id: 'b6ff135b34e041ffb2d4a4865f3e235f',
+          type: 'io.cozy.files',
+          _type: 'io.cozy.files',
+          _id: 'b6ff135b34e041ffb2d4a4865f3e235f'
+        }
+      }
+
+      const returnedDatas = extractAndMergeDocument(
+        dataAlreadyIncludedInUpdatedStateWithIncluded,
+        updatedStateWithIncluded
+      )
+
+      // Then
+      expect(
+        returnedDatas['io.cozy.files'] ===
+          updatedStateWithIncluded['io.cozy.files']
+      ).toBeFalsy()
+
+      expect(returnedDatas['io.cozy.files']).toEqual(
+        updatedStateWithIncluded['io.cozy.files']
+      )
+    }
+  )
 })
 
 describe('mergeDocumentsWithRelationships', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "27.15.3",
+  "version": "27.17.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -21,7 +21,7 @@
     "cozy-device-helper": "^1.12.0",
     "cozy-flags": "2.7.1",
     "cozy-logger": "^1.6.0",
-    "cozy-stack-client": "^27.15.0",
+    "cozy-stack-client": "^27.17.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.13",
     "microee": "^0.0.6",
@@ -71,5 +71,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "22b5f77ecd2a97510f15c06243191e9b1300c141"
+  "gitHead": "f10fc26fb792b5b7ab5e57479cd94a64c4270837"
 }

package/types/models/folder.d.ts

@@ -6,6 +6,7 @@ export namespace MAGIC_FOLDERS {
     const NOTES: string;
     const HOME: string;
     const PAPERS: string;
+    const COACH_CO2: string;
 }
 export function ensureMagicFolder(client: CozyClient, id: string, path: string): Promise<IOCozyFolder>;
 export function createFolderWithReference(client: CozyClient, path: string, document: CozyClientDocument): Promise<IOCozyFolder>;