cozy-bar 15.0.0 → 15.1.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/Settings/StorageData.js

@@ -27,7 +27,7 @@ var StorageData = function StorageData() {
 
   if (!isLoaded) return null; // we used this default quota set in getStorageData, we just reuse it here
 
-  var storageData = (0, _instance.makeDiskInfos)(diskUsage.data.attributes.used, diskUsage.data.attributes.quota || Math.max(Math.pow(10, 12), 10 * parseInt(diskUsage.data.attributes.used, 10)));
+  var storageData = (0, _instance.makeDiskInfos)(diskUsage.data.used, diskUsage.data.quota || Math.max(Math.pow(10, 12), 10 * parseInt(diskUsage.data.used, 10)));
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, t('storage_phrase', {
     diskUsage: storageData.humanDiskUsage,
     diskQuota: storageData.humanDiskQuota

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.0\"";
+var version = "\"15.1.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-bar",
-  "version": "15.0.0",
+  "version": "15.1.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/)",
@@ -50,9 +50,6 @@
     "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",