{{ .dump }}
- {{ .json }}
- {{ .dump }}
- {{ .json }}
- The form is valid!
- {{else}} -The form is invalid!
- {{end}} - - {{ form .form }} - - - - - diff --git a/form/field.go b/form/field.go index fe63326..1a3f5e5 100644 --- a/form/field.go +++ b/form/field.go @@ -26,7 +26,7 @@ import ( ) // Generic function for field.Validation -func DefaultFieldValidation(f *Field) bool { +func FieldValidation(f *Field) bool { if len(f.Children) > 0 { isValid := true @@ -38,11 +38,7 @@ func DefaultFieldValidation(f *Field) bool { c.Errors = errs } - isValid = isChildValid && isValid - - for _, sc := range c.Children { - isValid = DefaultFieldValidation(sc) && isValid - } + isValid = isValid && isChildValid } return isValid @@ -60,22 +56,20 @@ func DefaultFieldValidation(f *Field) bool { // Field represents a field in a form type Field struct { - Name string `json:"name"` - NamePrefix string `json:"name_prefix"` - Widget string `json:"widget"` - Data any `json:"-"` - Options []*Option `json:"options"` - Children []*Field `json:"children"` - Constraints []validation.Constraint `json:"-"` - Errors []validation.Error `json:"-"` - BeforeMount func(data any) (any, error) `json:"-"` - BeforeBind func(data any) (any, error) `json:"-"` - Validate func(f *Field) bool `json:"-"` - IsSlice bool `json:"is_slice"` - IsCollection bool `json:"is_collection"` - IsFixedName bool `json:"is_fixed_name"` - Form *Form `json:"-"` - Parent *Field `json:"-"` + Name string `json:"name"` + Widget string `json:"widget"` + Data any `json:"-"` + Options []*Option `json:"options"` + Children []*Field `json:"children"` + Constraints []validation.Constraint `json:"-"` + Errors []validation.Error `json:"-"` + BeforeMount func(data any) (any, error) `json:"-"` + BeforeBind func(data any) (any, error) `json:"-"` + Validate func(f *Field) bool `json:"-"` + IsSlice bool `json:"is_slice"` + IsFixedName bool `json:"is_fixed_name"` + Form *Form `json:"-"` + Parent *Field `json:"-"` } // Generates a new field with default properties @@ -103,26 +97,11 @@ func NewField(name, widget string) *Field { NewOption("help_attr", Attrs{}), ) - f.Validate = DefaultFieldValidation + f.Validate = FieldValidation return f } -func (f *Field) Copy() *Field { - return &Field{ - Name: f.Name, - Form: f.Form, - Widget: f.Widget, - Options: f.Options, - Constraints: f.Constraints, - BeforeMount: f.BeforeMount, - BeforeBind: f.BeforeBind, - Validate: f.Validate, - IsSlice: f.IsSlice, - IsFixedName: f.IsFixedName, - } -} - // Checks if the field contains an option using its name func (f *Field) HasOption(name string) bool { for _, option := range f.Options { @@ -158,21 +137,6 @@ func (f *Field) WithOptions(options ...*Option) *Field { return f } -// Remove an option if exists -func (f *Field) RemoveOption(name string) *Field { - var options []*Option - - for _, option := range f.Options { - if option.Name != name { - options = append(options, option) - } - } - - f.Options = options - - return f -} - // Sets data the field func (f *Field) WithData(data any) *Field { f.Data = data @@ -194,13 +158,6 @@ func (f *Field) WithSlice() *Field { return f } -// Sets that the field represents a collection -func (f *Field) WithCollection() *Field { - f.IsCollection = true - - return f -} - // Sets that the name of the field is not computed func (f *Field) WithFixedName() *Field { f.IsFixedName = true @@ -276,9 +233,9 @@ func (f *Field) GetName() string { } if f.Form != nil && f.Form.Name != "" { - name = fmt.Sprintf("%s%s[%s]", f.Form.Name, f.NamePrefix, f.Name) + name = fmt.Sprintf("%s[%s]", f.Form.Name, f.Name) } else if f.Parent != nil { - name = fmt.Sprintf("%s%s[%s]", f.Parent.GetName(), f.NamePrefix, f.Name) + name = fmt.Sprintf("%s[%s]", f.Parent.GetName(), f.Name) } else { name = f.Name } @@ -330,7 +287,7 @@ func (f *Field) Mount(data any) error { } // Bind the data into the given map -func (f *Field) Bind(data map[string]any, key *string, parentIsSlice bool) error { +func (f *Field) Bind(data map[string]any, key *string) error { if len(f.Children) == 0 { v, err := f.BeforeBind(f.Data) @@ -350,35 +307,12 @@ func (f *Field) Bind(data map[string]any, key *string, parentIsSlice bool) error data[f.Name] = make(map[string]any) for _, child := range f.Children { - child.Bind(data[f.Name].(map[string]any), key, f.IsCollection) - } - - if f.IsCollection { - var nextData []any - values := data[f.Name].(map[string]any) - var keys []string - - for key, _ := range values { - keys = append(keys, key) - } - - slices.Sort(keys) - - for _, key := range keys { - for valueKey, value := range values { - if valueKey == key { - nextData = append(nextData, value) - } - } - } - - data[f.Name] = nextData + child.Bind(data[f.Name].(map[string]any), key) } return nil } -// Generates a tree of errors func (f *Field) ErrorsTree(tree map[string]any, key *string) { var index string diff --git a/form/field_choice.go b/form/field_choice.go index 16c06fc..70d2545 100644 --- a/form/field_choice.go +++ b/form/field_choice.go @@ -145,7 +145,7 @@ func NewFieldChoice(name string) *Field { ) f.Validate = func(field *Field) bool { - isValid := field.Validate(field) + isValid := FieldValidation(field) if len(validation.NewNotBlank().Validate(field.Data)) == 0 { choices := field.GetOption("choices").Value.(*Choices) diff --git a/form/field_collection.go b/form/field_collection.go deleted file mode 100644 index 3f3ece1..0000000 --- a/form/field_collection.go +++ /dev/null @@ -1,80 +0,0 @@ -package form - -// @license GNU AGPL version 3 or any later version -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see{{ .Dump }}
+ {{ .Dump }}
+