cozy-harvest-lib 18.2.2 → 19.0.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [19.0.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@18.2.2...cozy-harvest-lib@19.0.0) (2023-10-18)
+
+
+### Features
+
+* **cozy-harvest-lib:** Update cozy-client from 41.0.0 to 41.8.1 ([351d981](https://github.com/cozy/cozy-libs/commit/351d98105c625a23a1fa98f6df8a1a0009c16d0b))
+* Redirect users to where they can download the mobile application ([9d71ea6](https://github.com/cozy/cozy-libs/commit/9d71ea6d78b7b6a832a06bc013c6e9690d3f3d74))
+* Small wording improvements linked to CCC ([e8dafde](https://github.com/cozy/cozy-libs/commit/e8dafdea275bfe32b40a350114a564a87ca17f90))
+
+
+### BREAKING CHANGES
+
+* **cozy-harvest-lib:** You need cozy-client >= 41.8.1
+
+
+
+
+
 ## [18.2.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@18.2.1...cozy-harvest-lib@18.2.2) (2023-10-13)
 
 

package/dist/components/AccountForm/InstallFlagshipButton.js

@@ -0,0 +1,26 @@
+import React from 'react';
+import { getFlagshipDownloadLink } from 'cozy-client/dist/models/utils';
+import Buttons from 'cozy-ui/transpiled/react/Buttons';
+import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
+
+var InstallFlagshipButton = function InstallFlagshipButton(_ref) {
+  var className = _ref.className;
+
+  var _useI18n = useI18n(),
+      t = _useI18n.t,
+      lang = _useI18n.lang;
+
+  var handleClick = function handleClick() {
+    var downloadLink = getFlagshipDownloadLink(lang);
+    window.open(downloadLink, '_blank');
+  };
+
+  return /*#__PURE__*/React.createElement(Buttons, {
+    className: className,
+    fullWidth: true,
+    label: t('accountForm.installFlagship.label'),
+    onClick: handleClick
+  });
+};
+
+export { InstallFlagshipButton };

package/dist/components/AccountForm/InstallFlagshipButton.spec.js

@@ -0,0 +1,74 @@
+import { render, fireEvent, screen } from '@testing-library/react';
+import React from 'react';
+import { isAndroid, isIOS } from 'cozy-device-helper';
+import flag from 'cozy-flags';
+import { InstallFlagshipButton } from './InstallFlagshipButton';
+jest.mock('cozy-device-helper', function () {
+  return {
+    isAndroid: jest.fn(),
+    isIOS: jest.fn()
+  };
+});
+jest.mock('cozy-flags');
+jest.mock('cozy-ui/transpiled/react/providers/I18n', function () {
+  return {
+    useI18n: jest.fn(function () {
+      return {
+        t: function t(key) {
+          return key;
+        },
+        lang: 'en'
+      };
+    })
+  };
+});
+describe('InstallFlagshipButton', function () {
+  afterEach(function () {
+    jest.clearAllMocks();
+  });
+  it('should render correctly', function () {
+    render( /*#__PURE__*/React.createElement(InstallFlagshipButton, null));
+    expect(screen.getByText('accountForm.installFlagship.label')).toBeInTheDocument();
+  });
+  it('should open the download link in a new tab when clicked', function () {
+    var mockWindowOpen = jest.spyOn(window, 'open').mockImplementation(function () {});
+    render( /*#__PURE__*/React.createElement(InstallFlagshipButton, null));
+    fireEvent.click(screen.getByText('accountForm.installFlagship.label'));
+    expect(mockWindowOpen).toHaveBeenCalledTimes(1);
+    expect(mockWindowOpen).toHaveBeenCalledWith('https://cozy.io/en/download', '_blank');
+  });
+  it('should open the Play Store when clicked on an Android device', function () {
+    isAndroid.mockReturnValueOnce(true);
+    var mockWindowOpen = jest.spyOn(window, 'open').mockImplementation(function () {});
+    render( /*#__PURE__*/React.createElement(InstallFlagshipButton, null));
+    fireEvent.click(screen.getByText('accountForm.installFlagship.label'));
+    expect(mockWindowOpen).toHaveBeenCalledTimes(1);
+    expect(mockWindowOpen).toHaveBeenCalledWith('https://play.google.com/store/apps/details?id=io.cozy.flagship.mobile&hl=en', '_blank');
+  });
+  it('should open the Play Store when clicked on an Android device with a custom id', function () {
+    isAndroid.mockReturnValueOnce(true);
+    flag.mockReturnValueOnce('playstore_custom_id');
+    var mockWindowOpen = jest.spyOn(window, 'open').mockImplementation(function () {});
+    render( /*#__PURE__*/React.createElement(InstallFlagshipButton, null));
+    fireEvent.click(screen.getByText('accountForm.installFlagship.label'));
+    expect(mockWindowOpen).toHaveBeenCalledTimes(1);
+    expect(mockWindowOpen).toHaveBeenCalledWith('https://play.google.com/store/apps/details?id=playstore_custom_id&hl=en', '_blank');
+  });
+  it('should open the App Store when clicked on an iOS device', function () {
+    isIOS.mockReturnValueOnce(true);
+    var mockWindowOpen = jest.spyOn(window, 'open').mockImplementation(function () {});
+    render( /*#__PURE__*/React.createElement(InstallFlagshipButton, null));
+    fireEvent.click(screen.getByText('accountForm.installFlagship.label'));
+    expect(mockWindowOpen).toHaveBeenCalledTimes(1);
+    expect(mockWindowOpen).toHaveBeenCalledWith('https://apps.apple.com/en/app/id1600636174', '_blank');
+  });
+  it('should open the App Store when clicked on an iOS device with a custom id', function () {
+    isIOS.mockReturnValueOnce(true);
+    flag.mockReturnValueOnce('appstore_custom_id');
+    var mockWindowOpen = jest.spyOn(window, 'open').mockImplementation(function () {});
+    render( /*#__PURE__*/React.createElement(InstallFlagshipButton, null));
+    fireEvent.click(screen.getByText('accountForm.installFlagship.label'));
+    expect(mockWindowOpen).toHaveBeenCalledTimes(1);
+    expect(mockWindowOpen).toHaveBeenCalledWith('https://apps.apple.com/en/app/appstore_custom_id', '_blank');
+  });
+});

package/dist/components/AccountForm/__snapshots__/index.spec.jsx.snap

@@ -157,7 +157,7 @@ exports[`AccountForm should render normally when client side konnector with laun
           "onClick": [Function],
         }
       }
-      description="Connect testkonnector to your Cozy to synchronize your account and automatically retrieve all your data. "
+      description="Connect testkonnector to your Cozy to synchronize your account and retrieve all your data. "
       title="Connect to your Cozy"
     />
   </React.Fragment>
@@ -189,12 +189,8 @@ exports[`AccountForm should render with specific message when client side konnec
         </ForwardRef>
       </Bd>
     </Media>
-    <ForwardRef
+    <InstallFlagshipButton
       className="u-mt-2 u-mb-1-half"
-      fullWidth={true}
-      label="Install Cozy on mobile"
-      onClick={[Function]}
-      variant="primary"
     />
   </React.Fragment>
 </div>

package/dist/components/AccountForm/index.js

@@ -30,6 +30,7 @@ import Typography from 'cozy-ui/transpiled/react/Typography';
 import { Media, Img, Bd } from 'cozy-ui/transpiled/react/deprecated/Media';
 import AccountFields from './AccountFields';
 import CannotConnectModal from './CannotConnectModal';
+import { InstallFlagshipButton } from './InstallFlagshipButton';
 import ReadOnlyIdentifier from './ReadOnlyIdentifier';
 import fieldHelpers, { getEncryptedFieldName, SECRET } from '../../helpers/fields';
 import { KonnectorJobError } from '../../helpers/konnectors';
@@ -294,7 +295,6 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
           showError = _this$props2.showError,
           t = _this$props2.t,
           fieldOptions = _this$props2.fieldOptions,
-          historyAction = _this$props2.historyAction,
           flowState = _this$props2.flowState;
       var submitting = flowState.running;
       var error = flowState.error;
@@ -400,13 +400,8 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
               className: "u-m-1"
             }, /*#__PURE__*/React.createElement(Typography, null, t('accountForm.notClientSide', {
               name: name
-            })))), /*#__PURE__*/React.createElement(Button, {
-              className: "u-mt-2 u-mb-1-half",
-              fullWidth: true,
-              label: t('accountForm.installFlagship.label'),
-              onClick: function onClick() {
-                return historyAction('/', 'push');
-              }
+            })))), /*#__PURE__*/React.createElement(InstallFlagshipButton, {
+              className: "u-mt-2 u-mb-1-half"
             })), _this3.state.showConfirmationModal && /*#__PURE__*/React.createElement(Dialog, {
               title: t('triggerManager.confirmationModal.title'),
               description: t('triggerManager.confirmationModal.description'),

package/dist/locales/en.json

@@ -31,7 +31,7 @@
     "clientSide": {
       "title": "Connect to your Cozy",
       "submit": "Connect",
-      "description": "Connect %{name} to your Cozy to synchronize your account and automatically retrieve all your data. "
+      "description": "Connect %{name} to your Cozy to synchronize your account and retrieve all your data. "
     }
   },
   "contracts": {
@@ -545,7 +545,7 @@
   },
   "connectionBackdrop": {
     "connecting": "Connection in progress",
-    "progress": "We are requesting %{name}, this can take up to 30 seconds..."
+    "progress": "Establishing a connection to %{name} can take up to 30 seconds..."
   },
   "disconnectedAccountModal": {
     "disconnected-help": "This account is disconnected. Your data has been kept. If you want to restart the synchronisation, please reconfigure your account with the \"Add a bank\" button."

package/dist/locales/fr.json

@@ -31,7 +31,7 @@
     "clientSide": {
       "title": "Connecter à mon Cozy",
       "submit": "Connecter",
-      "description": "Connectez %{name} à votre Cozy pour synchroniser votre compte et récupérer automatiquement vos données."
+      "description": "Connectez %{name} à votre Cozy pour synchroniser votre compte et récupérer vos données."
     }
   },
   "contracts": {
@@ -545,7 +545,7 @@
   },
   "connectionBackdrop": {
     "connecting": "Connexion en cours",
-    "progress": "Nous interrogeons %{name}, cela peut prendre jusqu'à 30 secondes..."
+    "progress": "Établissement de la connexion à %{name}, cela peut prendre jusqu'à 30 secondes.."
   },
   "disconnectedAccountModal": {
     "disconnected-help": "Vous avez déconnecté votre compte. Vous conservez l'historique de vos données déjà importées. Si vous souhaitez reprendre la connexion, reconfigurez votre compte depuis le bouton \"Ajouter une banque\"."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "18.2.2",
+  "version": "19.0.0",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -72,7 +72,7 @@
     "babel-jest": "26.6.3",
     "babel-plugin-inline-react-svg": "1.1.2",
     "babel-preset-cozy-app": "^2.1.0",
-    "cozy-client": "^41.0.0",
+    "cozy-client": "^41.8.1",
     "cozy-device-helper": "^3.0.0",
     "cozy-flags": "^3.0.1",
     "cozy-intent": "^2.17.1",
@@ -100,7 +100,7 @@
   },
   "peerDependencies": {
     "@babel/runtime": ">=7.12.5",
-    "cozy-client": ">=41.0.0",
+    "cozy-client": ">=41.8.1",
     "cozy-device-helper": ">=2.6.0",
     "cozy-flags": ">=2.3.5",
     "cozy-intent": ">=1.14.1",
@@ -112,5 +112,5 @@
     "react-router-dom": ">=4.3.1"
   },
   "sideEffects": false,
-  "gitHead": "db1beed511c49a1083ff9e95cda069d04f850d6d"
+  "gitHead": "2bd960d39f21969432cd25c5fc6e54ea85969c4a"
 }

