camzalewski/personal-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Only bind form field values that are not empty.

Browse source
This commit is contained in:
mikestefanello 2025-04-12 13:42:48 -04:00
parent 271e252c53
commit 356cf21b3e
6 changed files with 42 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ent/admin/handler.go
View file

@ -83,7 +83,7 @@ func (h *Handler) List(ctx echo.Context, entityType string) (*EntityList, error)
func (h *Handler) PasswordTokenCreate(ctx echo.Context) error {
var payload PasswordToken
if err := ctx.Bind(&payload); err != nil {
if err := h.bind(ctx, &payload); err != nil {
return err
}
@ -103,7 +103,7 @@ func (h *Handler) PasswordTokenUpdate(ctx echo.Context, id int) error {
}
var payload PasswordToken
if err = ctx.Bind(&payload); err != nil {
if err = h.bind(ctx, &payload); err != nil {
return err
}
@ -167,7 +167,7 @@ func (h *Handler) PasswordTokenGet(ctx echo.Context, id int) error {
func (h *Handler) UserCreate(ctx echo.Context) error {
var payload User
if err := ctx.Bind(&payload); err != nil {
if err := h.bind(ctx, &payload); err != nil {
return err
}
@ -188,7 +188,7 @@ func (h *Handler) UserUpdate(ctx echo.Context, id int) error {
}
var payload User
if err = ctx.Bind(&payload); err != nil {
if err = h.bind(ctx, &payload); err != nil {
return err
}
@ -262,3 +262,14 @@ func (h *Handler) getOffset(ctx echo.Context) int {
}
return 0
}
func (h *Handler) bind(ctx echo.Context, entity any) error {
// Remove empty field values so Echo's bind does to fail when trying to parse things like
// times, etc.
for k, v := range ctx.Request().Form {
if len(v) == 1 && len(v[0]) == 0 {
delete(ctx.Request().Form, k)
}
}
return ctx.Bind(entity)
}

15
ent/admin/templates/handler.tmpl
View file

@ -90,7 +90,7 @@
{{ range $n := $.Nodes }}
func (h *Handler) {{ $n.Name }}Create(ctx echo.Context) error {
var payload {{ $n.Name }}
if err := ctx.Bind(&payload); err != nil {
if err := h.bind(ctx, &payload); err != nil {
return err
}
@ -114,7 +114,7 @@
}
var payload {{ $n.Name }}
if err = ctx.Bind(&payload); err != nil {
if err = h.bind(ctx, &payload); err != nil {
return err
}
@ -204,4 +204,15 @@
return 0
}
func (h *Handler) bind(ctx echo.Context, entity any) error {
// Remove empty field values so Echo's bind does to fail when trying to parse things like
// times, etc.
for k, v := range ctx.Request().Form {
if len(v) == 1 && len(v[0]) == 0 {
delete(ctx.Request().Form, k)
}
}
return ctx.Bind(entity)
}
{{ end }}

2
ent/admin/templates/types.tmpl
View file

@ -8,7 +8,7 @@
{{ range $n := $.Nodes }}
type {{ $n.Name }} struct {
{{- range $f := $n.Fields }}
{{ fieldName $f.Name }} {{ $f.Type }} `form:"{{ $f.Name }}"`
{{ fieldName $f.Name }} {{ $f.Type }} `form:"{{ $f.Name }}"`
{{- end }}
}
{{ end }}

5
pkg/handlers/admin.go
View file

@ -151,10 +151,11 @@ func (h *Admin) EntityDeleteSubmit(n *gen.Type) echo.HandlerFunc {
return func(ctx echo.Context) error {
id := ctx.Get(entityIDContextKey).(int)
if err := h.admin.Delete(ctx, n.Name, id); err != nil {
return fail(err, fmt.Sprintf("failed to delete %s (ID: %d)", n.Name, id))
msg.Danger(ctx, err.Error())
return h.EntityDelete(n)(ctx)
}
msg.Success(ctx, fmt.Sprintf("Successfully deleted %s ID %d.", n.Name, id))
msg.Success(ctx, fmt.Sprintf("Successfully deleted %s (ID %d).", n.Name, id))
return redirect.
New(ctx).

4
pkg/services/container_test.go
View file

@ -17,4 +17,8 @@ func TestNewContainer(t *testing.T) {
assert.NotNil(t, c.Mail)
assert.NotNil(t, c.Auth)
assert.NotNil(t, c.Tasks)
g := c.Graph
if g == nil {
}
}

10
pkg/ui/pages/entity.go
View file

@ -68,6 +68,7 @@ func AdminEntityForm(ctx echo.Context, schema *load.Schema, values url.Values) e
for _, f := range schema.Fields {
// TODO cardinality?
// TODO optional fields?
// TODO password?
switch f.Info.Type {
case field.TypeString:
nodes = append(nodes, InputField(InputFieldParams{
@ -85,8 +86,8 @@ func AdminEntityForm(ctx echo.Context, schema *load.Schema, values url.Values) e
Help: fmt.Sprintf("Use the following format: %s", time.Now().Format(time.RFC3339)),
Value: getValue(f.Name),
}))
case field.TypeInt, field.TypeInt8, field.TypeInt16, field.TypeInt32,
field.TypeInt64, field.TypeFloat32, field.TypeFloat64:
case field.TypeInt, field.TypeInt8, field.TypeInt16, field.TypeInt32, field.TypeInt64,
field.TypeFloat32, field.TypeFloat64:
nodes = append(nodes, InputField(InputFieldParams{
Name: f.Name,
InputType: "number",
@ -95,8 +96,9 @@ func AdminEntityForm(ctx echo.Context, schema *load.Schema, values url.Values) e
}))
case field.TypeBool:
nodes = append(nodes, Checkbox(CheckboxParams{
Name: f.Name,
Label: label(f.Name),
Name: f.Name,
Label: label(f.Name),
Checked: getValue(f.Name) != "",
}))
case field.TypeEnum:
// TODO