cozy-harvest-lib 11.2.0 → 11.4.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [11.4.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@11.3.0...cozy-harvest-lib@11.4.0) (2023-01-10)
+
+
+### Features
+
+* **harvest:** Add success snackbar after successful synchronization ([242544e](https://github.com/cozy/cozy-libs/commit/242544ef5717062c76ae2a23b8326739bce57369))
+
+
+
+
+
+# [11.3.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@11.2.0...cozy-harvest-lib@11.3.0) (2023-01-04)
+
+
+### Features
+
+* **harvest:** Add onSuccess in Routes API ([5f41164](https://github.com/cozy/cozy-libs/commit/5f411642d0ac325375925cad157f66275e64db67))
+
+
+
+
+
 # [11.2.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@11.1.0...cozy-harvest-lib@11.2.0) (2023-01-02)
 
 

package/dist/components/NewAccountModal.js

@@ -2,19 +2,19 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-import { useClient } from 'cozy-client';
+import DialogContent from '@material-ui/core/DialogContent';
 import flag from 'cozy-flags';
+import { useClient } from 'cozy-client';
 import { useI18n } from 'cozy-ui/transpiled/react/I18n';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
 import Typography from 'cozy-ui/transpiled/react/Typography';
+import { DialogTitle } from 'cozy-ui/transpiled/react/Dialog';
 import TriggerManager from './TriggerManager';
 import KonnectorIcon from './KonnectorIcon';
 import * as triggersModel from '../helpers/triggers';
 import KonnectorMaintenance from './Maintenance';
 import useMaintenanceStatus from './hooks/useMaintenanceStatus';
 import { MountPointContext } from './MountPointContext';
-import DialogContent from '@material-ui/core/DialogContent';
-import { DialogTitle } from 'cozy-ui/transpiled/react/Dialog';
 import { useDialogContext } from './DialogContext';
 /**
  * We need to deal with `onLoginSuccess` and `onSucess` because we
@@ -25,6 +25,7 @@ import { useDialogContext } from './DialogContext';
 
 var NewAccountModal = function NewAccountModal(_ref) {
   var konnector = _ref.konnector,
+      onSuccess = _ref.onSuccess,
       onDismiss = _ref.onDismiss;
 
   var _useI18n = useI18n(),
@@ -49,6 +50,21 @@ var NewAccountModal = function NewAccountModal(_ref) {
   var fieldOptions = {
     displaySecretPlaceholder: false
   };
+
+  var handleSuccess = function handleSuccess(trigger) {
+    if (onSuccess) {
+      return onSuccess();
+    }
+
+    var accountId = triggersModel.getAccountId(trigger);
+
+    if (!flag('harvest.inappconnectors.enabled') && trigger.worker !== 'client') {
+      replaceHistory("/accounts/".concat(accountId, "/success"));
+    }
+
+    replaceHistory("/accounts/".concat(accountId));
+  };
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DialogTitle, _extends({}, dialogTitleProps, {
     className: cx(dialogTitleProps.className, 'u-ta-center u-flex-column u-stack-m u-pb-1'),
     disableTypography: true
@@ -71,26 +87,8 @@ var NewAccountModal = function NewAccountModal(_ref) {
     className: "u-pt-0"
   }, /*#__PURE__*/React.createElement(TriggerManager, {
     konnector: konnector,
-    onLoginSuccess: function onLoginSuccess(trigger) {
-      var accountId = triggersModel.getAccountId(trigger);
-      var path = "/accounts/".concat(accountId);
-
-      if (!flag('harvest.inappconnectors.enabled') && trigger.worker !== 'client') {
-        path += '/success';
-      }
-
-      replaceHistory(path);
-    },
-    onSuccess: function onSuccess(trigger) {
-      var accountId = triggersModel.getAccountId(trigger);
-      var path = "/accounts/".concat(accountId);
-
-      if (!flag('harvest.inappconnectors.enabled') && trigger.worker !== 'client') {
-        path += '/success';
-      }
-
-      replaceHistory(path);
-    },
+    onLoginSuccess: handleSuccess,
+    onSuccess: handleSuccess,
     onVaultDismiss: onDismiss,
     fieldOptions: fieldOptions
   }), /*#__PURE__*/React.createElement("div", {

package/dist/components/Routes/RoutesV4.js

@@ -12,6 +12,7 @@ var RoutesV4 = function RoutesV4(_ref) {
   var konnectorRoot = _ref.konnectorRoot,
       konnectorWithTriggers = _ref.konnectorWithTriggers,
       accountsAndTriggers = _ref.accountsAndTriggers,
+      onSuccess = _ref.onSuccess,
       onDismiss = _ref.onDismiss;
   return /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(Route, {
     path: "".concat(konnectorRoot, "/"),
@@ -59,6 +60,7 @@ var RoutesV4 = function RoutesV4(_ref) {
     render: function render() {
       return /*#__PURE__*/React.createElement(NewAccountModal, {
         konnector: konnectorWithTriggers,
+        onSuccess: onSuccess,
         onDismiss: onDismiss
       });
     }

package/dist/components/Routes/RoutesV6.js

@@ -16,6 +16,7 @@ var HarvestParamsWrapper = function HarvestParamsWrapper(props) {
 var RoutesV6 = function RoutesV6(_ref) {
   var konnectorWithTriggers = _ref.konnectorWithTriggers,
       accountsAndTriggers = _ref.accountsAndTriggers,
+      onSuccess = _ref.onSuccess,
       onDismiss = _ref.onDismiss;
   return /*#__PURE__*/React.createElement(Routes, null, /*#__PURE__*/React.createElement(Route, {
     path: "/",
@@ -27,6 +28,7 @@ var RoutesV6 = function RoutesV6(_ref) {
     path: "new",
     element: /*#__PURE__*/React.createElement(NewAccountModal, {
       konnector: konnectorWithTriggers,
+      onSuccess: onSuccess,
       onDismiss: onDismiss
     })
   }), /*#__PURE__*/React.createElement(Route, {

package/dist/components/Routes.js

@@ -48,6 +48,7 @@ var Routes = function Routes(_ref) {
   var konnectorRoot = _ref.konnectorRoot,
       konnector = _ref.konnector,
       konnectorSlug = _ref.konnectorSlug,
+      onSuccess = _ref.onSuccess,
       onDismiss = _ref.onDismiss,
       datacardOptions = _ref.datacardOptions,
       ComponentsProps = _ref.ComponentsProps;
@@ -96,6 +97,7 @@ var Routes = function Routes(_ref) {
       konnectorRoot: konnectorRoot,
       konnectorWithTriggers: konnectorWithTriggers,
       accountsAndTriggers: accountsAndTriggers,
+      onSuccess: onSuccess,
       onDismiss: onDismiss
     });
   }))), /*#__PURE__*/React.createElement(VaultUnlockPlaceholder, null))))));

package/dist/components/cards/LaunchTriggerAlert.js

@@ -1,12 +1,15 @@
-import React from 'react';
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import React, { useState, useEffect } from 'react';
 import Alert from 'cozy-ui/transpiled/react/Alert';
 import Button from 'cozy-ui/transpiled/react/Buttons';
 import Typography from 'cozy-ui/transpiled/react/Typography';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
-import KonnectorIcon from '../KonnectorIcon';
+import Snackbar from 'cozy-ui/transpiled/react/Snackbar';
 import { getLastSuccessDate, getKonnectorSlug } from '../../helpers/triggers';
 import { isRunnable } from '../../helpers/konnectors';
 import { useFlowState } from '../../models/withConnectionFlow';
+import { SUCCESS } from '../../models/flowEvents';
+import KonnectorIcon from '../KonnectorIcon';
 import { makeLabel } from './helpers';
 export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref) {
   var flow = _ref.flow,
@@ -14,10 +17,16 @@ export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref) {
       t = _ref.t,
       disabled = _ref.disabled;
 
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      showSuccessSnackbar = _useState2[0],
+      setShowSuccessSnackbar = _useState2[1];
+
   var _useFlowState = useFlowState(flow),
       trigger = _useFlowState.trigger,
       running = _useFlowState.running,
-      expectingTriggerLaunch = _useFlowState.expectingTriggerLaunch;
+      expectingTriggerLaunch = _useFlowState.expectingTriggerLaunch,
+      status = _useFlowState.status;
 
   var launch = flow.launch,
       konnector = flow.konnector;
@@ -26,7 +35,12 @@ export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref) {
     win: window,
     konnector: konnector
   });
-  return /*#__PURE__*/React.createElement(Alert, {
+  useEffect(function () {
+    if (status === SUCCESS) {
+      setShowSuccessSnackbar(true);
+    }
+  }, [status]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Alert, {
     color: "var(--paperBackground)",
     icon: running ? /*#__PURE__*/React.createElement(Spinner, {
       className: "u-flex",
@@ -54,6 +68,18 @@ export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref) {
     running: running,
     expectingTriggerLaunch: expectingTriggerLaunch,
     lastSuccessDate: lastSuccessDate
-  })));
+  }))), /*#__PURE__*/React.createElement(Snackbar, {
+    open: showSuccessSnackbar,
+    onClose: function onClose() {
+      return setShowSuccessSnackbar(false);
+    }
+  }, /*#__PURE__*/React.createElement(Alert, {
+    variant: "filled",
+    elevation: 6,
+    severity: "success",
+    onClose: function onClose() {
+      return setShowSuccessSnackbar(false);
+    }
+  }, t('card.launchTrigger.success'))));
 };
 export default LaunchTriggerAlert;

package/dist/locales/en.json

@@ -77,6 +77,7 @@
       "button": {
         "label": "Run again now"
       },
+      "success": "Successful synchronization",
       "error": "An error occured.",
       "frequency": {
         "label": "Frequency:",

package/dist/locales/fr.json

@@ -77,6 +77,7 @@
       "button": {
         "label": "Mettre à jour"
       },
+      "success": "Synchronisation réussie",
       "error": "Une erreur est survenue.",
       "frequency": {
         "label": "Fréquence :",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "11.2.0",
+  "version": "11.4.0",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -90,5 +90,5 @@
     "react-router-dom": ">=4.3.1"
   },
   "sideEffects": false,
-  "gitHead": "034e1cbcf44130b8ad3e697001e017a1a610698b"
+  "gitHead": "c2606cb995dfb001340033281f78008aa47cd55f"
 }

package/src/components/NewAccountModal.jsx

@@ -1,12 +1,14 @@
 import React, { useContext } from 'react'
 import PropTypes from 'prop-types'
 import cx from 'classnames'
-import { useClient } from 'cozy-client'
-import flag from 'cozy-flags'
+import DialogContent from '@material-ui/core/DialogContent'
 
+import flag from 'cozy-flags'
+import { useClient } from 'cozy-client'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Spinner from 'cozy-ui/transpiled/react/Spinner'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { DialogTitle } from 'cozy-ui/transpiled/react/Dialog'
 
 import TriggerManager from './TriggerManager'
 import KonnectorIcon from './KonnectorIcon'
@@ -14,8 +16,6 @@ import * as triggersModel from '../helpers/triggers'
 import KonnectorMaintenance from './Maintenance'
 import useMaintenanceStatus from './hooks/useMaintenanceStatus'
 import { MountPointContext } from './MountPointContext'
-import DialogContent from '@material-ui/core/DialogContent'
-import { DialogTitle } from 'cozy-ui/transpiled/react/Dialog'
 import { useDialogContext } from './DialogContext'
 
 /**
@@ -24,7 +24,7 @@ import { useDialogContext } from './DialogContext'
  * few konnectors know if the login is success or not.
  *
  */
-const NewAccountModal = ({ konnector, onDismiss }) => {
+const NewAccountModal = ({ konnector, onSuccess, onDismiss }) => {
   const { t } = useI18n()
   const client = useClient()
   const { replaceHistory } = useContext(MountPointContext)
@@ -40,6 +40,21 @@ const NewAccountModal = ({ konnector, onDismiss }) => {
     displaySecretPlaceholder: false
   }
 
+  const handleSuccess = trigger => {
+    if (onSuccess) {
+      return onSuccess()
+    }
+
+    const accountId = triggersModel.getAccountId(trigger)
+    if (
+      !flag('harvest.inappconnectors.enabled') &&
+      trigger.worker !== 'client'
+    ) {
+      replaceHistory(`/accounts/${accountId}/success`)
+    }
+    replaceHistory(`/accounts/${accountId}`)
+  }
+
   return (
     <>
       <DialogTitle
@@ -69,28 +84,8 @@ const NewAccountModal = ({ konnector, onDismiss }) => {
         <DialogContent className="u-pt-0">
           <TriggerManager
             konnector={konnector}
-            onLoginSuccess={trigger => {
-              const accountId = triggersModel.getAccountId(trigger)
-              let path = `/accounts/${accountId}`
-              if (
-                !flag('harvest.inappconnectors.enabled') &&
-                trigger.worker !== 'client'
-              ) {
-                path += '/success'
-              }
-              replaceHistory(path)
-            }}
-            onSuccess={trigger => {
-              const accountId = triggersModel.getAccountId(trigger)
-              let path = `/accounts/${accountId}`
-              if (
-                !flag('harvest.inappconnectors.enabled') &&
-                trigger.worker !== 'client'
-              ) {
-                path += '/success'
-              }
-              replaceHistory(path)
-            }}
+            onLoginSuccess={handleSuccess}
+            onSuccess={handleSuccess}
             onVaultDismiss={onDismiss}
             fieldOptions={fieldOptions}
           />

package/src/components/Routes/RoutesV4.jsx

@@ -14,6 +14,7 @@ const RoutesV4 = ({
   konnectorRoot,
   konnectorWithTriggers,
   accountsAndTriggers,
+  onSuccess,
   onDismiss
 }) => {
   return (
@@ -64,6 +65,7 @@ const RoutesV4 = ({
         render={() => (
           <NewAccountModal
             konnector={konnectorWithTriggers}
+            onSuccess={onSuccess}
             onDismiss={onDismiss}
           />
         )}

package/src/components/Routes/RoutesV6.jsx

@@ -18,6 +18,7 @@ const HarvestParamsWrapper = props => {
 const RoutesV6 = ({
   konnectorWithTriggers,
   accountsAndTriggers,
+  onSuccess,
   onDismiss
 }) => {
   return (
@@ -37,6 +38,7 @@ const RoutesV6 = ({
         element={
           <NewAccountModal
             konnector={konnectorWithTriggers}
+            onSuccess={onSuccess}
             onDismiss={onDismiss}
           />
         }

package/src/components/Routes.jsx

@@ -49,6 +49,7 @@ const Routes = ({
   konnectorRoot,
   konnector,
   konnectorSlug,
+  onSuccess,
   onDismiss,
   datacardOptions,
   ComponentsProps
@@ -95,6 +96,7 @@ const Routes = ({
                           konnectorRoot={konnectorRoot}
                           konnectorWithTriggers={konnectorWithTriggers}
                           accountsAndTriggers={accountsAndTriggers}
+                          onSuccess={onSuccess}
                           onDismiss={onDismiss}
                         />
                       )}

package/src/components/cards/LaunchTriggerAlert.jsx

@@ -1,57 +1,83 @@
-import React from 'react'
+import React, { useState, useEffect } from 'react'
 
 import Alert from 'cozy-ui/transpiled/react/Alert'
 import Button from 'cozy-ui/transpiled/react/Buttons'
 import Typography from 'cozy-ui/transpiled/react/Typography'
 import Spinner from 'cozy-ui/transpiled/react/Spinner'
+import Snackbar from 'cozy-ui/transpiled/react/Snackbar'
 
-import KonnectorIcon from '../KonnectorIcon'
 import { getLastSuccessDate, getKonnectorSlug } from '../../helpers/triggers'
 import { isRunnable } from '../../helpers/konnectors'
 import { useFlowState } from '../../models/withConnectionFlow'
+import { SUCCESS } from '../../models/flowEvents'
+import KonnectorIcon from '../KonnectorIcon'
 import { makeLabel } from './helpers'
 
 export const LaunchTriggerAlert = ({ flow, f, t, disabled }) => {
-  const { trigger, running, expectingTriggerLaunch } = useFlowState(flow)
+  const [showSuccessSnackbar, setShowSuccessSnackbar] = useState(false)
+  const { trigger, running, expectingTriggerLaunch, status } =
+    useFlowState(flow)
   const { launch, konnector } = flow
+
   const lastSuccessDate = getLastSuccessDate(trigger)
   const isKonnectorRunnable = isRunnable({ win: window, konnector })
 
+  useEffect(() => {
+    if (status === SUCCESS) {
+      setShowSuccessSnackbar(true)
+    }
+  }, [status])
+
   return (
-    <Alert
-      color="var(--paperBackground)"
-      icon={
-        running ? (
-          <Spinner className="u-flex" noMargin />
-        ) : (
-          <KonnectorIcon
-            className="u-w-1 u-h-1"
-            konnectorSlug={getKonnectorSlug(trigger)}
-          />
-        )
-      }
-      action={
-        isKonnectorRunnable && (
-          <Button
-            variant="text"
-            size="small"
-            disabled={running || disabled}
-            label={t('card.launchTrigger.button.label')}
-            onClick={() => launch({ autoSuccessTimer: false })}
-          />
-        )
-      }
-    >
-      <Typography variant="caption">
-        {makeLabel({
-          t,
-          f,
-          running,
-          expectingTriggerLaunch,
-          lastSuccessDate
-        })}
-      </Typography>
-    </Alert>
+    <>
+      <Alert
+        color="var(--paperBackground)"
+        icon={
+          running ? (
+            <Spinner className="u-flex" noMargin />
+          ) : (
+            <KonnectorIcon
+              className="u-w-1 u-h-1"
+              konnectorSlug={getKonnectorSlug(trigger)}
+            />
+          )
+        }
+        action={
+          isKonnectorRunnable && (
+            <Button
+              variant="text"
+              size="small"
+              disabled={running || disabled}
+              label={t('card.launchTrigger.button.label')}
+              onClick={() => launch({ autoSuccessTimer: false })}
+            />
+          )
+        }
+      >
+        <Typography variant="caption">
+          {makeLabel({
+            t,
+            f,
+            running,
+            expectingTriggerLaunch,
+            lastSuccessDate
+          })}
+        </Typography>
+      </Alert>
+      <Snackbar
+        open={showSuccessSnackbar}
+        onClose={() => setShowSuccessSnackbar(false)}
+      >
+        <Alert
+          variant="filled"
+          elevation={6}
+          severity="success"
+          onClose={() => setShowSuccessSnackbar(false)}
+        >
+          {t('card.launchTrigger.success')}
+        </Alert>
+      </Snackbar>
+    </>
   )
 }
 

package/src/locales/en.json

@@ -77,6 +77,7 @@
       "button": {
         "label": "Run again now"
       },
+      "success": "Successful synchronization",
       "error": "An error occured.",
       "frequency": {
         "label": "Frequency:",

package/src/locales/fr.json

@@ -77,6 +77,7 @@
       "button": {
         "label": "Mettre à jour"
       },
+      "success": "Synchronisation réussie",
       "error": "Une erreur est survenue.",
       "frequency": {
         "label": "Fréquence :",