cozy-harvest-lib 13.0.1 → 13.2.0

package/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [13.2.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@13.1.0...cozy-harvest-lib@13.2.0) (2023-02-08)
+
+
+### Features
+
+* Add triggers realtime to ConnectionFlow ([b46616e](https://github.com/cozy/cozy-libs/commit/b46616ee9212af7609d8497eae7027cf50c7a63d))
+
+
+
+
+
+# [13.1.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@13.0.1...cozy-harvest-lib@13.1.0) (2023-02-03)
+
+
+### Bug Fixes
+
+* **harvest:** Move variables before use ([1aea052](https://github.com/cozy/cozy-libs/commit/1aea052824f2c5247531eb1e54ac71888655dd75))
+
+
+### Features
+
+* **harvest:** Add a maintenance message as a suffix ([fad4f45](https://github.com/cozy/cozy-libs/commit/fad4f458edac5d5ef7863e23da014753e6a68b7e))
+* The sync button must redirect to the connection modal ([20ac4f8](https://github.com/cozy/cozy-libs/commit/20ac4f8d81c9823c40b376f439e3a49f9214456e))
+
+
+
+
+
 ## [13.0.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@13.0.0...cozy-harvest-lib@13.0.1) (2023-02-02)
 
 

package/dist/components/KonnectorConfiguration/DataTab/index.js

@@ -59,7 +59,7 @@ export var DataTab = function DataTab(_ref) {
   return /*#__PURE__*/React.createElement("div", null, flag('harvest.inappconnectors.enabled') && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LaunchTriggerCard, {
     konnectorRoot: konnectorRoot,
     flow: flow,
-    withDescription: true
+    withMaintenanceDescription: true
   }), isMobile && /*#__PURE__*/React.createElement(Divider, {
     style: styles.divider
   })), /*#__PURE__*/React.createElement("div", {

package/dist/components/cards/LaunchTriggerAlert.js

@@ -10,7 +10,7 @@ import Spinner from 'cozy-ui/transpiled/react/Spinner';
 import Snackbar from 'cozy-ui/transpiled/react/Snackbar';
 import WrenchCircleIcon from 'cozy-ui/transpiled/react/Icons/WrenchCircle';
 import { makeStyles } from 'cozy-ui/transpiled/react/styles';
-import { getKonnectorSlug } from '../../helpers/triggers';
+import { getAccountId, getKonnectorSlug } from '../../helpers/triggers';
 import { isRunnable, isDisconnected } from '../../helpers/konnectors';
 import { useFlowState } from '../../models/withConnectionFlow';
 import { SUCCESS } from '../../models/flowEvents';
@@ -25,12 +25,12 @@ var useStyles = makeStyles({
   root: {
     padding: '.5rem 1rem'
   },
-  message: {
-    maxWidth: function maxWidth(_ref) {
-      var block = _ref.block;
-      return block && 'calc(100% - 16px - .5rem)';
-    } // 16px is the size of the icon
+  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'
@@ -44,7 +44,7 @@ export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref2) {
       t = _ref2.t,
       konnectorRoot = _ref2.konnectorRoot,
       historyAction = _ref2.historyAction,
-      withDescription = _ref2.withDescription;
+      withMaintenanceDescription = _ref2.withMaintenanceDescription;
   var client = useClient();
 
   var _useState = useState(false),
@@ -67,11 +67,11 @@ export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref2) {
       isInMaintenance = _useMaintenanceStatus2.isInMaintenance,
       maintenanceMessages = _useMaintenanceStatus2.messages;
 
+  var isInError = !!error;
+  var block = isInError || !!withMaintenanceDescription && isInMaintenance;
   var styles = useStyles({
     block: block
   });
-  var isInError = !!error;
-  var block = withDescription && (isInError || isInMaintenance);
   var isKonnectorRunnable = isRunnable({
     win: window,
     konnector: konnector
@@ -82,6 +82,13 @@ export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref2) {
       setShowSuccessSnackbar(true);
     }
   }, [status]);
+  var SyncButtonAction = isInError ? function () {
+    return historyAction(konnectorRoot ? "".concat(konnectorRoot, "/accounts/").concat(getAccountId(trigger), "/edit") : '/edit', 'push');
+  } : function () {
+    return launch({
+      autoSuccessTimer: false
+    });
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Alert, {
     color: isInError ? undefined : isInMaintenance ? 'var(--grey50)' : 'var(--paperBackgroundColor)',
     severity: isInError ? 'error' : undefined,
@@ -103,11 +110,7 @@ export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref2) {
       size: "small",
       disabled: running,
       label: t('card.launchTrigger.button.label'),
-      onClick: function onClick() {
-        return launch({
-          autoSuccessTimer: false
-        });
-      }
+      onClick: SyncButtonAction
     }), !block && /*#__PURE__*/React.createElement("div", {
       style: {
         margin: '-.5rem -.5rem -.5rem 0'
@@ -135,7 +138,8 @@ export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref2) {
     konnector: konnector,
     trigger: trigger,
     running: running,
-    expectingTriggerLaunch: expectingTriggerLaunch
+    expectingTriggerLaunch: expectingTriggerLaunch,
+    isInMaintenance: isInMaintenance
   })), block && /*#__PURE__*/React.createElement("div", {
     style: {
       margin: '-1rem -1rem -1rem 0'

package/dist/components/cards/LaunchTriggerAlertMenu.js

@@ -23,7 +23,8 @@ var LaunchTriggerAlertMenu = function LaunchTriggerAlertMenu(_ref) {
 
   var _useFlowState = useFlowState(flow),
       running = _useFlowState.running,
-      trigger = _useFlowState.trigger;
+      trigger = _useFlowState.trigger,
+      error = _useFlowState.error;
 
   var launch = flow.launch,
       konnector = flow.konnector;
@@ -39,6 +40,14 @@ var LaunchTriggerAlertMenu = function LaunchTriggerAlertMenu(_ref) {
       showOptions = _useState2[0],
       setShowOptions = _useState2[1];
 
+  var isInError = !!error;
+  var SyncButtonAction = isInError ? function () {
+    return historyAction(konnectorRoot ? "".concat(konnectorRoot, "/accounts/").concat(getAccountId(trigger), "/edit") : '/edit', 'push');
+  } : function () {
+    return launch({
+      autoSuccessTimer: false
+    });
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconButton, {
     ref: anchorRef,
     onClick: function onClick() {
@@ -57,9 +66,7 @@ var LaunchTriggerAlertMenu = function LaunchTriggerAlertMenu(_ref) {
       icon: SyncIcon
     }),
     onClick: function onClick() {
-      launch({
-        autoSuccessTimer: false
-      });
+      SyncButtonAction();
       setShowOptions(false);
     }
   }, t('card.launchTrigger.button.label')), !isKonnectorDisconnected && /*#__PURE__*/React.createElement(ActionMenuItem, {

package/dist/components/cards/helpers.js

@@ -23,21 +23,23 @@ export var makeLabel = function makeLabel(_ref) {
       konnector = _ref.konnector,
       trigger = _ref.trigger,
       running = _ref.running,
-      expectingTriggerLaunch = _ref.expectingTriggerLaunch;
+      expectingTriggerLaunch = _ref.expectingTriggerLaunch,
+      isInMaintenance = _ref.isInMaintenance;
   var lastSuccessDate = getLastSuccessDate(trigger);
+  var mantenanceSuffix = isInMaintenance ? " \xB7 ".concat(t('konnectorBlock.inMaintenance')) : '';
 
   if (running || expectingTriggerLaunch) {
-    return t('card.launchTrigger.lastSync.syncing');
+    return "".concat(t('card.launchTrigger.lastSync.syncing')).concat(mantenanceSuffix);
   }
 
   if (lastSuccessDate) {
     if (getDifferenceInMinutes(lastSuccessDate) < DEFAULT_TIME) {
-      return t('card.launchTrigger.lastSync.justNow');
+      return "".concat(t('card.launchTrigger.lastSync.justNow')).concat(mantenanceSuffix);
     }
 
-    return t('card.launchTrigger.lastSync.afterSomeTimes', {
+    return "".concat(t('card.launchTrigger.lastSync.afterSomeTimes', {
       times: formatLocallyDistanceToNow(lastSuccessDate)
-    });
+    })).concat(mantenanceSuffix);
   }
 
   if (isDisconnected(konnector, trigger)) {

package/dist/models/ConnectionFlow.js

@@ -174,6 +174,8 @@ export var ConnectionFlow = /*#__PURE__*/function () {
     this.handleAccountUpdated = this.handleAccountUpdated.bind(this);
     this.handleCurrentJobUpdated = this.handleCurrentJobUpdated.bind(this);
     this.handleTriggerJobUpdated = this.handleTriggerJobUpdated.bind(this);
+    this.handleTriggerDeleted = this.handleTriggerDeleted.bind(this);
+    this.handleTriggerCreated = this.handleTriggerCreated.bind(this);
     this.handleAccountTwoFA = this.handleAccountTwoFA.bind(this);
     this.launch = this.launch.bind(this);
     this.sendTwoFACode = this.sendTwoFACode.bind(this);
@@ -188,6 +190,7 @@ export var ConnectionFlow = /*#__PURE__*/function () {
     this.realtime = client.plugins.realtime;
     this.watchCurrentJobIfTriggerIsAlreadyRunning();
     this.watchTriggerJobs();
+    this.watchTriggers();
   }
 
   _createClass(ConnectionFlow, [{
@@ -682,6 +685,30 @@ export var ConnectionFlow = /*#__PURE__*/function () {
 
       return handleFormSubmit;
     }()
+  }, {
+    key: "handleTriggerCreated",
+    value: function handleTriggerCreated(trigger) {
+      var _trigger$message;
+
+      if (this.konnector.slug !== (trigger === null || trigger === void 0 ? void 0 : (_trigger$message = trigger.message) === null || _trigger$message === void 0 ? void 0 : _trigger$message.konnector) || this.trigger !== null) {
+        return; // filter out trigger associated to konnector or if a current trigger already exists
+      }
+
+      this.trigger = trigger; // @ts-ignore
+
+      this.emit(UPDATE_EVENT);
+    }
+  }, {
+    key: "handleTriggerDeleted",
+    value: function handleTriggerDeleted(trigger) {
+      var _this$trigger;
+
+      if (((_this$trigger = this.trigger) === null || _this$trigger === void 0 ? void 0 : _this$trigger._id) !== (trigger === null || trigger === void 0 ? void 0 : trigger._id)) return; // filter out trigger associated to current trigger
+
+      this.reset(); // @ts-ignore
+
+      this.emit(UPDATE_EVENT);
+    }
   }, {
     key: "handleAccountUpdated",
     value: function handleAccountUpdated(account) {
@@ -717,9 +744,9 @@ export var ConnectionFlow = /*#__PURE__*/function () {
   }, {
     key: "handleTriggerJobUpdated",
     value: function handleTriggerJobUpdated(job) {
-      var _this$trigger, _this$job;
+      var _this$trigger2, _this$job;
 
-      if (job.trigger_id !== ((_this$trigger = this.trigger) === null || _this$trigger === void 0 ? void 0 : _this$trigger._id)) return; // filter out jobs associated to other triggers
+      if (job.trigger_id !== ((_this$trigger2 = this.trigger) === null || _this$trigger2 === void 0 ? void 0 : _this$trigger2._id)) return; // filter out jobs associated to other triggers
 
       if (job._id === ((_this$job = this.job) === null || _this$job === void 0 ? void 0 : _this$job._id)) return; // if the event is associated to a job we are already watchin, ignore it. No need to refetch the current trigger in this case
 
@@ -842,7 +869,7 @@ export var ConnectionFlow = /*#__PURE__*/function () {
     key: "ensureDefaultFolderPathInAccount",
     value: function () {
       var _ensureDefaultFolderPathInAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(client, _ref5) {
-        var _trigger$message;
+        var _trigger$message2;
 
         var trigger, account, konnector, folderId, folder, result, savedAccount;
         return _regeneratorRuntime.wrap(function _callee9$(_context9) {
@@ -851,7 +878,7 @@ export var ConnectionFlow = /*#__PURE__*/function () {
               case 0:
                 trigger = _ref5.trigger, account = _ref5.account, konnector = _ref5.konnector;
                 // @ts-ignore the message property does not exist in TriggersDoctype
-                folderId = trigger === null || trigger === void 0 ? void 0 : (_trigger$message = trigger.message) === null || _trigger$message === void 0 ? void 0 : _trigger$message.folder_to_save;
+                folderId = trigger === null || trigger === void 0 ? void 0 : (_trigger$message2 = trigger.message) === null || _trigger$message2 === void 0 ? void 0 : _trigger$message2.folder_to_save;
 
                 if (folderId) {
                   _context9.next = 4;
@@ -999,17 +1026,27 @@ export var ConnectionFlow = /*#__PURE__*/function () {
   }, {
     key: "watchCurrentJobIfTriggerIsAlreadyRunning",
     value: function watchCurrentJobIfTriggerIsAlreadyRunning() {
-      var _this$trigger2, _this$trigger2$curren;
+      var _this$trigger3, _this$trigger3$curren;
 
-      if (((_this$trigger2 = this.trigger) === null || _this$trigger2 === void 0 ? void 0 : (_this$trigger2$curren = _this$trigger2.current_state) === null || _this$trigger2$curren === void 0 ? void 0 : _this$trigger2$curren.status) === 'running') {
-        var _this$trigger3, _this$trigger3$curren;
+      if (((_this$trigger3 = this.trigger) === null || _this$trigger3 === void 0 ? void 0 : (_this$trigger3$curren = _this$trigger3.current_state) === null || _this$trigger3$curren === void 0 ? void 0 : _this$trigger3$curren.status) === 'running') {
+        var _this$trigger4, _this$trigger4$curren;
 
         this.job = {
-          _id: (_this$trigger3 = this.trigger) === null || _this$trigger3 === void 0 ? void 0 : (_this$trigger3$curren = _this$trigger3.current_state) === null || _this$trigger3$curren === void 0 ? void 0 : _this$trigger3$curren.last_executed_job_id
+          _id: (_this$trigger4 = this.trigger) === null || _this$trigger4 === void 0 ? void 0 : (_this$trigger4$curren = _this$trigger4.current_state) === null || _this$trigger4$curren === void 0 ? void 0 : _this$trigger4$curren.last_executed_job_id
         };
         this.watchJob();
       }
     }
+    /**
+     * Watch all triggers
+     */
+
+  }, {
+    key: "watchTriggers",
+    value: function watchTriggers() {
+      this.realtime.subscribe('deleted', 'io.cozy.triggers', this.handleTriggerDeleted);
+      this.realtime.subscribe('created', 'io.cozy.triggers', this.handleTriggerCreated);
+    }
     /**
      * Watch all jobs related to the current trigger
      */
@@ -1018,10 +1055,10 @@ export var ConnectionFlow = /*#__PURE__*/function () {
     key: "watchTriggerJobs",
     value: function watchTriggerJobs() {
       if (this.trigger) {
-        var _this$trigger4;
+        var _this$trigger5;
 
         // When the trigger comes from realtime, cozy-stack does not add the current_state to the object. So we need to request the stack to get it
-        if (!((_this$trigger4 = this.trigger) !== null && _this$trigger4 !== void 0 && _this$trigger4.current_state)) {
+        if (!((_this$trigger5 = this.trigger) !== null && _this$trigger5 !== void 0 && _this$trigger5.current_state)) {
           this.refetchTrigger();
         }
 
@@ -1097,6 +1134,8 @@ export var ConnectionFlow = /*#__PURE__*/function () {
     value: function unsubscribeAllConnectionFlowRealtime() {
       this.realtime.unsubscribe('updated', JOBS_DOCTYPE, this.handleTriggerJobUpdated);
       this.realtime.unsubscribe('updated', JOBS_DOCTYPE, this.job._id, this.handleCurrentJobUpdated.bind(this));
+      this.realtime.unsubscribe('deleted', 'io.cozy.triggers', this.handleTriggerDeleted);
+      this.realtime.unsubscribe('created', 'io.cozy.triggers', this.handleTriggerCreated);
     }
   }, {
     key: "unwatch",