cozy-bar 15.0.1 → 15.2.0

package/dist/components/Apps/ButtonCozyHome.js

@@ -27,7 +27,8 @@ var ButtonCozyHome = function ButtonCozyHome(_ref) {
     onClick: function onClick() {
       webviewIntent.call('backToHome');
     },
-    className: "coz-nav-apps-btns-home coz-nav-apps-btns-home--is-flagship"
+    className: "coz-nav-apps-btns-home coz-nav-apps-btns-home--is-flagship",
+    "data-testid": "buttonCozyHome"
   }, /*#__PURE__*/_react.default.createElement(_IconCozyHome.default, {
     className: "coz-nav-apps-btns-home-svg",
     isInvertedTheme: isInvertedTheme

package/dist/components/Apps/ButtonCozyHome.spec.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { shallow } from 'enzyme'
+import { render, fireEvent } from '@testing-library/react'
 import { ButtonCozyHome } from './ButtonCozyHome'
 import { isFlagshipApp } from 'cozy-device-helper'
 import { useWebviewIntent } from 'cozy-intent'
@@ -9,51 +9,39 @@ jest.mock('cozy-intent', () => ({
   useWebviewIntent: jest.fn(() => ({ call: jest.fn() }))
 }))
 
-const homeHref = 'foo'
-const expectedCall = 'backToHome'
-
 describe('ButtonCozyHome', () => {
-  it('should render a span with no props', () => {
-    isFlagshipApp.mockImplementation(() => false)
-    const render = shallow(<ButtonCozyHome />)
-    const element = render.getElement()
+  it('renders a link with backToHome intent for flagship apps', () => {
+    isFlagshipApp.mockReturnValue(true)
 
-    expect(element.type).toBe('span')
-  })
+    const mockCall = jest.fn()
+    useWebviewIntent.mockImplementation(() => ({ call: mockCall }))
 
-  it('should render an anchor with correct href when homeHref', () => {
-    isFlagshipApp.mockImplementation(() => false)
-    const render = shallow(<ButtonCozyHome homeHref={homeHref} />)
-    const element = render.getElement()
+    // We need to use a testid because
+    // - the a tag has no text to query it (just an icon)
+    // - an "a" tag without href is not seen as a link by queryByRole
+    const { getByTestId } = render(<ButtonCozyHome />)
+    const linkElement = getByTestId('buttonCozyHome')
 
-    expect(element.type).toBe('a')
-    expect(element.props.href).toBe(homeHref)
-  })
+    fireEvent.click(linkElement)
 
-  it('should render an anchor when isFlagshipApp', () => {
-    isFlagshipApp.mockImplementation(() => true)
-    const render = shallow(<ButtonCozyHome />)
-    const element = render.getElement()
-
-    expect(element.type).toBe('a')
+    expect(mockCall).toHaveBeenCalledWith('backToHome')
   })
 
-  it('should give priority to anchor if both isFlagshipApp and homeHref are present', () => {
-    isFlagshipApp.mockImplementation(() => true)
-    const render = shallow(<ButtonCozyHome homeHref={homeHref} />)
-    const element = render.getElement()
+  it('renders a link with homeHref for non-flagship apps with homeHref', () => {
+    isFlagshipApp.mockReturnValue(false)
+
+    const { queryByRole } = render(<ButtonCozyHome homeHref="/home" />)
+    const linkElement = queryByRole('link')
 
-    expect(element.type).toBe('a')
+    expect(linkElement).toHaveAttribute('href', '/home')
   })
 
-  it('should call the correct context method on click', () => {
-    isFlagshipApp.mockImplementation(() => true)
-    const mockCall = jest.fn()
-    useWebviewIntent.mockImplementation(() => ({ call: mockCall }))
-    const render = shallow(<ButtonCozyHome homeHref={homeHref} />)
+  it('renders a span without href for non-flagship apps without homeHref', () => {
+    isFlagshipApp.mockReturnValue(false)
 
-    render.simulate('click')
+    const { queryByRole } = render(<ButtonCozyHome />)
+    const linkElement = queryByRole('link')
 
-    expect(mockCall).toBeCalledWith(expectedCall)
+    expect(linkElement).toBeNull()
   })
 })

package/dist/components/Bar.spec.jsx

@@ -38,7 +38,8 @@ describe('Bar', () => {
     shouldDisplayOffers.mockReturnValue(false)
     useInstanceInfo.mockReturnValue({
       isLoaded: true,
-      diskUsage: { data: { attributes: { used: 0 } } }
+      diskUsage: { data: { used: 0 } },
+      instance: { data: {} }
     })
   })
 

package/dist/components/Drawer.spec.jsx

@@ -19,7 +19,8 @@ describe('bar', () => {
     jest.resetAllMocks()
     useInstanceInfo.mockReturnValue({
       isLoaded: true,
-      diskUsage: { data: { attributes: { used: 0 } } }
+      diskUsage: { data: { used: 0 } },
+      instance: { data: {} }
     })
   })
 

package/dist/components/Settings/SettingsContent.js

@@ -25,6 +25,10 @@ var _ActionsItems = _interopRequireDefault(require("cozy-ui/transpiled/react/Act
 
 var _actions = require("./actions");
 
+var _termsOfService = require("./actions/termsOfService");
+
+var _legalNotice = require("./actions/legalNotice");
+
 var _useI18n2 = _interopRequireDefault(require("../useI18n"));
 
 var SettingsContent = function SettingsContent(_ref) {
@@ -37,7 +41,7 @@ var SettingsContent = function SettingsContent(_ref) {
   var _useI18n = (0, _useI18n2.default)(),
       t = _useI18n.t;
 
-  var actions = (0, _Actions.makeActions)([_actions.profile, _actions.appearance, _actions.plans, _actions.storage, _actions.permissions, _Actions.divider, _actions.connectedDevices, _actions.connections, _Actions.divider, _actions.help, _actions.contact, _actions.logout], {
+  var actions = (0, _Actions.makeActions)([_actions.profile, _actions.appearance, _actions.plans, _actions.storage, _actions.permissions, _Actions.divider, _actions.connectedDevices, _actions.connections, _Actions.divider, _actions.help, _actions.contact, _legalNotice.legalNotice, _termsOfService.termsOfService, _actions.logout], {
     t: t,
     instanceInfo: instanceInfo,
     onLogOut: onLogOut

package/dist/components/Settings/actions/legalNotice.js

@@ -0,0 +1,64 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.legalNotice = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _ActionsMenuItem = _interopRequireDefault(require("cozy-ui/transpiled/react/ActionsMenu/ActionsMenuItem"));
+
+var _ListItemIcon = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemIcon"));
+
+var _ListItemText = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemText"));
+
+var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
+
+var _Justice = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Justice"));
+
+var _Openwith = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Openwith"));
+
+var Component = (0, _react.forwardRef)(function (_ref, ref) {
+  var action = _ref.action,
+      props = (0, _objectWithoutProperties2.default)(_ref, ["action"]);
+  return /*#__PURE__*/_react.default.createElement(_ActionsMenuItem.default, (0, _extends2.default)({}, props, {
+    ref: ref
+  }), /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, null, /*#__PURE__*/_react.default.createElement(_Icon.default, {
+    icon: action.icon
+  })), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {
+    primary: action.label
+  }), /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, null, /*#__PURE__*/_react.default.createElement(_Icon.default, {
+    icon: _Openwith.default
+  })));
+});
+Component.displayName = 'LegalNoticeAction';
+
+var legalNotice = function legalNotice(_ref2) {
+  var t = _ref2.t,
+      instanceInfo = _ref2.instanceInfo;
+  var icon = _Justice.default;
+  var label = t('legalNotice');
+  return {
+    name: 'legalNotice',
+    icon: icon,
+    label: label,
+    displayCondition: function displayCondition() {
+      return !!instanceInfo.instance.data.legal_notice_url;
+    },
+    action: function action() {
+      window.open(instanceInfo.instance.data.legal_notice_url, '_blank', 'noopener, noreferrer');
+    },
+    Component: Component
+  };
+};
+
+exports.legalNotice = legalNotice;

package/dist/components/Settings/actions/termsOfService.js

@@ -0,0 +1,61 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.termsOfService = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _ActionsMenuItem = _interopRequireDefault(require("cozy-ui/transpiled/react/ActionsMenu/ActionsMenuItem"));
+
+var _ListItemIcon = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemIcon"));
+
+var _ListItemText = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemText"));
+
+var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
+
+var _Contract = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Contract"));
+
+var _Openwith = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Openwith"));
+
+var Component = (0, _react.forwardRef)(function (_ref, ref) {
+  var action = _ref.action,
+      props = (0, _objectWithoutProperties2.default)(_ref, ["action"]);
+  return /*#__PURE__*/_react.default.createElement(_ActionsMenuItem.default, (0, _extends2.default)({}, props, {
+    ref: ref
+  }), /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, null, /*#__PURE__*/_react.default.createElement(_Icon.default, {
+    icon: action.icon
+  })), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {
+    primary: action.label
+  }), /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, null, /*#__PURE__*/_react.default.createElement(_Icon.default, {
+    icon: _Openwith.default
+  })));
+});
+Component.displayName = 'TermsOfServiceAction';
+
+var termsOfService = function termsOfService(_ref2) {
+  var t = _ref2.t,
+      instanceInfo = _ref2.instanceInfo;
+  var icon = _Contract.default;
+  var label = t('termsOfService');
+  return {
+    name: 'termsOfService',
+    icon: icon,
+    label: label,
+    action: function action() {
+      window.open("https://files.cozycloud.cc/TOS".concat(instanceInfo.instance.data.tos ? "-".concat(instanceInfo.instance.data.tos) : '-201711', ".pdf"), '_blank', 'noopener, noreferrer');
+    },
+    Component: Component
+  };
+};
+
+exports.termsOfService = termsOfService;

package/dist/index.js

@@ -72,5 +72,5 @@ var _BarProvider = _interopRequireDefault(require("./components/BarProvider"));
 var _reducers = require("./lib/reducers");
 
 /* global __VERSION__ */
-var version = "\"15.0.1\"";
+var version = "\"15.2.0\"";
 exports.version = version;

package/dist/lib/reducers/apps.js

@@ -17,6 +17,8 @@ var _stack = _interopRequireDefault(require("../stack"));
 
 var _lodash = _interopRequireDefault(require("lodash.unionwith"));
 
+var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
+
 // constants
 var DELETE_APP = 'DELETE_APP';
 var RECEIVE_APP = 'RECEIVE_APP';
@@ -107,7 +109,7 @@ exports.setInfos = setInfos;
 var fetchApps = function fetchApps() {
   return /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(dispatch) {
-      var rawAppList, apps;
+      var rawAppList, excludedApps, apps;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -121,29 +123,32 @@ var fetchApps = function fetchApps() {
 
             case 4:
               rawAppList = _context.sent;
-              apps = rawAppList.map(mapApp);
+              excludedApps = (0, _cozyFlags.default)('apps.hidden') || [];
+              apps = rawAppList.map(mapApp).filter(function (app) {
+                return !excludedApps.includes(app);
+              });
 
               if (rawAppList.length) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
 
               throw new Error('No installed apps found by the bar');
 
-            case 8:
-              _context.next = 10;
+            case 9:
+              _context.next = 11;
               return dispatch(setDefaultApp(apps));
 
-            case 10:
-              _context.next = 12;
+            case 11:
+              _context.next = 13;
               return dispatch(receiveAppList(apps));
 
-            case 12:
-              _context.next = 18;
+            case 13:
+              _context.next = 19;
               break;
 
-            case 14:
-              _context.prev = 14;
+            case 15:
+              _context.prev = 15;
               _context.t0 = _context["catch"](0);
               dispatch({
                 type: FETCH_APPS_FAILURE
@@ -151,12 +156,12 @@ var fetchApps = function fetchApps() {
 
               console.warn(_context.t0.message ? _context.t0.message : _context.t0);
 
-            case 18:
+            case 19:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 14]]);
+      }, _callee, null, [[0, 15]]);
     }));
 
     return function (_x) {

package/dist/locales/en.json

@@ -12,6 +12,8 @@
   "contact": "Contact us",
   "logout": "Log out",
   "soon": "soon",
+  "termsOfService": "Terms of Service",
+  "legalNotice": "Legal notice",
   "error_UnavailableStack": "The stack is unreachable (connection timed-out).",
   "error_UnauthorizedStack": "Some permissions are missing, the application can't access the requested resource on the stack.",
   "no_apps": "No applications found on the Cozy.",

package/dist/locales/fr.json

@@ -12,6 +12,8 @@
   "contact": "Nous contacter",
   "logout": "Déconnexion",
   "soon": "à venir",
+  "termsOfService": "Conditions générales d’utilisation",
+  "legalNotice": "Mentions légales",
   "error_UnavailableStack": "Connexion à la stack impossible (connection timed-out)",
   "error_UnauthorizedStack": "Des permissions sont manquante, l'application ne peut accéder aux ressources demandées.",
   "no_apps": "Pas d'applications Cozy trouvées.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-bar",
-  "version": "15.0.1",
+  "version": "15.2.0",
   "description": "cozy-bar.js library, a small lib provided by cozy-stack to inject the Cozy-bar component into each app",
   "main": "dist/index.js",
   "author": "Cozy Cloud <contact@cozycloud.cc> (https://cozy.io/)",
@@ -42,17 +42,14 @@
     "babel-plugin-module-resolver": "^4.0.0",
     "babel-plugin-transform-define": "^2.0.0",
     "babel-preset-cozy-app": "^1.9.0",
-    "cozy-client": "^48.12.1",
+    "cozy-client": "^51.1.0",
     "cozy-device-helper": "2.6.0",
     "cozy-flags": "^2.10.2",
-    "cozy-intent": "^1.7.0",
+    "cozy-intent": "^2.29.1",
     "cozy-interapp": "0.4.9",
     "cozy-logger": "1.9.1",
     "cozy-realtime": "^4.0.5",
     "cozy-ui": "^111.12.0",
-    "enzyme": "3.10.0",
-    "enzyme-adapter-react-16": "1.3",
-    "enzyme-to-json": "3.3.5",
     "eslint-config-cozy-app": "2.0.0",
     "identity-obj-proxy": "3.0.0",
     "jest": "24.9.0",
@@ -76,10 +73,10 @@
   },
   "peerDependencies": {
     "@cozy/minilog": ">=1.0.0",
-    "cozy-client": ">=48.12.1",
+    "cozy-client": ">=51.1.0",
     "cozy-device-helper": ">=2.6.0",
     "cozy-flags": ">=2.10.2",
-    "cozy-intent": ">=1.3.0",
+    "cozy-intent": ">=2.29.1",
     "cozy-interapp": ">=0.4.9",
     "cozy-realtime": ">=4.0.5",
     "cozy-ui": ">=111.12.0",