cozy-bar 22.0.0 → 22.1.1

package/dist/components/Apps/ButtonCozyHome.js

@@ -28,14 +28,16 @@ var ButtonCozyHome = exports.ButtonCozyHome = function ButtonCozyHome(_ref) {
   if (homeHref) {
     return /*#__PURE__*/_react.default.createElement("a", {
       href: homeHref,
-      className: "coz-nav-apps-btns-home"
+      className: "coz-nav-apps-btns-home",
+      "data-testid": "buttonCozyHome"
     }, /*#__PURE__*/_react.default.createElement(_IconCozyHome.default, {
       className: "coz-nav-apps-btns-home-svg",
       isInvertedTheme: isInvertedTheme
     }));
   }
   return /*#__PURE__*/_react.default.createElement("span", {
-    className: "coz-nav-apps-btns-home"
+    className: "coz-nav-apps-btns-home",
+    "data-testid": "buttonCozyHome"
   }, /*#__PURE__*/_react.default.createElement(_IconCozyHome.default, {
     className: "coz-nav-apps-btns-home-svg",
     isInvertedTheme: isInvertedTheme

package/dist/components/Apps/IconCozyHome.js

@@ -5,60 +5,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
-var _AppIcon = _interopRequireDefault(require("cozy-ui/transpiled/react/AppIcon"));
-var _stack = _interopRequireDefault(require("../../lib/stack"));
-var _isTwakeTheme = require("cozy-ui/transpiled/react/helpers/isTwakeTheme");
 var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
 var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 var _TwakeWorkplace = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/TwakeWorkplace"));
-/* Generated with node_modules/.bin/svgr src/assets/sprites/icon-cozy-home.svg  */
-function SvgIconCozyHome(props) {
-  return /*#__PURE__*/_react.default.createElement("svg", (0, _extends2.default)({
-    width: 32,
-    height: 32
-  }, props), /*#__PURE__*/_react.default.createElement("g", {
-    fill: "none",
-    fillRule: "evenodd"
-  }, /*#__PURE__*/_react.default.createElement("circle", {
-    fill: "#297EF2",
-    fillRule: "nonzero",
-    cx: 16,
-    cy: 16,
-    r: 16
-  }), /*#__PURE__*/_react.default.createElement("path", {
-    d: "M19.314 17.561a.555.555 0 01-.82.12 4.044 4.044 0 01-2.499.862 4.04 4.04 0 01-2.494-.86.557.557 0 01-.815-.12.547.547 0 01.156-.748c.214-.14.229-.421.229-.424a.555.555 0 01.176-.385.504.504 0 01.386-.145.544.544 0 01.528.553c0 .004 0 .153-.054.36a2.954 2.954 0 003.784-.008 1.765 1.765 0 01-.053-.344.546.546 0 01.536-.561h.01c.294 0 .538.237.545.532 0 0 .015.282.227.422a.544.544 0 01.158.746m2.322-6.369a5.94 5.94 0 00-1.69-3.506A5.651 5.651 0 0015.916 6a5.648 5.648 0 00-4.029 1.687 5.936 5.936 0 00-1.691 3.524 5.677 5.677 0 00-3.433 1.737 5.966 5.966 0 00-1.643 4.137C5.12 20.347 7.704 23 10.882 23h10.236c3.176 0 5.762-2.653 5.762-5.915 0-3.083-2.31-5.623-5.244-5.893",
-    fill: "#FFF"
-  })));
-}
-var IconCozyHome = function IconCozyHome(_ref) {
-  var className = _ref.className,
-    isInvertedTheme = _ref.isInvertedTheme;
+var IconCozyHome = function IconCozyHome() {
   var _useBreakpoints = (0, _Breakpoints.useBreakpoints)(),
     isMobile = _useBreakpoints.isMobile;
-  if ((0, _isTwakeTheme.isTwakeTheme)()) {
-    return /*#__PURE__*/_react.default.createElement(_Icon.default, {
-      icon: _TwakeWorkplace.default,
-      size: isMobile ? 28 : 32,
-      className: isMobile ? 'u-ml-half' : undefined
-    });
-  }
-  var fetchIcon = function fetchIcon() {
-    if (isInvertedTheme) {
-      return "".concat(_stack.default.get.cozyURL(), "/assets/images/icon-cozy-home-inverted.svg");
-    }
-    return "".concat(_stack.default.get.cozyURL(), "/assets/images/icon-cozy-home.svg");
-  };
-  return /*#__PURE__*/_react.default.createElement(_AppIcon.default, {
-    fetchIcon: fetchIcon,
-    fallbackIcon: SvgIconCozyHome,
-    className: className
+  return /*#__PURE__*/_react.default.createElement(_Icon.default, {
+    icon: _TwakeWorkplace.default,
+    size: isMobile ? 28 : 32,
+    className: isMobile ? 'u-ml-half' : undefined
   });
 };
-IconCozyHome.propTypes = {
-  className: _propTypes.default.string,
-  isInvertedTheme: _propTypes.default.bool
-};
 var _default = exports.default = IconCozyHome;

package/dist/components/Bar.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mapStateToProps = exports.mapDispatchToProps = exports.default = exports.Bar = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactRedux = require("react-redux");
@@ -13,44 +12,27 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Grid = _interopRequireDefault(require("cozy-ui/transpiled/react/Grid"));
 var _Divider = _interopRequireDefault(require("cozy-ui/transpiled/react/Divider"));
 var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
-var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 var _AppTitle = _interopRequireDefault(require("cozy-ui/transpiled/react/AppTitle"));
 var _cozyDeviceHelper = require("cozy-device-helper");
 var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
-var _isTwakeTheme = require("cozy-ui/transpiled/react/helpers/isTwakeTheme");
 var _ButtonCozyHome = require("./Apps/ButtonCozyHome");
 var _Banner = _interopRequireDefault(require("./Banner"));
-var _Drawer = _interopRequireDefault(require("./Drawer"));
-var _Settings = _interopRequireDefault(require("./Settings"));
-var _Apps = _interopRequireDefault(require("./Apps"));
 var _AppsMenu = _interopRequireDefault(require("./AppsMenu"));
 var _UserMenu = _interopRequireDefault(require("./UserMenu"));
 var _HelpLink = _interopRequireDefault(require("./HelpLink"));
 var _reducers = require("../lib/reducers");
-var _useI18n2 = _interopRequireDefault(require("./useI18n"));
 var _cozyClient = require("cozy-client");
 var _cozySearch = require("cozy-search");
 var _SearchButton = _interopRequireDefault(require("./Search/SearchButton"));
 var _classnames = _interopRequireDefault(require("classnames"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-/* Generated with node_modules/.bin/svgr src/assets/sprites/icon-apps.svg */
-function SvgIconApps(props) {
-  return /*#__PURE__*/_react.default.createElement("svg", (0, _extends2.default)({
-    width: 16,
-    height: 16
-  }, props), /*#__PURE__*/_react.default.createElement("path", {
-    d: "M0 0h4v4H0V0zm0 6h4v4H0V6zm0 6h4v4H0v-4zM6 0h4v4H6V0zm0 6h4v4H6V6zm0 6h4v4H6v-4zm6-12h4v4h-4V0zm0 6h4v4h-4V6zm0 6h4v4h-4v-4z",
-    fillRule: "evenodd"
-  }));
-}
 var Bar = exports.Bar = function Bar(_ref) {
   var _componentsProps$Wrap;
   var fetchContext = _ref.fetchContext,
     fetchSettingsData = _ref.fetchSettingsData,
     fetchApps = _ref.fetchApps,
     isPublic = _ref.isPublic,
-    onDrawer = _ref.onDrawer,
     barLeft = _ref.barLeft,
     barRight = _ref.barRight,
     barCenter = _ref.barCenter,
@@ -59,24 +41,13 @@ var Bar = exports.Bar = function Bar(_ref) {
     userActionRequired = _ref.userActionRequired,
     searchOptions = _ref.searchOptions,
     isInvertedTheme = _ref.isInvertedTheme,
-    appName = _ref.appName,
-    appNamePrefix = _ref.appNamePrefix,
     appSlug = _ref.appSlug,
-    iconPath = _ref.iconPath,
     hasFetchedApps = _ref.hasFetchedApps,
     homeApp = _ref.homeApp,
     componentsProps = _ref.componentsProps;
   var client = (0, _cozyClient.useClient)();
-  var _useI18n = (0, _useI18n2.default)(),
-    t = _useI18n.t;
   var _useBreakpoints = (0, _Breakpoints.useBreakpoints)(),
     isMobile = _useBreakpoints.isMobile;
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    drawerVisible = _useState2[0],
-    setDrawerVisible = _useState2[1];
-  var showDrawerAndBurger = !isPublic && isMobile && !(0, _isTwakeTheme.isTwakeTheme)();
-  var showSettings = !isPublic && !isMobile;
   var fetchInitialData = (0, _react.useCallback)(function () {
     if (!isPublic) {
       fetchContext();
@@ -96,24 +67,8 @@ var Bar = exports.Bar = function Bar(_ref) {
       client.removeListener('tokenRefreshed', handleTokenRefreshed);
     };
   }, [client, fetchInitialData]);
-  (0, _react.useEffect)(function () {
-    if (!hasFetchedApps && drawerVisible) {
-      fetchApps();
-    }
-  }, [drawerVisible, fetchApps, hasFetchedApps]);
-  var toggleDrawer = function toggleDrawer() {
-    onDrawer(!drawerVisible);
-    setDrawerVisible(!drawerVisible);
-  };
   var renderCenter = function renderCenter() {
-    return (0, _isTwakeTheme.isTwakeTheme)() ? null : /*#__PURE__*/_react.default.createElement(_Apps.default, {
-      appName: appName,
-      appNamePrefix: appNamePrefix,
-      appSlug: appSlug,
-      iconPath: iconPath,
-      isPublic: isPublic,
-      isInvertedTheme: isInvertedTheme
-    });
+    return null;
   };
   var renderLeft = function renderLeft() {
     if ((0, _cozyDeviceHelper.isFlagshipApp)() || (0, _cozyFlags.default)('flagship.debug')) {
@@ -121,48 +76,26 @@ var Bar = exports.Bar = function Bar(_ref) {
         isInvertedTheme: isInvertedTheme
       });
     }
-    if ((0, _isTwakeTheme.isTwakeTheme)()) {
-      var homeHref = !isPublic && homeApp && homeApp.href;
-      if (isMobile) {
-        return /*#__PURE__*/_react.default.createElement(_ButtonCozyHome.ButtonCozyHome, {
-          homeHref: homeHref
-        });
-      }
-      var isHome = appSlug === 'home';
-      return /*#__PURE__*/_react.default.createElement(_Grid.default, {
-        container: true,
-        alignItems: "center",
-        className: "u-w-auto"
-      }, !isHome && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ButtonCozyHome.ButtonCozyHome, {
+    var homeHref = !isPublic && homeApp && homeApp.href;
+    if (isMobile) {
+      return /*#__PURE__*/_react.default.createElement(_ButtonCozyHome.ButtonCozyHome, {
         homeHref: homeHref
-      }), /*#__PURE__*/_react.default.createElement(_Divider.default, {
-        orientation: "vertical",
-        className: "u-mr-half",
-        flexItem: true
-      })), /*#__PURE__*/_react.default.createElement(_AppTitle.default, {
-        slug: appSlug
-      }));
+      });
     }
-
-    // data-tutorial attribute allows to be targeted in an application tutorial
-    return showDrawerAndBurger ? /*#__PURE__*/_react.default.createElement("button", {
-      type: "button",
-      className: "coz-bar-btn coz-bar-burger",
-      onClick: toggleDrawer,
-      "data-tutorial": "apps-mobile"
-    }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
-      icon: SvgIconApps,
-      width: 16,
-      height: 16,
-      color: "currentColor"
-    }), /*#__PURE__*/_react.default.createElement("span", {
-      className: "u-visuallyhidden"
-    }, t('drawer'))) : null;
-  };
-  var renderRight = function renderRight() {
-    return showSettings ? /*#__PURE__*/_react.default.createElement(_Settings.default, {
-      onLogOut: onLogOut
-    }) : null;
+    var isHome = appSlug === 'home';
+    return /*#__PURE__*/_react.default.createElement(_Grid.default, {
+      container: true,
+      alignItems: "center",
+      className: "u-w-auto"
+    }, !isHome && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ButtonCozyHome.ButtonCozyHome, {
+      homeHref: homeHref
+    }), /*#__PURE__*/_react.default.createElement(_Divider.default, {
+      orientation: "vertical",
+      className: "u-mr-half",
+      flexItem: true
+    })), /*#__PURE__*/_react.default.createElement(_AppTitle.default, {
+      slug: appSlug
+    }));
   };
   var renderTwakeRight = function renderTwakeRight() {
     // Special case because search on Drive on mobile still rely
@@ -198,25 +131,13 @@ var Bar = exports.Bar = function Bar(_ref) {
     className: "coz-bar-container"
   }, barLeft || renderLeft(), barCenter || renderCenter(), /*#__PURE__*/_react.default.createElement("div", {
     className: "u-flex-grow"
-  }, barSearch || renderSearch()), searchOptions.enabled && isMobile ? /*#__PURE__*/_react.default.createElement(_SearchButton.default, null) : null, (0, _isTwakeTheme.isTwakeTheme)() ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, barRight, !isPublic && renderTwakeRight()) : barRight || renderRight(), showDrawerAndBurger ? /*#__PURE__*/_react.default.createElement(_Drawer.default, {
-    visible: drawerVisible,
-    onClose: toggleDrawer,
-    drawerListener: function drawerListener() {
-      return onDrawer(drawerVisible);
-    },
-    onLogOut: onLogOut,
-    isInvertedTheme: isInvertedTheme
-  }) : null), userActionRequired && /*#__PURE__*/_react.default.createElement(_Banner.default, userActionRequired));
+  }, barSearch || renderSearch()), searchOptions.enabled && isMobile ? /*#__PURE__*/_react.default.createElement(_SearchButton.default, null) : null, barRight, !isPublic && renderTwakeRight()), userActionRequired && /*#__PURE__*/_react.default.createElement(_Banner.default, userActionRequired));
 };
 Bar.propTypes = {
-  appName: _propTypes.default.string,
-  appNamePrefix: _propTypes.default.string,
   appSlug: _propTypes.default.string,
-  iconPath: _propTypes.default.string,
   isPublic: _propTypes.default.bool,
   isInvertedTheme: _propTypes.default.bool,
   onLogOut: _propTypes.default.func,
-  onDrawer: _propTypes.default.func,
   userActionRequired: _propTypes.default.object,
   componentsProps: _propTypes.default.shape({
     Wrapper: _propTypes.default.shape({

package/dist/components/Bar.spec.jsx

@@ -3,7 +3,7 @@ import { isFlagshipApp } from 'cozy-device-helper'
 import { BarLike } from 'test/lib/BarLike'
 
 import { Bar } from './Bar'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { render } from '@testing-library/react'
 import { createMockClient } from 'cozy-client'
 import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
@@ -100,32 +100,6 @@ describe('Bar', () => {
     expect(mockFetchSettingsData).not.toHaveBeenCalled()
   })
 
-  it('should not fetch apps if hasFetchedApps is true', async () => {
-    setup({ hasFetchedApps: true })
-
-    const toogleButton = await screen.getByText('Show menu drawer')
-    fireEvent.click(toogleButton)
-
-    // wait the drawer to be opened
-    await screen.getByText('Contact us')
-
-    expect(mockFetchApps).not.toHaveBeenCalled()
-  })
-
-  it('should re-fetch apps if apps are not fetched and drawer opens', async () => {
-    setup({ hasFetchedApps: false })
-
-    expect(mockFetchApps).toHaveBeenCalledTimes(1)
-
-    const toogleButton = await screen.getByText('Show menu drawer')
-    fireEvent.click(toogleButton)
-
-    // wait the drawer to be opened
-    await screen.getByText('Contact us')
-
-    expect(mockFetchApps).toHaveBeenCalledTimes(2)
-  })
-
   it('should call re-fetch data when token is refreshed', () => {
     const { client } = setup()
     client.emit('tokenRefreshed')

package/dist/components/UserMenu/components/AvatarMyself.js

@@ -16,11 +16,8 @@ var AvatarMyself = function AvatarMyself(_ref) {
   var rootURL = client.getStackClient().uri;
   return /*#__PURE__*/_react.default.createElement(_Avatar.default, {
     className: className,
-    size: size
-  }, /*#__PURE__*/_react.default.createElement("img", {
-    width: "100%",
-    height: "100%",
+    size: size,
     src: "".concat(rootURL, "/public/avatar?fallback=initials")
-  }));
+  });
 };
 var _default = exports.default = AvatarMyself;

package/dist/index.js

@@ -71,4 +71,4 @@ var _BarProvider = _interopRequireDefault(require("./components/BarProvider"));
 var _reducers = require("./lib/reducers");
 /* global __VERSION__ */
 
-var version = exports.version = "\"22.0.0\"";
+var version = exports.version = "\"22.1.1\"";

package/dist/index.spec.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { render, screen } from '@testing-library/react'
 
-import { BarComponent, BarProvider, BarRight } from './index'
+import { BarComponent, BarProvider, BarLeft } from './index'
 import { BarLike } from '../test/lib/BarLike'
 
 describe('The bar library', function() {
@@ -21,7 +21,7 @@ describe('The bar library', function() {
       </BarLike>
     )
 
-    const buttonElement = screen.queryByRole('button', { name: /settings/i })
+    const buttonElement = screen.queryByTestId('buttonCozyHome')
     expect(buttonElement).toBeInTheDocument()
   })
 
@@ -30,12 +30,12 @@ describe('The bar library', function() {
       <BarLike>
         <BarProvider>
           <BarComponent />
-          <BarRight>Custom text</BarRight>
+          <BarLeft>Custom text</BarLeft>
         </BarProvider>
       </BarLike>
     )
 
-    const buttonElement = screen.queryByRole('button', { name: /settings/i })
+    const buttonElement = screen.queryByTestId('buttonCozyHome')
     expect(buttonElement).not.toBeInTheDocument()
 
     const currentApp = screen.getByText('Custom text')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-bar",
-  "version": "22.0.0",
+  "version": "22.1.1",
   "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/)",