fix: Revamp session-speaker custom forms, fix URLs (#3333)

abhinavk96 · web-flow · commit 7d387281e55e · 2019-07-31T15:30:53.000+05:30
diff --git a/app/components/forms/session-speaker-form.js b/app/components/forms/session-speaker-form.js
@@ -110,7 +110,7 @@ export default Component.extend(FormMixin, {
             },
             {
               type   : 'regExp',
-              value  : compulsoryProtocolValidUrlPattern,
+              value  : protocolLessValidUrlPattern,
               prompt : this.l10n.t('Please enter a valid url')
             }
           ]
@@ -121,7 +121,7 @@ export default Component.extend(FormMixin, {
           rules      : [
             {
               type   : 'regExp',
-              value  : compulsoryProtocolValidUrlPattern,
+              value  : protocolLessValidUrlPattern,
               prompt : this.l10n.t('Please enter a valid url')
             }
           ]
@@ -135,7 +135,7 @@ export default Component.extend(FormMixin, {
             },
             {
               type   : 'regExp',
-              value  : compulsoryProtocolValidUrlPattern,
+              value  : protocolLessValidUrlPattern,
               prompt : this.l10n.t('Please enter a valid url')
             }
           ]
@@ -146,7 +146,7 @@ export default Component.extend(FormMixin, {
           rules      : [
             {
               type   : 'regExp',
-              value  : compulsoryProtocolValidUrlPattern,
+              value  : protocolLessValidUrlPattern,
               prompt : this.l10n.t('Please enter a valid url')
             }
           ]
@@ -160,7 +160,7 @@ export default Component.extend(FormMixin, {
             },
             {
               type   : 'regExp',
-              value  : compulsoryProtocolValidUrlPattern,
+              value  : protocolLessValidUrlPattern,
               prompt : this.l10n.t('Please enter a valid url')
             }
           ]
@@ -171,7 +171,7 @@ export default Component.extend(FormMixin, {
           rules      : [
             {
               type   : 'regExp',
-              value  : compulsoryProtocolValidUrlPattern,
+              value  : protocolLessValidUrlPattern,
               prompt : this.l10n.t('Please enter a valid url')
             }
           ]
@@ -437,7 +437,7 @@ export default Component.extend(FormMixin, {
           rules      : [
             {
               type   : 'empty',
-              prompt : this.l10n.t('Please enter GitHub link')
+              prompt : this.l10n.t('Please enter your GitHub profile url')
             },
             {
               type   : 'regExp',
@@ -462,12 +462,12 @@ export default Component.extend(FormMixin, {
           rules      : [
             {
               type   : 'empty',
-              prompt : this.l10n.t('Please enter linkedin link')
+              prompt : this.l10n.t('Please enter Linkedin profile url')
             },
             {
               type   : 'regExp',
               value  : validLinkedinProfileUrlPattern,
-              prompt : this.l10n.t('Please enter a valid linkedin profile url')
+              prompt : this.l10n.t('Please enter a valid Linkedin profile url')
             }
           ]
         },
@@ -478,7 +478,7 @@ export default Component.extend(FormMixin, {
             {
               type   : 'regExp',
               value  : validLinkedinProfileUrlPattern,
-              prompt : this.l10n.t('Please enter a valid linkedin profile url')
+              prompt : this.l10n.t('Please enter a valid Linkedin profile url')
             }
           ]
         }
diff --git a/app/models/custom-form.js b/app/models/custom-form.js
@@ -102,6 +102,15 @@ export default ModelBase.extend({
     }
   }),
 
+  isUrlField: computed('type', 'fieldIdentifier', function() {
+    return this.type === 'text'
+    && (['website', 'twitter', 'github', 'facebook', 'linkedin', 'slidesUrl', 'videoUrl', 'audioUrl'].includes(this.fieldIdentifier));
+  }),
+
+  segmentedLinkName: computed('fieldIdentifier', function() {
+    return `segmentedLink${this.fieldIdentifier.charAt(0).toUpperCase()  + this.fieldIdentifier.slice(1)}`;
+  }),
+
   isRequiredObserver: observer('isRequired', function() {
     if (!this.isIncluded && this.isRequired) {
       this.set('isIncluded', true);
diff --git a/app/models/session.js b/app/models/session.js
@@ -2,7 +2,7 @@ import attr from 'ember-data/attr';
 import moment from 'moment';
 import ModelBase from 'open-event-frontend/models/base';
 import { belongsTo, hasMany } from 'ember-data/relationships';
-import { computedDateTimeSplit } from 'open-event-frontend/utils/computed-helpers';
+import { computedDateTimeSplit, computedSegmentedLink } from 'open-event-frontend/utils/computed-helpers';
 import { computed } from '@ember/object';
 
 const detectedTimezone = moment.tz.guess();
@@ -51,5 +51,12 @@ export default ModelBase.extend({
   startAtDate : computedDateTimeSplit.bind(this)('startsAt', 'date'),
   startAtTime : computedDateTimeSplit.bind(this)('startsAt', 'time'),
   endsAtDate  : computedDateTimeSplit.bind(this)('endsAt', 'date'),
-  endsAtTime  : computedDateTimeSplit.bind(this)('endsAt', 'time')
+  endsAtTime  : computedDateTimeSplit.bind(this)('endsAt', 'time'),
+
+  segmentedLinkSlidesUrl : computedSegmentedLink.bind(this)('slidesUrl'),
+  segmentedLinkAudioUrl  : computedSegmentedLink.bind(this)('audioUrl'),
+  segmentedLinkVideoUrl  : computedSegmentedLink.bind(this)('videoUrl'),
+  segmentedLinkSignUpUrl : computedSegmentedLink.bind(this)('signUpUrl')
+
+
 });
diff --git a/app/models/speaker.js b/app/models/speaker.js
@@ -33,9 +33,11 @@ export default ModelBase.extend({
   gender             : attr('string'),
   heardFrom          : attr('string'),
 
-  segmentedLinkWebsite : computedSegmentedLink.bind(this)('website'),
-  segmentedLinkTwitter : computedSegmentedLink.bind(this)('twitter'),
-
+  segmentedLinkWebsite  : computedSegmentedLink.bind(this)('website'),
+  segmentedLinkTwitter  : computedSegmentedLink.bind(this)('twitter'),
+  segmentedLinkGithub   : computedSegmentedLink.bind(this)('github'),
+  segmentedLinkFacebook : computedSegmentedLink.bind(this)('facebook'),
+  segmentedLinkLinkedIn : computedSegmentedLink.bind(this)('linkedin'),
   /**
    * Relationships
    */
diff --git a/app/templates/components/forms/session-speaker-form.hbs b/app/templates/components/forms/session-speaker-form.hbs
@@ -14,8 +14,17 @@
               {{widgets/forms/rich-text-editor value=(mut (get data.session field.fieldIdentifier))
                 textareaId=(if field.isRequired (concat 'session_' field.fieldIdentifier '_required') (concat 'session_' field.fieldIdentifier))}}
             {{else}}
-              {{input type=field.type value=(mut (get data.session field.fieldIdentifier))
-                id=(if field.isRequired (concat 'session_' field.fieldIdentifier '_required') (concat 'session_' field.fieldIdentifier))}}
+              {{#if field.isUrlField}}
+                {{widgets/forms/link-input
+                  fixedName=true
+                  inputId=(if field.isRequired (concat 'session_' field.fieldIdentifier '_required') (concat 'session_' field.fieldIdentifier))
+                  segmentedLink=(get data.session field.segmentedLinkName)
+                  canRemoveItem=false
+                }}
+              {{else}}
+                {{input type=field.type value=(mut (get data.session field.fieldIdentifier))
+                        id=(if field.isRequired (concat 'session_' field.fieldIdentifier '_required') (concat 'session_' field.fieldIdentifier))}}
+              {{/if}}
             {{/if}}
           {{/if}}
           {{#if (eq field.type 'image')}}
@@ -177,11 +186,11 @@
               {{widgets/forms/rich-text-editor value=(mut (get data.speaker field.fieldIdentifier))
                 textareaId=(if field.isRequired (concat 'speaker_' field.fieldIdentifier '_required') (concat 'speaker_' field.fieldIdentifier))}}
             {{else}}
-              {{#if (or (eq field.name 'Website') (eq field.name 'Twitter'))}}
+              {{#if field.isUrlField}}
                 {{widgets/forms/link-input
                   fixedName=true
                   inputId=(if field.isRequired (concat 'speaker_' field.fieldIdentifier '_required') (concat 'speaker_' field.fieldIdentifier))
-                  segmentedLink=(if (eq field.name 'Website') data.speaker.segmentedLinkWebsite data.speaker.segmentedLinkTwitter)
+                  segmentedLink=(get data.speaker field.segmentedLinkName)
                   canRemoveItem=false
                 }}
               {{else}}

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ export default Component.extend(FormMixin, {`
`110`	`110`	`},`
`111`	`111`	`{`
`112`	`112`	`type : 'regExp',`
`113`		`- value : compulsoryProtocolValidUrlPattern,`
	`113`	`+ value : protocolLessValidUrlPattern,`
`114`	`114`	`prompt : this.l10n.t('Please enter a valid url')`
`115`	`115`	`}`
`116`	`116`	`]`
`@@ -121,7 +121,7 @@ export default Component.extend(FormMixin, {`
`121`	`121`	`rules : [`
`122`	`122`	`{`
`123`	`123`	`type : 'regExp',`
`124`		`- value : compulsoryProtocolValidUrlPattern,`
	`124`	`+ value : protocolLessValidUrlPattern,`
`125`	`125`	`prompt : this.l10n.t('Please enter a valid url')`
`126`	`126`	`}`
`127`	`127`	`]`
`@@ -135,7 +135,7 @@ export default Component.extend(FormMixin, {`
`135`	`135`	`},`
`136`	`136`	`{`
`137`	`137`	`type : 'regExp',`
`138`		`- value : compulsoryProtocolValidUrlPattern,`
	`138`	`+ value : protocolLessValidUrlPattern,`
`139`	`139`	`prompt : this.l10n.t('Please enter a valid url')`
`140`	`140`	`}`
`141`	`141`	`]`
`@@ -146,7 +146,7 @@ export default Component.extend(FormMixin, {`
`146`	`146`	`rules : [`
`147`	`147`	`{`
`148`	`148`	`type : 'regExp',`
`149`		`- value : compulsoryProtocolValidUrlPattern,`
	`149`	`+ value : protocolLessValidUrlPattern,`
`150`	`150`	`prompt : this.l10n.t('Please enter a valid url')`
`151`	`151`	`}`
`152`	`152`	`]`
`@@ -160,7 +160,7 @@ export default Component.extend(FormMixin, {`
`160`	`160`	`},`
`161`	`161`	`{`
`162`	`162`	`type : 'regExp',`
`163`		`- value : compulsoryProtocolValidUrlPattern,`
	`163`	`+ value : protocolLessValidUrlPattern,`
`164`	`164`	`prompt : this.l10n.t('Please enter a valid url')`
`165`	`165`	`}`
`166`	`166`	`]`
`@@ -171,7 +171,7 @@ export default Component.extend(FormMixin, {`
`171`	`171`	`rules : [`
`172`	`172`	`{`
`173`	`173`	`type : 'regExp',`
`174`		`- value : compulsoryProtocolValidUrlPattern,`
	`174`	`+ value : protocolLessValidUrlPattern,`
`175`	`175`	`prompt : this.l10n.t('Please enter a valid url')`
`176`	`176`	`}`
`177`	`177`	`]`
`@@ -437,7 +437,7 @@ export default Component.extend(FormMixin, {`
`437`	`437`	`rules : [`
`438`	`438`	`{`
`439`	`439`	`type : 'empty',`
`440`		`- prompt : this.l10n.t('Please enter GitHub link')`
	`440`	`+ prompt : this.l10n.t('Please enter your GitHub profile url')`
`441`	`441`	`},`
`442`	`442`	`{`
`443`	`443`	`type : 'regExp',`
`@@ -462,12 +462,12 @@ export default Component.extend(FormMixin, {`
`462`	`462`	`rules : [`
`463`	`463`	`{`
`464`	`464`	`type : 'empty',`
`465`		`- prompt : this.l10n.t('Please enter linkedin link')`
	`465`	`+ prompt : this.l10n.t('Please enter Linkedin profile url')`
`466`	`466`	`},`
`467`	`467`	`{`
`468`	`468`	`type : 'regExp',`
`469`	`469`	`value : validLinkedinProfileUrlPattern,`
`470`		`- prompt : this.l10n.t('Please enter a valid linkedin profile url')`
	`470`	`+ prompt : this.l10n.t('Please enter a valid Linkedin profile url')`
`471`	`471`	`}`
`472`	`472`	`]`
`473`	`473`	`},`
`@@ -478,7 +478,7 @@ export default Component.extend(FormMixin, {`
`478`	`478`	`{`
`479`	`479`	`type : 'regExp',`
`480`	`480`	`value : validLinkedinProfileUrlPattern,`
`481`		`- prompt : this.l10n.t('Please enter a valid linkedin profile url')`
	`481`	`+ prompt : this.l10n.t('Please enter a valid Linkedin profile url')`
`482`	`482`	`}`
`483`	`483`	`]`
`484`	`484`	`}`