Merge branch 'fix-invite-screen' into feature/invite-button

7 files changed, 48 insertions, 15 deletions

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index d4d789781..1fe594d73 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
@@ -45,17 +49,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);
@@ -64,10 +68,22 @@ export default class Invite extends Component {
     e.preventDefault();
     this.form.submit({
       onSuccess: (form) => {
+
         this.props.onSubmit({ 
           invites: form.values().invite,
           from: this.props.from
         });
+
+        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: () => {},
     });
@@ -78,6 +94,10 @@ export default class Invite extends Component {
     const { intl } = this.context;
     const { from } = this.props;
 
+    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)}>
@@ -97,9 +117,15 @@ 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"
+            disabled={!atLeastOneEmailAddress}
             label={intl.formatMessage(messages.submitButtonLabel)}
           />
           <Link
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/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 6162455bb..c9e9b860b 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/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,
       // // },
diff --git a/src/models/User.js b/src/models/User.js
index 2e5df4795..d2a455e20 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -10,7 +10,7 @@ export default class User {
   @observable emailIsConfirmed = true; // better assume it's confirmed to avoid noise
   @observable subscription = {};
   @observable isSubscriptionOwner = false;
-  @observable isPremium = false;
+  @observable isPremium = true;
   @observable beta = false;
   @observable donor = {};
   @observable isDonor = false;
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';