feat: Add speaker and session custom form input (#4549)

Author: iamareebjamal

app/components/forms/orders/order-form.js

@@ -27,7 +27,6 @@ export default Component.extend(FormMixin, {
       attendee.set('firstname', '');
       attendee.set('lastname', '');
       attendee.set('email', '');
-      attendee.set('complexFieldValues', {});
     });
     return this.data.attendees;
   }),

app/components/forms/session-speaker-form.js

@@ -14,7 +14,7 @@ export default Component.extend(FormMixin, {
   newSessionSelected : false,
 
   getValidationRules() {
-    return {
+    const validationRules = {
       inline : true,
       delay  : false,
       on     : 'blur',
@@ -484,6 +484,24 @@ export default Component.extend(FormMixin, {
         }
       }
     };
+
+    const addCustomFieldRules = form => {
+      this.allFields[form].filter(field => field.isComplex && field.isRequired).forEach(field => {
+        validationRules.fields[`${form}_${field.fieldIdentifier}_required`] = {
+          rules: [
+            {
+              type   : 'empty',
+              prompt : this.l10n.t('Please enter ' + field.name)
+            }
+          ]
+        };
+      });
+    };
+
+    addCustomFieldRules('speaker');
+    addCustomFieldRules('session');
+
+    return validationRules;
   },
 
   countries: orderBy(countries, 'name'),

app/models/attendee.js

@@ -42,5 +42,11 @@ export default ModelBase.extend({
   event  : belongsTo('event'),
   order  : belongsTo('order'),
   ticket : belongsTo('ticket'),
-  user   : belongsTo('user')
+  user   : belongsTo('user'),
+
+  ready() {
+    if (!this.complexFieldValues) {
+      this.complexFieldValues = {};
+    }
+  }
 });

app/models/session.js

@@ -57,7 +57,12 @@ export default ModelBase.extend({
   segmentedLinkSlidesUrl : computedSegmentedLink.bind(this)('slidesUrl'),
   segmentedLinkAudioUrl  : computedSegmentedLink.bind(this)('audioUrl'),
   segmentedLinkVideoUrl  : computedSegmentedLink.bind(this)('videoUrl'),
-  segmentedLinkSignUpUrl : computedSegmentedLink.bind(this)('signUpUrl')
+  segmentedLinkSignUpUrl : computedSegmentedLink.bind(this)('signUpUrl'),
 
+  ready() {
+    if (!this.complexFieldValues) {
+      this.complexFieldValues = {};
+    }
+  }
 
 });

app/models/speaker.js

@@ -49,6 +49,12 @@ export default ModelBase.extend({
 
   user     : belongsTo('user'),
   event    : belongsTo('event'),
-  sessions : hasMany('session')
+  sessions : hasMany('session'),
+
+  ready() {
+    if (!this.complexFieldValues) {
+      this.complexFieldValues = {};
+    }
+  }
 
 });

app/templates/components/forms/session-speaker-form.hbs

@@ -24,7 +24,7 @@
               {{else}}
                 <Input
                   @type={{field.type}}
-                  @value={{mut (get this.data.session field.fieldIdentifier)}}
+                  @value={{mut (get this.data.session field.identifierPath)}}
                   @id={{if field.isRequired (concat "session_" field.fieldIdentifier "_required") (concat "session_" field.fieldIdentifier)}} />
               {{/if}}
             {{/if}}
@@ -153,7 +153,7 @@
                 {{#if (not this.data.speaker.isEmailOverridden)}}
                   <Input
                     @type={{field.type}}
-                    @value={{mut (get this.data.speaker field.fieldIdentifier)}}
+                    @value={{mut (get this.data.speaker field.identifierPath)}}
                     @id={{if field.isRequired (concat "speaker_" field.fieldIdentifier "_required") (concat "speaker_" field.fieldIdentifier)}} />
                 {{/if}}
               {{else}}
@@ -166,7 +166,7 @@
                 {{else}}
                   <Input
                     @type={{field.type}}
-                    @value={{mut (get this.data.speaker field.fieldIdentifier)}}
+                    @value={{mut (get this.data.speaker field.identifierPath)}}
                     @id={{if field.isRequired (concat "speaker_" field.fieldIdentifier "_required") (concat "speaker_" field.fieldIdentifier)}} />
                 {{/if}}
               {{/if}}
@@ -268,7 +268,7 @@
               {{#if (not this.data.speaker.isEmailOverridden)}}
                 <Input
                   @type={{field.type}}
-                  @value={{mut (get this.data.speaker field.fieldIdentifier)}}
+                  @value={{mut (get this.data.speaker field.identifierPath)}}
                   @id={{if field.isRequired (concat "speaker_" field.fieldIdentifier "_required") (concat "speaker_" field.fieldIdentifier)}} />
               {{/if}}
             {{else}}
@@ -281,7 +281,7 @@
               {{else}}
                 <Input
                   @type={{field.type}}
-                  @value={{mut (get this.data.speaker field.fieldIdentifier)}}
+                  @value={{mut (get this.data.speaker field.identifierPath)}}
                   @id={{if field.isRequired (concat "speaker_" field.fieldIdentifier "_required") (concat "speaker_" field.fieldIdentifier)}} />
               {{/if}}
             {{/if}}
@@ -412,7 +412,7 @@
               {{else}}
                 <Input
                   @type={{field.type}}
-                  @value={{mut (get this.data.session field.fieldIdentifier)}}
+                  @value={{mut (get this.data.session field.identifierPath)}}
                   @id={{if field.isRequired (concat "session_" field.fieldIdentifier "_required") (concat "session_" field.fieldIdentifier)}} />
               {{/if}}
             {{/if}}