cozy-ui 60.9.1 → 60.10.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [60.10.0](https://github.com/cozy/cozy-ui/compare/v60.9.1...v60.10.0) (2022-01-31)
+
+
+### Bug Fixes
+
+* Update cozy-intent and device helper ([87d612c](https://github.com/cozy/cozy-ui/commit/87d612c))
+
+
+### Features
+
+* Inject webviewService into BarContext ([b6c269f](https://github.com/cozy/cozy-ui/commit/b6c269f))
+* Update BarContext testing ([15803f4](https://github.com/cozy/cozy-ui/commit/15803f4))
+* Upgrade cozy-intent to latest ([8653ad1](https://github.com/cozy/cozy-ui/commit/8653ad1))
+
 ## [60.9.1](https://github.com/cozy/cozy-ui/compare/v60.9.0...v60.9.1) (2022-01-27)
 
 
@@ -162,6 +176,7 @@
 
 * cozy-intent@1.1.2 or later is now required
 otherwise, AppLinker will crash
+* Wrap your App in the WebviewIntentProvider (via import { WebviewIntentProvider } from 'cozy-intent)
 
 ## [58.5.1](https://github.com/cozy/cozy-ui/compare/v58.5.0...v58.5.1) (2022-01-07)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-ui",
-  "version": "60.9.1",
+  "version": "60.10.0",
   "description": "Cozy apps UI SDK",
   "main": "./index.js",
   "bin": {
@@ -89,10 +89,10 @@
     "commitlint-config-cozy": "0.6.0",
     "copyfiles": "2.1.1",
     "cozy-client": "^27.5.1",
-    "cozy-device-helper": "^1.16.0",
+    "cozy-device-helper": "^1.16.1",
     "cozy-doctypes": "^1.69.0",
     "cozy-harvest-lib": "^6.7.3",
-    "cozy-intent": "^1.3.0",
+    "cozy-intent": "^1.6.0",
     "cozy-sharing": "^3.10.0",
     "css-loader": "0.28.11",
     "cssnano": "4.1.11",

package/react/BarContextProvider/index.jsx

@@ -6,16 +6,29 @@ import { CozyProvider } from 'cozy-client'
 import { Provider } from 'react-redux'
 import { WebviewIntentProvider } from 'cozy-intent'
 
-const BarContextProvider = props => {
-  if (!props.children) return null
+const BarContextProvider = ({
+  children,
+  store,
+  client,
+  f,
+  t,
+  lang,
+  webviewService
+}) => {
+  if (!children) return null
+
   return (
-    <Provider store={props.store}>
-      <CozyProvider client={props.client}>
-        <I18nContext.Provider
-          value={{ f: props.f, t: props.t, lang: props.lang }}
-        >
+    <Provider store={store}>
+      <CozyProvider client={client}>
+        <I18nContext.Provider value={{ f, t, lang }}>
           <BreakpointsProvider>
-            <WebviewIntentProvider>{props.children}</WebviewIntentProvider>
+            {webviewService ? (
+              <WebviewIntentProvider webviewService={webviewService}>
+                {children}
+              </WebviewIntentProvider>
+            ) : (
+              children
+            )}
           </BreakpointsProvider>
         </I18nContext.Provider>
       </CozyProvider>

package/react/BarContextProvider/index.spec.jsx

@@ -1,21 +1,20 @@
 import React from 'react'
+import { Provider, useStore } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import { render } from '@testing-library/react'
 
+import { useWebviewIntent } from 'cozy-intent'
 import CozyClient, {
   createMockClient,
   CozyProvider,
   useClient
 } from 'cozy-client'
-import configureStore from 'redux-mock-store'
-import { Provider, useStore } from 'react-redux'
-import { isFlagshipApp } from 'cozy-device-helper'
 
 import BarContextProvider from '.'
 import I18n, { useI18n, translate } from '../I18n'
 
-jest.mock('cozy-device-helper', () => ({
-  isFlagshipApp: jest.fn()
-}))
-
+const mockWebviewService = { foo: 'bar' }
+const mockVoidWebviewService = 'No context'
 const locales = { helloworld: 'Hello World !' }
 const localesBar = { a: 'b' }
 
@@ -29,6 +28,20 @@ const DumbHelloWorld = translate()(({ t, f, lang }) => (
   </div>
 ))
 
+const IntentComponent = () => {
+  let webviewIntent
+  let render
+
+  try {
+    webviewIntent = useWebviewIntent()
+    render = webviewIntent.foo
+  } catch {
+    render = mockVoidWebviewService
+  }
+
+  return <main>{render}</main>
+}
+
 const MockedBar = props => {
   const client = new CozyClient({})
   return (
@@ -40,53 +53,146 @@ const MockedBar = props => {
   )
 }
 
-const App = () => {
+const App = ({ children, webviewService }) => {
   const { t, f, lang } = useI18n()
   const client = useClient()
   const store = useStore()
+
   return (
     <MockedBar>
-      <BarContextProvider t={t} f={f} lang={lang} client={client} store={store}>
-        <DumbHelloWorld />
+      <BarContextProvider
+        t={t}
+        f={f}
+        lang={lang}
+        client={client}
+        store={store}
+        webviewService={webviewService}
+      >
+        {children}
       </BarContextProvider>
     </MockedBar>
   )
 }
 
 describe('BarContextProvider', () => {
+  afterAll(() => {
+    window.cozy = undefined
+  })
+
   it('should provide the right (aka app not the one from the bar) t/f/store/client to the DumbHelloWorld', () => {
     const client = createMockClient({})
     const mockStore = configureStore()
     const store = mockStore(x => x)
-    const root = mount(
+
+    const { queryByText } = render(
+      <Provider store={store}>
+        <CozyProvider client={client}>
+          <I18n lang="en" dictRequire={() => locales}>
+            <App>
+              <DumbHelloWorld />
+            </App>
+          </I18n>
+        </CozyProvider>
+      </Provider>
+    )
+
+    expect(queryByText('<div>Hello World !<br>6 Jan<br>en</div>')).toBeDefined()
+  })
+
+  it('should render nothing when no children is provided', () => {
+    const { container } = render(<BarContextProvider />)
+    expect(container.firstChild).toBeNull()
+  })
+
+  it('should work without a cozy-intent context', () => {
+    // Set App Amirale context
+    window.cozy.isFlagshipApp = true
+
+    const client = createMockClient({})
+    const mockStore = configureStore()
+    const store = mockStore(x => x)
+
+    const { queryByText } = render(
       <Provider store={store}>
         <CozyProvider client={client}>
           <I18n lang="en" dictRequire={() => locales}>
-            <App />
+            <App>
+              <IntentComponent />
+            </App>
           </I18n>
         </CozyProvider>
       </Provider>
     )
-    expect(root.html()).toBe('<div>Hello World !<br>6 Jan<br>en</div>')
+
+    expect(queryByText(mockVoidWebviewService)).toBeInTheDocument()
   })
 
-  it('should try to provide a cozy-intent context', async () => {
+  it('should not try to provide a cozy-intent context if one is provided', () => {
+    // Set App Amirale context
+    window.cozy.isFlagshipApp = true
+
     const client = createMockClient({})
     const mockStore = configureStore()
     const store = mockStore(x => x)
-    mount(
+
+    const { queryByText } = render(
+      <Provider store={store}>
+        <CozyProvider client={client}>
+          <I18n lang="en" dictRequire={() => locales}>
+            <App webviewService={mockWebviewService}>
+              <IntentComponent />
+            </App>
+          </I18n>
+        </CozyProvider>
+      </Provider>
+    )
+
+    expect(queryByText(mockWebviewService.foo)).toBeInTheDocument()
+  })
+
+  it('should work without a cozy-intent context', () => {
+    // Set Web context
+    window.cozy.isFlagshipApp = false
+
+    const client = createMockClient({})
+    const mockStore = configureStore()
+    const store = mockStore(x => x)
+
+    const { queryByText } = render(
+      <Provider store={store}>
+        <CozyProvider client={client}>
+          <I18n lang="en" dictRequire={() => locales}>
+            <App>
+              <IntentComponent />
+            </App>
+          </I18n>
+        </CozyProvider>
+      </Provider>
+    )
+
+    expect(queryByText(mockVoidWebviewService)).toBeInTheDocument()
+  })
+
+  it('should not try to provide a cozy-intent context if one is provided', () => {
+    // Set Web context
+    window.cozy.isFlagshipApp = false
+
+    const client = createMockClient({})
+    const mockStore = configureStore()
+    const store = mockStore(x => x)
+
+    const { queryByText } = render(
       <Provider store={store}>
         <CozyProvider client={client}>
           <I18n lang="en" dictRequire={() => locales}>
-            <App />
+            <App webviewService={mockWebviewService}>
+              <IntentComponent />
+            </App>
           </I18n>
         </CozyProvider>
       </Provider>
     )
 
-    // Currently only the WebviewProvider should call this function in BarContext
-    // This is an easy way to test that the provider is working, albeit brittle
-    // A full test would need to mock cozy-intent, post-me and react-native
-    expect(isFlagshipApp).toHaveBeenCalled()
+    expect(queryByText(mockWebviewService.foo)).not.toBeInTheDocument()
   })
 })

package/transpiled/react/BarContextProvider/index.js

@@ -5,19 +5,28 @@ import { CozyProvider } from 'cozy-client';
 import { Provider } from 'react-redux';
 import { WebviewIntentProvider } from 'cozy-intent';
 
-var BarContextProvider = function BarContextProvider(props) {
-  if (!props.children) return null;
+var BarContextProvider = function BarContextProvider(_ref) {
+  var children = _ref.children,
+      store = _ref.store,
+      client = _ref.client,
+      f = _ref.f,
+      t = _ref.t,
+      lang = _ref.lang,
+      webviewService = _ref.webviewService;
+  if (!children) return null;
   return React.createElement(Provider, {
-    store: props.store
+    store: store
   }, React.createElement(CozyProvider, {
-    client: props.client
+    client: client
   }, React.createElement(I18nContext.Provider, {
     value: {
-      f: props.f,
-      t: props.t,
-      lang: props.lang
+      f: f,
+      t: t,
+      lang: lang
     }
-  }, React.createElement(BreakpointsProvider, null, React.createElement(WebviewIntentProvider, null, props.children)))));
+  }, React.createElement(BreakpointsProvider, null, webviewService ? React.createElement(WebviewIntentProvider, {
+    webviewService: webviewService
+  }, children) : children))));
 };
 
 export default BarContextProvider;