cozy-harvest-lib 22.0.6 → 22.0.7

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 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)
 
 

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "22.0.6",
+  "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": "b7d55abbda1a057fcfe88f0a5558c10c84fdeab7"
+  "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')