cozy-client 60.35.0 → 60.36.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.35.0";
+CozyClient.version = "60.36.0";
 
 _microee.default.mixin(CozyClient);
 

package/dist/const.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DOCTYPE_SHARING_RECIPIENTS = exports.DOCTYPE_FILES_ENCRYPTION = exports.DOCTYPE_PERMISSIONS = exports.DOCTYPE_FILES = exports.REGISTRATION_ABORT = void 0;
+exports.DOCTYPE_SHARING_RECIPIENTS = exports.DOCTYPE_FILES_SHORTCUTS = exports.DOCTYPE_FILES_ENCRYPTION = exports.DOCTYPE_PERMISSIONS = exports.DOCTYPE_FILES = exports.REGISTRATION_ABORT = void 0;
 var REGISTRATION_ABORT = 'REGISTRATION_ABORT';
 exports.REGISTRATION_ABORT = REGISTRATION_ABORT;
 var DOCTYPE_FILES = 'io.cozy.files';
@@ -12,5 +12,7 @@ var DOCTYPE_PERMISSIONS = 'io.cozy.permissions';
 exports.DOCTYPE_PERMISSIONS = DOCTYPE_PERMISSIONS;
 var DOCTYPE_FILES_ENCRYPTION = 'io.cozy.files.encryption';
 exports.DOCTYPE_FILES_ENCRYPTION = DOCTYPE_FILES_ENCRYPTION;
+var DOCTYPE_FILES_SHORTCUTS = 'io.cozy.files.shortcuts';
+exports.DOCTYPE_FILES_SHORTCUTS = DOCTYPE_FILES_SHORTCUTS;
 var DOCTYPE_SHARING_RECIPIENTS = 'io.cozy.sharings.recipients';
 exports.DOCTYPE_SHARING_RECIPIENTS = DOCTYPE_SHARING_RECIPIENTS;

package/dist/hooks/useFetchShortcut.js

@@ -19,9 +19,19 @@ var _dsl = require("../queries/dsl");
 
 var _CozyClient = _interopRequireDefault(require("../CozyClient"));
 
+var _const = require("../const");
+
 var DEFAULT_CACHE_TIMEOUT_QUERIES = 10 * 60 * 1000; // 10 minutes
 
-var useFetchShortcut = function useFetchShortcut(client, id) {
+/**
+ * Fetch a shortcut and the icon to display for it.
+ *
+ * @param {import('../CozyClient').default} client - A CozyClient instance
+ * @param {string} id - The shortcut file id
+ * @param {string} [driveId] - Id of the shared drive the shortcut belongs to
+ */
+
+var useFetchShortcut = function useFetchShortcut(client, id, driveId) {
   var _useState = (0, _react.useState)(null),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       shortcutInfos = _useState2[0],
@@ -38,9 +48,11 @@ var useFetchShortcut = function useFetchShortcut(client, id) {
       setFetchStatus = _useState6[1];
 
   (0, _react.useEffect)(function () {
+    var isCancelled = false;
+
     var fetchData = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _shortcutInfosResult$, _shortcutInfosResult$2, _shortcutInfosResult$3, shortcutInfosResult, targetApp, targetAppIconUrl, shortcutRemoteUrl, imgUrl;
+        var _shortcutInfosResult$, _shortcutInfosResult$2, _shortcutInfosResult$3, baseDefinition, shortcutInfosResult, targetApp, targetAppIconUrl, shortcutRemoteUrl, imgUrl;
 
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
@@ -48,62 +60,90 @@ var useFetchShortcut = function useFetchShortcut(client, id) {
               case 0:
                 setFetchStatus('loading');
                 _context.prev = 1;
-                _context.next = 4;
+                baseDefinition = (0, _dsl.Q)(_const.DOCTYPE_FILES_SHORTCUTS).getById(id);
+                _context.next = 5;
                 return client.fetchQueryAndGetFromState({
-                  definition: (0, _dsl.Q)('io.cozy.files.shortcuts').getById(id),
+                  definition: driveId ? baseDefinition.sharingById(driveId) : baseDefinition,
                   options: {
-                    as: "io.cozy.files.shortcuts/".concat(id),
+                    as: driveId ? "".concat(_const.DOCTYPE_FILES_SHORTCUTS, "/").concat(driveId, "/").concat(id) : "".concat(_const.DOCTYPE_FILES_SHORTCUTS, "/").concat(id),
                     fetchPolicy: _CozyClient.default.fetchPolicies.olderThan(DEFAULT_CACHE_TIMEOUT_QUERIES),
                     singleDocData: true
                   }
                 });
 
-              case 4:
+              case 5:
                 shortcutInfosResult = _context.sent;
+
+                if (!isCancelled) {
+                  _context.next = 8;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 8:
                 targetApp = shortcutInfosResult === null || shortcutInfosResult === void 0 ? void 0 : (_shortcutInfosResult$ = shortcutInfosResult.data) === null || _shortcutInfosResult$ === void 0 ? void 0 : (_shortcutInfosResult$2 = _shortcutInfosResult$.metadata) === null || _shortcutInfosResult$2 === void 0 ? void 0 : (_shortcutInfosResult$3 = _shortcutInfosResult$2.target) === null || _shortcutInfosResult$3 === void 0 ? void 0 : _shortcutInfosResult$3.app;
 
                 if (!targetApp) {
-                  _context.next = 13;
+                  _context.next = 18;
                   break;
                 }
 
-                _context.next = 9;
+                _context.next = 12;
                 return client.getStackClient().getIconURL({
                   type: 'app',
                   slug: targetApp,
                   priority: 'stack'
                 });
 
-              case 9:
+              case 12:
                 targetAppIconUrl = _context.sent;
+
+                if (!isCancelled) {
+                  _context.next = 15;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 15:
                 setShortcutImg(targetAppIconUrl);
-                _context.next = 16;
+                _context.next = 21;
                 break;
 
-              case 13:
+              case 18:
                 shortcutRemoteUrl = new URL(shortcutInfosResult.data.url);
                 imgUrl = "".concat(client.getStackClient().uri, "/bitwarden/icons/").concat(shortcutRemoteUrl.host, "/icon.png");
                 setShortcutImg(imgUrl);
 
-              case 16:
+              case 21:
                 setShortcutInfos({
                   data: shortcutInfosResult.data
                 });
                 setFetchStatus('loaded');
-                _context.next = 23;
+                _context.next = 30;
                 break;
 
-              case 20:
-                _context.prev = 20;
+              case 25:
+                _context.prev = 25;
                 _context.t0 = _context["catch"](1);
+
+                if (!isCancelled) {
+                  _context.next = 29;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 29:
                 setFetchStatus('failed');
 
-              case 23:
+              case 30:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, null, [[1, 20]]);
+        }, _callee, null, [[1, 25]]);
       }));
 
       return function fetchData() {
@@ -112,7 +152,10 @@ var useFetchShortcut = function useFetchShortcut(client, id) {
     }();
 
     fetchData();
-  }, [client, id]);
+    return function () {
+      isCancelled = true;
+    };
+  }, [client, id, driveId]);
   return {
     shortcutInfos: shortcutInfos,
     shortcutImg: shortcutImg,

package/dist/hooks/useFetchShortcut.spec.jsx

@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks'
+import { act, renderHook } from '@testing-library/react-hooks'
 
 import useFetchShortcut from './useFetchShortcut'
 import { createMockClient } from '../../dist/mock'
@@ -103,6 +103,36 @@ describe('useFetchShortcut', () => {
     )
   })
 
