cozy-harvest-lib 22.0.5 → 22.0.7

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.
 
+## [22.0.7](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@22.0.6...cozy-harvest-lib@22.0.7) (2024-01-17)
+
+
+### Bug Fixes
+
+* Do not disable submit buton when password is the same ([f431e7f](https://github.com/cozy/cozy-libs/commit/f431e7fda2e1d16618f687c5b16fbfbef83ab0e7))
+
+
+
+
+
+## [22.0.6](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@22.0.5...cozy-harvest-lib@22.0.6) (2024-01-08)
+
+
+### Bug Fixes
+
+* Use konnectorFolder from cozy-client ([f81eed9](https://github.com/cozy/cozy-libs/commit/f81eed99e502f2c1378c6c2d0daa157047967f6e))
+
+
+
+
+
 ## [22.0.5](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@22.0.4...cozy-harvest-lib@22.0.5) (2024-01-08)
 
 

package/dist/components/AccountForm/index.js

@@ -114,14 +114,12 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
   _createClass(AccountForm, [{
     key: "isSubmittable",
     value: function isSubmittable(_ref) {
-      var dirty = _ref.dirty,
-          error = _ref.error,
-          initialValues = _ref.initialValues,
+      var error = _ref.error,
           valid = _ref.valid;
-      var modified = !initialValues || dirty; // Here error is not a validation error but an instance of a
+      // Here error is not a validation error but an instance of a
       // KonnectorJobError, so submitting again is possible
-
-      return modified && (error || valid);
+      var result = error || valid;
+      return result;
     }
     /**
      * Give focus to next input in the form.
@@ -161,10 +159,8 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
      * Handle key up and check if `ENTER` key has been pressed. If so, submit the
      * form if all parmater are ok.
      * @param  {React.SyntheticEvent} event         Key events
-     * @param  {Boolean} dirty         Indicates if form is dirty, i.e. if values
      * have changed
      * @param  {Object} form          The form object injected by ReactFinalForm.
-     * @param  {Object} initialValues Initial data injected into AccountForm
      * @param  {Boolean} valid        Indicates if the form data is valid
      * @param  {Object} values        Actual form values data
      */
@@ -172,9 +168,7 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
   }, {
     key: "handleKeyUp",
     value: function handleKeyUp(event, _ref2) {
-      var dirty = _ref2.dirty,
-          form = _ref2.form,
-          initialValues = _ref2.initialValues,
+      var form = _ref2.form,
           valid = _ref2.valid,
           values = _ref2.values;
 
@@ -182,8 +176,6 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
         var changedFocus = isMobile() && !!this.focusNext();
 
         if (!changedFocus && this.isSubmittable({
-          dirty: dirty,
-          initialValues: initialValues,
           valid: valid
         })) {
           this.handleSubmit(values, form);
@@ -303,7 +295,6 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
           vendor_link = konnector.vendor_link;
       var sanitizedFields = manifest.sanitizeFields(fields);
       fieldHelpers.addForceEncryptedPlaceholder(sanitizedFields, fieldOptions);
-      var initialValues = account && account.auth;
       var values = manifest.getFieldsValues(konnector, account);
       var isReadOnlyIdentifier = Boolean(get(account, 'relationships.vaultCipher')) && this.props.readOnlyIdentifier;
 
@@ -321,16 +312,13 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
           onSubmit: onSubmit,
           validate: this.validate(sanitizedFields, values),
           render: function render(_ref3) {
-            var dirty = _ref3.dirty,
-                form = _ref3.form,
+            var form = _ref3.form,
                 values = _ref3.values,
                 valid = _ref3.valid;
             return /*#__PURE__*/React.createElement("div", {
               onKeyUp: function onKeyUp(event) {
                 return _this3.handleKeyUp(event, {
-                  dirty: dirty,
                   form: form,
-                  initialValues: initialValues,
                   valid: valid,
                   values: values
                 });
@@ -365,9 +353,7 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
               buttonProps: _defineProperty({
                 busy: submitting && !flag('harvest.inappconnectors.enabled'),
                 disabled: submitting || !_this3.isSubmittable({
-                  dirty: dirty,
                   error: error,
-                  initialValues: initialValues,
                   valid: valid
                 }),
                 label: t('accountForm.clientSide.submit'),
@@ -379,9 +365,7 @@ export var AccountForm = /*#__PURE__*/function (_PureComponent) {
               busy: submitting && !flag('harvest.inappconnectors.enabled'),
               className: "u-mt-2 u-mb-1-half",
               disabled: submitting || !_this3.isSubmittable({
-                dirty: dirty,
                 error: error,
-                initialValues: initialValues,
                 valid: valid
               }),
               fullWidth: true,

package/dist/components/AccountForm/index.spec.js

@@ -260,52 +260,15 @@ describe('AccountForm', function () {
 
       assertButtonEnabled(wrapper);
     });
-    it('should be disabled with initialValues', function () {
-      var account = {
-        auth: {
-          username: 'foo',
-          passphrase: 'bar'
-        }
-      };
-
-      var _setup12 = setup({
-        account: account
-      }),
-          wrapper = _setup12.wrapper;
-
-      assertButtonDisabled(wrapper);
-    });
-    /**
-     * This case corresponds to an account edition of a trigger already having
-     * an error. We are not supposed to submit it without modifications.
-     */
-
-    it('should be disabled with initialValues AND error', function () {
-      var account = {
-        auth: {
-          username: 'foo',
-          passphrase: 'bar'
-        }
-      };
-      var error = new Error('Existing trigger error');
-
-      var _setup13 = setup({
-        account: account,
-        error: error
-      }),
-          wrapper = _setup13.wrapper;
-
-      assertButtonDisabled(wrapper);
-    });
     it('should be enabled when an error exists', function () {
       var account = {};
       var error = new Error('Test error');
 
-      var _setup14 = setup({
+      var _setup12 = setup({
         account: account,
         error: error
       }),
-          wrapper = _setup14.wrapper;
+          wrapper = _setup12.wrapper;
 
       assertButtonEnabled(wrapper);
     });
@@ -314,8 +277,8 @@ describe('AccountForm', function () {
     var loginInput = document.createElement('input');
     var passwordInput = document.createElement('input');
     it('should focus next input', function () {
-      var _setup15 = setup(),
-          wrapper = _setup15.wrapper;
+      var _setup13 = setup(),
+          wrapper = _setup13.wrapper;
 
       wrapper.instance().inputs = {
         login: loginInput,
@@ -334,8 +297,8 @@ describe('AccountForm', function () {
     it('should ignore other keys than ENTER', function () {
       isMobile.mockReturnValue(false);
 
-      var _setup16 = setup(),
-          wrapper = _setup16.wrapper;
+      var _setup14 = setup(),
+          wrapper = _setup14.wrapper;
 
       wrapper.instance().handleSubmit = jest.fn();
       wrapper.instance().handleKeyUp({
@@ -346,8 +309,8 @@ describe('AccountForm', function () {
     it('should submit form', function () {
       isMobile.mockReturnValue(false);
 
-      var _setup17 = setup(),
-          wrapper = _setup17.wrapper;
+      var _setup15 = setup(),
+          wrapper = _setup15.wrapper;
 
       wrapper.instance().handleSubmit = jest.fn();
       wrapper.instance().isSubmittable = jest.fn().mockReturnValue(true);
@@ -359,8 +322,8 @@ describe('AccountForm', function () {
     it('should not submit form', function () {
       isMobile.mockReturnValue(false);
 
-      var _setup18 = setup({}),
-          wrapper = _setup18.wrapper;
+      var _setup16 = setup({}),
+          wrapper = _setup16.wrapper;
 
       wrapper.instance().handleSubmit = jest.fn();
       wrapper.instance().isSubmittable = jest.fn().mockReturnValue(false);
@@ -372,8 +335,8 @@ describe('AccountForm', function () {
     it('should focus next input on mobile', function () {
       isMobile.mockReturnValue(true);
 
-      var _setup19 = setup(),
-          wrapper = _setup19.wrapper;
+      var _setup17 = setup(),
+          wrapper = _setup17.wrapper;
 
       wrapper.instance().focusNext = jest.fn().mockReturnValue(document.createElement('input'));
       wrapper.instance().handleKeyUp({
@@ -384,8 +347,8 @@ describe('AccountForm', function () {
     it('should submit form on mobile', function () {
       isMobile.mockReturnValue(true);
 
-      var _setup20 = setup(),
-          wrapper = _setup20.wrapper;
+      var _setup18 = setup(),
+          wrapper = _setup18.wrapper;
 
       wrapper.instance().focusNext = jest.fn().mockReturnValue(null);
       wrapper.instance().isSubmittable = jest.fn().mockReturnValue(true);
@@ -399,8 +362,8 @@ describe('AccountForm', function () {
     it('should not submit form on mobile', function () {
       isMobile.mockReturnValue(true);
 
-      var _setup21 = setup(),
-          wrapper = _setup21.wrapper;
+      var _setup19 = setup(),
+          wrapper = _setup19.wrapper;
 
       wrapper.instance().focusNext = jest.fn().mockReturnValue(null);
       wrapper.instance().isSubmittable = jest.fn().mockReturnValue(false);

package/dist/connections/triggers.js

@@ -1,15 +1,11 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { ensureKonnectorFolder } from 'cozy-client/dist/models/konnectorFolder';
 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';
-var FILES_DOCTYPE = 'io.cozy.files';
-var PERMISSIONS_DOCTYPE = 'io.cozy.permissions';
 var TRIGGERS_DOCTYPE = 'io.cozy.triggers';
 /**
  * Creates a trigger with given attributes
@@ -174,96 +170,29 @@ export var triggersMutations = function triggersMutations(client) {
     launchTrigger: launchTrigger.bind(null, client)
   };
 };
-
-var ensureKonnectorFolder = /*#__PURE__*/function () {
+export var ensureTrigger = /*#__PURE__*/function () {
   var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(client, _ref5) {
-    var konnector, account, t, permissions, files, CozyFolder, _yield$Promise$all, _yield$Promise$all2, adminFolder, photosFolder, path, folder;
-
+    var trigger, account, konnector, t, folder;
     return _regeneratorRuntime.wrap(function _callee5$(_context5) {
       while (1) {
         switch (_context5.prev = _context5.next) {
           case 0:
-            konnector = _ref5.konnector, account = _ref5.account, t = _ref5.t;
-            permissions = client.collection(PERMISSIONS_DOCTYPE);
-            files = client.collection(FILES_DOCTYPE);
-            CozyFolder = CozyFolderClass.copyWithClient(client);
-            _context5.next = 6;
-            return Promise.all([CozyFolder.ensureMagicFolder(CozyFolder.magicFolders.ADMINISTRATIVE, "/".concat(t('folder.administrative'))), CozyFolder.ensureMagicFolder(CozyFolder.magicFolders.PHOTOS, "/".concat(t('folder.photos')))]);
-
-          case 6:
-            _yield$Promise$all = _context5.sent;
-            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
-            adminFolder = _yield$Promise$all2[0];
-            photosFolder = _yield$Promise$all2[1];
-            path = konnectors.buildFolderPath(konnector, account, {
-              administrative: adminFolder.path,
-              photos: photosFolder.path
-            });
-            _context5.next = 13;
-            return statDirectoryByPath(client, path);
-
-          case 13:
-            _context5.t0 = _context5.sent;
-
-            if (_context5.t0) {
-              _context5.next = 18;
-              break;
-            }
-
-            _context5.next = 17;
-            return createDirectoryByPath(client, path);
-
-          case 17:
-            _context5.t0 = _context5.sent;
-
-          case 18:
-            folder = _context5.t0;
-            _context5.next = 21;
-            return permissions.add(konnector, konnectors.buildFolderPermission(folder));
-
-          case 21:
-            _context5.next = 23;
-            return files.addReferencesTo(konnector, [folder]);
-
-          case 23:
-            return _context5.abrupt("return", folder);
-
-          case 24:
-          case "end":
-            return _context5.stop();
-        }
-      }
-    }, _callee5);
-  }));
-
-  return function ensureKonnectorFolder(_x9, _x10) {
-    return _ref6.apply(this, arguments);
-  };
-}();
-
-export var ensureTrigger = /*#__PURE__*/function () {
-  var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(client, _ref7) {
-    var trigger, account, konnector, t, folder;
-    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-      while (1) {
-        switch (_context6.prev = _context6.next) {
-          case 0:
-            trigger = _ref7.trigger, account = _ref7.account, konnector = _ref7.konnector, t = _ref7.t;
+            trigger = _ref5.trigger, account = _ref5.account, konnector = _ref5.konnector, t = _ref5.t;
 
             if (!trigger) {
-              _context6.next = 3;
+              _context5.next = 3;
               break;
             }
 
-            return _context6.abrupt("return", trigger);
+            return _context5.abrupt("return", trigger);
 
           case 3:
             if (!konnectors.needsFolder(konnector)) {
-              _context6.next = 7;
+              _context5.next = 7;
               break;
             }
 
-            _context6.next = 6;
+            _context5.next = 6;
             return ensureKonnectorFolder(client, {
               konnector: konnector,
               account: account,
@@ -271,10 +200,10 @@ export var ensureTrigger = /*#__PURE__*/function () {
             });
 
           case 6:
-            folder = _context6.sent;
+            folder = _context5.sent;
 
           case 7:
-            _context6.next = 9;
+            _context5.next = 9;
             return createTrigger(client, triggersModel.buildTriggerAttributes({
               account: account,
               cron: cron.fromKonnector(konnector),
@@ -283,18 +212,18 @@ export var ensureTrigger = /*#__PURE__*/function () {
             }));
 
           case 9:
-            return _context6.abrupt("return", _context6.sent);
+            return _context5.abrupt("return", _context5.sent);
 
           case 10:
           case "end":
-            return _context6.stop();
+            return _context5.stop();
         }
       }
-    }, _callee6);
+    }, _callee5);
   }));
 
-  return function ensureTrigger(_x11, _x12) {
-    return _ref8.apply(this, arguments);
+  return function ensureTrigger(_x9, _x10) {
+    return _ref6.apply(this, arguments);
   };
 }();
 export default triggersMutations;

package/dist/connections/triggers.spec.js

@@ -2,39 +2,9 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 /* eslint-env jest */
-import { createTrigger, launchTrigger, ensureTrigger } from 'connections/triggers';
-import Polyglot from 'node-polyglot';
+import { createTrigger, launchTrigger } from 'connections/triggers';
 import CozyClient from 'cozy-client';
-import { CozyFolder } from 'cozy-doctypes';
-import { statDirectoryByPath, createDirectoryByPath } from '../../src/connections/files';
-import en from '../../src/locales/en.json';
 import fixtures from '../../test/fixtures';
-jest.mock('../../src/connections/files', function () {
-  return {
-    statDirectoryByPath: jest.fn(),
-    createDirectoryByPath: jest.fn()
-  };
-});
-afterEach(function () {
-  jest.restoreAllMocks();
-  statDirectoryByPath.mockClear();
-  createDirectoryByPath.mockClear();
-});
-
-CozyFolder.copyWithClient = function () {
-  return {
-    magicFolders: CozyFolder.magicFolders,
-    ensureMagicFolder: function ensureMagicFolder(id, path) {
-      return {
-        path: path
-      };
-    }
-  };
-};
-
-var polyglot = new Polyglot();
-polyglot.extend(en);
-var fakeT = polyglot.t.bind(polyglot);
 
 var setup = function setup() {
   var client = new CozyClient({});
@@ -46,26 +16,12 @@ var setup = function setup() {
       data: fixtures.launchedJob
     })
   };
-  var permissionCollection = {
-    add: jest.fn().mockResolvedValue({})
-  };
-  var fileCollection = {
-    addReferencesTo: jest.fn().mockResolvedValue({})
-  };
-  jest.spyOn(CozyClient.prototype, 'collection').mockImplementation(function (doctype) {
-    if (doctype == 'io.cozy.triggers') {
-      return triggerCollection;
-    } else if (doctype == 'io.cozy.permissions') {
-      return permissionCollection;
-    } else if (doctype == 'io.cozy.files') {
-      return fileCollection;
-    }
+  jest.spyOn(CozyClient.prototype, 'collection').mockImplementation(function () {
+    return triggerCollection;
   });
   return {
     client: client,
-    triggerCollection: triggerCollection,
-    permissionCollection: permissionCollection,
-    fileCollection: fileCollection
+    triggerCollection: triggerCollection
   };
 };
 
@@ -120,73 +76,4 @@ describe('Trigger mutations', function () {
       }, _callee2);
     })));
   });
-});
-describe('when konnector needs folder', function () {
-  it('should create folder if it does not exist', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-    var _setup3, client, permissionCollection, fileCollection, addReferencesTo;
-
-    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            _setup3 = setup(), client = _setup3.client, permissionCollection = _setup3.permissionCollection, fileCollection = _setup3.fileCollection;
-            statDirectoryByPath.mockResolvedValue(null);
-            createDirectoryByPath.mockReturnValue(fixtures.folder);
-            _context3.next = 5;
-            return ensureTrigger(client, {
-              konnector: fixtures.konnectorWithFolder,
-              account: fixtures.account,
-              t: fakeT
-            });
-
-          case 5:
-            expect(statDirectoryByPath).toHaveBeenCalledTimes(1);
-            expect(createDirectoryByPath).toHaveBeenCalledTimes(1);
-            expect(createDirectoryByPath).toHaveBeenCalledWith(client, fixtures.folderPath);
-            expect(permissionCollection.add).toHaveBeenCalledTimes(1);
-            expect(permissionCollection.add).toHaveBeenCalledWith(fixtures.konnectorWithFolder, fixtures.folderPermission);
-            addReferencesTo = fileCollection.addReferencesTo;
-            expect(addReferencesTo).toHaveBeenCalledTimes(1);
-            expect(addReferencesTo).toHaveBeenCalledWith(fixtures.konnectorWithFolder, [fixtures.folder]);
-
-          case 13:
-          case "end":
-            return _context3.stop();
-        }
-      }
-    }, _callee3);
-  })));
-  it('should not create folder if it exists', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-    var _setup4, client, permissionCollection, fileCollection, addPermission, addReferencesTo;
-
-    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-      while (1) {
-        switch (_context4.prev = _context4.next) {
-          case 0:
-            _setup4 = setup(), client = _setup4.client, permissionCollection = _setup4.permissionCollection, fileCollection = _setup4.fileCollection;
-            statDirectoryByPath.mockResolvedValue(fixtures.folder);
-            _context4.next = 4;
-            return ensureTrigger(client, {
-              account: fixtures.account,
-              konnector: fixtures.konnectorWithFolder,
-              t: fakeT
-            });
-
-          case 4:
-            expect(statDirectoryByPath).toHaveBeenCalledTimes(1);
-            expect(createDirectoryByPath).toHaveBeenCalledTimes(0);
-            addPermission = permissionCollection.add;
-            expect(addPermission).toHaveBeenCalledTimes(1);
-            expect(addPermission).toHaveBeenCalledWith(fixtures.konnectorWithFolder, fixtures.folderPermission);
-            addReferencesTo = fileCollection.addReferencesTo;
-            expect(addReferencesTo).toHaveBeenCalledTimes(1);
-            expect(addReferencesTo).toHaveBeenCalledWith(fixtures.konnectorWithFolder, [fixtures.folder]);
-
-          case 12:
-          case "end":
-            return _context4.stop();
-        }
-      }
-    }, _callee4);
-  })));
 });

package/dist/models/ConnectionFlow.spec.js

@@ -37,12 +37,6 @@ jest.mock('../sentry', function () {
     captureException: jest.fn()
   };
 });
-jest.mock('../connections/files', function () {
-  return {
-    statDirectoryByPath: jest.fn(),
-    createDirectoryByPath: jest.fn()
-  };
-});
 KonnectorJobWatcher.prototype.watch = jest.fn();
 jest.mock('date-fns');
 var realtimeMock = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "22.0.5",
+  "version": "22.0.7",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -106,5 +106,5 @@
     "react-router-dom": ">=4.3.1"
   },
   "sideEffects": false,
-  "gitHead": "1d769fb5515fbfa5344e69c089536d8b20c27fee"
+  "gitHead": "e96e3f59e027dc5c55614bbe1877b0b7a527b076"
 }

package/src/components/AccountForm/index.jsx

@@ -71,11 +71,11 @@ export class AccountForm extends PureComponent {
    * @param  {Object} formState See https://github.com/final-form/final-form#formstate
    * @return {Boolean}
    */
-  isSubmittable({ dirty, error, initialValues, valid }) {
-    const modified = !initialValues || dirty
+  isSubmittable({ error, valid }) {
     // Here error is not a validation error but an instance of a
     // KonnectorJobError, so submitting again is possible
-    return modified && (error || valid)
+    const result = error || valid
+    return result
   }
 
   /**
@@ -115,20 +115,15 @@ export class AccountForm extends PureComponent {
    * Handle key up and check if `ENTER` key has been pressed. If so, submit the
    * form if all parmater are ok.
    * @param  {React.SyntheticEvent} event         Key events
-   * @param  {Boolean} dirty         Indicates if form is dirty, i.e. if values
    * have changed
    * @param  {Object} form          The form object injected by ReactFinalForm.
-   * @param  {Object} initialValues Initial data injected into AccountForm
    * @param  {Boolean} valid        Indicates if the form data is valid
    * @param  {Object} values        Actual form values data
    */
-  handleKeyUp(event, { dirty, form, initialValues, valid, values }) {
+  handleKeyUp(event, { form, valid, values }) {
     if (event.key === 'Enter') {
       const changedFocus = isMobile() && !!this.focusNext()
-      if (
-        !changedFocus &&
-        this.isSubmittable({ dirty, initialValues, valid })
-      ) {
+      if (!changedFocus && this.isSubmittable({ valid })) {
         this.handleSubmit(values, form)
       }
     }
@@ -242,7 +237,6 @@ export class AccountForm extends PureComponent {
     const sanitizedFields = manifest.sanitizeFields(fields)
     fieldHelpers.addForceEncryptedPlaceholder(sanitizedFields, fieldOptions)
 
-    const initialValues = account && account.auth
     const values = manifest.getFieldsValues(konnector, account)
 
     const isReadOnlyIdentifier =
@@ -263,13 +257,11 @@ export class AccountForm extends PureComponent {
         initialValues={values}
         onSubmit={onSubmit}
         validate={this.validate(sanitizedFields, values)}
-        render={({ dirty, form, values, valid }) => (
+        render={({ form, values, valid }) => (
           <div
             onKeyUp={event =>
               this.handleKeyUp(event, {
-                dirty,
                 form,
-                initialValues,
                 valid,
                 values
               })
@@ -327,9 +319,7 @@ export class AccountForm extends PureComponent {
                       disabled:
                         submitting ||
                         !this.isSubmittable({
-                          dirty,
                           error,
-                          initialValues,
                           valid
                         }),
                       label: t('accountForm.clientSide.submit'),
@@ -346,9 +336,7 @@ export class AccountForm extends PureComponent {
                     disabled={
                       submitting ||
                       !this.isSubmittable({
-                        dirty,
                         error,
-                        initialValues,
                         valid
                       })
                     }

package/src/components/AccountForm/index.spec.jsx

@@ -230,40 +230,6 @@ describe('AccountForm', () => {
       assertButtonEnabled(wrapper)
     })
 
-    it('should be disabled with initialValues', () => {
-      const account = {
-        auth: {
-          username: 'foo',
-          passphrase: 'bar'
-        }
-      }
-      const { wrapper } = setup({
-        account
-      })
-
-      assertButtonDisabled(wrapper)
-    })
-
-    /**
-     * This case corresponds to an account edition of a trigger already having
-     * an error. We are not supposed to submit it without modifications.
-     */
-    it('should be disabled with initialValues AND error', () => {
-      const account = {
-        auth: {
-          username: 'foo',
-          passphrase: 'bar'
-        }
-      }
-      const error = new Error('Existing trigger error')
-      const { wrapper } = setup({
-        account,
-        error
-      })
-
-      assertButtonDisabled(wrapper)
-    })
-
     it('should be enabled when an error exists', () => {
       const account = {}
       const error = new Error('Test error')

package/src/connections/triggers.js

@@ -1,14 +1,11 @@
+import { ensureKonnectorFolder } from 'cozy-client/dist/models/konnectorFolder'
 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'
 
-const FILES_DOCTYPE = 'io.cozy.files'
-const PERMISSIONS_DOCTYPE = 'io.cozy.permissions'
 const TRIGGERS_DOCTYPE = 'io.cozy.triggers'
 
 /**
@@ -71,34 +68,6 @@ export const triggersMutations = client => {
   }
 }
 
-const ensureKonnectorFolder = async (client, { konnector, account, t }) => {
-  const permissions = client.collection(PERMISSIONS_DOCTYPE)
-  const files = client.collection(FILES_DOCTYPE)
-  const CozyFolder = CozyFolderClass.copyWithClient(client)
-  const [adminFolder, photosFolder] = await Promise.all([
-    CozyFolder.ensureMagicFolder(
-      CozyFolder.magicFolders.ADMINISTRATIVE,
-      `/${t('folder.administrative')}`
-    ),
-    CozyFolder.ensureMagicFolder(
-      CozyFolder.magicFolders.PHOTOS,
-      `/${t('folder.photos')}`
-    )
-  ])
-  const path = konnectors.buildFolderPath(konnector, account, {
-    administrative: adminFolder.path,
-    photos: photosFolder.path
-  })
-  const folder =
-    (await statDirectoryByPath(client, path)) ||
-    (await createDirectoryByPath(client, path))
-
-  await permissions.add(konnector, konnectors.buildFolderPermission(folder))
-  await files.addReferencesTo(konnector, [folder])
-
-  return folder
-}
-
 export const ensureTrigger = async (
   client,
   { trigger, account, konnector, t }
@@ -110,7 +79,11 @@ export const ensureTrigger = async (
   let folder
 
   if (konnectors.needsFolder(konnector)) {
-    folder = await ensureKonnectorFolder(client, { konnector, account, t })
+    folder = await ensureKonnectorFolder(client, {
+      konnector,
+      account,
+      t
+    })
   }
 
   return await createTrigger(

package/src/connections/triggers.spec.js

@@ -1,43 +1,10 @@
 /* eslint-env jest */
-import {
-  createTrigger,
-  launchTrigger,
-  ensureTrigger
-} from 'connections/triggers'
-import Polyglot from 'node-polyglot'
+import { createTrigger, launchTrigger } from 'connections/triggers'
 
 import CozyClient from 'cozy-client'
-import { CozyFolder } from 'cozy-doctypes'
 
-import {
-  statDirectoryByPath,
-  createDirectoryByPath
-} from '../../src/connections/files'
-import en from '../../src/locales/en.json'
 import fixtures from '../../test/fixtures'
 
-jest.mock('../../src/connections/files', () => ({
-  statDirectoryByPath: jest.fn(),
-  createDirectoryByPath: jest.fn()
-}))
-
-afterEach(() => {
-  jest.restoreAllMocks()
-  statDirectoryByPath.mockClear()
-  createDirectoryByPath.mockClear()
-})
-
-CozyFolder.copyWithClient = () => ({
-  magicFolders: CozyFolder.magicFolders,
-  ensureMagicFolder: (id, path) => ({
-    path
-  })
-})
-
-const polyglot = new Polyglot()
-polyglot.extend(en)
-const fakeT = polyglot.t.bind(polyglot)
-
 const setup = () => {
   const client = new CozyClient({})
   const triggerCollection = {
@@ -49,29 +16,13 @@ const setup = () => {
     })
   }
 
-  const permissionCollection = {
-    add: jest.fn().mockResolvedValue({})
-  }
-
-  const fileCollection = {
-    addReferencesTo: jest.fn().mockResolvedValue({})
-  }
-
-  jest.spyOn(CozyClient.prototype, 'collection').mockImplementation(doctype => {
-    if (doctype == 'io.cozy.triggers') {
-      return triggerCollection
-    } else if (doctype == 'io.cozy.permissions') {
-      return permissionCollection
-    } else if (doctype == 'io.cozy.files') {
-      return fileCollection
-    }
+  jest.spyOn(CozyClient.prototype, 'collection').mockImplementation(() => {
+    return triggerCollection
   })
 
   return {
     client,
-    triggerCollection,
-    permissionCollection,
-    fileCollection
+    triggerCollection
   }
 }
 
@@ -94,63 +45,3 @@ describe('Trigger mutations', () => {
     })
   })
 })
-
-describe('when konnector needs folder', () => {
-  it('should create folder if it does not exist', async () => {
-    const { client, permissionCollection, fileCollection } = setup()
-    statDirectoryByPath.mockResolvedValue(null)
-    createDirectoryByPath.mockReturnValue(fixtures.folder)
-
-    await ensureTrigger(client, {
-      konnector: fixtures.konnectorWithFolder,
-      account: fixtures.account,
-      t: fakeT
-    })
-
-    expect(statDirectoryByPath).toHaveBeenCalledTimes(1)
-    expect(createDirectoryByPath).toHaveBeenCalledTimes(1)
-    expect(createDirectoryByPath).toHaveBeenCalledWith(
-      client,
-      fixtures.folderPath
-    )
-
-    expect(permissionCollection.add).toHaveBeenCalledTimes(1)
-    expect(permissionCollection.add).toHaveBeenCalledWith(
-      fixtures.konnectorWithFolder,
-      fixtures.folderPermission
-    )
-
-    const addReferencesTo = fileCollection.addReferencesTo
-    expect(addReferencesTo).toHaveBeenCalledTimes(1)
-    expect(addReferencesTo).toHaveBeenCalledWith(fixtures.konnectorWithFolder, [
-      fixtures.folder
-    ])
-  })
-
-  it('should not create folder if it exists', async () => {
-    const { client, permissionCollection, fileCollection } = setup()
-    statDirectoryByPath.mockResolvedValue(fixtures.folder)
-
-    await ensureTrigger(client, {
-      account: fixtures.account,
-      konnector: fixtures.konnectorWithFolder,
-      t: fakeT
-    })
-
-    expect(statDirectoryByPath).toHaveBeenCalledTimes(1)
-    expect(createDirectoryByPath).toHaveBeenCalledTimes(0)
-
-    const addPermission = permissionCollection.add
-    expect(addPermission).toHaveBeenCalledTimes(1)
-    expect(addPermission).toHaveBeenCalledWith(
-      fixtures.konnectorWithFolder,
-      fixtures.folderPermission
-    )
-
-    const addReferencesTo = fileCollection.addReferencesTo
-    expect(addReferencesTo).toHaveBeenCalledTimes(1)
-    expect(addReferencesTo).toHaveBeenCalledWith(fixtures.konnectorWithFolder, [
-      fixtures.folder
-    ])
-  })
-})

package/src/models/ConnectionFlow.spec.js

@@ -32,11 +32,6 @@ jest.mock('../sentry', () => {
   }
 })
 
-jest.mock('../connections/files', () => ({
-  statDirectoryByPath: jest.fn(),
-  createDirectoryByPath: jest.fn()
-}))
-
 KonnectorJobWatcher.prototype.watch = jest.fn()
 
 jest.mock('date-fns')

package/dist/connections/files.js

@@ -1,86 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-var FILES_DOCTYPE = 'io.cozy.files';
-/**
- * Creates a directory from a given path
- * @param  {Object}  client CozyClient
- * @param  {string}  path   Directory path
- * @return {Object}         Directory attributes
- */
-
-export var createDirectoryByPath = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(client, path) {
-    var _yield$client$collect, data;
-
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return client.collection(FILES_DOCTYPE).createDirectoryByPath(path);
-
-          case 2:
-            _yield$client$collect = _context.sent;
-            data = _yield$client$collect.data;
-            return _context.abrupt("return", data);
-
-          case 5:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function createDirectoryByPath(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
-/**
- * Retrieves a directory from its path
- * @param  {Object}  client CozyClient
- * @param  {string}  path   Directory path
- * @return {Object}        Created io.cozy.files document
- */
-
-export var statDirectoryByPath = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(client, path) {
-    var response;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.prev = 0;
-            _context2.next = 3;
-            return client.collection(FILES_DOCTYPE).statByPath(path);
-
-          case 3:
-            response = _context2.sent;
-            return _context2.abrupt("return", response.data);
-
-          case 7:
-            _context2.prev = 7;
-            _context2.t0 = _context2["catch"](0);
-
-            if (!(_context2.t0 && _context2.t0.status === 404)) {
-              _context2.next = 11;
-              break;
-            }
-
-            return _context2.abrupt("return", null);
-
-          case 11:
-            throw new Error(_context2.t0.message);
-
-          case 12:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2, null, [[0, 7]]);
-  }));
-
-  return function statDirectoryByPath(_x3, _x4) {
-    return _ref2.apply(this, arguments);
-  };
-}();

package/dist/connections/files.spec.js

@@ -1,141 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-
-/* eslint-env jest */
-import { createDirectoryByPath, statDirectoryByPath } from 'connections/files';
-import client from 'cozy-client';
-jest.mock('cozy-client', function () {
-  return {
-    collection: jest.fn().mockReturnValue({
-      addReferencesTo: jest.fn(),
-      createDirectoryByPath: jest.fn(),
-      statByPath: jest.fn()
-    })
-  };
-});
-var fixtures = {
-  path: '/Administrative/KonnectTest/84595fcbc15242f2a69ac483b37ae999',
-  directory: {
-    _id: '326267e55ff0511c7f7b9ba56e04b334',
-    _rev: '2-510e5a2b3c84aba208c480a91fd39abf',
-    type: 'directory',
-    name: '84595fcbc15242f2a69ac483b37ae999',
-    dir_id: '326267e55ff0511c7f7b9ba56e00ca07',
-    created_at: '2018-12-18T11:22:41.065070118+01:00',
-    updated_at: '2018-12-18T11:22:41.065070118+01:00',
-    tags: [],
-    path: '/Administrative/KonnectTest/84595fcbc15242f2a69ac483b37ae999'
-  },
-  references: {
-    data: [{
-      type: 'io.cozy.files',
-      id: '326267e55ff0511c7f7b9ba56e04b334'
-    }]
-  }
-};
-describe('Files mutations', function () {
-  beforeAll(function () {
-    client.collection().addReferencesTo.mockResolvedValue({
-      data: fixtures.references
-    });
-    client.collection().createDirectoryByPath.mockResolvedValue({
-      data: fixtures.directory
-    });
-    client.collection().statByPath.mockResolvedValue({
-      data: fixtures.directory
-    });
-  });
-  afterEach(function () {
-    jest.clearAllMocks();
-  });
-  afterAll(function () {
-    jest.restoreAllMocks();
-  });
-  describe('createDirectoryByPath', function () {
-    it('calls Cozy Client and return io.cozy.files document', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var directory;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return createDirectoryByPath(client, fixtures.path);
-
-            case 2:
-              directory = _context.sent;
-              expect(client.collection().createDirectoryByPath).toHaveBeenCalledWith(fixtures.path);
-              expect(directory).toEqual(fixtures.directory);
-
-            case 5:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    })));
-  });
-  describe('statDirectoryByPath', function () {
-    it('calls Cozy Client and return io.cozy.files data', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.t0 = expect;
-              _context2.next = 3;
-              return statDirectoryByPath(client, fixtures.path);
-
-            case 3:
-              _context2.t1 = _context2.sent;
-              (0, _context2.t0)(_context2.t1).toEqual(fixtures.directory);
-
-            case 5:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    })));
-    it('returns null if Cozy Client returns a 404 error', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              client.collection().statByPath.mockRejectedValue({
-                status: 404
-              });
-              _context3.t0 = expect;
-              _context3.next = 4;
-              return statDirectoryByPath(client, fixtures.path);
-
-            case 4:
-              _context3.t1 = _context3.sent;
-              (0, _context3.t0)(_context3.t1).toBeNull();
-
-            case 6:
-            case "end":
-              return _context3.stop();
-          }
-        }
-      }, _callee3);
-    })));
-    it('throw error if Cozy Client returns any other error', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              client.collection().statByPath.mockRejectedValue({
-                status: 403,
-                message: 'Test error'
-              });
-              _context4.next = 3;
-              return expect(statDirectoryByPath(client, fixtures.path)).rejects.toThrow('Test error');
-
-            case 3:
-            case "end":
-              return _context4.stop();
-          }
-        }
-      }, _callee4);
-    })));
-  });
-});

package/src/connections/files.js

@@ -1,30 +0,0 @@
-const FILES_DOCTYPE = 'io.cozy.files'
-
-/**
- * Creates a directory from a given path
- * @param  {Object}  client CozyClient
- * @param  {string}  path   Directory path
- * @return {Object}         Directory attributes
- */
-export const createDirectoryByPath = async (client, path) => {
-  const { data } = await client
-    .collection(FILES_DOCTYPE)
-    .createDirectoryByPath(path)
-  return data
-}
-
-/**
- * Retrieves a directory from its path
- * @param  {Object}  client CozyClient
- * @param  {string}  path   Directory path
- * @return {Object}        Created io.cozy.files document
- */
-export const statDirectoryByPath = async (client, path) => {
-  try {
-    const response = await client.collection(FILES_DOCTYPE).statByPath(path)
-    return response.data
-  } catch (error) {
-    if (error && error.status === 404) return null
-    throw new Error(error.message)
-  }
-}

package/src/connections/files.spec.js

@@ -1,94 +0,0 @@
-/* eslint-env jest */
-
-import { createDirectoryByPath, statDirectoryByPath } from 'connections/files'
-
-import client from 'cozy-client'
-
-jest.mock('cozy-client', () => ({
-  collection: jest.fn().mockReturnValue({
-    addReferencesTo: jest.fn(),
-    createDirectoryByPath: jest.fn(),
-    statByPath: jest.fn()
-  })
-}))
-
-const fixtures = {
-  path: '/Administrative/KonnectTest/84595fcbc15242f2a69ac483b37ae999',
-  directory: {
-    _id: '326267e55ff0511c7f7b9ba56e04b334',
-    _rev: '2-510e5a2b3c84aba208c480a91fd39abf',
-    type: 'directory',
-    name: '84595fcbc15242f2a69ac483b37ae999',
-    dir_id: '326267e55ff0511c7f7b9ba56e00ca07',
-    created_at: '2018-12-18T11:22:41.065070118+01:00',
-    updated_at: '2018-12-18T11:22:41.065070118+01:00',
-    tags: [],
-    path: '/Administrative/KonnectTest/84595fcbc15242f2a69ac483b37ae999'
-  },
-  references: {
-    data: [
-      {
-        type: 'io.cozy.files',
-        id: '326267e55ff0511c7f7b9ba56e04b334'
-      }
-    ]
-  }
-}
-
-describe('Files mutations', () => {
-  beforeAll(() => {
-    client
-      .collection()
-      .addReferencesTo.mockResolvedValue({ data: fixtures.references })
-
-    client
-      .collection()
-      .createDirectoryByPath.mockResolvedValue({ data: fixtures.directory })
-
-    client
-      .collection()
-      .statByPath.mockResolvedValue({ data: fixtures.directory })
-  })
-
-  afterEach(() => {
-    jest.clearAllMocks()
-  })
-
-  afterAll(() => {
-    jest.restoreAllMocks()
-  })
-
-  describe('createDirectoryByPath', () => {
-    it('calls Cozy Client and return io.cozy.files document', async () => {
-      const directory = await createDirectoryByPath(client, fixtures.path)
-
-      expect(client.collection().createDirectoryByPath).toHaveBeenCalledWith(
-        fixtures.path
-      )
-      expect(directory).toEqual(fixtures.directory)
-    })
-  })
-
-  describe('statDirectoryByPath', () => {
-    it('calls Cozy Client and return io.cozy.files data', async () => {
-      expect(await statDirectoryByPath(client, fixtures.path)).toEqual(
-        fixtures.directory
-      )
-    })
-
-    it('returns null if Cozy Client returns a 404 error', async () => {
-      client.collection().statByPath.mockRejectedValue({ status: 404 })
-      expect(await statDirectoryByPath(client, fixtures.path)).toBeNull()
-    })
-
-    it('throw error if Cozy Client returns any other error', async () => {
-      client
-        .collection()
-        .statByPath.mockRejectedValue({ status: 403, message: 'Test error' })
-
-      await expect(statDirectoryByPath(client, fixtures.path)).rejects.toThrow(
-        'Test error'
-      )
-    })
-  })
-})