cozy-pouch-link 60.10.0 → 60.11.0

package/dist/jsonapi.js

@@ -167,7 +167,7 @@ var buildPathWithName = function buildPathWithName(parentPath, fileName) {
 
 var computeFileFullpath = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(client, file) {
-    var _file$path, newPath, filePath, parentPath, path, parentDir, _path;
+    var _file$path, newPath, filePath, parentPath, builtPath, path, _yield$queryFileById, parentDir, _path;
 
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
@@ -202,34 +202,38 @@ var computeFileFullpath = /*#__PURE__*/function () {
 
           case 10:
             filePath = getFilePath(file._id);
+            parentPath = getFilePath(file.dir_id);
 
-            if (!filePath) {
-              _context.next = 14;
+            if (!(parentPath && filePath)) {
+              _context.next = 17;
               break;
             }
 
-            // File path exists in memory
-            file.path = filePath;
-            return _context.abrupt("return", file);
+            // Check if file path is up to date
+            builtPath = buildPathWithName(parentPath, file.name);
 
-          case 14:
-            parentPath = getFilePath(file.dir_id);
+            if (filePath !== builtPath) {
+              setFilePath(file._id, builtPath);
+            }
 
+            file.path = builtPath;
+            return _context.abrupt("return", file);
+
+          case 17:
             if (!parentPath) {
-              _context.next = 20;
+              _context.next = 22;
               break;
             }
 
-            // Parent path exists in memory
+            // Parent path exists in memory: use it to compute file path and save in memory
             path = buildPathWithName(parentPath, file.name);
-            setFilePath(file._id, path); // Add the path in memory
-
+            setFilePath(file._id, path);
             file.path = path;
             return _context.abrupt("return", file);
 
-          case 20:
+          case 22:
             if (file.dir_id) {
-              _context.next = 23;
+              _context.next = 25;
               break;
             }
 
@@ -237,16 +241,17 @@ var computeFileFullpath = /*#__PURE__*/function () {
 
             return _context.abrupt("return", file);
 
-          case 23:
-            _context.next = 25;
+          case 25:
+            _context.next = 27;
             return (0, _files.queryFileById)(client, file.dir_id);
 
-          case 25:
-            parentDir = _context.sent;
+          case 27:
+            _yield$queryFileById = _context.sent;
+            parentDir = _yield$queryFileById.data;
 
             if (parentDir !== null && parentDir !== void 0 && parentDir.path) {
-              _path = buildPathWithName(parentDir === null || parentDir === void 0 ? void 0 : parentDir.path, file.name);
-              file.path = _path; // Add the paths in memory
+              _path = buildPathWithName(parentDir.path, file.name);
+              file.path = _path; // Add the computed paths in memory
 
               setFilePath(file.dir_id, parentDir.path);
               setFilePath(file._id, _path);
@@ -254,7 +259,7 @@ var computeFileFullpath = /*#__PURE__*/function () {
 
             return _context.abrupt("return", file);
 
-          case 28:
+          case 31:
           case "end":
             return _context.stop();
         }

package/dist/jsonapi.spec.js

@@ -1,6 +1,16 @@
 import CozyClient from 'cozy-client'
 
-import { fromPouchResult, normalizeDoc } from './jsonapi'
+import {
+  computeFileFullpath,
+  fromPouchResult,
+  normalizeDoc,
+  resetAllPaths
+} from './jsonapi'
+import { queryFileById } from './files'
+
+jest.mock('./files', () => ({
+  queryFileById: jest.fn()
+}))
 
 const BART_FIXTURE = {
   id: 1,
@@ -642,3 +652,71 @@ const multipleDocRes = {
     }
   ]
 }
+
+describe('computeFileFullpath', () => {
+  afterEach(() => {
+    resetAllPaths()
+  })
+  const dir = {
+    _id: '123',
+    _type: 'io.cozy.files',
+    type: 'directory',
+    dir_id: 'ROOT',
+    name: 'MYDIR',
+    path: 'ROOT/MYDIR'
+  }
+  const fileWithFullpath = {
+    _id: '456',
+    _type: 'io.cozy.files',
+    type: 'file',
+    dir_id: '123',
+    name: 'file1',
+    path: 'ROOT/MYDIR/file1'
+  }
+  const fileWithStackPath = {
+    _id: '789',
+    _type: 'io.cozy.files',
+    type: 'file',
+    dir_id: '123',
+    name: 'file2',
+    path: 'ROOT/MYDIR'
+  }
+  const filewithNoPath = {
+    _id: '000',
+    _type: 'io.cozy.files',
+    type: 'file',
+    dir_id: '123',
+    name: 'file3'
+  }
+  it('should handle directory', async () => {
+    const res = await computeFileFullpath(client, dir)
+    expect(res).toEqual(dir)
+  })
+
+  it('should handle file with complete path', async () => {
+    const res = await computeFileFullpath(client, fileWithFullpath)
+    expect(res).toEqual(fileWithFullpath)
+  })
+
+  it('should compute fullpath for file with incomplete path', async () => {
+    const res = await computeFileFullpath(client, fileWithStackPath)
+    expect(res.path).toEqual('ROOT/MYDIR/file2')
+  })
+
+  it('should compute fullpath for file with no path', async () => {
+    // eslint-disable-next-line prettier/prettier
+    queryFileById.mockResolvedValue({ data: dir })
+    const res = await computeFileFullpath(client, filewithNoPath)
+    expect(res.path).toEqual('ROOT/MYDIR/file3')
+  })
+
+  it('should handle updates on path', async () => {
+    queryFileById.mockResolvedValue({ data: dir })
+    const res1 = await computeFileFullpath(client, filewithNoPath)
+    expect(res1.path).toEqual('ROOT/MYDIR/file3')
+
+    const updFile = { ...filewithNoPath, name: 'file3.1', path: undefined }
+    const res2 = await computeFileFullpath(client, updFile)
+    expect(res2.path).toEqual('ROOT/MYDIR/file3.1')
+  })
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-pouch-link",
-  "version": "60.10.0",
+  "version": "60.11.0",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -13,7 +13,7 @@
     "url": "git+https://github.com/cozy/cozy-client.git"
   },
   "dependencies": {
-    "cozy-client": "^60.9.0",
+    "cozy-client": "^60.11.0",
     "pouchdb-browser": "^7.2.2",
     "pouchdb-find": "^7.2.2"
   },
@@ -41,5 +41,5 @@
     "typecheck": "tsc -p tsconfig.json"
   },
   "sideEffects": false,
-  "gitHead": "5f378a0a86e81b803b23b3b5d4d1d47abcaa76c6"
+  "gitHead": "8a114254c6f27a0358b0d79338f452337745b297"
 }