cozy-bar 8.6.0 → 8.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-bar",
-  "version": "8.6.0",
+  "version": "8.7.2",
   "description": "cozy-bar.js library, a small lib provided by cozy-stack to inject the Cozy-bar component into each app",
   "main": "dist/cozy-bar.js",
   "author": "Cozy Cloud <contact@cozycloud.cc> (https://cozy.io/)",
@@ -85,7 +85,7 @@
     "redux-logger": "3.0.6",
     "semantic-release": "15.13.24",
     "style-loader": "0.23.1",
-    "stylus": "0.54.7",
+    "stylus": "0.57.0",
     "stylus-loader": "3.0.2",
     "svg-sprite-loader": "4.1.6",
     "url-loader": "1.1.2",
@@ -98,17 +98,18 @@
     "@cozy/minilog": "^1.0.0",
     "cozy-client": "^27.17.0",
     "cozy-device-helper": "^1.16.1",
-    "cozy-flags": "2.4.1",
+    "cozy-flags": "^2.8.5",
     "cozy-interapp": "0.4.9",
     "cozy-realtime": "^4.0.5",
     "cozy-ui": "^51.8.0",
     "hammerjs": "2.0.8",
     "lodash.debounce": "4.0.8",
+    "lodash.set": "^4.3.2",
     "lodash.unionwith": "4.6.0",
     "prop-types": "15.7.2",
     "react-autosuggest": "9.4.3",
     "react-redux": "5.1.1",
-    "redux": "3.7.2",
+    "redux": "4.1.2",
     "redux-persist": "5.10.0",
     "redux-thunk": "2.3.0",
     "semver-compare": "^1.0.0"

package/src/components/Apps/ButtonCozyHome.jsx

@@ -1,15 +1,18 @@
 import React from 'react'
