cozy-client 48.11.0 → 48.11.2

package/dist/CozyClient.js

@@ -2626,7 +2626,7 @@ var CozyClient = /*#__PURE__*/function () {
      * 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
+     * @returns {Promise<import("./types").QueryState|null>} - Query state or null if the query does not exist
      */
 
   }, {
@@ -2639,27 +2639,36 @@ var CozyClient = /*#__PURE__*/function () {
             switch (_context21.prev = _context21.next) {
               case 0:
                 _context21.prev = 0;
+
+                if ((0, _store.isQueryExisting)(this.store.getState(), queryId)) {
+                  _context21.next = 3;
+                  break;
+                }
+
+                return _context21.abrupt("return", Promise.resolve(null));
+
+              case 3:
                 this.dispatch((0, _store.resetQuery)(queryId));
                 query = this.getQueryFromState(queryId);
-                _context21.next = 5;
+                _context21.next = 7;
                 return this.query(query.definition, {
                   as: queryId
                 });
 
-              case 5:
+              case 7:
                 return _context21.abrupt("return", _context21.sent);
 
-              case 8:
-                _context21.prev = 8;
+              case 10:
+                _context21.prev = 10;
                 _context21.t0 = _context21["catch"](0);
                 throw _context21.t0;
 
-              case 11:
+              case 13:
               case "end":
                 return _context21.stop();
             }
           }
-        }, _callee21, this, [[0, 8]]);
+        }, _callee21, this, [[0, 10]]);
       }));
 
       function resetQuery(_x22) {
@@ -2830,7 +2839,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 = "48.11.0";
+CozyClient.version = "48.11.2";
 
 _microee.default.mixin(CozyClient);
 

package/dist/CozyClient.spec.js

@@ -30,6 +30,7 @@ import {
   receiveMutationError,
   getQueryFromState,
   getRawQueryFromState,
+  isQueryExisting,
   loadQuery,
   resetQuery
 } from './store'
@@ -51,6 +52,7 @@ const METADATA_VERSION = 1
 
 jest.mock('./store', () => ({
   ...jest.requireActual('./store'),
+  isQueryExisting: jest.fn().mockReturnValue(false),
   getQueryFromState: jest.fn().mockReturnValue({}),
   getRawQueryFromState: jest.fn().mockReturnValue({})
 }))
@@ -1878,15 +1880,16 @@ describe('CozyClient', () => {
     const fakeResponse = {
       data: [TODO_1, TODO_2, TODO_3]
     }
+    const queryId = 'allTodos'
 
     afterEach(() => {
       jest.restoreAllMocks()
     })
 
     it('should reset the query state and refetch it', async () => {
+      isQueryExisting.mockReturnValue(true)
       requestHandler.mockResolvedValue(fakeResponse)
       const queryDefinition = Q('io.cozy.todos')
-      const queryId = 'allTodos'
       getQueryFromState.mockReturnValue({
         definition: queryDefinition,
         id: queryId,
@@ -1903,6 +1906,12 @@ describe('CozyClient', () => {
         receiveQueryResult('allTodos', fakeResponse)
       )
     })
+
+    it('should return null when the query is not found', async () => {
+      isQueryExisting.mockReturnValue(false)
+      const res = await client.resetQuery(queryId)
+      expect(res).toBe(null)
+    })
   })
 })
 

package/dist/models/file.js

@@ -482,9 +482,6 @@ var move = /*#__PURE__*/function () {
         force,
         resp,
         destinationPath,
-        _yield$client$query2,
-        movedFile,
-        filename,
         conflictResp,
         _resp,
         _args4 = arguments;
@@ -570,59 +567,40 @@ var move = /*#__PURE__*/function () {
             _context4.t1 = _context4["catch"](19);
 
             if (!(_context4.t1.status === 409 && force)) {
-              _context4.next = 52;
+              _context4.next = 43;
               break;
             }
 
-            if (!destination.path) {
-              _context4.next = 33;
-              break;
-            }
-
-            destinationPath = destination.path;
-            _context4.next = 41;
-            break;
-
-          case 33:
-            _context4.next = 35;
-            return client.query((0, _dsl.Q)(_const.DOCTYPE_FILES).getById(file._id));
+            _context4.next = 31;
+            return getFullpath(client, destination._id, file.name);
 
-          case 35:
-            _yield$client$query2 = _context4.sent;
-            movedFile = _yield$client$query2.data;
-            filename = movedFile.name;
-            _context4.next = 40;
-            return getFullpath(client, destination._id, filename);
-
-          case 40:
+          case 31:
             destinationPath = _context4.sent;
-
-          case 41:
-            _context4.next = 43;
+            _context4.next = 34;
             return client.collection(_const.DOCTYPE_FILES).statByPath(destinationPath);
 
-          case 43:
+          case 34:
             conflictResp = _context4.sent;
-            _context4.next = 46;
+            _context4.next = 37;
             return client.collection(_const.DOCTYPE_FILES).destroy(conflictResp.data);
 
-          case 46:
-            _context4.next = 48;
+          case 37:
+            _context4.next = 39;
             return client.collection(_const.DOCTYPE_FILES).updateFileMetadata(file._id, {
               dir_id: destination._id
             });
 
-          case 48:
+          case 39:
             _resp = _context4.sent;
             return _context4.abrupt("return", {
               moved: _resp.data,
               deleted: conflictResp.data.id
             });
 
-          case 52:
+          case 43:
             throw _context4.t1;
 
-          case 53:
+          case 44:
           case "end":
             return _context4.stop();
         }

package/dist/models/file.spec.js

@@ -455,8 +455,11 @@ describe('File Model', () => {
       _id: 'dir-b1e1c256',
       _type: 'io.cozy.files',
       dir_id: 'io.cozy.files.root-dir',
-      path: '/'
+      type: 'directory',
+      name: 'Photos',
+      path: '/Photos'
     }
+
     const nextcloudFolder = {
       _id: 'folder-12435',
       _type: 'io.cozy.remote.nextcloud.files',
@@ -520,13 +523,6 @@ describe('File Model', () => {
           _type: 'io.cozy.files'
         }
       })
-      getSpy.mockResolvedValue({
-        data: {
-          id: cozyFile._id,
-          name: 'mydoc.odt',
-          _type: 'io.cozy.files'
-        }
-      })
       statByPathSpy.mockResolvedValue({
         data: {
           id: DELETED_FILE_ID,

package/dist/store/index.js

@@ -55,7 +55,7 @@ Object.defineProperty(exports, "receiveMutationError", {
     return _mutations.receiveMutationError;
   }
 });
-exports.resetState = exports.getRawQueryFromState = exports.getQueryFromState = exports.getQueryFromStore = exports.getDocumentFromState = exports.getCollectionFromState = exports.getStateRoot = exports.createStore = exports.default = exports.StoreProxy = void 0;
+exports.resetState = exports.isQueryExisting = exports.getRawQueryFromState = exports.getQueryFromState = exports.getQueryFromStore = exports.getDocumentFromState = exports.getCollectionFromState = exports.getStateRoot = exports.createStore = exports.default = exports.StoreProxy = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -208,4 +208,10 @@ var getRawQueryFromState = function getRawQueryFromState(state, queryId) {
   return (0, _queries.getQueryFromSlice)(getStateRoot(state).queries, queryId);
 };
 
-exports.getRawQueryFromState = getRawQueryFromState;
+exports.getRawQueryFromState = getRawQueryFromState;
+
+var isQueryExisting = function isQueryExisting(state, queryId) {
+  return getStateRoot(state).queries[queryId] !== undefined;
+};
+
+exports.isQueryExisting = isQueryExisting;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "48.11.0",
+  "version": "48.11.2",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -75,5 +75,5 @@
     "react-native-ios11-devicecheck": "https://github.com/cozy/react-native-devicecheck#app-attest-v0.1"
   },
   "sideEffects": false,
-  "gitHead": "556aef794fd9cdb577b7c22860f932187c355856"
+  "gitHead": "e8129adc0b6d19e3165c79fe00294428e213f9c4"
 }

package/types/CozyClient.d.ts

@@ -748,9 +748,9 @@ declare class CozyClient {
      * 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
+     * @returns {Promise<import("./types").QueryState|null>} - Query state or null if the query does not exist
      */
-    resetQuery(queryId: string): Promise<import("./types").QueryState>;
+    resetQuery(queryId: string): Promise<import("./types").QueryState | null>;
 }
 declare namespace CozyClient {
     export const hooks: {};

package/types/store/index.d.ts

@@ -14,6 +14,7 @@ export function getDocumentFromState(state: any, doctype: any, id: any): any;
 export function getQueryFromStore(store: any, queryId: any): any;
 export function getQueryFromState(state: any, queryId: any): any;
 export function getRawQueryFromState(state: any, queryId: any): any;
+export function isQueryExisting(state: any, queryId: any): boolean;
 declare function combinedReducer(state: {
     documents: {};
     queries: {};