package/src/components/AccountForm/InstallFlagshipButton.jsx

@@ -0,0 +1,25 @@
+import React from 'react'
+
+import { getFlagshipDownloadLink } from 'cozy-client/dist/models/utils'
+import Buttons from 'cozy-ui/transpiled/react/Buttons'
+import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
+
+const InstallFlagshipButton = ({ className }) => {
+  const { t, lang } = useI18n()
+
+  const handleClick = () => {
+    let downloadLink = getFlagshipDownloadLink(lang)
+    window.open(downloadLink, '_blank')
+  }
+
+  return (
+    <Buttons
+      className={className}
+      fullWidth
+      label={t('accountForm.installFlagship.label')}
+      onClick={handleClick}
+    />
+  )
+}
+
+export { InstallFlagshipButton }

package/src/components/AccountForm/InstallFlagshipButton.spec.jsx

@@ -0,0 +1,113 @@
+import { render, fireEvent, screen } from '@testing-library/react'
+import React from 'react'
+
+import { isAndroid, isIOS } from 'cozy-device-helper'
+import flag from 'cozy-flags'
+
+import { InstallFlagshipButton } from './InstallFlagshipButton'
+
+jest.mock('cozy-device-helper', () => ({
+  isAndroid: jest.fn(),
+  isIOS: jest.fn()
+}))
+
+jest.mock('cozy-flags')
+
+jest.mock('cozy-ui/transpiled/react/providers/I18n', () => ({
+  useI18n: jest.fn(() => ({ t: key => key, lang: 'en' }))
+}))
+
+describe('InstallFlagshipButton', () => {
+  afterEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('should render correctly', () => {
+    render(<InstallFlagshipButton />)
+
+    expect(
+      screen.getByText('accountForm.installFlagship.label')
+    ).toBeInTheDocument()
+  })
+
+  it('should open the download link in a new tab when clicked', () => {
+    const mockWindowOpen = jest
+      .spyOn(window, 'open')
+      .mockImplementation(() => {})
+
+    render(<InstallFlagshipButton />)
+
+    fireEvent.click(screen.getByText('accountForm.installFlagship.label'))
+    expect(mockWindowOpen).toHaveBeenCalledTimes(1)
+    expect(mockWindowOpen).toHaveBeenCalledWith(
+      'https://cozy.io/en/download',
+      '_blank'
+    )
+  })
+
+  it('should open the Play Store when clicked on an Android device', () => {
+    isAndroid.mockReturnValueOnce(true)
+    const mockWindowOpen = jest
+      .spyOn(window, 'open')
+      .mockImplementation(() => {})
+
+    render(<InstallFlagshipButton />)
+
+    fireEvent.click(screen.getByText('accountForm.installFlagship.label'))
+    expect(mockWindowOpen).toHaveBeenCalledTimes(1)
+    expect(mockWindowOpen).toHaveBeenCalledWith(
+      'https://play.google.com/store/apps/details?id=io.cozy.flagship.mobile&hl=en',
+      '_blank'
+    )
+  })
+
+  it('should open the Play Store when clicked on an Android device with a custom id', () => {
+    isAndroid.mockReturnValueOnce(true)
+    flag.mockReturnValueOnce('playstore_custom_id')
+    const mockWindowOpen = jest
+      .spyOn(window, 'open')
+      .mockImplementation(() => {})
+
+    render(<InstallFlagshipButton />)
+
+    fireEvent.click(screen.getByText('accountForm.installFlagship.label'))
+    expect(mockWindowOpen).toHaveBeenCalledTimes(1)
+    expect(mockWindowOpen).toHaveBeenCalledWith(
+      'https://play.google.com/store/apps/details?id=playstore_custom_id&hl=en',
+      '_blank'
+    )
+  })
+
+  it('should open the App Store when clicked on an iOS device', () => {
+    isIOS.mockReturnValueOnce(true)
+    const mockWindowOpen = jest
+      .spyOn(window, 'open')
+      .mockImplementation(() => {})
+
+    render(<InstallFlagshipButton />)
+
+    fireEvent.click(screen.getByText('accountForm.installFlagship.label'))
+    expect(mockWindowOpen).toHaveBeenCalledTimes(1)
+    expect(mockWindowOpen).toHaveBeenCalledWith(
+      'https://apps.apple.com/en/app/id1600636174',
+      '_blank'
+    )
+  })
+
+  it('should open the App Store when clicked on an iOS device with a custom id', () => {
+    isIOS.mockReturnValueOnce(true)
+    flag.mockReturnValueOnce('appstore_custom_id')
+    const mockWindowOpen = jest
+      .spyOn(window, 'open')
+      .mockImplementation(() => {})
+
+    render(<InstallFlagshipButton />)
+
+    fireEvent.click(screen.getByText('accountForm.installFlagship.label'))
+    expect(mockWindowOpen).toHaveBeenCalledTimes(1)
+    expect(mockWindowOpen).toHaveBeenCalledWith(
+      'https://apps.apple.com/en/app/appstore_custom_id',
+      '_blank'
+    )
+  })
+})

