cozy-client 47.6.0 → 48.0.0

package/dist/CozyClient.js

@@ -2620,6 +2620,54 @@ var CozyClient = /*#__PURE__*/function () {
 
       return saveAfterFetchSettings;
     }()
+    /**
+     * Reset a query
+     *
+     * This method will reset the query state to its initial state and refetch it.
+     *
+     * @param {string} queryId - Query id
+     * @returns {Promise<import("./types").QueryState>} - Query state
+     */
+
+  }, {
+    key: "resetQuery",
+    value: function () {
+      var _resetQuery2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21(queryId) {
+        var query;
+        return _regenerator.default.wrap(function _callee21$(_context21) {
+          while (1) {
+            switch (_context21.prev = _context21.next) {
+              case 0:
+                _context21.prev = 0;
+                this.dispatch((0, _store.resetQuery)(queryId));
+                query = this.getQueryFromState(queryId);
+                _context21.next = 5;
+                return this.query(query.definition, {
+                  as: queryId
+                });
+
+              case 5:
+                return _context21.abrupt("return", _context21.sent);
+
+              case 8:
+                _context21.prev = 8;
+                _context21.t0 = _context21["catch"](0);
+                throw _context21.t0;
+
+              case 11:
+              case "end":
+                return _context21.stop();
+            }
+          }
+        }, _callee21, this, [[0, 8]]);
+      }));
+
+      function resetQuery(_x22) {
+        return _resetQuery2.apply(this, arguments);
+      }
+
+      return resetQuery;
+    }()
   }], [{
     key: "fromOldClient",
     value: function fromOldClient(oldClient, options) {
@@ -2642,22 +2690,22 @@ var CozyClient = /*#__PURE__*/function () {
   }, {
     key: "fromOldOAuthClient",
     value: function () {
-      var _fromOldOAuthClient = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21(oldClient, options) {
+      var _fromOldOAuthClient = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22(oldClient, options) {
         var credentials, oauthOptions, client;
-        return _regenerator.default.wrap(function _callee21$(_context21) {
+        return _regenerator.default.wrap(function _callee22$(_context22) {
           while (1) {
-            switch (_context21.prev = _context21.next) {
+            switch (_context22.prev = _context22.next) {
               case 0:
                 if (!oldClient._oauth) {
-                  _context21.next = 12;
+                  _context22.next = 12;
                   break;
                 }
 
-                _context21.next = 3;
+                _context22.next = 3;
                 return oldClient.authorize();
 
               case 3:
-                credentials = _context21.sent;
+                credentials = _context22.sent;
                 oauthOptions = {
                   oauth: credentials.client,
                   token: credentials.token,
@@ -2668,28 +2716,28 @@ var CozyClient = /*#__PURE__*/function () {
                 }, oauthOptions), options));
 
                 if (!client.loginPromise) {
-                  _context21.next = 9;
+                  _context22.next = 9;
                   break;
                 }
 
-                _context21.next = 9;
+                _context22.next = 9;
                 return client.loginPromise;
 
               case 9:
-                return _context21.abrupt("return", client);
+                return _context22.abrupt("return", client);
 
               case 12:
                 throw new Error('Cannot instantiate a new client: old client is not an OAuth client. CozyClient.fromOldClient might be more suitable.');
 
               case 13:
               case "end":
-                return _context21.stop();
+                return _context22.stop();
             }
           }
-        }, _callee21);
+        }, _callee22);
       }));
 
-      function fromOldOAuthClient(_x22, _x23) {
+      function fromOldOAuthClient(_x23, _x24) {
         return _fromOldOAuthClient.apply(this, arguments);
       }
 
@@ -2782,7 +2830,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 = "47.6.0";
+CozyClient.version = "48.0.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/CozyClient.spec.js

@@ -30,7 +30,8 @@ import {
   receiveMutationError,
   getQueryFromState,
   getRawQueryFromState,
-  loadQuery
+  loadQuery,
+  resetQuery
 } from './store'
 import { HasManyFiles, Association, HasMany } from './associations'
 import mapValues from 'lodash/mapValues'
@@ -1872,6 +1873,37 @@ describe('CozyClient', () => {
       })
     })
   })
