cozy-harvest-lib 8.0.0 → 8.2.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.
 
+# [8.2.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.1.1...cozy-harvest-lib@8.2.0) (2022-04-13)
+
+
+### Features
+
+* Fix back navigation ([89283ab](https://github.com/cozy/cozy-libs/commit/89283ab1beb06fa15625a7f108abbddf37216397))
+
+
+
+
+
+## [8.1.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.1.0...cozy-harvest-lib@8.1.1) (2022-04-11)
+
+
+### Bug Fixes
+
+* **cozy-harvest-lib:** Correctly handle onClick on AppLinkCard ([c9068c5](https://github.com/cozy/cozy-libs/commit/c9068c53a1ec2e1f6b9b7636f6b25aadec69900f))
+* **cozy-harvest-lib:** Disable AppLink button until fallback is resolved ([bedc90d](https://github.com/cozy/cozy-libs/commit/bedc90d80c899bb93a2be70d6963d62742fb600b))
+
+
+
+
+
+# [8.1.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.0.0...cozy-harvest-lib@8.1.0) (2022-04-08)
+
+
+### Bug Fixes
+
+* Remove unused restoreAllMocks ([6dd376a](https://github.com/cozy/cozy-libs/commit/6dd376a2a7f4393a9446375383d6b77510f87d95))
+
+
+### Features
+
+* Do not mark a job as succeeded on login success ([39e6d01](https://github.com/cozy/cozy-libs/commit/39e6d0161839a6d00ef0dcf24eb6aa0ddeff5f78))
+* Watch job changes when the trigger is already running ([ca01663](https://github.com/cozy/cozy-libs/commit/ca01663eb41bbbcfed5d1f146c9cd68956faa9df))
+
+
+
+
+
 # [8.0.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@7.3.7...cozy-harvest-lib@8.0.0) (2022-04-04)
 
 

package/dist/components/AccountModal.js

@@ -26,7 +26,7 @@ import * as triggersModel from '../helpers/triggers';
 import KonnectorAccountTabs from './KonnectorConfiguration/KonnectorAccountTabs';
 import AccountSelectBox from './AccountSelectBox/AccountSelectBox';
 import KonnectorModalHeader from './KonnectorModalHeader';
-import { withMountPointPushHistory } from './MountPointContext';
+import { withMountPointHistory } from './MountPointContext';
 import withLocales from './hoc/withLocales';
 import DialogContent from '@material-ui/core/DialogContent';
 /**
@@ -247,6 +247,7 @@ export var AccountModal = /*#__PURE__*/function (_Component) {
           accountsAndTriggers = _this$props2.accountsAndTriggers,
           t = _this$props2.t,
           pushHistory = _this$props2.pushHistory,
+          replaceHistory = _this$props2.replaceHistory,
           initialActiveTab = _this$props2.initialActiveTab,
           isMobile = _this$props2.breakpoints.isMobile,
           showAccountSelection = _this$props2.showAccountSelection,
@@ -293,7 +294,7 @@ export var AccountModal = /*#__PURE__*/function (_Component) {
         account: account,
         onAccountDeleted: onDismiss,
         addAccount: function addAccount() {
-          return pushHistory('/new');
+          return replaceHistory('/new');
         },
         showNewAccountButton: showNewAccountButton
       })));
@@ -324,7 +325,7 @@ AccountModal.propTypes = {
     trigger: PropTypes.object.isRequired
   })).isRequired,
   t: PropTypes.func.isRequired,
-  pushHistory: PropTypes.func.isRequired,
+  replaceHistory: PropTypes.func.isRequired,
   accountId: PropTypes.string.isRequired,
 
   /** @type {string} Can be set to force the initial active tab */
@@ -336,4 +337,4 @@ AccountModal.propTypes = {
   /** @type {Boolean} Whether to show the button to add a new account */
   showNewAccountButton: PropTypes.bool
 };
-export default flow(withClient, withLocales, withMountPointPushHistory, withBreakpoints())(AccountModal);
+export default flow(withClient, withLocales, withMountPointHistory, withBreakpoints())(AccountModal);

package/dist/components/AccountModal.spec.js

@@ -38,6 +38,7 @@ var accountIdMock = '123';
 describe('AccountModal', function () {
   var setup = function setup() {
     var mockHistoryPush = jest.fn();
+    var mockHistoryReplace = jest.fn();
     var component = shallow( /*#__PURE__*/React.createElement(AccountModal, {
       konnector: {},
       t: function t(x) {
@@ -46,6 +47,7 @@ describe('AccountModal', function () {
       accountId: accountIdMock,
       accountsAndTriggers: accountsAndTriggersMock,
       pushHistory: mockHistoryPush,
+      replaceHistory: mockHistoryReplace,
       breakpoints: {
         isMobile: true
       },
@@ -53,7 +55,8 @@ describe('AccountModal', function () {
     }));
     return {
       component: component,
-      mockHistoryPush: mockHistoryPush
+      mockHistoryPush: mockHistoryPush,
+      mockHistoryReplace: mockHistoryReplace
     };
   };
 

package/dist/components/AccountsListModal.js

@@ -13,7 +13,8 @@ var AccountsListModal = function AccountsListModal(_ref) {
       t = _ref.t;
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      pushHistory = _useContext.pushHistory,
+      replaceHistory = _useContext.replaceHistory;
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DialogContent, null, /*#__PURE__*/React.createElement(Stack, {
     className: "u-mb-3"
@@ -29,7 +30,7 @@ var AccountsListModal = function AccountsListModal(_ref) {
     accounts: accounts,
     konnector: konnector,
     onPick: function onPick(option) {
-      return pushHistory("/accounts/".concat(option.account._id));
+      return replaceHistory("/accounts/".concat(option.account._id));
     },
     addAccount: function addAccount() {
       return pushHistory('/new');

package/dist/components/EditAccountModal.js

@@ -27,7 +27,7 @@ import { DialogCloseButton, useCozyDialog } from 'cozy-ui/transpiled/react/CozyD
 import { fetchAccount as _fetchAccount } from '../connections/accounts';
 import * as triggersModel from '../helpers/triggers';
 import TriggerManager from './TriggerManager';
-import { withMountPointPushHistory } from './MountPointContext';
+import { withMountPointHistory } from './MountPointContext';
 import logger from '../logger';
 import { withTracker } from './hoc/tracking';
 import useTimeout from './hooks/useTimeout';
@@ -213,7 +213,7 @@ export var EditAccountModal = /*#__PURE__*/function (_Component) {
       var account = this.state.account;
 
       if (account) {
-        this.props.pushHistory("/accounts/".concat(account._id));
+        this.props.replaceHistory("/accounts/".concat(account._id));
       } else {
         this.props.pushHistory("/accounts");
       }
@@ -255,4 +255,4 @@ EditAccountModal.propTypes = {
   accounts: PropTypes.array.isRequired,
   reconnect: PropTypes.bool
 };
-export default flow(withClient, withMountPointPushHistory, withTracker)(EditAccountModal);
+export default flow(withClient, withMountPointHistory, withTracker)(EditAccountModal);

package/dist/components/HarvestModalRoot.js

@@ -8,13 +8,13 @@ var HarvestModalRoot = function HarvestModalRoot(_ref) {
       konnector = _ref.konnector;
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   if (accounts.length === 0) {
-    pushHistory('/new');
+    replaceHistory('/new');
     return null;
   } else if (accounts.length === 1) {
-    pushHistory("/accounts/".concat(accounts[0].account._id));
+    replaceHistory("/accounts/".concat(accounts[0].account._id));
     return null;
   } else {
     return /*#__PURE__*/React.createElement(AccountsListModal, {

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

@@ -76,7 +76,7 @@ var ConfigurationTab = function ConfigurationTab(_ref2) {
       isMobile = _useBreakpoints.isMobile;
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   var client = useClient();
   var vaultClient = useVaultClient();
@@ -238,7 +238,7 @@ var ConfigurationTab = function ConfigurationTab(_ref2) {
     button: true,
     divider: true,
     onClick: function onClick() {
-      return pushHistory("/accounts/".concat(account._id, "/edit"));
+      return replaceHistory("/accounts/".concat(account._id, "/edit"));
     }
   }, /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(Icon, {
     icon: KeyIcon,

package/dist/components/MountPointContext.js

@@ -26,20 +26,32 @@ export var RawMountPointProvider = /*#__PURE__*/function (_React$Component) {
 
     _this = _super.call(this, props);
     _this.pushHistory = _this.pushHistory.bind(_assertThisInitialized(_this));
+    _this.replaceHistory = _this.replaceHistory.bind(_assertThisInitialized(_this));
     _this.state = {
       baseRoute: props.baseRoute || '/',
-      pushHistory: _this.pushHistory
+      pushHistory: _this.pushHistory,
+      replaceHistory: _this.replaceHistory
     };
     return _this;
   }
 
   _createClass(RawMountPointProvider, [{
-    key: "pushHistory",
-    value: function pushHistory(route) {
+    key: "historyAction",
+    value: function historyAction(route, method) {
       var history = this.props.history;
       var baseRoute = this.state.baseRoute;
-      var segments = baseRoute.split('/').concat(route.split('/')).filter(Boolean);
-      history.push("/".concat(segments.join('/')));
+      var segments = '/'.concat(baseRoute.split('/').concat(route.split('/')).filter(Boolean).join('/'));
+      history[method](segments);
+    }
+  }, {
+    key: "pushHistory",
+    value: function pushHistory(route) {
+      this.historyAction(route, 'push');
+    }
+  }, {
+    key: "replaceHistory",
+    value: function replaceHistory(route) {
+      this.historyAction(route, 'replace');
     }
   }, {
     key: "render",
@@ -57,19 +69,21 @@ RawMountPointProvider.propTypes = {
   history: PropTypes.object
 };
 
-var withMountPointPushHistory = function withMountPointPushHistory(BaseComponent) {
+var withMountPointHistory = function withMountPointHistory(BaseComponent) {
   var Component = function Component(props) {
     var _useContext = useContext(MountPointContext),
-        pushHistory = _useContext.pushHistory;
+        pushHistory = _useContext.pushHistory,
+        replaceHistory = _useContext.replaceHistory;
 
     return /*#__PURE__*/React.createElement(BaseComponent, _extends({
-      pushHistory: pushHistory
+      pushHistory: pushHistory,
+      replaceHistory: replaceHistory
     }, props));
   };
 
-  Component.displayName = "withMountPointPushHistory(".concat(BaseComponent.displayName || BaseComponent.name, ")");
+  Component.displayName = "withMountPointHistory(".concat(BaseComponent.displayName || BaseComponent.name, ")");
   return Component;
 };
 
 var MountPointProvider = withRouter(RawMountPointProvider);
-export { MountPointContext, MountPointProvider, withMountPointPushHistory };
+export { MountPointContext, MountPointProvider, withMountPointHistory };

package/dist/components/MountPointContext.spec.js

@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import { RawMountPointProvider } from 'components/MountPointContext';
 describe('MountPointProvider', function () {
   var historyMock = {
-    push: jest.fn()
+    replace: jest.fn()
   };
   beforeEach(function () {
     jest.resetAllMocks();
@@ -13,33 +13,33 @@ describe('MountPointProvider', function () {
       baseRoute: "/root",
       history: historyMock
     }));
-    component.instance().pushHistory('/one');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one');
-    component.instance().pushHistory('/one/two');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one/two');
-    component.instance().pushHistory('no/slash');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/no/slash');
-    component.instance().pushHistory('too/many///slashes');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/too/many/slashes');
+    component.instance().replaceHistory('/one');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one');
+    component.instance().replaceHistory('/one/two');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one/two');
+    component.instance().replaceHistory('no/slash');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/no/slash');
+    component.instance().replaceHistory('too/many///slashes');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/too/many/slashes');
   });
   it('should handle a trailing slash in the base route', function () {
     var component = shallow( /*#__PURE__*/React.createElement(RawMountPointProvider, {
       baseRoute: "/root/",
       history: historyMock
     }));
-    component.instance().pushHistory('/one');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one');
-    component.instance().pushHistory('no/slash');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/no/slash');
+    component.instance().replaceHistory('/one');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one');
+    component.instance().replaceHistory('no/slash');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/no/slash');
   });
   it('should handle a base route with multiple segments', function () {
     var component = shallow( /*#__PURE__*/React.createElement(RawMountPointProvider, {
       baseRoute: "/base/route/",
       history: historyMock
     }));
-    component.instance().pushHistory('/one');
-    expect(historyMock.push).toHaveBeenCalledWith('/base/route/one');
-    component.instance().pushHistory('/one/two');
-    expect(historyMock.push).toHaveBeenCalledWith('/base/route/one/two');
+    component.instance().replaceHistory('/one');
+    expect(historyMock.replace).toHaveBeenCalledWith('/base/route/one');
+    component.instance().replaceHistory('/one/two');
+    expect(historyMock.replace).toHaveBeenCalledWith('/base/route/one/two');
   });
 });

package/dist/components/NewAccountModal.js

@@ -32,7 +32,7 @@ var NewAccountModal = function NewAccountModal(_ref) {
   var client = useClient();
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   var _useMaintenanceStatus = useMaintenanceStatus(client, konnector),
       fetchStatus = _useMaintenanceStatus.fetchStatus,
@@ -78,7 +78,7 @@ var NewAccountModal = function NewAccountModal(_ref) {
         path += '/success';
       }
 
-      pushHistory(path);
+      replaceHistory(path);
     },
     onSuccess: function onSuccess(trigger) {
       var accountId = triggersModel.getAccountId(trigger);
@@ -88,7 +88,7 @@ var NewAccountModal = function NewAccountModal(_ref) {
         path += '/success';
       }
 
-      pushHistory(path);
+      replaceHistory(path);
     },
     onVaultDismiss: onDismiss,
     fieldOptions: fieldOptions

package/dist/components/NewAccountModal.spec.js

@@ -27,9 +27,9 @@ jest.mock('./DialogContext', function () {
   };
 });
 describe('NewAccountModal', function () {
-  var pushHistory = jest.fn();
+  var replaceHistory = jest.fn();
   var mountPointContextValue = {
-    pushHistory: pushHistory
+    replaceHistory: replaceHistory
   };
   var konnectorTrigger = {
     worker: 'konnector',
@@ -58,7 +58,7 @@ describe('NewAccountModal', function () {
       }
     }))));
     onLoginSuccessFn(konnectorTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
   });
   it('should redirect to route without success on login success for client triggers', function () {
     render( /*#__PURE__*/React.createElement(AppLike, {
@@ -72,7 +72,7 @@ describe('NewAccountModal', function () {
       }
     }))));
     onLoginSuccessFn(clientTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
   });
   it('should redirect to success route on success for non client triggers', function () {
     render( /*#__PURE__*/React.createElement(AppLike, {
@@ -86,7 +86,7 @@ describe('NewAccountModal', function () {
       }
     }))));
     onSuccessFn(konnectorTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
   });
   it('should redirect to route without success on success for client triggers', function () {
     render( /*#__PURE__*/React.createElement(AppLike, {
@@ -100,6 +100,6 @@ describe('NewAccountModal', function () {
       }
     }))));
     onSuccessFn(clientTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
   });
 });

package/dist/components/RedirectToAccountFormButton.js

@@ -13,11 +13,11 @@ var RedirectToAccountFormButton = function RedirectToAccountFormButton(_ref) {
   var accountId = getAccountId(trigger);
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   var handleClick = useCallback(function () {
-    pushHistory("/accounts/".concat(accountId, "/edit?reconnect"));
-  }, [accountId, pushHistory]);
+    replaceHistory("/accounts/".concat(accountId, "/edit?reconnect"));
+  }, [accountId, replaceHistory]);
   return /*#__PURE__*/React.createElement(Button, {
     className: "u-ml-0",
     theme: "secondary",

package/dist/components/RedirectToAccountFormButton.spec.js

@@ -4,10 +4,10 @@ import { MountPointContext } from './MountPointContext';
 import RedirectToAccountFormButton from './RedirectToAccountFormButton';
 import AppLike from '../../test/AppLike';
 describe('redirect to account form button', function () {
-  it('should use pushHistory to navigate', function () {
-    var pushHistory = jest.fn();
+  it('should use replaceHistory to navigate', function () {
+    var replaceHistory = jest.fn();
     var mountPointContextValue = {
-      pushHistory: pushHistory
+      replaceHistory: replaceHistory
     };
     var trigger = {
       message: {
@@ -20,6 +20,6 @@ describe('redirect to account form button', function () {
       trigger: trigger
     }))));
     fireEvent.click(root.getByText('Reconnect'));
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/account-id-1337/edit?reconnect');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/account-id-1337/edit?reconnect');
   });
 });

package/dist/components/cards/AppLinkCard.js

@@ -41,7 +41,8 @@ export var AppLinkButton = function AppLinkButton(_ref) {
     var onClick = _ref2.onClick,
         href = _ref2.href;
     return /*#__PURE__*/React.createElement(ButtonLink, {
-      onClick: fetchStatus !== 'loaded' ? onClick : null,
+      disabled: fetchStatus !== 'loaded',
+      onClick: fetchStatus === 'loaded' ? onClick : null,
       href: href,
       icon: isInstalled ? /*#__PURE__*/React.createElement(AppIcon, {
         app: slug,

package/dist/models/ConnectionFlow.js

@@ -184,6 +184,7 @@ export var ConnectionFlow = /*#__PURE__*/function () {
     this.realtime = new Realtime({
       client: client
     });
+    this.watchCurrentJobIfTriggerIsAlreadyRunning();
   }
 
   _createClass(ConnectionFlow, [{
@@ -500,7 +501,8 @@ export var ConnectionFlow = /*#__PURE__*/function () {
   }, {
     key: "handleLoginSuccess",
     value: function handleLoginSuccess() {
-      this.jobWatcher.handleSuccess();
+      this.jobWatcher.handleLoginSuccess();
+      this.triggerEvent(LOGIN_SUCCESS_EVENT);
     }
   }, {
     key: "handleLoginSuccessHandled",
@@ -848,16 +850,11 @@ export var ConnectionFlow = /*#__PURE__*/function () {
     key: "launch",
     value: function () {
       var _launch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
-        var _this2 = this;
-
         var _ref5,
             _ref5$autoSuccessTime,
             autoSuccessTimer,
             computedAutoSuccessTimer,
             launcher,
-            _iterator2,
-            _step2,
-            _loop,
             _args11 = arguments;
 
         return _regeneratorRuntime.wrap(function _callee11$(_context11) {
@@ -908,42 +905,11 @@ export var ConnectionFlow = /*#__PURE__*/function () {
                   }
                 }
 
-                this.realtime.subscribe('updated', JOBS_DOCTYPE, this.job._id, this.handleJobUpdated.bind(this));
-                this.jobWatcher = watchKonnectorJob(this.client, this.job, {
+                this.watchJob({
                   autoSuccessTimer: computedAutoSuccessTimer
                 });
-                logger.info("ConnectionFlow: Subscribed to ".concat(JOBS_DOCTYPE, ":").concat(this.job._id));
-                _iterator2 = _createForOfIteratorHelper(JOB_EVENTS);
-
-                try {
-                  _loop = function _loop() {
-                    var ev = _step2.value;
-
-                    _this2.jobWatcher.on(ev, function () {
-                      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                        args[_key2] = arguments[_key2];
-                      }
-
-                      return _this2.triggerEvent.apply(_this2, [ev].concat(args));
-                    });
-                  };
-
-                  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                    _loop();
-                  }
-                } catch (err) {
-                  _iterator2.e(err);
-                } finally {
-                  _iterator2.f();
-                }
-
-                this.unsubscribeAllRealtime = function () {
-                  _this2.jobWatcher.unsubscribeAll();
-
-                  _this2.realtime.unsubscribeAll();
-                };
 
-              case 19:
+              case 14:
               case "end":
                 return _context11.stop();
             }
@@ -957,6 +923,63 @@ export var ConnectionFlow = /*#__PURE__*/function () {
 
       return launch;
     }()
+    /**
+     * If the trigger we display is already running, subscribe to the associated job
+     */
+
+  }, {
+    key: "watchCurrentJobIfTriggerIsAlreadyRunning",
+    value: function watchCurrentJobIfTriggerIsAlreadyRunning() {
+      if (get(this, 'trigger.current_state.status') === 'running') {
+        this.job = {
+          _id: get(this, 'trigger.current_state.last_executed_job_id')
+        };
+        this.watchJob();
+      }
+    }
+  }, {
+    key: "watchJob",
+    value: function watchJob() {
+      var _this2 = this;
+
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+        autoSuccessTimer: false
+      };
+      this.realtime.subscribe('updated', JOBS_DOCTYPE, this.job._id, this.handleJobUpdated.bind(this));
+      this.jobWatcher = watchKonnectorJob(this.client, this.job, options);
+      logger.info("ConnectionFlow: Subscribed to ".concat(JOBS_DOCTYPE, ":").concat(this.job._id));
+
+      var _iterator2 = _createForOfIteratorHelper(JOB_EVENTS),
+          _step2;
+
+      try {
+        var _loop = function _loop() {
+          var ev = _step2.value;
+
+          _this2.jobWatcher.on(ev, function () {
+            for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+              args[_key2] = arguments[_key2];
+            }
+
+            return _this2.triggerEvent.apply(_this2, [ev].concat(args));
+          });
+        };
+
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          _loop();
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+
+      this.unsubscribeAllRealtime = function () {
+        _this2.jobWatcher.unsubscribeAll();
+
+        _this2.realtime.unsubscribeAll();
+      };
+    }
   }, {
     key: "unwatch",
     value: function unwatch() {
@@ -985,7 +1008,7 @@ export var ConnectionFlow = /*#__PURE__*/function () {
           accountError = _this$state.accountError;
       var triggerError = triggersModel.getKonnectorJobError(trigger);
       return {
-        running: ![ERRORED, IDLE, SUCCESS].includes(status),
+        running: get(trigger, 'current_state.status') === 'running' || ![ERRORED, IDLE, SUCCESS].includes(status),
         twoFARunning: status === RUNNING_TWOFA,
         twoFARetry: status == TWO_FA_MISMATCH,
         triggerError: triggerError,