Merge pull request #31 from merefield/number_and_url_validation

Number and url validation

assets/javascripts/discourse/components/wizard-custom-field.js.es6

@@ -14,7 +14,7 @@ export default Ember.Component.extend({
   categoryPropertyTypes: generateSelectKitContent(['id', 'slug']),
 
   @computed('field.type')
-  isInput: (type) => type === 'text' || type === 'textarea',
+  isInput: (type) => type === 'text' || type === 'textarea' || type === 'url',
 
   @computed('field.type')
   isCategoryOrTag: (type) => type === 'tag' || type === 'category',

assets/javascripts/wizard/initializers/custom.js.es6

@@ -214,13 +214,14 @@ export default {
       inputComponentName: function() {
         const type = this.get('field.type');
         const id = this.get('field.id');
-        if (type === 'text-only') return false;
+        if (['text-only'].includes(type)) return false;
         return (type === 'component') ? Ember.String.dasherize(id) : `wizard-field-${type}`;
       }.property('field.type', 'field.id')
     });
 
     const StandardFieldValidation = [
       'text',
+      'number',
       'textarea',
       'dropdown',
       'tag',
@@ -259,6 +260,8 @@ export default {
             valid = val && val.id > 0;
           } else if (StandardFieldValidation.indexOf(type) > -1) {
             valid = val && val.length > 0;
+          } else if (type === 'url') {
+            valid = true
           }
         }
 

assets/javascripts/wizard/templates/components/wizard-field-number.hbs

@@ -0,0 +1 @@
+{{input type='number' step='0.01' id=field.id value=field.value}}

assets/javascripts/wizard/templates/components/wizard-field-url.hbs

@@ -0,0 +1 @@
+{{input type='text' id=field.id value=field.value}}

config/locales/server.en.yml

@@ -9,6 +9,7 @@ en:
     field:
       too_short: "%{label} must be at least %{min} characters"
       required: "%{label} is required."
+      not_url: "%{label} must be a valid url"
     none: "We couldn't find a wizard at that address."
     no_skip: "Wizard can't be skipped"
     export:

lib/custom_wizard/builder.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 TagStruct = Struct.new(:id, :name)
 
 class CustomWizard::Builder
@@ -346,6 +348,12 @@ class CustomWizard::Builder
       updater.errors.add(field['id'].to_s, I18n.t('wizard.field.too_short', label: label, min: min_length.to_i))
     end
 
+    if is_url_type(field)
+      if !check_if_url(value)
+        updater.errors.add(field['id'].to_s, I18n.t('wizard.field.not_url', label: label))
+      end
+    end
+
     ## ensure all checkboxes are booleans
     if field['type'] === 'checkbox'
       updater.fields[field['id']] = standardise_boolean(value)
@@ -362,6 +370,14 @@ class CustomWizard::Builder
     ['text', 'textarea'].include? field['type']
   end
 
+  def is_url_type(field)
+    ['url'].include? field['type']
+  end
+
+  def check_if_url(value)
+    value =~ URI::regexp
+  end
+
   def standardise_boolean(value)
     ActiveRecord::Type::Boolean.new.cast(value)
   end

lib/custom_wizard/field.rb

@@ -1,6 +1,6 @@
 class CustomWizard::Field
   def self.types
-    @types ||= ['checkbox', 'composer', 'dropdown', 'tag', 'category', 'image', 'text', 'textarea', 'text-only', 'upload', 'user-selector']
+    @types ||= ['checkbox', 'composer', 'dropdown', 'tag', 'category', 'image', 'text', 'textarea', 'text-only', 'number', 'upload', 'user-selector', 'url']
   end
 
   def self.require_assets