+  it('should ignore a drive answer resolving after a newer one', async () => {
+    const makeDeferred = () => {
+      let resolve
+      const promise = new Promise(r => {
+        resolve = r
+      })
+      return { promise, resolve }
+    }
+    const deferred = { driveA: makeDeferred(), driveB: makeDeferred() }
+    const spy = jest
+      .spyOn(mockClient, 'fetchQueryAndGetFromState')
+      .mockImplementation(
+        ({ definition }) => deferred[definition.sharingId].promise
+      )
+
+    const { result, rerender } = renderHook(
+      ({ driveId }) => useFetchShortcut(mockClient, '123', driveId),
+      { initialProps: { driveId: 'driveA' } }
+    )
+    rerender({ driveId: 'driveB' })
+
+    await act(async () => {
+      deferred.driveB.resolve({ data: { _id: '123', url: 'https://b.test' } })
+      deferred.driveA.resolve({ data: { _id: '123', url: 'https://a.test' } })
+    })
+
+    expect(result.current.shortcutInfos.data.url).toEqual('https://b.test')
+    spy.mockRestore()
+  })
+
   it('should return shortcutImg for the targeted application icon when available', async () => {
     const { result, waitForNextUpdate } = renderHook(() =>
       useFetchShortcut(mockClient, 'linkToCozyApp')

package/dist/links/StackLink.js

@@ -334,7 +334,7 @@ var StackLink = /*#__PURE__*/function (_CozyLink) {
                 throw new Error('No doctype found in a query definition');
 
               case 5:
-                if (doctype === _const.DOCTYPE_FILES && sharingId) {
+                if ((doctype === _const.DOCTYPE_FILES || doctype === _const.DOCTYPE_FILES_SHORTCUTS) && sharingId) {
                   options = _objectSpread(_objectSpread({}, options), {}, {
                     driveId: sharingId
                   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "60.35.0",
+  "version": "60.36.0",
   "license": "MIT",
   "main": "dist/index.node.js",
   "browser": "dist/index.js",
@@ -19,7 +19,7 @@
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.170",
     "btoa": "^1.2.1",
-    "cozy-stack-client": "^60.33.0",
+    "cozy-stack-client": "^60.36.0",
     "date-fns": "^2.30.0",
     "fast-deep-equal": "^3.1.3",
     "json-stable-stringify": "^1.0.1",
@@ -74,5 +74,5 @@
     "react-native-ios11-devicecheck": "^0.0.3"
   },
   "sideEffects": false,
-  "gitHead": "e7dea141c80635ee999543be89411db5bc955e2e"
+  "gitHead": "56e61b64bcd2ae9cd517f9ddb923c332f3db7230"
 }

package/types/const.d.ts

@@ -2,4 +2,5 @@ export const REGISTRATION_ABORT: "REGISTRATION_ABORT";
 export const DOCTYPE_FILES: "io.cozy.files";
 export const DOCTYPE_PERMISSIONS: "io.cozy.permissions";
 export const DOCTYPE_FILES_ENCRYPTION: "io.cozy.files.encryption";
+export const DOCTYPE_FILES_SHORTCUTS: "io.cozy.files.shortcuts";
 export const DOCTYPE_SHARING_RECIPIENTS: "io.cozy.sharings.recipients";

package/types/hooks/useFetchShortcut.d.ts

@@ -1,5 +1,12 @@
 export default useFetchShortcut;
-declare function useFetchShortcut(client: any, id: any): {
+/**
+ * Fetch a shortcut and the icon to display for it.
+ *
+ * @param {import('../CozyClient').default} client - A CozyClient instance
+ * @param {string} id - The shortcut file id
+ * @param {string} [driveId] - Id of the shared drive the shortcut belongs to
+ */
+declare function useFetchShortcut(client: import('../CozyClient').default, id: string, driveId?: string): {
     shortcutInfos: any;
     shortcutImg: any;
     fetchStatus: string;