+
+  describe('resetQuery', () => {
+    const fakeResponse = {
+      data: [TODO_1, TODO_2, TODO_3]
+    }
+
+    afterEach(() => {
+      jest.restoreAllMocks()
+    })
+
+    it('should reset the query state and refetch it', async () => {
+      requestHandler.mockResolvedValue(fakeResponse)
+      const queryDefinition = Q('io.cozy.todos')
+      const queryId = 'allTodos'
+      getQueryFromState.mockReturnValue({
+        definition: queryDefinition,
+        id: queryId,
+        data: fakeResponse
+      })
+
+      await client.resetQuery(queryId)
+
+      const dispatchCalls = client.store.dispatch.mock.calls
+      const firstDispatchCall = dispatchCalls[0]
+      expect(firstDispatchCall[0]).toEqual(resetQuery(queryId))
+      const lastDispatchCall = dispatchCalls[dispatchCalls.length - 1]
+      expect(lastDispatchCall[0]).toEqual(
+        receiveQueryResult('allTodos', fakeResponse)
+      )
+    })
+  })
 })
 
 describe('file creation', () => {

package/dist/models/file.js

@@ -457,25 +457,29 @@ var getFullpath = /*#__PURE__*/function () {
 }();
 /**
  * Move file to destination.
+ * Manage 4 cases :
+ * - Move inside a Cozy server
+ * - Move inside a Nextcloud server
+ * - Move from a Nextcloud server to Cozy
+ * - Move from Cozy to a Nextcloud server
  *
- * @param {CozyClient} client             - The CozyClient instance
- * @param   {string} fileId               - The file's id (required)
- * @param   {object} destination          - The destination object containing:
- * @param   {string} destination.folderId - The destination folder's id (required)
- * @param   {string} destination.path     - The file's path after the move (optional, used to optimize performance in case of conflict)
- * @param   {boolean} force               - Whether we should overwrite, i.e. put to trash, the destination in case of conflict (defaults to false).
- * @returns {Promise}                     - A promise that returns the move action response and the deleted file id (if any) if resolved or an Error if rejected
- *
+ * @param {CozyClient} client                                                                    - The CozyClient instance
+ * @param {import('../types').IOCozyFile | import('../types').NextcloudFile} file                - The file to move (required)
+ * @param {import('../types').IOCozyFolder | import('../types').NextcloudFile} destination       - The destination folder (required)
+ * @param {object} options                                                                       - The options
+ * @param {boolean} options.force                                                                - Whether we should overwrite,
+ * i.e. put to trash, the destination in case of conflict (defaults to false).
+ * @returns {Promise<{moved: undefined|import('../types').IOCozyFile, deleted: null|string[] }>} - A promise that returns the move action response (if any)
+ * and the deleted file id (if any) if resolved or an Error if rejected
  */
 
 
 exports.getFullpath = getFullpath;
 
 var move = /*#__PURE__*/function () {
-  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(client, fileId, destination) {
-    var force,
-        folderId,
-        path,
+  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(client, file, destination) {
+    var _ref6,
+        force,
         resp,
         destinationPath,
         _yield$client$query2,
@@ -489,84 +493,141 @@ var move = /*#__PURE__*/function () {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
-            force = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : false;
-            folderId = destination.folderId, path = destination.path;
-            _context4.prev = 2;
-            _context4.next = 5;
-            return client.collection(_const.DOCTYPE_FILES).updateFileMetadata(fileId, {
-              dir_id: folderId
+            _ref6 = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : {
+              force: false
+            }, force = _ref6.force;
+            _context4.prev = 1;
+
+            if (!(file._type === 'io.cozy.remote.nextcloud.files')) {
+              _context4.next = 10;
+              break;
+            }
+
+            if (!(destination._type === 'io.cozy.remote.nextcloud.files')) {
+              _context4.next = 7;
+              break;
+            }
+
+            _context4.next = 6;
+            return client.collection('io.cozy.remote.nextcloud.files').move(file, destination);
+
+          case 6:
+            return _context4.abrupt("return", {
+              moved: undefined,
+              deleted: null
+            });
+
+          case 7:
+            _context4.next = 9;
+            return client.collection('io.cozy.remote.nextcloud.files').moveToCozy(file, destination);
+
+          case 9:
+            return _context4.abrupt("return", {
+              moved: undefined,
+              deleted: null
+            });
+
+          case 10:
+            if (!(destination._type === 'io.cozy.remote.nextcloud.files')) {
+              _context4.next = 14;
+              break;
+            }
+
+            _context4.next = 13;
+            return client.collection('io.cozy.remote.nextcloud.files').moveFromCozy(destination, file);
+
+          case 13:
+            return _context4.abrupt("return", {
+              moved: undefined,
+              deleted: null
             });
 
-          case 5:
+          case 14:
+            _context4.next = 19;
+            break;
+
+          case 16:
+            _context4.prev = 16;
+            _context4.t0 = _context4["catch"](1);
+            throw _context4.t0;
+
+          case 19:
+            _context4.prev = 19;
+            _context4.next = 22;
+            return client.collection(_const.DOCTYPE_FILES).updateFileMetadata(file._id, {
+              dir_id: destination._id
+            });
+
+          case 22:
             resp = _context4.sent;
             return _context4.abrupt("return", {
               moved: resp.data,
               deleted: null
             });
 
-          case 9:
-            _context4.prev = 9;
-            _context4.t0 = _context4["catch"](2);
+          case 26:
+            _context4.prev = 26;
+            _context4.t1 = _context4["catch"](19);
 
-            if (!(_context4.t0.status === 409 && force)) {
-              _context4.next = 35;
+            if (!(_context4.t1.status === 409 && force)) {
+              _context4.next = 52;
               break;
             }
 
-            if (!path) {
-              _context4.next = 16;
+            if (!destination.path) {
+              _context4.next = 33;
               break;
             }
 
-            destinationPath = path;
-            _context4.next = 24;
+            destinationPath = destination.path;
+            _context4.next = 41;
             break;
 
-          case 16:
-            _context4.next = 18;
-            return client.query((0, _dsl.Q)(_const.DOCTYPE_FILES).getById(fileId));
+          case 33:
+            _context4.next = 35;
+            return client.query((0, _dsl.Q)(_const.DOCTYPE_FILES).getById(file._id));
 
-          case 18:
+          case 35:
             _yield$client$query2 = _context4.sent;
             movedFile = _yield$client$query2.data;
             filename = movedFile.name;
-            _context4.next = 23;
-            return getFullpath(client, folderId, filename);
+            _context4.next = 40;
+            return getFullpath(client, destination._id, filename);
 
-          case 23:
+          case 40:
             destinationPath = _context4.sent;
 
-          case 24:
-            _context4.next = 26;
+          case 41:
+            _context4.next = 43;
             return client.collection(_const.DOCTYPE_FILES).statByPath(destinationPath);
 
-          case 26:
+          case 43:
             conflictResp = _context4.sent;
-            _context4.next = 29;
+            _context4.next = 46;
             return client.collection(_const.DOCTYPE_FILES).destroy(conflictResp.data);
 
-          case 29:
-            _context4.next = 31;
-            return client.collection(_const.DOCTYPE_FILES).updateFileMetadata(fileId, {
-              dir_id: folderId
+          case 46:
+            _context4.next = 48;
+            return client.collection(_const.DOCTYPE_FILES).updateFileMetadata(file._id, {
+              dir_id: destination._id
             });
 
-          case 31:
+          case 48:
             _resp = _context4.sent;
             return _context4.abrupt("return", {
               moved: _resp.data,
               deleted: conflictResp.data.id
             });
 
-          case 35:
-            throw _context4.t0;
+          case 52:
+            throw _context4.t1;
 
-          case 36:
+          case 53:
           case "end":
             return _context4.stop();
         }
       }
-    }, _callee4, null, [[2, 9]]);
+    }, _callee4, null, [[1, 16], [19, 26]]);
   }));
 
   return function move(_x9, _x10, _x11) {
@@ -588,7 +649,7 @@ var move = /*#__PURE__*/function () {
 exports.move = move;
 
 var overrideFileForPath = /*#__PURE__*/function () {
-  var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(client, dirPath, file, metadata) {
+  var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(client, dirPath, file, metadata) {
     var path, filesCollection, existingFile, _existingFile$data, fileId, dirId, resp, _dirId, createdFile;
 
     return _regenerator.default.wrap(function _callee5$(_context5) {
@@ -652,7 +713,7 @@ var overrideFileForPath = /*#__PURE__*/function () {
   }));
 
   return function overrideFileForPath(_x12, _x13, _x14, _x15) {
-    return _ref6.apply(this, arguments);
+    return _ref7.apply(this, arguments);
   };
 }();
 /**
@@ -730,7 +791,7 @@ var generateFileNameForRevision = function generateFileNameForRevision(file, rev
 exports.generateFileNameForRevision = generateFileNameForRevision;
 
 var uploadFileWithConflictStrategy = /*#__PURE__*/function () {
-  var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(client, file, options) {
+  var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(client, file, options) {
     var name, dirId, conflictStrategy, conflictOptions, path, existingFile, fileId, resp, _splitFilename2, filename, extension, newFileName;
 
     return _regenerator.default.wrap(function _callee6$(_context6) {
@@ -804,7 +865,7 @@ var uploadFileWithConflictStrategy = /*#__PURE__*/function () {
   }));
 
   return function uploadFileWithConflictStrategy(_x16, _x17, _x18) {
-    return _ref7.apply(this, arguments);
+    return _ref8.apply(this, arguments);
   };
 }();
 /**
@@ -817,7 +878,7 @@ var uploadFileWithConflictStrategy = /*#__PURE__*/function () {
 exports.uploadFileWithConflictStrategy = uploadFileWithConflictStrategy;
 
 var readMobileFile = /*#__PURE__*/function () {
-  var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(fileURL) {
+  var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(fileURL) {
     var p;
     return _regenerator.default.wrap(function _callee10$(_context10) {
       while (1) {
@@ -828,13 +889,13 @@ var readMobileFile = /*#__PURE__*/function () {
              */
             p = new Promise(function (resolve, reject) {
               var onResolvedLocalFS = /*#__PURE__*/function () {
-                var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(fileEntry) {
+                var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(fileEntry) {
                   return _regenerator.default.wrap(function _callee9$(_context9) {
                     while (1) {
                       switch (_context9.prev = _context9.next) {
                         case 0:
                           fileEntry.file( /*#__PURE__*/function () {
-                            var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(file) {
+                            var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(file) {
                               var reader;
                               return _regenerator.default.wrap(function _callee8$(_context8) {
                                 while (1) {
@@ -867,7 +928,7 @@ var readMobileFile = /*#__PURE__*/function () {
                             }));
 
                             return function (_x21) {
-                              return _ref10.apply(this, arguments);
+                              return _ref11.apply(this, arguments);
                             };
                           }(), function (err) {
                             // Since this module is pretty recent, let's have this info in sentry if needed
@@ -885,7 +946,7 @@ var readMobileFile = /*#__PURE__*/function () {
                 }));
 
                 return function onResolvedLocalFS(_x20) {
-                  return _ref9.apply(this, arguments);
+                  return _ref10.apply(this, arguments);
                 };
               }();
 
@@ -916,7 +977,7 @@ var readMobileFile = /*#__PURE__*/function () {
   }));
 
   return function readMobileFile(_x19) {
-    return _ref8.apply(this, arguments);
+    return _ref9.apply(this, arguments);
   };
 }();
 /**
@@ -931,7 +992,7 @@ var readMobileFile = /*#__PURE__*/function () {
 exports.readMobileFile = readMobileFile;
 
 var doMobileUpload = /*#__PURE__*/function () {
-  var _ref12 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11(client, fileURL, options) {
+  var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11(client, fileURL, options) {
     var file;
     return _regenerator.default.wrap(function _callee11$(_context11) {
       while (1) {
@@ -953,7 +1014,7 @@ var doMobileUpload = /*#__PURE__*/function () {
   }));
 
   return function doMobileUpload(_x22, _x23, _x24) {
-    return _ref12.apply(this, arguments);
+    return _ref13.apply(this, arguments);
   };
 }();
 /**
@@ -1013,7 +1074,7 @@ var isFromKonnector = function isFromKonnector(file) {
 exports.isFromKonnector = isFromKonnector;
 
 var fetchBlobFileById = /*#__PURE__*/function () {
-  var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(client, fileId) {
+  var _ref14 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(client, fileId) {
     var fileColl, fileBin, fileBlob;
     return _regenerator.default.wrap(function _callee12$(_context12) {
       while (1) {
@@ -1041,7 +1102,7 @@ var fetchBlobFileById = /*#__PURE__*/function () {
   }));
 
   return function fetchBlobFileById(_x25, _x26) {
-    return _ref13.apply(this, arguments);
+    return _ref14.apply(this, arguments);
   };
 }();
 

package/dist/models/file.spec.js

@@ -16,6 +16,9 @@ const updateFileMetadataSpy = jest.fn().mockName('updateFileMetadata')
 const createFileSpy = jest.fn().mockName('createFileSpy')
 const updateFileSpy = jest.fn().mockName('updateFileSpy')
 const fetchFileContentByIdSpy = jest.fn().mockName('fetchFileContentById')
+const moveSpy = jest.fn().mockName('move')
+const moveToCozySpy = jest.fn().mockName('moveToCozy')
+const moveFromCozySpy = jest.fn().mockName('moveFromCozy')
 
 beforeAll(() => {
   cozyClient.stackClient.collection.mockReturnValue({
@@ -25,7 +28,10 @@ beforeAll(() => {
     updateFileMetadata: updateFileMetadataSpy,
     createFile: createFileSpy,
     updateFile: updateFileSpy,
-    fetchFileContentById: fetchFileContentByIdSpy
+    fetchFileContentById: fetchFileContentByIdSpy,
+    move: moveSpy,
+    moveToCozy: moveToCozySpy,
+    moveFromCozy: moveFromCozySpy
   })
 })
 
@@ -439,23 +445,46 @@ describe('File Model', () => {
   })
 
   describe('move', () => {
-    const fileId = 'file-2295478c'
-    const folderId = 'dir-b1e1c256'
+    const cozyFile = {
+      _id: 'file-2295478c',
+      _type: 'io.cozy.files',
+      name: 'mydoc.odt',
+      dir_id: 'io.cozy.files.root-dir'
+    }
+    const cozyFolder = {
+      _id: 'dir-b1e1c256',
+      _type: 'io.cozy.files',
+      dir_id: 'io.cozy.files.root-dir',
+      path: '/'
+    }
+    const nextcloudFolder = {
+      _id: 'folder-12435',
+      _type: 'io.cozy.remote.nextcloud.files',
+      path: '/Photos',
+      name: 'Photos'
+    }
+
+    const nextcloudFile = {
+      _id: 'file-12345',
+      _type: 'io.cozy.remote.nextcloud.files',
+      path: '/Photos/Penguins.jpg',
+      name: 'Penguins.jpg'
+    }
 
     afterEach(() => {
       jest.restoreAllMocks()
       jest.clearAllMocks()
     })
 
-    it('should move a file to another destination', async () => {
+    it('should move a io.cozy.file to another io.cozy.file', async () => {
       updateFileMetadataSpy.mockResolvedValue({
         data: {
-          id: fileId,
-          dir_id: folderId,
+          id: cozyFile._id,
+          dir_id: cozyFolder._id,
           _type: 'io.cozy.files'
         }
       })
-      const result = await fileModel.move(cozyClient, fileId, { folderId })
+      const result = await fileModel.move(cozyClient, cozyFile, cozyFolder)
       expect(updateFileMetadataSpy).toHaveBeenCalled()
       expect(result).toEqual({
         deleted: null,
@@ -472,7 +501,7 @@ describe('File Model', () => {
         status: 409
       })
       try {
-        await fileModel.move(cozyClient, fileId, { folderId })
+        await fileModel.move(cozyClient, cozyFile, cozyFolder)
       } catch (e) {
         expect(e).toEqual({ status: 409 })
       }
@@ -486,14 +515,14 @@ describe('File Model', () => {
       })
       updateFileMetadataSpy.mockResolvedValue({
         data: {
-          id: fileId,
-          dir_id: folderId,
+          id: cozyFile._id,
+          dir_id: cozyFolder._id,
           _type: 'io.cozy.files'
         }
       })
       getSpy.mockResolvedValue({
         data: {
-          id: fileId,
+          id: cozyFile._id,
           name: 'mydoc.odt',
           _type: 'io.cozy.files'
         }
@@ -504,12 +533,9 @@ describe('File Model', () => {
           _type: 'io.cozy.files'
         }
       })
-      const result = await fileModel.move(
-        cozyClient,
-        fileId,
-        { folderId },
-        true
-      )
+      const result = await fileModel.move(cozyClient, cozyFile, cozyFolder, {
+        force: true
+      })
       expect(updateFileMetadataSpy).toHaveBeenCalled()
       expect(destroySpy).toHaveBeenCalled()
       expect(result).toEqual({
@@ -522,41 +548,34 @@ describe('File Model', () => {
       })
     })
 
-    it('should use destination.path if it is given', async () => {
-      const DELETED_FILE_ID = 'deleted-c097ffca'
-
-      updateFileMetadataSpy.mockRejectedValueOnce({
-        status: 409
-      })
-      updateFileMetadataSpy.mockResolvedValue({
-        data: {
-          id: fileId,
-          dir_id: folderId,
-          _type: 'io.cozy.files'
-        }
-      })
-      statByPathSpy.mockResolvedValue({
-        data: {
-          id: DELETED_FILE_ID,
-          _type: 'io.cozy.files'
-        }
-      })
+    it('should move a Nextcloud file inside a Nextcloud folder', async () => {
       const result = await fileModel.move(
         cozyClient,
-        fileId,
-        { folderId, path: '/mydir/mydoc.odt' },
-        true
+        nextcloudFile,
+        nextcloudFolder
       )
-      expect(getSpy).not.toHaveBeenCalled()
-      expect(updateFileMetadataSpy).toHaveBeenCalled()
-      expect(destroySpy).toHaveBeenCalled()
+      expect(moveSpy).toBeCalledWith(nextcloudFile, nextcloudFolder)
       expect(result).toEqual({
-        deleted: DELETED_FILE_ID,
-        moved: {
-          id: 'file-2295478c',
-          dir_id: 'dir-b1e1c256',
-          _type: 'io.cozy.files'
-        }
+        deleted: null,
+        moved: undefined
+      })
+    })
+
+    it('should move a Nexcloud file into a Cozy folder', async () => {
+      const result = await fileModel.move(cozyClient, nextcloudFile, cozyFolder)
+      expect(moveToCozySpy).toBeCalledWith(nextcloudFile, cozyFolder)
+      expect(result).toEqual({
+        deleted: null,
+        moved: undefined
+      })
+    })
+
+    it('should move a Cozy file to a Nextcloud folder', async () => {
+      const result = await fileModel.move(cozyClient, cozyFile, nextcloudFolder)
+      expect(moveFromCozySpy).toBeCalledWith(nextcloudFolder, cozyFile)
+      expect(result).toEqual({
+        deleted: null,
+        moved: undefined
       })
     })
   })

package/dist/store/index.js

@@ -19,6 +19,12 @@ Object.defineProperty(exports, "loadQuery", {
     return _queries.loadQuery;
   }
 });
+Object.defineProperty(exports, "resetQuery", {
+  enumerable: true,
+  get: function get() {
+    return _queries.resetQuery;
+  }
+});
 Object.defineProperty(exports, "receiveQueryResult", {
   enumerable: true,
   get: function get() {

package/dist/store/queries.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.QueryIDGenerator = exports.getQueryFromSlice = exports.receiveQueryError = exports.receiveQueryResult = exports.loadQuery = exports.initQuery = exports.default = exports.updateData = exports.makeSorterFromDefinition = exports.mergeSelectorAndPartialIndex = exports.convert$gtNullSelectors = exports.sortAndLimitDocsIds = exports.isReceivingData = exports.isQueryAction = void 0;
+exports.QueryIDGenerator = exports.getQueryFromSlice = exports.resetQuery = exports.receiveQueryError = exports.receiveQueryResult = exports.loadQuery = exports.initQuery = exports.default = exports.updateData = exports.makeSorterFromDefinition = exports.mergeSelectorAndPartialIndex = exports.convert$gtNullSelectors = exports.sortAndLimitDocsIds = exports.isReceivingData = exports.isQueryAction = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -58,7 +58,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var INIT_QUERY = 'INIT_QUERY';
 var LOAD_QUERY = 'LOAD_QUERY';
 var RECEIVE_QUERY_RESULT = 'RECEIVE_QUERY_RESULT';
-var RECEIVE_QUERY_ERROR = 'RECEIVE_QUERY_ERROR'; // Read if the devtools are open to store the execution time
+var RECEIVE_QUERY_ERROR = 'RECEIVE_QUERY_ERROR';
+var RESET_QUERY = 'RESET_QUERY'; // Read if the devtools are open to store the execution time
 // This is done at runtime to not read the value everytime
 // we receive a result. So you have to refresh your page
 // in order to get the stats
@@ -66,7 +67,7 @@ var RECEIVE_QUERY_ERROR = 'RECEIVE_QUERY_ERROR'; // Read if the devtools are ope
 var executionStatsEnabled = (0, _cozyFlags.default)('debug');
 
 var isQueryAction = function isQueryAction(action) {
-  return [INIT_QUERY, LOAD_QUERY, RECEIVE_QUERY_RESULT, RECEIVE_QUERY_ERROR].indexOf(action.type) !== -1;
+  return [INIT_QUERY, LOAD_QUERY, RECEIVE_QUERY_RESULT, RECEIVE_QUERY_ERROR, RESET_QUERY].indexOf(action.type) !== -1;
 };
 
 exports.isQueryAction = isQueryAction;
@@ -273,6 +274,13 @@ var query = function query() {
         lastErrorUpdate: Date.now()
       });
 
+    case RESET_QUERY:
+      return _objectSpread(_objectSpread({}, queryInitialState), {}, {
+        id: action.queryId,
+        definition: state.definition,
+        options: state.options
+      });
+
     default:
       return state;
   }
@@ -658,11 +666,27 @@ var receiveQueryError = function receiveQueryError(queryId, error) {
     queryId: queryId,
     error: error
   }, options);
-}; // selectors
+};
+/**
+ * Reset the query state to its initial state
+ *
+ * @param {string} queryId - id of the query
+ * @returns {object} - Redux action to dispatch
+ */
 
 
 exports.receiveQueryError = receiveQueryError;
 
+var resetQuery = function resetQuery(queryId) {
+  return {
+    type: RESET_QUERY,
+    queryId: queryId
+  };
+}; // selectors
+
+
+exports.resetQuery = resetQuery;
+
 var mapIdsToDocuments = function mapIdsToDocuments(documents, doctype, ids) {
   return ids.map(function (id) {
     return (0, _documents.getDocumentFromSlice)(documents, doctype, id);

package/dist/types.js

@@ -20,6 +20,7 @@ var _dsl = require("./queries/dsl");
  * @typedef {"io.cozy.account"} AccountsDoctype
  * @typedef {"io.cozy.konnectors"} KonnectorsDoctype
  * @typedef {"io.cozy.triggers"} TriggersDoctype
+ * @typedef {"io.cozy.remote.nextcloud.files"} NextcloudFilesDoctype
  * @typedef {AccountsDoctype|TriggersDoctype|KonnectorsDoctype|NotesDoctype|AppsDoctype|SettingsDoctype|OAuthClientsDoctype|FilesDoctype} KnownDoctype
  * @typedef {KnownDoctype|string} Doctype
  */
@@ -453,6 +454,19 @@ var _dsl = require("./queries/dsl");
  * @typedef {CozyClientDocument & FolderDocument} IOCozyFolder - An io.cozy.files document
  */
 
+/**
+ * @typedef {object} NextcloudFile - An io.cozy.remote.nextcloud document after normalization
+ * @property {string} [_id] - Id of the file
+ * @property {string} [id] - Id of the file
+ * @property {NextcloudFilesDoctype} _type - Doctype of the folder
+ * @property {string} name - Name of the file
+ * @property {string} path - Path to the file
+ * @property {string} parentPath - Path to the folder containing the file
+ * @property {'file'|'directory'} type - Type of the file
+ * @property {object} cozyMetadata - Mime of the file
+ * @property {string} cozyMetadata.sourceAccount - Id of the io.cozy.account associated to the Nextcloud
+ */
+
 /**
  * @typedef {object} OAuthClientDocument - An io.cozy.oauth.clients document
  * @property {string} _id - Id of the client

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "47.6.0",
+  "version": "48.0.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -18,7 +18,7 @@
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.170",
     "btoa": "^1.2.1",
-    "cozy-stack-client": "^47.4.0",
+    "cozy-stack-client": "^48.0.0",
     "date-fns": "2.29.3",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.13",
@@ -75,5 +75,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "ea8b7909ac8241fcc443fc16536985b702966e40"
+  "gitHead": "548ea3a862111beca5d8189acbba357c9e60685c"
 }

package/types/CozyClient.d.ts

@@ -742,6 +742,15 @@ declare class CozyClient {
      * @returns {Promise<any>} - The result of the `client.save()` call
      */
     saveAfterFetchSettings<T_2 extends string>(slug: string, itemsOrSetter: Record<string, any> | ((oldValue: any) => Record<T_2, any>), setterKeys?: T_2[]): Promise<any>;
+    /**
+     * Reset a query
+     *
+     * This method will reset the query state to its initial state and refetch it.
+     *
+     * @param {string} queryId - Query id
+     * @returns {Promise<import("./types").QueryState>} - Query state
+     */
+    resetQuery(queryId: string): Promise<import("./types").QueryState>;
 }
 declare namespace CozyClient {
     export const hooks: {};

package/types/models/file.d.ts

@@ -50,10 +50,12 @@ export function hasMetadataAttribute({ file, attribute }: {
     attribute: string;
 }): boolean;
 export function getFullpath(client: CozyClient, dirId: string, name: string): Promise<string>;
-export function move(client: CozyClient, fileId: string, destination: {
-    folderId: string;
-    path: string;
-}, force?: boolean): Promise<any>;
+export function move(client: CozyClient, file: import('../types').IOCozyFile | import('../types').NextcloudFile, destination: import('../types').IOCozyFolder | import('../types').NextcloudFile, { force }?: {
+    force: boolean;
+}): Promise<{
+    moved: undefined | import('../types').IOCozyFile;
+    deleted: null | string[];
+}>;
 export function overrideFileForPath(client: CozyClient, dirPath: string, file: object, metadata: object): Promise<import("../types").IOCozyFile>;
 export function generateNewFileNameOnConflict(filenameWithoutExtension: string, conflictOptions?: import('../types').ConflictOptions): string;
 export function generateFileNameForRevision(file: import("../types").IOCozyFile, revision: object, f: Function): string;

package/types/store/index.d.ts

@@ -24,5 +24,5 @@ declare function combinedReducer(state: {
 export function resetState(): {
     type: string;
 };
-export { initQuery, loadQuery, receiveQueryResult, receiveQueryError } from "./queries";
+export { initQuery, loadQuery, resetQuery, receiveQueryResult, receiveQueryError } from "./queries";
 export { initMutation, receiveMutationResult, receiveMutationError } from "./mutations";

package/types/store/queries.d.ts

@@ -13,6 +13,7 @@ export function initQuery(queryId: string, queryDefinition: QueryDefinition, opt
 export function loadQuery(queryId: string, options?: import("../types").QueryOptions): object;
 export function receiveQueryResult(queryId: string, response: object, options?: import("../types").QueryOptions): object;
 export function receiveQueryError(queryId: string, error: object, options?: import("../types").QueryOptions): object;
+export function resetQuery(queryId: string): object;
 export function getQueryFromSlice(state: any, queryId: any, documents: any): any;
 export class QueryIDGenerator {
     idCounter: number;

package/types/types.d.ts

@@ -9,6 +9,7 @@ export type FilesDoctype = "io.cozy.files";
 export type AccountsDoctype = "io.cozy.account";
 export type KonnectorsDoctype = "io.cozy.konnectors";
 export type TriggersDoctype = "io.cozy.triggers";
+export type NextcloudFilesDoctype = "io.cozy.remote.nextcloud.files";
 export type KnownDoctype = "io.cozy.files" | "io.cozy.account" | "io.cozy.triggers" | "io.cozy.konnectors" | "io.cozy.notes" | "io.cozy.apps" | "io.cozy.settings" | "io.cozy-oauth.clients";
 export type Doctype = string;
 export type AccountsDocument = {
@@ -805,6 +806,45 @@ export type FolderDocument = {
  * - An io.cozy.files document
  */
 export type IOCozyFolder = CozyClientDocument & FolderDocument;
+/**
+ * - An io.cozy.remote.nextcloud document after normalization
+ */
+export type NextcloudFile = {
+    /**
+     * - Id of the file
+     */
+    _id?: string;
+    /**
+     * - Id of the file
+     */
+    id?: string;
+    /**
+     * - Doctype of the folder
+     */
+    _type: NextcloudFilesDoctype;
+    /**
+     * - Name of the file
+     */
+    name: string;
+    /**
+     * - Path to the file
+     */
+    path: string;
+    /**
+     * - Path to the folder containing the file
+     */
+    parentPath: string;
+    /**
+     * - Type of the file
+     */
+    type: 'file' | 'directory';
+    /**
+     * - Mime of the file
+     */
+    cozyMetadata: {
+        sourceAccount: string;
+    };
+};
 /**
  * - An io.cozy.oauth.clients document
  */