cozy-client 43.3.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.3.0";
+CozyClient.version = "43.4.1";
 
 _microee.default.mixin(CozyClient);
 

package/dist/devtools/Flags/FlagEdit.js

@@ -0,0 +1,109 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FlagEdit = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _TextField = _interopRequireDefault(require("cozy-ui/transpiled/react/TextField"));
+
+var _Buttons = _interopRequireDefault(require("cozy-ui/transpiled/react/Buttons"));
+
+var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
+
+var _helpers = require("./helpers");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+var FlagEdit = function FlagEdit(_ref) {
+  var editedFlag = _ref.flag;
+
+  var _useState = (0, _react.useState)({
+    key: '',
+    name: '',
+    value: '',
+    humanValue: ''
+  }),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      formData = _useState2[0],
+      setFormData = _useState2[1];
+
+  (0, _react.useEffect)(function () {
+    if (editedFlag) setFormData(editedFlag);
+  }, [editedFlag]);
+
+  var handleSubmit = function handleSubmit(e) {
+    e.preventDefault();
+    if (!formData.name || !formData.value) return;
+    /** @type {any} */
+
+    var value = formData.value;
+
+    if ((0, _helpers.isJSONString)(value)) {
+      value = JSON.parse(value);
+    } else if (value === 'true' || value === 'false') {
+      value = Boolean(value);
+    }
+
+    (0, _cozyFlags.default)(formData.name, value);
+    location.reload();
+  };
+
+  var handleFlagNameChange = function handleFlagNameChange(e) {
+    setFormData(_objectSpread(_objectSpread({}, formData), {}, {
+      key: "flag__".concat(e.target.value),
+      name: e.target.value
+    }));
+  };
+
+  var handleFlagValueChange = function handleFlagValueChange(e) {
+    var value = e.target.value;
+
+    if (Number.isInteger(value)) {
+      value = parseInt(value);
+    }
+
+    setFormData(_objectSpread(_objectSpread({}, formData), {}, {
+      value: value,
+      humanValue: (0, _helpers.makeHumanValue)(value)
+    }));
+  };
+
+  return /*#__PURE__*/_react.default.createElement("form", {
+    onSubmit: handleSubmit,
+    className: "u-mt-1 u-flex-items-center u-flex"
+  }, /*#__PURE__*/_react.default.createElement(_TextField.default, {
+    label: "Name",
+    name: "name",
+    onChange: handleFlagNameChange,
+    value: formData.name,
+    size: "small",
+    variant: "outlined"
+  }), /*#__PURE__*/_react.default.createElement(_TextField.default, {
+    label: "Value",
+    name: "value",
+    onChange: handleFlagValueChange,
+    value: formData.humanValue,
+    size: "small",
+    variant: "outlined",
+    className: "u-ml-1"
+  }), /*#__PURE__*/_react.default.createElement(_Buttons.default, {
+    type: "submit",
+    label: "Edit",
+    className: "u-ml-1"
+  }));
+};
+
+exports.FlagEdit = FlagEdit;

package/dist/devtools/Flags/FlagItem.js

@@ -0,0 +1,74 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _reactInspector = require("react-inspector");
+
+var _IconButton = _interopRequireDefault(require("cozy-ui/transpiled/react/IconButton"));
+
+var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
+
+var _Pen = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Pen"));
+
+var _Trash = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Trash"));
+
+var _ListItem = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItem"));
+
+var _ListItemText = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemText"));
+
+var _ListItemSecondaryAction = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemSecondaryAction"));
+
+var _Checkbox = _interopRequireDefault(require("cozy-ui/transpiled/react/Checkbox"));
+
+var _ListItemIcon = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemIcon"));
+
+var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
+
+var FlagItem = function FlagItem(_ref) {
+  var flag = _ref.flag,
+      onEdit = _ref.onEdit,
+      onTrash = _ref.onTrash;
+
+  var handleCheckboxChange = function handleCheckboxChange(e) {
+    (0, _cozyFlags.default)(flag.name, e.target.checked);
+    location.reload();
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_ListItem.default, {
+    size: "small"
+  }, /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, null, flag.type === 'boolean' ? /*#__PURE__*/_react.default.createElement(_Checkbox.default, {
+    size: "small",
+    checked: flag.value,
+    onChange: handleCheckboxChange
+  }) : null), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {
+    primary: flag.humanName,
+    secondary: flag.type === 'object' ? /*#__PURE__*/_react.default.createElement(_reactInspector.ObjectInspector, {
+      data: flag.value
+    }) : flag.type !== 'boolean' ? flag.humanValue : null
+  }), /*#__PURE__*/_react.default.createElement(_ListItemSecondaryAction.default, null, /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+    size: "small",
+    onClick: function onClick() {
+      return onEdit(flag);
+    }
+  }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
+    icon: _Pen.default
+  })), /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+    className: "u-ml-1",
+    size: "small",
+    onClick: function onClick() {
+      return onTrash(flag);
+    }
+  }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
+    icon: _Trash.default
+  }))));
+};
+
+var _default = FlagItem;
+exports.default = _default;

