From 7b03fa16c50f2250bcc16284016cb05f501ec51a Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Fri, 19 Jan 2018 16:36:26 +0100
Subject: fix invite screen [object Object] value

mobx-react-form expects nested `fields` property in array
---
 src/components/auth/Invite.js     | 22 +++++++++++-----------
 src/helpers/validation-helpers.js |  2 +-
 src/lib/Form.js                   |  5 +++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index c1d815dcd..dface4fe1 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -45,17 +45,17 @@ export default class Invite extends Component {
   form = new Form({
     fields: {
       invite: [...Array(3).fill({
-        name: {
-          label: this.context.intl.formatMessage(messages.nameLabel),
-          // value: '',
-          placeholder: this.context.intl.formatMessage(messages.nameLabel),
-        },
-        email: {
-          label: this.context.intl.formatMessage(messages.emailLabel),
-          // value: '',
-          validate: [email],
-          placeholder: this.context.intl.formatMessage(messages.emailLabel),
-        },
+        fields: {
+          name: {
+            label: this.context.intl.formatMessage(messages.nameLabel),
+            placeholder: this.context.intl.formatMessage(messages.nameLabel),
+          },
+          email: {
+            label: this.context.intl.formatMessage(messages.emailLabel),
+            placeholder: this.context.intl.formatMessage(messages.emailLabel),
+            validators: [email],
+          }
+        }
       })],
     },
   }, this.context.intl);
diff --git a/src/helpers/validation-helpers.js b/src/helpers/validation-helpers.js
index eeb12cab7..a8a242d54 100644
--- a/src/helpers/validation-helpers.js
+++ b/src/helpers/validation-helpers.js
@@ -13,7 +13,7 @@ export function email({ field }) {
     isValid = true;
   }
 
-  return [isValid, `${field.label} is not a valid email address`];
+  return [isValid, `${field.label} not valid`];
 }
 
 export function url({ field }) {
diff --git a/src/lib/Form.js b/src/lib/Form.js
index a22699b45..9b8321948 100644
--- a/src/lib/Form.js
+++ b/src/lib/Form.js
@@ -21,8 +21,9 @@ export default class DefaultForm extends Form {
 
   options() {
     return {
-      validateOnInit: false,
-      // validateOnBlur: true,
+      validateOnInit: false, // default: true
+      // validateOnBlur: true, // default: true
+      // validateOnChange: true // default: false
       // // validationDebounceWait: {
       // //   trailing: true,
       // // },
-- 
cgit v1.2.3-70-g09d2


From 3692bd81a71d4caf094dc01b175df95519e796e8 Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Fri, 19 Jan 2018 17:14:44 +0100
Subject: implemented check for at least one email address

realized by leveraging `disabled` attribute of submit button
---
 src/components/auth/Invite.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index dface4fe1..3eb1f2765 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -74,6 +74,10 @@ export default class Invite extends Component {
     const { form } = this;
     const { intl } = this.context;
 
+    const atLeastOneEmailAddress = form.$('invite')
+      .map(invite => {return invite.$('email').value})
+      .some(email => email.trim() !== '')
+
     return (
       <div className="auth__container auth__container--signup">
         <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
@@ -96,6 +100,7 @@ export default class Invite extends Component {
           <Button
             type="submit"
             className="auth__button"
+            disabled={!atLeastOneEmailAddress}
             label={intl.formatMessage(messages.submitButtonLabel)}
           />
           <Link
-- 
cgit v1.2.3-70-g09d2


From 56520969f508c1db257d7573962ad6b762205e56 Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Fri, 19 Jan 2018 17:26:17 +0100
Subject: alternative UX implementation of check for email address count > 0

comment out line 122 to test
---
 src/components/auth/Invite.js | 19 +++++++++++++++++++
 src/i18n/locales/en-US.json   |  1 +
 src/styles/invite.scss        |  4 ++++
 src/styles/main.scss          |  1 +
 4 files changed, 25 insertions(+)
 create mode 100644 src/styles/invite.scss

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 3eb1f2765..c4c35d538 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -30,6 +30,10 @@ const messages = defineMessages({
     id: 'invite.skip.label',
     defaultMessage: '!!!I want to do this later',
   },
+  noEmailAddresses: {
+    id: 'invite.error.noEmails',
+    defaultMessage: '!!!At least one email address is required',
+  }
 });
 
 @observer
@@ -64,6 +68,16 @@ export default class Invite extends Component {
     e.preventDefault();
     this.form.submit({
       onSuccess: (form) => {
+
+        const atLeastOneEmailAddress = form.$('invite')
+          .map(invite => {return invite.$('email').value})
+          .some(email => email.trim() !== '')
+        
+        if (!atLeastOneEmailAddress) {
+          form.invalidate('no-email-addresses')
+          return
+        }
+  
         this.props.onSubmit({ invites: form.values().invite });
       },
       onError: () => {},
@@ -97,6 +111,11 @@ export default class Invite extends Component {
               </div>
             </div>
           ))}
+          {form.error === 'no-email-addresses' && (
+            <p className="franz-form__error invite-form__error">
+              {intl.formatMessage(messages.noEmailAddresses)}
+            </p>
+          )}
           <Button
             type="submit"
             className="auth__button"
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 63d7ce60b..f58d5634b 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -45,6 +45,7 @@
   "invite.name.label": "Name",
   "invite.email.label": "Email address",
   "invite.skip.label": "I want to do this later",
+  "invite.error.noEmails": "At least one email address is required",
   "subscription.submit.label": "I want to support the development of Franz",
   "subscription.paymentSessionError": "Could not initialize payment form",
   "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
diff --git a/src/styles/invite.scss b/src/styles/invite.scss
new file mode 100644
index 000000000..345095da8
--- /dev/null
+++ b/src/styles/invite.scss
@@ -0,0 +1,4 @@
+.invite-form__error {
+  text-align: center;
+  margin-bottom: 20px !important; /* otherwise overridden by rule: p:last-of-type */
+}
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 261396f6f..20f1803e4 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -18,6 +18,7 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './type.scss';
 @import './welcome.scss';
 @import './auth.scss';
+@import './invite.scss';
 @import './tooltip.scss';
 @import './info-bar.scss';
 @import './status-bar-target-url.scss';
-- 
cgit v1.2.3-70-g09d2


From cd041c1e22b6b903ea7b336e672e0d9376728ae0 Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Tue, 30 Jan 2018 11:29:56 +0100
Subject: Revert "alternative UX implementation of check for email address
 count > 0"

This reverts commit 56520969f508c1db257d7573962ad6b762205e56.
---
 src/components/auth/Invite.js | 19 -------------------
 src/i18n/locales/en-US.json   |  1 -
 src/styles/invite.scss        |  4 ----
 src/styles/main.scss          |  1 -
 4 files changed, 25 deletions(-)
 delete mode 100644 src/styles/invite.scss

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index c4c35d538..3eb1f2765 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -30,10 +30,6 @@ const messages = defineMessages({
     id: 'invite.skip.label',
     defaultMessage: '!!!I want to do this later',
   },
-  noEmailAddresses: {
-    id: 'invite.error.noEmails',
-    defaultMessage: '!!!At least one email address is required',
-  }
 });
 
 @observer
@@ -68,16 +64,6 @@ export default class Invite extends Component {
     e.preventDefault();
     this.form.submit({
       onSuccess: (form) => {
-
-        const atLeastOneEmailAddress = form.$('invite')
-          .map(invite => {return invite.$('email').value})
-          .some(email => email.trim() !== '')
-        
-        if (!atLeastOneEmailAddress) {
-          form.invalidate('no-email-addresses')
-          return
-        }
-  
         this.props.onSubmit({ invites: form.values().invite });
       },
       onError: () => {},
@@ -111,11 +97,6 @@ export default class Invite extends Component {
               </div>
             </div>
           ))}
-          {form.error === 'no-email-addresses' && (
-            <p className="franz-form__error invite-form__error">
-              {intl.formatMessage(messages.noEmailAddresses)}
-            </p>
-          )}
           <Button
             type="submit"
             className="auth__button"
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index f58d5634b..63d7ce60b 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -45,7 +45,6 @@
   "invite.name.label": "Name",
   "invite.email.label": "Email address",
   "invite.skip.label": "I want to do this later",
-  "invite.error.noEmails": "At least one email address is required",
   "subscription.submit.label": "I want to support the development of Franz",
   "subscription.paymentSessionError": "Could not initialize payment form",
   "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
diff --git a/src/styles/invite.scss b/src/styles/invite.scss
deleted file mode 100644
index 345095da8..000000000
--- a/src/styles/invite.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.invite-form__error {
-  text-align: center;
-  margin-bottom: 20px !important; /* otherwise overridden by rule: p:last-of-type */
-}
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 20f1803e4..261396f6f 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -18,7 +18,6 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './type.scss';
 @import './welcome.scss';
 @import './auth.scss';
-@import './invite.scss';
 @import './tooltip.scss';
 @import './info-bar.scss';
 @import './status-bar-target-url.scss';
-- 
cgit v1.2.3-70-g09d2


From 682a54e03ab5a918683d19c77380573ad6c33811 Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Tue, 30 Jan 2018 11:45:35 +0100
Subject: fix linting errors

---
 src/components/auth/Invite.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 3eb1f2765..c6dca3a65 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -54,8 +54,8 @@ export default class Invite extends Component {
             label: this.context.intl.formatMessage(messages.emailLabel),
             placeholder: this.context.intl.formatMessage(messages.emailLabel),
             validators: [email],
-          }
-        }
+          },
+        },
       })],
     },
   }, this.context.intl);
@@ -75,8 +75,8 @@ export default class Invite extends Component {
     const { intl } = this.context;
 
     const atLeastOneEmailAddress = form.$('invite')
-      .map(invite => {return invite.$('email').value})
-      .some(email => email.trim() !== '')
+      .map(invite => invite.$('email').value)
+      .some(emailValue => emailValue.trim() !== '');
 
     return (
       <div className="auth__container auth__container--signup">
-- 
cgit v1.2.3-70-g09d2