cozy-harvest-lib 20.1.2 → 20.1.4

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.1.4](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@20.1.3...cozy-harvest-lib@20.1.4) (2023-11-02)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
+
+
+
+
+## [20.1.3](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@20.1.2...cozy-harvest-lib@20.1.3) (2023-10-31)
+
+**Note:** Version bump only for package cozy-harvest-lib
+
+
+
+
+
 ## [20.1.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@20.1.1...cozy-harvest-lib@20.1.2) (2023-10-27)
 
 

package/dist/components/AccountModal.js

@@ -17,6 +17,7 @@ import get from 'lodash/get';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { models, withClient } from 'cozy-client';
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger';
 import flag from 'cozy-flags';
 import DialogContent from 'cozy-ui/transpiled/react/DialogContent';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
@@ -32,7 +33,6 @@ import { withMountPointProps } from './MountPointContext';
 import withLocales from './hoc/withLocales';
 import { fetchAccount as _fetchAccount } from '../connections/accounts';
 import { intentsApiProptype, innerAccountModalOverridesProptype } from '../helpers/proptypes';
-import * as triggersModel from '../helpers/triggers';
 /**
  * Takes an accountId and a list of accounts containing their respecting triggers
  * isplays the selected account and the accounts linked

package/dist/components/EditAccountModal.js

@@ -16,6 +16,7 @@ import get from 'lodash/get';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { withClient } from 'cozy-client';
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger';
 import flag from 'cozy-flags';
 import { Dialog } from 'cozy-ui/transpiled/react/CozyDialogs';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
@@ -25,7 +26,6 @@ import { withTracker } from './hoc/tracking';
 import useTimeout from './hooks/useTimeout';
 import { fetchAccount as _fetchAccount } from '../connections/accounts';
 import { intentsApiProptype } from '../helpers/proptypes';
-import * as triggersModel from '../helpers/triggers';
 import logger from '../logger';
 var showStyle = {
   opacity: 1,

package/dist/components/NewAccountModal.js

@@ -3,6 +3,7 @@ import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React, { useContext } from 'react';
 import { useClient } from 'cozy-client';
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger';
 import flag from 'cozy-flags';
 import { DialogTitle } from 'cozy-ui/transpiled/react/Dialog';
 import DialogContent from 'cozy-ui/transpiled/react/DialogContent';
@@ -17,7 +18,6 @@ import { MountPointContext } from './MountPointContext';
 import LegacyTriggerManager from './TriggerManager';
 import { InformationsCard } from './cards/InformationsCard';
 import useMaintenanceStatus from './hooks/useMaintenanceStatus';
-import * as triggersModel from '../helpers/triggers';
 /**
  * We need to deal with `onLoginSuccess` and `onSucess` because we
  * can have a `onSuccess` without having a `onLoginSuccess` since only

package/dist/components/RedirectToAccountFormButton.js

@@ -1,8 +1,8 @@
 import React, { useContext, useCallback } from 'react';
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger';
 import Button from 'cozy-ui/transpiled/react/deprecated/Button';
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import { MountPointContext } from './MountPointContext';
-import { getAccountId } from '../helpers/triggers';
 
 var RedirectToAccountFormButton = function RedirectToAccountFormButton(_ref) {
   var trigger = _ref.trigger;
@@ -10,7 +10,7 @@ var RedirectToAccountFormButton = function RedirectToAccountFormButton(_ref) {
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  var accountId = getAccountId(trigger);
+  var accountId = triggersModel.getAccountId(trigger);
 
   var _useContext = useContext(MountPointContext),
       replaceHistory = _useContext.replaceHistory;

package/dist/components/cards/LaunchTriggerAlert.js

@@ -2,6 +2,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import PropTypes from 'prop-types';
 import React, { useState, useEffect } from 'react';
 import { useClient } from 'cozy-client';
+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';
@@ -16,7 +17,7 @@ import { RunningAlert } from './RunningAlert';
 import { makeLabel } from './helpers';
 import { isDisconnected } from '../../helpers/konnectors';
 import { intentsApiProptype } from '../../helpers/proptypes';
-import { getAccountId, getKonnectorSlug } from '../../helpers/triggers';
+import { getKonnectorSlug } from '../../helpers/triggers';
 import { findKonnectorPolicy } from '../../konnector-policies';
 import { SUCCESS } from '../../models/flowEvents';
 import { useFlowState } from '../../models/withConnectionFlow';
@@ -88,7 +89,7 @@ export var LaunchTriggerAlert = function LaunchTriggerAlert(_ref2) {
     }
   }, [status]);
   var SyncButtonAction = konnectorPolicy.shouldLaunchRedirectToEdit(error) ? function () {
-    return historyAction(konnectorRoot ? "".concat(konnectorRoot, "/accounts/").concat(getAccountId(trigger), "/edit") : '/edit', 'push');
+    return historyAction(konnectorRoot ? "".concat(konnectorRoot, "/accounts/").concat(triggersModel.getAccountId(trigger), "/edit") : '/edit', 'push');
   } : function () {
     return launch({
       autoSuccessTimer: false

package/dist/components/cards/LaunchTriggerAlertMenu.js

@@ -2,6 +2,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import PropTypes from 'prop-types';
 import React, { useRef, useState } from 'react';
 import { useClient } from 'cozy-client';
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger';
 import Icon from 'cozy-ui/transpiled/react/Icon';
 import IconButton from 'cozy-ui/transpiled/react/IconButton';
 import DotsIcon from 'cozy-ui/transpiled/react/Icons/Dots';
@@ -10,7 +11,6 @@ import SyncIcon from 'cozy-ui/transpiled/react/Icons/Sync';
 import ActionMenu, { ActionMenuItem } from 'cozy-ui/transpiled/react/deprecated/ActionMenu';
 import { isDisconnected } from '../../helpers/konnectors';
 import { intentsApiProptype } from '../../helpers/proptypes';
-import { getAccountId } from '../../helpers/triggers';
 import { findKonnectorPolicy } from '../../konnector-policies';
 import { useFlowState } from '../../models/withConnectionFlow';
 import OpenOAuthWindowButton from '../AccountModalWithoutTabs/OpenOAuthWindowButton';
@@ -49,7 +49,7 @@ var LaunchTriggerAlertMenu = function LaunchTriggerAlertMenu(_ref) {
       setShowOptions = _useState2[1];
 
   var SyncButtonAction = konnectorPolicy.shouldLaunchRedirectToEdit(error) ? function () {
-    return historyAction(konnectorRoot ? "".concat(konnectorRoot, "/accounts/").concat(getAccountId(trigger), "/edit") : '/edit', 'push');
+    return historyAction(konnectorRoot ? "".concat(konnectorRoot, "/accounts/").concat(triggersModel.getAccountId(trigger), "/edit") : '/edit', 'push');
   } : function () {
     return launch({
       autoSuccessTimer: false
@@ -91,7 +91,7 @@ var LaunchTriggerAlertMenu = function LaunchTriggerAlertMenu(_ref) {
       icon: GearIcon
     }),
     onClick: function onClick() {
-      return historyAction(konnectorRoot ? "".concat(konnectorRoot, "/accounts/").concat(getAccountId(trigger), "/config") : '/config', 'push');
+      return historyAction(konnectorRoot ? "".concat(konnectorRoot, "/accounts/").concat(triggersModel.getAccountId(trigger), "/config") : '/config', 'push');
     }
   }, t('card.launchTrigger.configure')), !isClisk && isKonnectorDisconnected && /*#__PURE__*/React.createElement(ActionMenuItem, {
     left: /*#__PURE__*/React.createElement(Icon, {

package/dist/connections/accounts.js

@@ -9,8 +9,8 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import keyBy from 'lodash/keyBy';
 import merge from 'lodash/merge';
 import { Q } from 'cozy-client';
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger';
 import assert from '../assert';
-import * as triggersModel from '../helpers/triggers';
 import logger from '../logger';
 export var ACCOUNTS_DOCTYPE = 'io.cozy.accounts';
 var PERMISSIONS_DOCTYPE = 'io.cozy.permissions';

package/dist/connections/triggers.js

@@ -1,13 +1,13 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger';
 import { CozyFolder as CozyFolderClass } from 'cozy-doctypes';
 import { fetchAccount, updateAccount } from './accounts';
 import { statDirectoryByPath, createDirectoryByPath } from './files';
 import * as accounts from '../helpers/accounts';
 import cron from '../helpers/cron';
 import * as konnectors from '../helpers/konnectors';
-import * as triggers from '../helpers/triggers';
 var FILES_DOCTYPE = 'io.cozy.files';
 var PERMISSIONS_DOCTYPE = 'io.cozy.permissions';
 var TRIGGERS_DOCTYPE = 'io.cozy.triggers';
@@ -123,7 +123,7 @@ export var prepareTriggerAccount = /*#__PURE__*/function () {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
-            accountId = triggers.getAccountId(trigger);
+            accountId = triggersModel.getAccountId(trigger);
 
             if (accountId) {
               _context4.next = 3;
@@ -275,7 +275,7 @@ export var ensureTrigger = /*#__PURE__*/function () {
 
           case 7:
             _context6.next = 9;
-            return createTrigger(client, triggers.buildAttributes({
+            return createTrigger(client, triggersModel.buildTriggerAttributes({
               account: account,
               cron: cron.fromKonnector(konnector),
               folder: folder,

package/dist/helpers/accounts.js

@@ -12,12 +12,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import clone from 'lodash/clone';
 import get from 'lodash/get';
 import merge from 'lodash/merge';
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger';
 import manifest from './manifest';
 import assert from '../assert';
 import { hasReachMaxAccountsByKonnector, hasReachMaxAccounts } from '../components/AccountsPaywall/helpers';
 import { fetchAccount } from '../connections/accounts';
 import { buildCountTriggersQuery, buildAppsRegistryMaintenance } from '../helpers/queries';
-import * as triggersModel from '../helpers/triggers';
 var DEFAULT_TWOFA_CODE_PROVIDER_TYPE = 'default';
 export var TWOFA_PROVIDERS = {
   EMAIL: 'email',

package/dist/helpers/triggers.js

@@ -1,52 +1,7 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import DateFns from 'date-fns';
 import get from 'lodash/get';
 import { toFrequency } from './cron';
 import { KonnectorJobError } from './konnectors';
-var DEFAULT_CRON = '0 0 0 * * 0'; // Once a week, sunday at midnight
-
-/**
- * Build trigger attributes given konnector and account
- * @param  {object} konnector
- * @param  {object} account
- * @return {object} created trigger
- */
-
-export var buildAttributes = function buildAttributes(_ref) {
-  var account = _ref.account,
-      _ref$cron = _ref.cron,
-      cron = _ref$cron === void 0 ? DEFAULT_CRON : _ref$cron,
-      folder = _ref.folder,
-      konnector = _ref.konnector;
-  var message = {
-    account: account._id,
-    konnector: konnector.slug
-  };
-
-  if (folder) {
-    message['folder_to_save'] = folder._id;
-  }
-
-  var result = {
-    worker: 'konnector',
-    message: message
-  };
-  var options = konnector.clientSide ? {
-    type: '@client'
-  } : {
-    type: '@cron',
-    arguments: cron
-  };
-  return _objectSpread(_objectSpread({}, result), options);
-};
-export var getAccountId = function getAccountId(trigger) {
-  return get(trigger, 'message.account');
-};
 /**
  * Get error for a given trigger document
  * @param  {Object} trigger io.cozy.trigger as returned by stack
@@ -90,9 +45,7 @@ export var getFrequency = function getFrequency(trigger) {
   return toFrequency(trigger.arguments);
 };
 var helpers = {
-  buildAttributes: buildAttributes,
   isKonnectorRunning: isKonnectorRunning,
-  getAccountId: getAccountId,
   getKonnectorJobError: getKonnectorJobError,
   getFrequency: getFrequency,
   getKonnectorSlug: getKonnectorSlug,

package/dist/helpers/triggers.spec.js

@@ -1,87 +1,7 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 /* eslint-env jest */
 import { KonnectorJobError } from 'helpers/konnectors';
-import { buildAttributes, getKonnectorJobError, isKonnectorRunning } from 'helpers/triggers';
+import { getKonnectorJobError, isKonnectorRunning } from 'helpers/triggers';
 describe('Triggers Helper', function () {
-  describe('buildAttributes', function () {
-    var konnector = {
-      slug: 'konnectest'
-    };
-    var account = {
-      _id: '963a51f6cdd34401b0904de32cc5578d'
-    };
-    it('builds attributes', function () {
-      expect(buildAttributes({
-        konnector: konnector,
-        account: account
-      })).toEqual({
-        arguments: '0 0 0 * * 0',
-        type: '@cron',
-        worker: 'konnector',
-        message: {
-          account: '963a51f6cdd34401b0904de32cc5578d',
-          konnector: 'konnectest'
-        }
-      });
-    });
-    it('builds attributes with cron', function () {
-      var cron = '0 0 0 * * 2';
-      expect(buildAttributes({
-        konnector: konnector,
-        account: account,
-        cron: cron
-      })).toEqual({
-        arguments: '0 0 0 * * 2',
-        type: '@cron',
-        worker: 'konnector',
-        message: {
-          account: '963a51f6cdd34401b0904de32cc5578d',
-          konnector: 'konnectest'
-        }
-      });
-    });
-    it('builds for client side connectors', function () {
-      var clientSideConnector = _objectSpread(_objectSpread({}, konnector), {}, {
-        clientSide: true
-      });
-
-      expect(buildAttributes({
-        konnector: clientSideConnector,
-        account: account
-      })).toEqual({
-        type: '@client',
-        worker: 'konnector',
-        message: {
-          account: '963a51f6cdd34401b0904de32cc5578d',
-          konnector: 'konnectest'
-        }
-      });
-    });
-    it('build attributes with folder', function () {
-      var folder = {
-        _id: '4c43f8e88e5f4a608667da6b5bae8fa4'
-      };
-      expect(buildAttributes({
-        konnector: konnector,
-        account: account,
-        folder: folder
-      })).toEqual({
-        arguments: '0 0 0 * * 0',
-        type: '@cron',
-        worker: 'konnector',
-        message: {
-          account: '963a51f6cdd34401b0904de32cc5578d',
-          folder_to_save: '4c43f8e88e5f4a608667da6b5bae8fa4',
-          konnector: 'konnectest'
-        }
-      });
-    });
-  });
   describe('getKonnectorJobError', function () {
     it('returns known KonnectorJobError', function () {
       var trigger = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "20.1.2",
+  "version": "20.1.4",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -40,7 +40,7 @@
     "@storybook/testing-library": "0.0.14-next.2",
     "classnames": "^2.3.1",
     "cozy-bi-auth": "0.0.25",
-    "cozy-doctypes": "^1.88.6",
+    "cozy-doctypes": "^1.88.7",
     "cozy-logger": "^1.10.1",
     "date-fns": "^1.30.1",
     "final-form": "^4.18.5",
@@ -74,7 +74,7 @@
     "babel-preset-cozy-app": "^2.1.0",
     "cozy-client": "^41.9.0",
     "cozy-device-helper": "^3.0.0",
-    "cozy-flags": "^3.0.1",
+    "cozy-flags": "^3.1.0",
     "cozy-intent": "^2.18.0",
     "cozy-keys-lib": "^6.0.0",
     "cozy-realtime": "^5.0.0",
@@ -112,5 +112,5 @@
     "react-router-dom": ">=4.3.1"
   },
   "sideEffects": false,
-  "gitHead": "6da69c3efe784f0d6a3dd71c0bf28b79ed7c03a6"
+  "gitHead": "54e4d1fbc8764c7fee740ab2b7a13f177ebaf463"
 }

package/src/components/AccountModal.jsx

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 
 import { models, withClient } from 'cozy-client'
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger'
 import flag from 'cozy-flags'
 import DialogContent from 'cozy-ui/transpiled/react/DialogContent'
 import Spinner from 'cozy-ui/transpiled/react/Spinner'
@@ -23,7 +24,6 @@ import {
   intentsApiProptype,
   innerAccountModalOverridesProptype
 } from '../helpers/proptypes'
-import * as triggersModel from '../helpers/triggers'
 
 /**
  * Takes an accountId and a list of accounts containing their respecting triggers

package/src/components/EditAccountModal.jsx

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 
 import { withClient } from 'cozy-client'
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger'
 import flag from 'cozy-flags'
 import { Dialog } from 'cozy-ui/transpiled/react/CozyDialogs'
 import Spinner from 'cozy-ui/transpiled/react/Spinner'
@@ -14,7 +15,6 @@ import { withTracker } from './hoc/tracking'
 import useTimeout from './hooks/useTimeout'
 import { fetchAccount } from '../connections/accounts'
 import { intentsApiProptype } from '../helpers/proptypes'
-import * as triggersModel from '../helpers/triggers'
 import logger from '../logger'
 
 const showStyle = { opacity: 1, transition: 'opacity 0.3s ease' }

package/src/components/NewAccountModal.jsx

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'
 import React, { useContext } from 'react'
 
 import { useClient } from 'cozy-client'
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger'
 import flag from 'cozy-flags'
 import { DialogTitle } from 'cozy-ui/transpiled/react/Dialog'
 import DialogContent from 'cozy-ui/transpiled/react/DialogContent'
@@ -18,7 +19,6 @@ import { MountPointContext } from './MountPointContext'
 import LegacyTriggerManager from './TriggerManager'
 import { InformationsCard } from './cards/InformationsCard'
 import useMaintenanceStatus from './hooks/useMaintenanceStatus'
-import * as triggersModel from '../helpers/triggers'
 
 /**
  * We need to deal with `onLoginSuccess` and `onSucess` because we

package/src/components/RedirectToAccountFormButton.jsx

@@ -1,14 +1,14 @@
 import React, { useContext, useCallback } from 'react'
 
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger'
 import Button from 'cozy-ui/transpiled/react/deprecated/Button'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
 import { MountPointContext } from './MountPointContext'
-import { getAccountId } from '../helpers/triggers'
 
 const RedirectToAccountFormButton = ({ trigger }) => {
   const { t } = useI18n()
-  const accountId = getAccountId(trigger)
+  const accountId = triggersModel.getAccountId(trigger)
   const { replaceHistory } = useContext(MountPointContext)
   const handleClick = useCallback(() => {
     replaceHistory(`/accounts/${accountId}/edit?reconnect`)

package/src/components/cards/LaunchTriggerAlert.jsx

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types'
 import React, { useState, useEffect } from 'react'
 
 import { useClient } from 'cozy-client'
+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'
@@ -17,7 +18,7 @@ import { RunningAlert } from './RunningAlert'
 import { makeLabel } from './helpers'
 import { isDisconnected } from '../../helpers/konnectors'
 import { intentsApiProptype } from '../../helpers/proptypes'
-import { getAccountId, getKonnectorSlug } from '../../helpers/triggers'
+import { getKonnectorSlug } from '../../helpers/triggers'
 import { findKonnectorPolicy } from '../../konnector-policies'
 import { SUCCESS } from '../../models/flowEvents'
 import { useFlowState } from '../../models/withConnectionFlow'
@@ -79,7 +80,9 @@ export const LaunchTriggerAlert = ({
     ? () =>
         historyAction(
           konnectorRoot
-            ? `${konnectorRoot}/accounts/${getAccountId(trigger)}/edit`
+            ? `${konnectorRoot}/accounts/${triggersModel.getAccountId(
+                trigger
+              )}/edit`
             : '/edit',
           'push'
         )

package/src/components/cards/LaunchTriggerAlertMenu.jsx

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types'
 import React, { useRef, useState } from 'react'
 
 import { useClient } from 'cozy-client'
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import IconButton from 'cozy-ui/transpiled/react/IconButton'
 import DotsIcon from 'cozy-ui/transpiled/react/Icons/Dots'
@@ -13,7 +14,6 @@ import ActionMenu, {
 
 import { isDisconnected } from '../../helpers/konnectors'
 import { intentsApiProptype } from '../../helpers/proptypes'
-import { getAccountId } from '../../helpers/triggers'
 import { findKonnectorPolicy } from '../../konnector-policies'
 import { useFlowState } from '../../models/withConnectionFlow'
 import OpenOAuthWindowButton from '../AccountModalWithoutTabs/OpenOAuthWindowButton'
@@ -46,7 +46,9 @@ const LaunchTriggerAlertMenu = ({
     ? () =>
         historyAction(
           konnectorRoot
-            ? `${konnectorRoot}/accounts/${getAccountId(trigger)}/edit`
+            ? `${konnectorRoot}/accounts/${triggersModel.getAccountId(
+                trigger
+              )}/edit`
             : '/edit',
           'push'
         )
@@ -97,7 +99,7 @@ const LaunchTriggerAlertMenu = ({
               onClick={() =>
                 historyAction(
                   konnectorRoot
-                    ? `${konnectorRoot}/accounts/${getAccountId(
+                    ? `${konnectorRoot}/accounts/${triggersModel.getAccountId(
                         trigger
                       )}/config`
                     : '/config',

package/src/connections/accounts.js

@@ -2,9 +2,9 @@ import keyBy from 'lodash/keyBy'
 import merge from 'lodash/merge'
 
 import { Q } from 'cozy-client'
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger'
 
 import assert from '../assert'
-import * as triggersModel from '../helpers/triggers'
 import logger from '../logger'
 
 export const ACCOUNTS_DOCTYPE = 'io.cozy.accounts'

package/src/connections/triggers.js

@@ -1,3 +1,4 @@
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger'
 import { CozyFolder as CozyFolderClass } from 'cozy-doctypes'
 
 import { fetchAccount, updateAccount } from './accounts'
@@ -5,7 +6,6 @@ import { statDirectoryByPath, createDirectoryByPath } from './files'
 import * as accounts from '../helpers/accounts'
 import cron from '../helpers/cron'
 import * as konnectors from '../helpers/konnectors'
-import * as triggers from '../helpers/triggers'
 
 const FILES_DOCTYPE = 'io.cozy.files'
 const PERMISSIONS_DOCTYPE = 'io.cozy.permissions'
@@ -45,7 +45,7 @@ export const launchTrigger = async (client, trigger) => {
 }
 
 export const prepareTriggerAccount = async (client, trigger) => {
-  const accountId = triggers.getAccountId(trigger)
+  const accountId = triggersModel.getAccountId(trigger)
   if (!accountId) {
     throw new Error('No account id in the trigger')
   }
@@ -115,7 +115,7 @@ export const ensureTrigger = async (
 
   return await createTrigger(
     client,
-    triggers.buildAttributes({
+    triggersModel.buildTriggerAttributes({
       account,
       cron: cron.fromKonnector(konnector),
       folder,

package/src/helpers/accounts.js

@@ -2,6 +2,8 @@ import clone from 'lodash/clone'
 import get from 'lodash/get'
 import merge from 'lodash/merge'
 
+import { triggers as triggersModel } from 'cozy-client/dist/models/trigger'
+
 import manifest from './manifest'
 import assert from '../assert'
 import {
@@ -13,7 +15,6 @@ import {
   buildCountTriggersQuery,
   buildAppsRegistryMaintenance
 } from '../helpers/queries'
-import * as triggersModel from '../helpers/triggers'
 
 const DEFAULT_TWOFA_CODE_PROVIDER_TYPE = 'default'
 

package/src/helpers/triggers.js

@@ -4,45 +4,6 @@ import get from 'lodash/get'
 import { toFrequency } from './cron'
 import { KonnectorJobError } from './konnectors'
 
-const DEFAULT_CRON = '0 0 0 * * 0' // Once a week, sunday at midnight
-
-/**
- * Build trigger attributes given konnector and account
- * @param  {object} konnector
- * @param  {object} account
- * @return {object} created trigger
- */
-export const buildAttributes = ({
-  account,
-  cron = DEFAULT_CRON,
-  folder,
-  konnector
-}) => {
-  const message = {
-    account: account._id,
-    konnector: konnector.slug
-  }
-
-  if (folder) {
-    message['folder_to_save'] = folder._id
-  }
-
-  const result = {
-    worker: 'konnector',
-    message
-  }
-
-  const options = konnector.clientSide
-    ? { type: '@client' }
-    : { type: '@cron', arguments: cron }
-
-  return { ...result, ...options }
-}
-
-export const getAccountId = trigger => {
-  return get(trigger, 'message.account')
-}
-
 /**
  * Get error for a given trigger document
  * @param  {Object} trigger io.cozy.trigger as returned by stack
@@ -88,9 +49,7 @@ export const getFrequency = trigger => {
 }
 
 const helpers = {
-  buildAttributes,
   isKonnectorRunning,
-  getAccountId,
   getKonnectorJobError,
   getFrequency,
   getKonnectorSlug,

package/src/helpers/triggers.spec.js

@@ -1,71 +1,9 @@
 /* eslint-env jest */
 
 import { KonnectorJobError } from 'helpers/konnectors'
-import {
-  buildAttributes,
-  getKonnectorJobError,
-  isKonnectorRunning
-} from 'helpers/triggers'
+import { getKonnectorJobError, isKonnectorRunning } from 'helpers/triggers'
 
 describe('Triggers Helper', () => {
-  describe('buildAttributes', () => {
-    const konnector = { slug: 'konnectest' }
-    const account = { _id: '963a51f6cdd34401b0904de32cc5578d' }
-
-    it('builds attributes', () => {
-      expect(buildAttributes({ konnector, account })).toEqual({
-        arguments: '0 0 0 * * 0',
-        type: '@cron',
-        worker: 'konnector',
-        message: {
-          account: '963a51f6cdd34401b0904de32cc5578d',
-          konnector: 'konnectest'
-        }
-      })
-    })
-
-    it('builds attributes with cron', () => {
-      const cron = '0 0 0 * * 2'
-      expect(buildAttributes({ konnector, account, cron })).toEqual({
-        arguments: '0 0 0 * * 2',
-        type: '@cron',
-        worker: 'konnector',
-        message: {
-          account: '963a51f6cdd34401b0904de32cc5578d',
-          konnector: 'konnectest'
-        }
-      })
-    })
-
-    it('builds for client side connectors', () => {
-      const clientSideConnector = { ...konnector, clientSide: true }
-      expect(
-        buildAttributes({ konnector: clientSideConnector, account })
-      ).toEqual({
-        type: '@client',
-        worker: 'konnector',
-        message: {
-          account: '963a51f6cdd34401b0904de32cc5578d',
-          konnector: 'konnectest'
-        }
-      })
-    })
-
-    it('build attributes with folder', () => {
-      const folder = { _id: '4c43f8e88e5f4a608667da6b5bae8fa4' }
-      expect(buildAttributes({ konnector, account, folder })).toEqual({
-        arguments: '0 0 0 * * 0',
-        type: '@cron',
-        worker: 'konnector',
-        message: {
-          account: '963a51f6cdd34401b0904de32cc5578d',
-          folder_to_save: '4c43f8e88e5f4a608667da6b5bae8fa4',
-          konnector: 'konnectest'
-        }
-      })
-    })
-  })
-
   describe('getKonnectorJobError', () => {
     it('returns known KonnectorJobError', () => {
       const trigger = {