package/dist/devtools/Flags/Flags.js

@@ -0,0 +1,65 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _Typography = _interopRequireDefault(require("cozy-ui/transpiled/react/Typography"));
+
+var _List = _interopRequireDefault(require("cozy-ui/transpiled/react/List"));
+
+var _PanelContent = _interopRequireDefault(require("../PanelContent"));
+
+var _FlagEdit = require("./FlagEdit");
+
+var _helpers = require("./helpers");
+
+var _FlagItem = _interopRequireDefault(require("./FlagItem"));
+
+var Flags = function Flags() {
+  var _useState = (0, _react.useState)(null),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      edited = _useState2[0],
+      setEdited = _useState2[1];
+
+  var flags = (0, _helpers.computeFlags)();
+
+  var handleEdit = function handleEdit(flag) {
+    setEdited(flag);
+  };
+
+  var handleTrash = function handleTrash(flag) {
+    if (localStorage.getItem(flag.key)) {
+      localStorage.removeItem(flag.key);
+      location.reload();
+    }
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_PanelContent.default, null, /*#__PURE__*/_react.default.createElement(_Typography.default, {
+    variant: "subtitle1"
+  }, "Flags"), /*#__PURE__*/_react.default.createElement(_List.default, {
+    dense: true,
+    className: "u-maw-6"
+  }, flags.map(function (flag) {
+    return /*#__PURE__*/_react.default.createElement(_FlagItem.default, {
+      key: flag.key,
+      flag: flag,
+      onEdit: handleEdit,
+      onTrash: handleTrash
+    });
+  })), /*#__PURE__*/_react.default.createElement(_FlagEdit.FlagEdit, {
+    flag: edited
+  }));
+};
+
+var _default = Flags;
+exports.default = _default;

package/dist/devtools/Flags/helpers.js

@@ -0,0 +1,49 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isJSONString = exports.computeFlags = exports.makeHumanValue = void 0;
+
+var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
+
+var human = function human(name) {
+  return name.replace(/[a-z][A-Z]/g, function (str) {
+    return str[0] + ' ' + str[1].toLowerCase();
+  });
+};
+
+var makeHumanValue = function makeHumanValue(value) {
+  return typeof value === 'object' ? JSON.stringify(value) : value.toString();
+};
+
+exports.makeHumanValue = makeHumanValue;
+
+var computeFlags = function computeFlags() {
+  return _cozyFlags.default.list().map(function (name) {
+    var value = (0, _cozyFlags.default)(name);
+    return {
+      key: "flag__".concat(name),
+      name: name,
+      type: typeof value,
+      humanName: human(name),
+      value: value,
+      humanValue: makeHumanValue(value)
+    };
+  });
+};
+
+exports.computeFlags = computeFlags;
+
+var isJSONString = function isJSONString(str) {
+  try {
+    JSON.parse(str);
+    return true;
+  } catch (e) {
+    return false;
+  }
+};
+
+exports.isJSONString = isJSONString;

package/dist/devtools/index.js

@@ -73,7 +73,7 @@ var _CrossMedium = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon
 
 var _Queries = _interopRequireDefault(require("./Queries"));
 
-var _Flags = _interopRequireDefault(require("./Flags"));
+var _Flags = _interopRequireDefault(require("./Flags/Flags"));
 
 var _LibraryVersions = _interopRequireDefault(require("./LibraryVersions"));
 

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.3.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": "eeefc22374dbb95969c385ca383b7d6ee8a1a58f"
+  "gitHead": "aceb4eec10ed6dac61f5e6ee168be6559225ec89"
 }

package/types/devtools/Flags/FlagEdit.d.ts

@@ -0,0 +1,3 @@
+export function FlagEdit({ flag: editedFlag }: {
+    flag: any;
+}): JSX.Element;

package/types/devtools/Flags/FlagItem.d.ts

@@ -0,0 +1,6 @@
+export default FlagItem;
+declare function FlagItem({ flag, onEdit, onTrash }: {
+    flag: any;
+    onEdit: any;
+    onTrash: any;
+}): JSX.Element;

package/types/devtools/Flags/Flags.d.ts

@@ -0,0 +1,2 @@
+export default Flags;
+declare function Flags(): JSX.Element;

package/types/devtools/Flags/helpers.d.ts

@@ -0,0 +1,3 @@
+export function makeHumanValue(value: any): any;
+export function computeFlags(): any;
+export function isJSONString(str: any): boolean;

package/dist/devtools/Flags.js

@@ -1,25 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _Typography = _interopRequireDefault(require("cozy-ui/transpiled/react/Typography"));
-
-var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
-
-var _PanelContent = _interopRequireDefault(require("./PanelContent"));
-
-var Flags = function Flags() {
-  return /*#__PURE__*/_react.default.createElement(_PanelContent.default, null, /*#__PURE__*/_react.default.createElement(_Typography.default, {
-    variant: "subtitle1"
-  }, "Flags"), /*#__PURE__*/_react.default.createElement(_cozyFlags.default.FlagSwitcher.List, null));
-};
-
-var _default = Flags;
-exports.default = _default;