cozy-client 43.4.0 → 43.4.1

package/dist/CozyClient.js

@@ -2703,7 +2703,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 = "43.4.0";
+CozyClient.version = "43.4.1";
 
 _microee.default.mixin(CozyClient);
 

package/dist/hooks/useFetchShortcut.js

@@ -15,6 +15,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _react = require("react");
 
+var _dsl = require("../queries/dsl");
+
+var _CozyClient = _interopRequireDefault(require("../CozyClient"));
+
+var DEFAULT_CACHE_TIMEOUT_QUERIES = 10 * 60 * 1000; // 10 minutes
+
 var useFetchShortcut = function useFetchShortcut(client, id) {
   var _useState = (0, _react.useState)(null),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -34,7 +40,8 @@ var useFetchShortcut = function useFetchShortcut(client, id) {
   (0, _react.useEffect)(function () {
     var fetchData = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var shortcutInfosResult, shortcutRemoteUrl, imgUrl;
+        var _shortcutInfosResult$, _shortcutInfosResult$2, _shortcutInfosResult$3, _shortcutInfosResult$4, shortcutInfosResult, targetApp, targetAppIconUrl, shortcutRemoteUrl, imgUrl;
+
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -42,29 +49,61 @@ var useFetchShortcut = function useFetchShortcut(client, id) {
                 setFetchStatus('loading');
                 _context.prev = 1;
                 _context.next = 4;
-                return client.getStackClient().fetchJSON('GET', "/shortcuts/".concat(id));
+                return client.fetchQueryAndGetFromState({
+                  definition: (0, _dsl.Q)('io.cozy.files.shortcuts').getById(id),
+                  options: {
+                    as: "io.cozy.files.shortcuts/".concat(id),
+                    fetchPolicy: _CozyClient.default.fetchPolicies.olderThan(DEFAULT_CACHE_TIMEOUT_QUERIES),
+                    singleDocData: true
+                  }
+                });
 
               case 4:
                 shortcutInfosResult = _context.sent;
+                targetApp = shortcutInfosResult === null || shortcutInfosResult === void 0 ? void 0 : (_shortcutInfosResult$ = shortcutInfosResult.data) === null || _shortcutInfosResult$ === void 0 ? void 0 : (_shortcutInfosResult$2 = _shortcutInfosResult$.attributes) === null || _shortcutInfosResult$2 === void 0 ? void 0 : (_shortcutInfosResult$3 = _shortcutInfosResult$2.metadata) === null || _shortcutInfosResult$3 === void 0 ? void 0 : (_shortcutInfosResult$4 = _shortcutInfosResult$3.target) === null || _shortcutInfosResult$4 === void 0 ? void 0 : _shortcutInfosResult$4.app;
+
+                if (!targetApp) {
+                  _context.next = 13;
+                  break;
+                }
+
+                _context.next = 9;
+                return client.getStackClient().getIconURL({
+                  type: 'app',
+                  slug: targetApp,
+                  priority: 'stack'
+                });
+
+              case 9:
+                targetAppIconUrl = _context.sent;
+                setShortcutImg(targetAppIconUrl);
+                _context.next = 16;
+                break;
+
+              case 13:
                 shortcutRemoteUrl = new URL(shortcutInfosResult.data.attributes.url);
                 imgUrl = "".concat(client.getStackClient().uri, "/bitwarden/icons/").concat(shortcutRemoteUrl.host, "/icon.png");
                 setShortcutImg(imgUrl);
-                setShortcutInfos(shortcutInfosResult);
+
+              case 16:
+                setShortcutInfos({
+                  data: shortcutInfosResult.data
+                });
                 setFetchStatus('loaded');
-                _context.next = 15;
+                _context.next = 23;
                 break;
 
-              case 12:
-                _context.prev = 12;
+              case 20:
+                _context.prev = 20;
                 _context.t0 = _context["catch"](1);
                 setFetchStatus('failed');
 
-              case 15:
+              case 23:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, null, [[1, 12]]);
+        }, _callee, null, [[1, 20]]);
       }));
 
       return function fetchData() {

package/dist/hooks/useFetchShortcut.spec.jsx

@@ -1,19 +1,71 @@
 import { renderHook } from '@testing-library/react-hooks'
+
 import useFetchShortcut from './useFetchShortcut'
 import { createMockClient } from '../../dist/mock'
+
 describe('useFetchShortcut', () => {
-  const mockClient = createMockClient({})
-  const id = '1'
-  it('should change loading status', async () => {
-    mockClient.stackClient.fetchJSON.mockResolvedValue({
-      data: {
-        attributes: {
-          url: 'http://foo.cozy.bar'
-        }
+  const mockClient = createMockClient({
+    queries: {
+      'io.cozy.files.shortcuts/123': {
+        doctype: 'io.cozy.files.shortcuts',
+        definition: {
+          doctype: 'io.cozy.files.shortcuts',
+          id: 'io.cozy.files.shortcuts/123'
+        },
+        data: [
+          {
+            type: 'io.cozy.files.shortcuts',
+            id: 'b7470059d40c88e4bd30031d5e0109d3',
+            attributes: {
+              _id: '',
+              name: 'cozy.url',
+              dir_id: '8034db0016d0548ded99b9627e003270',
+              url: 'https://cozy.io',
+              metadata: { extractor_version: 2 }
+            },
+            meta: { rev: '1-60e1359e63fa7fa9fa000a2726d5d4c7' }
+          }
+        ]
+      },
+      'io.cozy.files.shortcuts/linkToCozyApp': {
+        doctype: 'io.cozy.files.shortcuts',
+        definition: {
+          doctype: 'io.cozy.files.shortcuts',
+          id: 'io.cozy.files.shortcuts/linkToCozyApp'
+        },
+        data: [
+          {
+            type: 'io.cozy.files.shortcuts',
+            id: 'linkToCozyApp',
+            attributes: {
+              _id: '',
+              name: 'cozy.url',
+              dir_id: '8034db0016d0548ded99b9627e003270',
+              url: 'https://cozy.io',
+              metadata: {
+                extractor_version: 2,
+                target: {
+                  app: 'notes'
+                }
+              }
+            },
+            meta: { rev: '1-60e1359e63fa7fa9fa000a2726d5d4c7' }
+          }
+        ]
+      },
+      'io.cozy.files.shortcuts/no-found': {
+        doctype: 'io.cozy.files.shortcuts',
+        queryError: new Error('not found')
       }
-    })
+    },
+    clientOptions: {
+      uri: 'https://test.mycozy.cloud'
+    }
+  })
+
+  it('should change loading status', async () => {
     const { result, waitForNextUpdate } = renderHook(() =>
-      useFetchShortcut(mockClient, id)
+      useFetchShortcut(mockClient, '123')
     )
     expect(result.current.fetchStatus).toEqual('loading')
     await waitForNextUpdate()
@@ -24,7 +76,7 @@ describe('useFetchShortcut', () => {
     mockClient.stackClient.fetchJSON.mockRejectedValue('error')
 
     const { result, waitForNextUpdate } = renderHook(() =>
-      useFetchShortcut(mockClient, id)
+      useFetchShortcut(mockClient, 'no-found')
     )
     expect(result.current.fetchStatus).toEqual('loading')
     await waitForNextUpdate()
@@ -32,27 +84,15 @@ describe('useFetchShortcut', () => {
   })
 
   it('should return the data of a shortcut and change the display value', async () => {
-    mockClient.stackClient.fetchJSON.mockResolvedValue({
-      data: {
-        type: 'io.cozy.files.shortcuts',
-        id: 'b7470059d40c88e4bd30031d5e0109d3',
-        attributes: {
-          _id: '',
-          name: 'cozy.url',
-          dir_id: '8034db0016d0548ded99b9627e003270',
-          url: 'https://cozy.io',
-          metadata: { extractor_version: 2 }
-        },
-        meta: { rev: '1-60e1359e63fa7fa9fa000a2726d5d4c7' }
-      }
-    })
     const { result, waitForNextUpdate } = renderHook(() =>
-      useFetchShortcut(mockClient, id)
+      useFetchShortcut(mockClient, '123')
     )
 
     await waitForNextUpdate()
     expect(result.current.shortcutInfos).toEqual({
       data: {
+        _id: 'b7470059d40c88e4bd30031d5e0109d3',
+        _type: 'io.cozy.files.shortcuts',
         type: 'io.cozy.files.shortcuts',
         id: 'b7470059d40c88e4bd30031d5e0109d3',
         attributes: {
@@ -69,4 +109,15 @@ describe('useFetchShortcut', () => {
       `${mockClient.getStackClient().uri}/bitwarden/icons/cozy.io/icon.png`
     )
   })
+
+  it('should return shortcutImg for the targeted application icon when available', async () => {
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useFetchShortcut(mockClient, 'linkToCozyApp')
+    )
+
+    await waitForNextUpdate()
+    expect(result.current.shortcutImg).toEqual(
+      `${mockClient.getStackClient().uri}/registry/notes/icon`
+    )
+  })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-client",
-  "version": "43.4.0",
+  "version": "43.4.1",
   "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": "67f6b6d54cd250f975bc2e2b987cad2784476563"
+  "gitHead": "aceb4eec10ed6dac61f5e6ee168be6559225ec89"
 }