0
0
Fork 1
Spiegel von https://github.com/paviliondev/discourse-custom-wizard.git synchronisiert 2024-11-09 20:02:54 +01:00

working url and number validation

Dieser Commit ist enthalten in:
Robert Barrow 2020-03-23 18:40:11 +00:00
Ursprung 506a245a47
Commit ce9373dd91
7 geänderte Dateien mit 24 neuen und 6 gelöschten Zeilen

Datei anzeigen

@ -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',

Datei anzeigen

@ -4,7 +4,6 @@ import getUrl from 'discourse-common/lib/get-url';
export default StepController.extend({
actions: {
goNext(response) {
debugger;
const next = this.get('step.next');
if (response.redirect_on_next) {
window.location.href = response.redirect_on_next;

Datei anzeigen

@ -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
}
}

Datei anzeigen

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

Datei anzeigen

@ -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:

Datei anzeigen

@ -1,3 +1,5 @@
require 'uri'
TagStruct = Struct.new(:id, :name)
class CustomWizard::Builder
@ -330,7 +332,6 @@ class CustomWizard::Builder
end
def validate_field(field, updater, step_template)
byebug
value = updater.fields[field['id']]
min_length = false
label = field['label'] || I18n.t("#{field['key']}.label")
@ -347,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)
@ -357,13 +364,20 @@ class CustomWizard::Builder
validator[:block].call(field, updater, step_template)
end
end
byebug
end
def is_text_type(field)
['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

Datei anzeigen

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