+import { isFlagshipApp } from 'cozy-device-helper'
+
+import flag from 'cozy-flags'
 
 import IconCozyHome from './IconCozyHome'
 
 export const ButtonCozyHome = ({ webviewContext, homeHref }) => {
-  if (webviewContext)
+  if (isFlagshipApp() || flag('flagship.debug'))
     return (
       <a
         onClick={() => {
           webviewContext.call('backToHome')
         }}
-        className="coz-nav-apps-btns-home"
+        className="coz-nav-apps-btns-home --is-flagship"
       >
         <IconCozyHome className="coz-nav-apps-btns-home-svg" />
       </a>

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

@@ -1,7 +1,9 @@
 import React from 'react'
 import { shallow } from 'enzyme'
+import { ButtonCozyHome } from './ButtonCozyHome'
+import { isFlagshipApp } from 'cozy-device-helper'
 
-import { ButtonCozyHome } from 'components/Apps/ButtonCozyHome'
+jest.mock('cozy-device-helper')
 
 const homeHref = 'foo'
 const expectedCall = 'backToHome'
@@ -11,6 +13,7 @@ const webviewContext = {
 
 describe('ButtonCozyHome', () => {
   it('should render a span with no props', () => {
+    isFlagshipApp.mockImplementation(() => false)
     const render = shallow(<ButtonCozyHome />)
     const element = render.getElement()
 
@@ -18,6 +21,7 @@ describe('ButtonCozyHome', () => {
   })
 
   it('should render an anchor with correct href when homeHref', () => {
+    isFlagshipApp.mockImplementation(() => false)
     const render = shallow(<ButtonCozyHome homeHref={homeHref} />)
     const element = render.getElement()
 
@@ -25,14 +29,16 @@ describe('ButtonCozyHome', () => {
     expect(element.props.href).toBe(homeHref)
   })
 
-  it('should render an anchor when webviewContext', () => {
+  it('should render an anchor when isFlagshipApp', () => {
+    isFlagshipApp.mockImplementation(() => true)
     const render = shallow(<ButtonCozyHome webviewContext={webviewContext} />)
     const element = render.getElement()
 
     expect(element.type).toBe('a')
   })
 
-  it('should give priority to anchor if both webviewContext and homeHref are present', () => {
+  it('should give priority to anchor if both isFlagshipApp and homeHref are present', () => {
+    isFlagshipApp.mockImplementation(() => true)
     const render = shallow(
       <ButtonCozyHome homeHref={homeHref} webviewContext={webviewContext} />
     )
@@ -42,6 +48,7 @@ describe('ButtonCozyHome', () => {
   })
 
   it('should call the correct context method on click', () => {
+    isFlagshipApp.mockImplementation(() => true)
     const render = shallow(
       <ButtonCozyHome homeHref={homeHref} webviewContext={webviewContext} />
     )

package/src/components/Bar.jsx

@@ -10,7 +10,8 @@ import {
   getTracker,
   configureTracker
 } from 'cozy-ui/react/helpers/tracker'
-import { isMobileApp } from 'cozy-device-helper'
+import { isFlagshipApp, isMobileApp } from 'cozy-device-helper'
+import flag from 'cozy-flags'
 
 import { ButtonCozyHome } from 'components/Apps/ButtonCozyHome'
 import Banner from 'components/Banner'
@@ -167,7 +168,7 @@ export class Bar extends Component {
   renderLeft = () => {
     const { t, isPublic, webviewContext } = this.props
 
-    if (webviewContext) {
+    if (isFlagshipApp() || flag('flagship.debug')) {
       return <ButtonCozyHome webviewContext={webviewContext} />
     }
 

package/src/lib/logger.js

@@ -1,5 +1,8 @@
 import flag from 'cozy-flags'
 import _minilog from '@cozy/minilog'
+import set from 'lodash.set'
+
+set(window, `cozy.debug.flagship`, () => flag('flagship.debug', true))
 
 const minilog = window.minilog || _minilog
 const logger = minilog('cozy-bar')

package/src/styles/apps.css

@@ -50,6 +50,14 @@
   margin-right: .75rem;
 }
 
+[role=banner] .coz-nav-apps-btns-home.--is-flagship {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  margin: 0;
+  padding: 0 1rem;
+}
+
 
 [role=banner] .coz-nav-apps-btns-home-svg {
   max-width: 2rem;

package/transpiled/components/Apps/ButtonCozyHome.js

@@ -1,13 +1,15 @@
 import React from 'react';
+import { isFlagshipApp } from 'cozy-device-helper';
+import flag from 'cozy-flags';
 import IconCozyHome from "./IconCozyHome";
 export var ButtonCozyHome = function ButtonCozyHome(_ref) {
   var webviewContext = _ref.webviewContext,
       homeHref = _ref.homeHref;
-  if (webviewContext) return /*#__PURE__*/React.createElement("a", {
+  if (isFlagshipApp() || flag('flagship.debug')) return /*#__PURE__*/React.createElement("a", {
     onClick: function onClick() {
       webviewContext.call('backToHome');
     },
-    className: "coz-nav-apps-btns-home"
+    className: "coz-nav-apps-btns-home --is-flagship"
   }, /*#__PURE__*/React.createElement(IconCozyHome, {
     className: "coz-nav-apps-btns-home-svg"
   }));

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

@@ -1,7 +1,9 @@
 import React from 'react'
 import { shallow } from 'enzyme'
+import { ButtonCozyHome } from './ButtonCozyHome'
+import { isFlagshipApp } from 'cozy-device-helper'
 
-import { ButtonCozyHome } from 'components/Apps/ButtonCozyHome'
+jest.mock('cozy-device-helper')
 
 const homeHref = 'foo'
 const expectedCall = 'backToHome'
@@ -11,6 +13,7 @@ const webviewContext = {
 
 describe('ButtonCozyHome', () => {
   it('should render a span with no props', () => {
+    isFlagshipApp.mockImplementation(() => false)
     const render = shallow(<ButtonCozyHome />)
     const element = render.getElement()
 
@@ -18,6 +21,7 @@ describe('ButtonCozyHome', () => {
   })
 
   it('should render an anchor with correct href when homeHref', () => {
+    isFlagshipApp.mockImplementation(() => false)
     const render = shallow(<ButtonCozyHome homeHref={homeHref} />)
     const element = render.getElement()
 
@@ -25,14 +29,16 @@ describe('ButtonCozyHome', () => {
     expect(element.props.href).toBe(homeHref)
   })
 
-  it('should render an anchor when webviewContext', () => {
+  it('should render an anchor when isFlagshipApp', () => {
+    isFlagshipApp.mockImplementation(() => true)
     const render = shallow(<ButtonCozyHome webviewContext={webviewContext} />)
     const element = render.getElement()
 
     expect(element.type).toBe('a')
   })
 
-  it('should give priority to anchor if both webviewContext and homeHref are present', () => {
+  it('should give priority to anchor if both isFlagshipApp and homeHref are present', () => {
+    isFlagshipApp.mockImplementation(() => true)
     const render = shallow(
       <ButtonCozyHome homeHref={homeHref} webviewContext={webviewContext} />
     )
@@ -42,6 +48,7 @@ describe('ButtonCozyHome', () => {
   })
 
   it('should call the correct context method on click', () => {
+    isFlagshipApp.mockImplementation(() => true)
     const render = shallow(
       <ButtonCozyHome homeHref={homeHref} webviewContext={webviewContext} />
     )

package/transpiled/components/Bar.js

@@ -18,7 +18,8 @@ import { connect } from 'react-redux';
 import { translate } from "cozy-ui/transpiled/react/I18n";
 import Icon from "cozy-ui/transpiled/react/Icon";
 import { shouldEnableTracking, getTracker, configureTracker } from "cozy-ui/transpiled/react/helpers/tracker";
-import { isMobileApp } from 'cozy-device-helper';
+import { isFlagshipApp, isMobileApp } from 'cozy-device-helper';
+import flag from 'cozy-flags';
 import { ButtonCozyHome } from "./Apps/ButtonCozyHome";
 import Banner from "./Banner";
 import Drawer from "./Drawer";
@@ -106,7 +107,7 @@ export var Bar = /*#__PURE__*/function (_Component) {
           isPublic = _this$props.isPublic,
           webviewContext = _this$props.webviewContext;
 
-      if (webviewContext) {
+      if (isFlagshipApp() || flag('flagship.debug')) {
         return /*#__PURE__*/React.createElement(ButtonCozyHome, {
           webviewContext: webviewContext
         });

package/transpiled/cozy-bar.css

@@ -420,6 +420,14 @@
   margin-right: .75rem;
 }
 
+[role=banner] .coz-nav-apps-btns-home.--is-flagship {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  margin: 0;
+  padding: 0 1rem;
+}
+
 
 [role=banner] .coz-nav-apps-btns-home-svg {
   max-width: 2rem;

package/transpiled/lib/logger.js

@@ -1,5 +1,9 @@
 import flag from 'cozy-flags';
 import _minilog from '@cozy/minilog';
+import set from 'lodash.set';
+set(window, "cozy.debug.flagship", function () {
+  return flag('flagship.debug', true);
+});
 var minilog = window.minilog || _minilog;
 var logger = minilog('cozy-bar');
 

package/transpiled/styles/apps.css

@@ -50,6 +50,14 @@
   margin-right: .75rem;
 }
 
+[role=banner] .coz-nav-apps-btns-home.--is-flagship {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  margin: 0;
+  padding: 0 1rem;
+}
+
 
 [role=banner] .coz-nav-apps-btns-home-svg {
   max-width: 2rem;