package/src/components/AccountForm/__snapshots__/index.spec.jsx.snap

@@ -157,7 +157,7 @@ exports[`AccountForm should render normally when client side konnector with laun
           "onClick": [Function],
         }
       }
-      description="Connect testkonnector to your Cozy to synchronize your account and automatically retrieve all your data. "
+      description="Connect testkonnector to your Cozy to synchronize your account and retrieve all your data. "
       title="Connect to your Cozy"
     />
   </React.Fragment>
@@ -189,12 +189,8 @@ exports[`AccountForm should render with specific message when client side konnec
         </ForwardRef>
       </Bd>
     </Media>
-    <ForwardRef
+    <InstallFlagshipButton
       className="u-mt-2 u-mb-1-half"
-      fullWidth={true}
-      label="Install Cozy on mobile"
-      onClick={[Function]}
-      variant="primary"
     />
   </React.Fragment>
 </div>

package/src/components/AccountForm/index.jsx

@@ -16,6 +16,7 @@ import { Media, Img, Bd } from 'cozy-ui/transpiled/react/deprecated/Media'
 
 import AccountFields from './AccountFields'
 import CannotConnectModal from './CannotConnectModal'
+import { InstallFlagshipButton } from './InstallFlagshipButton'
 import ReadOnlyIdentifier from './ReadOnlyIdentifier'
 import fieldHelpers, {
   getEncryptedFieldName,
@@ -232,7 +233,6 @@ export class AccountForm extends PureComponent {
       showError,
       t,
       fieldOptions,
-      historyAction,
       flowState
     } = this.props
     const submitting = flowState.running
@@ -371,12 +371,7 @@ export class AccountForm extends PureComponent {
                     </Typography>
                   </Bd>
                 </Media>
-                <Button
-                  className="u-mt-2 u-mb-1-half"
-                  fullWidth
-                  label={t('accountForm.installFlagship.label')}
-                  onClick={() => historyAction('/', 'push')}
-                />
+                <InstallFlagshipButton className="u-mt-2 u-mb-1-half" />
               </>
             )}
             {this.state.showConfirmationModal && (

package/src/locales/en.json

@@ -31,7 +31,7 @@
     "clientSide": {
       "title": "Connect to your Cozy",
       "submit": "Connect",
-      "description": "Connect %{name} to your Cozy to synchronize your account and automatically retrieve all your data. "
+      "description": "Connect %{name} to your Cozy to synchronize your account and retrieve all your data. "
     }
   },
   "contracts": {
@@ -545,7 +545,7 @@
   },
   "connectionBackdrop": {
     "connecting": "Connection in progress",
-    "progress": "We are requesting %{name}, this can take up to 30 seconds..."
+    "progress": "Establishing a connection to %{name} can take up to 30 seconds..."
   },
   "disconnectedAccountModal": {
     "disconnected-help": "This account is disconnected. Your data has been kept. If you want to restart the synchronisation, please reconfigure your account with the \"Add a bank\" button."

package/src/locales/fr.json

@@ -31,7 +31,7 @@
     "clientSide": {
       "title": "Connecter à mon Cozy",
       "submit": "Connecter",
-      "description": "Connectez %{name} à votre Cozy pour synchroniser votre compte et récupérer automatiquement vos données."
+      "description": "Connectez %{name} à votre Cozy pour synchroniser votre compte et récupérer vos données."
     }
   },
   "contracts": {
@@ -545,7 +545,7 @@
   },
   "connectionBackdrop": {
     "connecting": "Connexion en cours",
-    "progress": "Nous interrogeons %{name}, cela peut prendre jusqu'à 30 secondes..."
+    "progress": "Établissement de la connexion à %{name}, cela peut prendre jusqu'à 30 secondes.."
   },
   "disconnectedAccountModal": {
     "disconnected-help": "Vous avez déconnecté votre compte. Vous conservez l'historique de vos données déjà importées. Si vous souhaitez reprendre la connexion, reconfigurez votre compte depuis le bouton \"Ajouter une banque\"."