cozy-harvest-lib 20.2.4 → 21.0.0

package/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [21.0.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@20.2.5...cozy-harvest-lib@21.0.0) (2023-12-06)
+
+
+### Bug Fixes
+
+* Remove Storybook from dependencies only use them in devDependencies ([c780148](https://github.com/cozy/cozy-libs/commit/c7801485512bef74f7b0f5016f8235908ee0460c))
+
+
+### Features
+
+* Add ErrorAlert ([28a9516](https://github.com/cozy/cozy-libs/commit/28a9516d1d11b760cc9aea8e0a6ed64c3e77759e))
+* Add LaunchButton ([ffc8f63](https://github.com/cozy/cozy-libs/commit/ffc8f6395b6cfd8b1197cde7d5ab1f8f3248486f))
+* Add MaintenanceAlert ([eaf17f5](https://github.com/cozy/cozy-libs/commit/eaf17f5df7a5cdfcb1b5006e029f3346909bb6b9))
+* Add RunnableAlert ([f31525f](https://github.com/cozy/cozy-libs/commit/f31525f627747f0a7079b335c059074b07cc327f))
+* Add TriggerAlert ([0570f44](https://github.com/cozy/cozy-libs/commit/0570f4450b75bcf5b56b5fa9641840d95e06f816))
+* Add TriggerAlertTemplate ([2e17695](https://github.com/cozy/cozy-libs/commit/2e176957be8e1aa540f50a76d5ff675404c65452))
+* Add UnrunnableAlert ([b07cdba](https://github.com/cozy/cozy-libs/commit/b07cdba7ef002e9b4c864b0652f4f2edd37f779b))
+* **TriggerAlert:** Improve wording for unknown ([572a936](https://github.com/cozy/cozy-libs/commit/572a936b3eaad79aa13dbb249c5310c5bcdd2e3c))
+* Update cozy-client from 41.9.0 to 45.0.1 ([2d613a8](https://github.com/cozy/cozy-libs/commit/2d613a8d654964c5c28d790afa493fb4b8169b64))
+
+
+### BREAKING CHANGES
+
+* you must have `cozy-client >= 45.0.1`
+
+
+
+
+
+## [20.2.5](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@20.2.4...cozy-harvest-lib@20.2.5) (2023-11-27)
+
+
+### Bug Fixes
+
+* **harvest:** Illustration as title in Suggestion ([daecc19](https://github.com/cozy/cozy-libs/commit/daecc19961922bc2ddff12874f551489d2519811))
+
+
+
+
+
 ## [20.2.4](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@20.2.3...cozy-harvest-lib@20.2.4) (2023-11-16)
 
 

package/dist/components/KonnectorSuggestionModal/index.js

@@ -88,14 +88,15 @@ var KonnectorSuggestionModal = function KonnectorSuggestionModal(_ref) {
   }, /*#__PURE__*/React.createElement(IllustrationDialog, {
     open: true,
     onClose: onClose,
-    content: /*#__PURE__*/React.createElement("div", {
-      className: "u-flex u-flex-column u-flex-items-center u-h-100"
-    }, /*#__PURE__*/React.createElement(Illustration, {
+    title: /*#__PURE__*/React.createElement(Illustration, {
       alt: t('app.logo.alt', {
         name: name
       }),
       app: slug
-    }), /*#__PURE__*/React.createElement(Typography, {
+    }),
+    content: /*#__PURE__*/React.createElement("div", {
+      className: "u-flex u-flex-column u-flex-items-center"
+    }, /*#__PURE__*/React.createElement(Typography, {
       className: "u-mb-half",
       variant: "h4"
     }, t('suggestions.title', {

package/dist/components/cards/ErrorAlert.js

@@ -0,0 +1,105 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Icon from 'cozy-ui/transpiled/react/Icon';
+import InfoIcon from 'cozy-ui/transpiled/react/Icons/Info';
+import { LaunchButton } from './LaunchButton';
+import { LaunchTriggerAlertMenu } from './LaunchTriggerAlertMenu';
+import { TriggerAlertTemplate } from './TriggerAlertTemplate';
+import { UnrunnableAlert } from './UnrunnableAlert';
+import { launchAction, connectAction, configureAction } from './actions';
+import { isDisconnected } from '../../helpers/konnectors';
+import TriggerErrorDescription from '../infos/TriggerErrorDescription';
+/**
+ * This component warns the user when the connector synchronisation is in error. It can also be used to restart synchronisation.
+ *
+ * @component
+ * @param {Object} props - The component props.
+ * @param {string} props.label - The label for the error alert.
+ * @param {Error} props.error - The error object.
+ * @param {string} props.konnectorRoot - The root URL of the konnector.
+ * @param {Object} props.trigger - The trigger object.
+ * @param {boolean} props.isRunning - Indicates if the konnector is running.
+ * @param {string} props.historyAction - The history action.
+ * @param {Object} props.flow - The flow object.
+ * @param {Object} props.account - The account object.
+ * @param {Object} props.intentsApi - The intents API object.
+ * @param {boolean} props.isRunnable - Indicates if the error is runnable.
+ * @returns {JSX.Element} The rendered error alert component.
+ */
+
+function ErrorAlert(_ref) {
+  var label = _ref.label,
+      error = _ref.error,
+      konnectorRoot = _ref.konnectorRoot,
+      trigger = _ref.trigger,
+      isRunning = _ref.isRunning,
+      historyAction = _ref.historyAction,
+      flow = _ref.flow,
+      account = _ref.account,
+      intentsApi = _ref.intentsApi,
+      isRunnable = _ref.isRunnable;
+  var konnector = flow.konnector;
+  var isKonnectorDisconnected = isDisconnected(konnector, trigger);
+  var actions = [launchAction, connectAction, configureAction];
+  var options = {
+    flow: flow,
+    account: account,
+    intentsApi: intentsApi,
+    error: error,
+    historyAction: historyAction,
+    konnectorRoot: konnectorRoot,
+    trigger: trigger,
+    isRunning: isRunning,
+    isDisconnected: isKonnectorDisconnected
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TriggerAlertTemplate, {
+    block: true,
+    severity: "error",
+    icon: /*#__PURE__*/React.createElement(Icon, {
+      icon: InfoIcon
+    }),
+    label: label,
+    labelColor: "error",
+    showAction: isRunnable,
+    menu: /*#__PURE__*/React.createElement(LaunchTriggerAlertMenu, {
+      actions: actions,
+      options: options,
+      disabled: isRunning
+    }),
+    button: /*#__PURE__*/React.createElement(LaunchButton, {
+      konnectorRoot: konnectorRoot,
+      trigger: trigger,
+      isInError: true,
+      error: error,
+      historyAction: historyAction,
+      flow: flow,
+      account: account,
+      intentsApi: intentsApi,
+      isRunning: isRunning
+    })
+  }, /*#__PURE__*/React.createElement(TriggerErrorDescription, {
+    error: error,
+    konnector: konnector,
+    linkProps: {
+      className: 'u-error'
+    }
+  })), !isRunnable ? /*#__PURE__*/React.createElement(UnrunnableAlert, {
+    konnectorName: konnector.name,
+    className: "u-mt-1",
+    withoutIcon: true
+  }) : null);
+}
+
+ErrorAlert.propTypes = {
+  label: PropTypes.string.isRequired,
+  error: PropTypes.object.isRequired,
+  konnectorRoot: PropTypes.string.isRequired,
+  trigger: PropTypes.object.isRequired,
+  isRunning: PropTypes.bool.isRequired,
+  historyAction: PropTypes.func.isRequired,
+  flow: PropTypes.object.isRequired,
+  account: PropTypes.object.isRequired,
+  intentsApi: PropTypes.object,
+  isRunnable: PropTypes.bool.isRequired
+};
+export { ErrorAlert };

package/dist/components/cards/ErrorAlert.stories.js

@@ -0,0 +1,46 @@
+import { ErrorAlert } from './ErrorAlert';
+import { KonnectorJobError } from '../../helpers/konnectors';
+var meta = {
+  component: ErrorAlert,
+  args: {
+    label: 'Sync. il y a 2 mois',
+    error: new KonnectorJobError('LOGIN_FAILED'),
+    konnectorRoot: '/konnector/dummy',
+    trigger: {},
+    historyAction: function historyAction() {},
+    flow: {
+      konnector: {
+        name: 'Dummy',
+        type: 'konnector',
+        slug: 'dummy',
+        locales: {
+          en: {
+            description: 'Konnector used for debug purpose',
+            fields: {
+              date: {
+                label: 'Date'
+              },
+              error: {
+                label: 'Intended error'
+              }
+            }
+          }
+        }
+      }
+    },
+    account: {},
+    intentsApi: {},
+    isRunnable: true
+  }
+};
+export default meta;
+export var Default = {
+  name: 'Default',
+  args: {}
+};
+export var NotRunnable = {
+  name: 'Not runnable',
+  args: {
+    isRunnable: false
+  }
+};

package/dist/components/cards/LaunchButton.js

@@ -0,0 +1,64 @@
+import React from 'react';
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger';
+import Button from 'cozy-ui/transpiled/react/Buttons';
+import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
+import { isDisconnected } from '../../helpers/konnectors';
+import { findKonnectorPolicy } from '../../konnector-policies';
+import OpenOAuthWindowButton from '../AccountModalWithoutTabs/OpenOAuthWindowButton';
+
+function LaunchButton() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      konnectorRoot = _ref.konnectorRoot,
+      trigger = _ref.trigger,
+      _ref$isInError = _ref.isInError,
+      isInError = _ref$isInError === void 0 ? false : _ref$isInError,
+      _ref$isRunning = _ref.isRunning,
+      isRunning = _ref$isRunning === void 0 ? false : _ref$isRunning,
+      error = _ref.error,
+      historyAction = _ref.historyAction,
+      flow = _ref.flow,
+      account = _ref.account,
+      intentsApi = _ref.intentsApi;
+
+  var _useI18n = useI18n(),
+      t = _useI18n.t;
+
+  var launch = flow.launch,
+      konnector = flow.konnector;
+  var isKonnectorDisconnected = isDisconnected(konnector);
+  var konnectorPolicy = findKonnectorPolicy(konnector);
+
+  var onSync = function onSync() {
+    if (konnectorPolicy.shouldLaunchRedirectToEdit(error)) {
+      return historyAction(konnectorRoot ? "".concat(konnectorRoot, "/accounts/").concat(triggersModel.getAccountId(trigger), "/edit") : '/edit', 'push');
+    } else {
+      launch({
+        autoSuccessTimer: false
+      });
+    }
+  };
+
+  if (!isKonnectorDisconnected) {
+    return null;
+  }
+
+  if (konnectorPolicy.shouldLaunchDisplayOAuthWindow(error)) {
+    return /*#__PURE__*/React.createElement(OpenOAuthWindowButton, {
+      flow: flow,
+      account: account,
+      intentsApi: intentsApi,
+      konnector: konnector
+    });
+  }
+
+  return /*#__PURE__*/React.createElement(Button, {
+    variant: "text",
+    color: isInError ? 'error' : undefined,
+    size: "small",
+    disabled: isRunning,
+    label: t('card.launchTrigger.button.label'),
+    onClick: onSync
+  });
+}
+
+export { LaunchButton };

package/dist/components/cards/LaunchTriggerAlert.js

@@ -1,57 +1,24 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import PropTypes from 'prop-types';
 import React, { useState, useEffect } from 'react';
-import { triggers as triggersModel } from 'cozy-client/dist/models/trigger';
 import Alert from 'cozy-ui/transpiled/react/Alert';
-import Button from 'cozy-ui/transpiled/react/Buttons';
-import Icon from 'cozy-ui/transpiled/react/Icon';
-import Info from 'cozy-ui/transpiled/react/Icons/Info';
-import WrenchCircleIcon from 'cozy-ui/transpiled/react/Icons/WrenchCircle';
 import Snackbar from 'cozy-ui/transpiled/react/Snackbar';
-import Spinner from 'cozy-ui/transpiled/react/Spinner';
-import Typography from 'cozy-ui/transpiled/react/Typography';
-import { makeStyles } from 'cozy-ui/transpiled/react/styles';
-import LaunchTriggerAlertMenu from './LaunchTriggerAlertMenu';
 import { RunningAlert } from './RunningAlert';
-import { makeLabel } from './helpers';
-import { isDisconnected } from '../../helpers/konnectors';
+import { TriggerAlert } from './TriggerAlert';
 import { intentsApiProptype } from '../../helpers/proptypes';
-import { getKonnectorSlug } from '../../helpers/triggers';
 import { findKonnectorPolicy } from '../../konnector-policies';
 import { SUCCESS } from '../../models/flowEvents';
 import { useFlowState } from '../../models/withConnectionFlow';
-import OpenOAuthWindowButton from '../AccountModalWithoutTabs/OpenOAuthWindowButton';
-import KonnectorIcon from '../KonnectorIcon';
 import withAdaptiveRouter from '../hoc/withRouter';
 import useMaintenanceStatus from '../hooks/useMaintenanceStatus';
-import TriggerErrorDescription from '../infos/TriggerErrorDescription';
-import TriggerMaintenanceDescription from '../infos/TriggerMaintenanceDescription';
-var useStyles = makeStyles({
-  root: {
-    padding: '.5rem 1rem'
-  },
-  message: function message(_ref) {
-    var block = _ref.block;
-    return block && {
-      maxWidth: 'calc(100% - 16px - .5rem)' // 16px is the size of the icon
-
-    };
-  },
-  action: {
-    marginRight: '-.5rem'
-  },
-  icon: {
-    marginRight: '.5rem'
-  }
-});
-export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref2) {
-  var flow = _ref2.flow,
-      t = _ref2.t,
-      konnectorRoot = _ref2.konnectorRoot,
-      historyAction = _ref2.historyAction,
-      intentsApi = _ref2.intentsApi,
-      account = _ref2.account,
-      withMaintenanceDescription = _ref2.withMaintenanceDescription;
+export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref) {
+  var flow = _ref.flow,
+      t = _ref.t,
+      konnectorRoot = _ref.konnectorRoot,
+      historyAction = _ref.historyAction,
+      intentsApi = _ref.intentsApi,
+      account = _ref.account,
+      withMaintenanceDescription = _ref.withMaintenanceDescription;
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -65,125 +32,40 @@ export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref2) {
       expectingTriggerLaunch = _useFlowState.expectingTriggerLaunch,
       status = _useFlowState.status;
 
-  var launch = flow.launch,
-      konnector = flow.konnector;
+  var konnector = flow.konnector;
 
   var _useMaintenanceStatus = useMaintenanceStatus(konnector.slug),
       _useMaintenanceStatus2 = _useMaintenanceStatus.data,
       isInMaintenance = _useMaintenanceStatus2.isInMaintenance,
-      maintenanceMessages = _useMaintenanceStatus2.messages;
+      maintenanceMessages = _useMaintenanceStatus2.messages,
+      maintenanceFetchStatus = _useMaintenanceStatus.fetchStatus;
 
   var isInError = !!error;
-  var block = isInError || !!withMaintenanceDescription && isInMaintenance;
-  var styles = useStyles({
-    block: block
-  });
+  /** The connector is considered to be running if the trigger is waiting to be launched */
+
+  var isRunning = running || expectingTriggerLaunch;
   var konnectorPolicy = findKonnectorPolicy(konnector);
   var isKonnectorRunnable = konnectorPolicy.isRunnable();
-  var isKonnectorDisconnected = isDisconnected(konnector, trigger);
   useEffect(function () {
     if (status === SUCCESS) {
       setShowSuccessSnackbar(true);
     }
   }, [status]);
-  var SyncButtonAction = konnectorPolicy.shouldLaunchRedirectToEdit(error) ? function () {
-    return historyAction(konnectorRoot ? "".concat(konnectorRoot, "/accounts/").concat(triggersModel.getAccountId(trigger), "/edit") : '/edit', 'push');
-  } : function () {
-    return launch({
-      autoSuccessTimer: false
-    });
-  };
-
-  var alertColor = function alertColor() {
-    if (isInError) return undefined;
-    if (isInMaintenance) return 'var(--grey50)';
-
-    if (!isKonnectorRunnable) {
-      return 'var(--grey100)';
-    }
-
-    return 'var(--paperBackgroundColor)';
-  };
-
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Alert, {
-    color: alertColor(),
-    severity: isInError ? 'error' : undefined,
-    block: block,
-    icon: isInError ? undefined : isInMaintenance || !isKonnectorRunnable ? /*#__PURE__*/React.createElement(Icon, {
-      icon: isInMaintenance ? WrenchCircleIcon : Info,
-      color: isInMaintenance ? 'var(--secondaryTextColor)' : 'var(--iconTextColor)'
-    }) : running ? /*#__PURE__*/React.createElement(Spinner, {
-      className: "u-flex",
-      noMargin: true
-    }) : /*#__PURE__*/React.createElement(KonnectorIcon, {
-      className: "u-w-1 u-h-1",
-      konnector: konnector,
-      konnectorSlug: getKonnectorSlug(trigger)
-    }),
-    action: isKonnectorRunnable && /*#__PURE__*/React.createElement(React.Fragment, null, !isInMaintenance && !isKonnectorDisconnected && (konnectorPolicy.shouldLaunchDisplayOAuthWindow(error) ? /*#__PURE__*/React.createElement(OpenOAuthWindowButton, {
-      flow: flow,
-      account: account,
-      intentsApi: intentsApi,
-      konnector: konnector
-    }) : /*#__PURE__*/React.createElement(Button, {
-      variant: "text",
-      color: isInError ? 'error' : undefined,
-      size: "small",
-      disabled: running,
-      label: t('card.launchTrigger.button.label'),
-      onClick: SyncButtonAction
-    })), !block && /*#__PURE__*/React.createElement("div", {
-      style: {
-        margin: '-.5rem -.5rem -.5rem 0'
-      }
-    }, /*#__PURE__*/React.createElement(LaunchTriggerAlertMenu, {
-      flow: flow,
-      t: t,
-      konnectorRoot: konnectorRoot,
-      historyAction: historyAction,
-      account: account,
-      intentsApi: intentsApi
-    }))),
-    classes: styles
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "u-flex-auto u-flex u-flex-column",
-    style: {
-      gap: '.5rem'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "u-flex u-flex-items-center"
-  }, /*#__PURE__*/React.createElement(Typography, {
-    variant: "caption",
-    className: "u-flex-auto",
-    color: isInError ? 'error' : isInMaintenance ? 'textSecondary' : undefined
-  }, makeLabel({
-    t: t,
-    konnector: konnector,
+  return /*#__PURE__*/React.createElement(React.Fragment, null, maintenanceFetchStatus === 'loaded' ? /*#__PURE__*/React.createElement(TriggerAlert, {
     trigger: trigger,
-    running: running,
-    expectingTriggerLaunch: expectingTriggerLaunch,
+    isRunning: isRunning,
+    isRunnable: isKonnectorRunnable,
+    isInError: isInError,
     isInMaintenance: isInMaintenance,
-    isKonnectorRunnable: isKonnectorRunnable
-  })), block && /*#__PURE__*/React.createElement("div", {
-    style: {
-      margin: '-1rem -1rem -1rem 0'
-    }
-  }, /*#__PURE__*/React.createElement(LaunchTriggerAlertMenu, {
-    flow: flow,
-    t: t,
+    error: error,
+    withMaintenanceDescription: withMaintenanceDescription,
+    maintenanceMessages: maintenanceMessages,
+    account: account,
     konnectorRoot: konnectorRoot,
     historyAction: historyAction,
-    account: account,
-    intentsApi: intentsApi
-  }))), block && isInError && /*#__PURE__*/React.createElement(TriggerErrorDescription, {
-    error: error,
-    konnector: konnector,
-    linkProps: {
-      className: 'u-error'
-    }
-  }), block && isInMaintenance && /*#__PURE__*/React.createElement(TriggerMaintenanceDescription, {
-    maintenanceMessages: maintenanceMessages
-  }))), konnectorPolicy.shouldDisplayRunningAlert({
+    intentsApi: intentsApi,
+    flow: flow
+  }) : null, konnectorPolicy.shouldDisplayRunningAlert({
     running: running
   }) && /*#__PURE__*/React.createElement(RunningAlert, null), /*#__PURE__*/React.createElement(Snackbar, {
     open: showSuccessSnackbar,

package/dist/components/cards/LaunchTriggerAlert.spec.js

@@ -140,7 +140,7 @@ describe('LaunchTriggerAlert', function () {
 
           case 3:
             fireEvent.click(root.getByTestId('alert-menu-button'));
-            buttons = root.getAllByText('card.launchTrigger.button.label');
+            buttons = root.getAllByText('Synchronize');
             expect(buttons.length).toBe(2);
             _iterator = _createForOfIteratorHelper(buttons);
 
@@ -182,7 +182,7 @@ describe('LaunchTriggerAlert', function () {
 
           case 3:
             fireEvent.click(root.getByTestId('alert-menu-button'));
-            buttons = root.getAllByText('card.launchTrigger.button.label');
+            buttons = root.getAllByText('Synchronize');
             expect(buttons.length).toBe(2);
             _iterator2 = _createForOfIteratorHelper(buttons);
 
@@ -219,11 +219,11 @@ describe('LaunchTriggerAlert', function () {
             }), root = _setup3.root, flow = _setup3.flow, historyAction = _setup3.historyAction;
             _context3.next = 3;
             return waitFor(function () {
-              return root.getByText('card.launchTrigger.button.label');
+              return root.getByText('Synchronize');
             });
 
           case 3:
-            fireEvent.click(root.getByText('card.launchTrigger.button.label'));
+            fireEvent.click(root.getByText('Synchronize'));
             expect(historyAction).toHaveBeenCalledWith('/edit', 'push');
             expect(flow.launch).not.toHaveBeenCalled();
 
@@ -284,7 +284,7 @@ describe('LaunchTriggerAlert', function () {
 
           case 4:
             fireEvent.click(root.getByTestId('alert-menu-button'));
-            buttons = root.getAllByText('card.launchTrigger.button.label');
+            buttons = root.getAllByText('Synchronize');
             expect(buttons.length).toBe(2);
             _iterator3 = _createForOfIteratorHelper(buttons);