Organized admin files.

pkg/handlers/admin.go

@@ -96,17 +96,15 @@ func (h *Admin) EntityList(n *gen.Type) echo.HandlerFunc {
 			return echo.NewHTTPError(http.StatusInternalServerError, err)
 		}
 
-		return pages.AdminEntityList(ctx, pages.AdminEntityListParams{
+		pgr := pager.NewPager(ctx, h.admin.Config.ItemsPerPage)
-			EntityType: n,
+
-			EntityList: list,
+		return pages.AdminEntityList(ctx, n.Name, list, pgr)
-			Pager:      pager.NewPager(ctx, h.admin.Config.ItemsPerPage),
-		})
 	}
 }
 
 func (h *Admin) EntityAdd(n *gen.Type) echo.HandlerFunc {
 	return func(ctx echo.Context) error {
-		return pages.AdminEntityForm(ctx, true, h.getEntitySchema(n), nil)
+		return pages.AdminEntityInput(ctx, true, h.getEntitySchema(n), nil)
 	}
 }
 
@@ -131,7 +129,7 @@ func (h *Admin) EntityAddSubmit(n *gen.Type) echo.HandlerFunc {
 func (h *Admin) EntityEdit(n *gen.Type) echo.HandlerFunc {
 	return func(ctx echo.Context) error {
 		v := ctx.Get(context.AdminEntityKey).(map[string][]string)
-		return pages.AdminEntityForm(ctx, false, h.getEntitySchema(n), v)
+		return pages.AdminEntityInput(ctx, false, h.getEntitySchema(n), v)
 	}
 }
 

pkg/ui/forms/admin_entity.go

@@ -0,0 +1,112 @@
+package forms
+
+import (
+	"net/http"
+	"net/url"
+
+	"entgo.io/ent/entc/load"
+	"entgo.io/ent/schema/field"
+	"github.com/mikestefanello/pagoda/ent/admin"
+	"github.com/mikestefanello/pagoda/pkg/routenames"
+	"github.com/mikestefanello/pagoda/pkg/ui"
+	. "github.com/mikestefanello/pagoda/pkg/ui/components"
+	. "maragu.dev/gomponents"
+	. "maragu.dev/gomponents/html"
+)
+
+func AdminEntity(r *ui.Request, isNew bool, schema *load.Schema, values url.Values) Node {
+	// TODO inline validation?
+	nodes := make(Group, 0)
+
+	getValue := func(name string) string {
+		if value := r.Context.FormValue(name); value != "" {
+			return value
+		}
+
+		if values != nil && len(values[name]) > 0 {
+			return values[name][0] // TODO cardinality
+		}
+
+		return ""
+	}
+
+	for _, f := range schema.Fields {
+		// TODO cardinality?
+		if !isNew && f.Immutable {
+			continue
+		}
+
+		switch f.Info.Type {
+		case field.TypeString:
+			p := InputFieldParams{
+				Name:      f.Name,
+				InputType: "text",
+				Label:     admin.FieldLabel(f.Name),
+				Value:     getValue(f.Name),
+			}
+
+			if f.Sensitive {
+				p.InputType = "password"
+				if !isNew {
+					p.Placeholder = "*****"
+					p.Help = "SENSITIVE: This field will only be updated if a value is provided."
+				}
+			}
+			nodes = append(nodes, InputField(p))
+		case field.TypeTime:
+			nodes = append(nodes, InputField(InputFieldParams{
+				Name:      f.Name,
+				InputType: "datetime-local",
+				Label:     admin.FieldLabel(f.Name),
+				Value:     getValue(f.Name),
+			}))
+		case field.TypeInt, field.TypeInt8, field.TypeInt16, field.TypeInt32, field.TypeInt64,
+			field.TypeUint, field.TypeUint8, field.TypeUint16, field.TypeUint32, field.TypeUint64,
+			field.TypeFloat32, field.TypeFloat64:
+			nodes = append(nodes, InputField(InputFieldParams{
+				Name:      f.Name,
+				InputType: "number",
+				Label:     admin.FieldLabel(f.Name),
+				Value:     getValue(f.Name),
+			}))
+		case field.TypeBool:
+			nodes = append(nodes, Checkbox(CheckboxParams{
+				Name:    f.Name,
+				Label:   admin.FieldLabel(f.Name),
+				Checked: getValue(f.Name) == "true",
+			}))
+		case field.TypeEnum:
+			options := make([]Choice, 0, len(f.Enums)+1)
+			if f.Optional {
+				options = append(options, Choice{
+					Label: "-",
+					Value: "",
+				})
+			}
+			for _, enum := range f.Enums {
+				options = append(options, Choice{
+					Label: enum.V,
+					Value: enum.V,
+				})
+			}
+			nodes = append(nodes, SelectList(OptionsParams{
+				Name:    f.Name,
+				Label:   admin.FieldLabel(f.Name),
+				Value:   getValue(f.Name),
+				Options: options,
+			}))
+		default:
+			nodes = append(nodes, P(Textf("%s not supported", f.Name)))
+		}
+	}
+
+	nodes = append(nodes, ControlGroup(
+		FormButton("is-primary", "Submit"),
+		ButtonLink(r.Path(routenames.AdminEntityList(schema.Name)), "is-secondary", "Cancel"),
+	), CSRF(r))
+
+	return Form(
+		Method(http.MethodPost),
+		nodes,
+	)
+}

pkg/ui/forms/admin_entity_delete.go

@@ -0,0 +1,27 @@
+package forms
+
+import (
+	"net/http"
+
+	"github.com/mikestefanello/pagoda/pkg/routenames"
+	"github.com/mikestefanello/pagoda/pkg/ui"
+	. "github.com/mikestefanello/pagoda/pkg/ui/components"
+	. "maragu.dev/gomponents"
+	. "maragu.dev/gomponents/html"
+)
+
+func AdminEntityDelete(r *ui.Request, entityTypeName string) Node {
+	return Form(
+		Method(http.MethodPost),
+		P(Class("subtitle"), Textf("Are you sure you want to delete this %s?", entityTypeName)),
+		ControlGroup(
+			FormButton("is-link", "Delete"),
+			ButtonLink(
+				r.Path(routenames.AdminEntityList(entityTypeName)),
+				"is-secondary",
+				"Cancel",
+			),
+		),
+		CSRF(r),
+	)
+}

pkg/ui/pages/admin_entity.go

@@ -0,0 +1,137 @@
+package pages
+
+import (
+	"fmt"
+	"net/url"
+
+	"entgo.io/ent/entc/load"
+	"github.com/labstack/echo/v4"
+	"github.com/mikestefanello/pagoda/ent/admin"
+	"github.com/mikestefanello/pagoda/pkg/pager"
+	"github.com/mikestefanello/pagoda/pkg/routenames"
+	"github.com/mikestefanello/pagoda/pkg/ui"
+	. "github.com/mikestefanello/pagoda/pkg/ui/components"
+	"github.com/mikestefanello/pagoda/pkg/ui/forms"
+	"github.com/mikestefanello/pagoda/pkg/ui/layouts"
+	. "maragu.dev/gomponents"
+	. "maragu.dev/gomponents/components"
+	. "maragu.dev/gomponents/html"
+)
+
+func AdminEntityDelete(ctx echo.Context, entityTypeName string) error {
+	r := ui.NewRequest(ctx)
+	r.Title = fmt.Sprintf("Delete %s", entityTypeName)
+
+	return r.Render(
+		layouts.Primary,
+		forms.AdminEntityDelete(r, entityTypeName),
+	)
+}
+
+func AdminEntityInput(ctx echo.Context, isNew bool, schema *load.Schema, values url.Values) error {
+	r := ui.NewRequest(ctx)
+	if isNew {
+		r.Title = fmt.Sprintf("Add %s", schema.Name)
+	} else {
+		r.Title = fmt.Sprintf("Edit %s", schema.Name)
+	}
+
+	return r.Render(
+		layouts.Primary,
+		forms.AdminEntity(r, isNew, schema, values),
+	)
+}
+
+func AdminEntityList(
+	ctx echo.Context,
+	entityTypeName string,
+	entityList *admin.EntityList,
+	pgr pager.Pager,
+) error {
+	r := ui.NewRequest(ctx)
+	r.Title = entityTypeName
+
+	genHeader := func() Node {
+		g := make(Group, 0, len(entityList.Columns)+3)
+		g = append(g, Th(Text("ID")))
+		for _, h := range entityList.Columns {
+			g = append(g, Th(Text(h)))
+		}
+		g = append(g, Th(), Th())
+		return g
+	}
+
+	genRow := func(row admin.EntityValues) Node {
+		g := make(Group, 0, len(row.Values)+3)
+		g = append(g, Th(Text(fmt.Sprint(row.ID))))
+		for _, h := range row.Values {
+			g = append(g, Td(Text(h)))
+		}
+		g = append(g,
+			Td(
+				ButtonLink(
+					r.Path(routenames.AdminEntityEdit(entityTypeName), row.ID),
+					"is-link",
+					"Edit",
+				),
+			),
+			Td(
+				ButtonLink(r.Path(routenames.AdminEntityDelete(entityTypeName), row.ID),
+					"is-danger",
+					"Delete",
+				),
+			),
+		)
+		return g
+	}
+
+	genRows := func() Node {
+		g := make(Group, 0, len(entityList.Entities))
+		for _, row := range entityList.Entities {
+			g = append(g, Tr(genRow(row)))
+		}
+		return g
+	}
+
+	pagedHref := func(page int) string {
+		return fmt.Sprintf("%s?%s=%d",
+			r.Path(routenames.AdminEntityList(entityTypeName)),
+			pager.QueryKey,
+			page,
+		)
+	}
+
+	return r.Render(layouts.Primary, Group{
+		ButtonLink(
+			r.Path(routenames.AdminEntityAdd(entityTypeName)),
+			"is-primary",
+			fmt.Sprintf("Add %s", entityTypeName),
+		),
+		Table(
+			Class("table"),
+			THead(
+				Tr(genHeader()),
+			),
+			TBody(genRows()),
+		),
+		Nav(
+			Class("pagination"),
+			A(
+				Classes{
+					"pagination-previous": true,
+					"is-disabled":         entityList.Page == 1,
+				},
+				If(entityList.Page != 1, Href(pagedHref(entityList.Page-1))),
+				Text("Previous page"),
+			),
+			A(
+				Classes{
+					"pagination-previous": true,
+					"is-disabled":         !entityList.HasNextPage,
+				},
+				If(entityList.HasNextPage, Href(pagedHref(entityList.Page+1))),
+				Text("Next page"),
+			),
+		),
+	})
+}

pkg/ui/pages/entity.go

@@ -1,240 +0,0 @@
-package pages
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-
-	"entgo.io/ent/entc/gen"
-	"entgo.io/ent/entc/load"
-	"entgo.io/ent/schema/field"
-	"github.com/labstack/echo/v4"
-	"github.com/mikestefanello/pagoda/ent/admin"
-	"github.com/mikestefanello/pagoda/pkg/pager"
-	"github.com/mikestefanello/pagoda/pkg/routenames"
-	"github.com/mikestefanello/pagoda/pkg/ui"
-	. "github.com/mikestefanello/pagoda/pkg/ui/components"
-	"github.com/mikestefanello/pagoda/pkg/ui/layouts"
-	. "maragu.dev/gomponents"
-	. "maragu.dev/gomponents/components"
-	. "maragu.dev/gomponents/html"
-)
-
-func AdminEntityDelete(ctx echo.Context, entityTypeName string) error {
-	r := ui.NewRequest(ctx)
-	r.Title = fmt.Sprintf("Delete %s", entityTypeName)
-
-	form := Form(
-		Method(http.MethodPost),
-		P(Class("subtitle"), Textf("Are you sure you want to delete this %s?", entityTypeName)),
-		ControlGroup(
-			FormButton("is-link", "Delete"),
-			ButtonLink(
-				r.Path(routenames.AdminEntityList(entityTypeName)),
-				"is-secondary",
-				"Cancel",
-			),
-		),
-		CSRF(r),
-	)
-
-	return r.Render(layouts.Primary, form)
-}
-
-func AdminEntityForm(ctx echo.Context, isNew bool, schema *load.Schema, values url.Values) error {
-	r := ui.NewRequest(ctx)
-	if isNew {
-		r.Title = fmt.Sprintf("Add %s", schema.Name)
-	} else {
-		r.Title = fmt.Sprintf("Edit %s", schema.Name)
-	}
-	// TODO inline validation?
-	nodes := make(Group, 0)
-
-	getValue := func(name string) string {
-		if value := ctx.FormValue(name); value != "" {
-			return value
-		}
-
-		if values != nil && len(values[name]) > 0 {
-			return values[name][0] // TODO cardinality
-		}
-
-		return ""
-	}
-
-	for _, f := range schema.Fields {
-		// TODO cardinality?
-		if !isNew && f.Immutable {
-			continue
-		}
-
-		switch f.Info.Type {
-		case field.TypeString:
-			p := InputFieldParams{
-				Name:      f.Name,
-				InputType: "text",
-				Label:     admin.FieldLabel(f.Name),
-				Value:     getValue(f.Name),
-			}
-
-			if f.Sensitive {
-				p.InputType = "password"
-				if !isNew {
-					p.Placeholder = "*****"
-					p.Help = "SENSITIVE: This field will only be updated if a value is provided."
-				}
-			}
-			nodes = append(nodes, InputField(p))
-		case field.TypeTime:
-			nodes = append(nodes, InputField(InputFieldParams{
-				Name:      f.Name,
-				InputType: "datetime-local",
-				Label:     admin.FieldLabel(f.Name),
-				Value:     getValue(f.Name),
-			}))
-		case field.TypeInt, field.TypeInt8, field.TypeInt16, field.TypeInt32, field.TypeInt64,
-			field.TypeUint, field.TypeUint8, field.TypeUint16, field.TypeUint32, field.TypeUint64,
-			field.TypeFloat32, field.TypeFloat64:
-			nodes = append(nodes, InputField(InputFieldParams{
-				Name:      f.Name,
-				InputType: "number",
-				Label:     admin.FieldLabel(f.Name),
-				Value:     getValue(f.Name),
-			}))
-		case field.TypeBool:
-			nodes = append(nodes, Checkbox(CheckboxParams{
-				Name:    f.Name,
-				Label:   admin.FieldLabel(f.Name),
-				Checked: getValue(f.Name) == "true",
-			}))
-		case field.TypeEnum:
-			options := make([]Choice, 0, len(f.Enums)+1)
-			if f.Optional {
-				options = append(options, Choice{
-					Label: "-",
-					Value: "",
-				})
-			}
-			for _, enum := range f.Enums {
-				options = append(options, Choice{
-					Label: enum.V,
-					Value: enum.V,
-				})
-			}
-			nodes = append(nodes, SelectList(OptionsParams{
-				Name:    f.Name,
-				Label:   admin.FieldLabel(f.Name),
-				Value:   getValue(f.Name),
-				Options: options,
-			}))
-		default:
-			nodes = append(nodes, P(Textf("%s not supported", f.Name)))
-		}
-	}
-
-	nodes = append(nodes, ControlGroup(
-		FormButton("is-primary", "Submit"),
-		ButtonLink(r.Path(routenames.AdminEntityList(schema.Name)), "is-secondary", "Cancel"),
-	), CSRF(r))
-
-	return r.Render(layouts.Primary, Form(
-		Method(http.MethodPost),
-		nodes,
-	))
-}
-
-type AdminEntityListParams struct {
-	EntityType *gen.Type
-	EntityList *admin.EntityList
-	Pager      pager.Pager
-}
-
-func AdminEntityList(ctx echo.Context, params AdminEntityListParams) error {
-	r := ui.NewRequest(ctx)
-	r.Title = params.EntityType.Name
-
-	genHeader := func() Node {
-		g := make(Group, 0, len(params.EntityList.Columns)+3)
-		g = append(g, Th(Text("ID")))
-		for _, h := range params.EntityList.Columns {
-			g = append(g, Th(Text(h)))
-		}
-		g = append(g, Th(), Th())
-		return g
-	}
-
-	genRow := func(row admin.EntityValues) Node {
-		g := make(Group, 0, len(row.Values)+3)
-		g = append(g, Th(Text(fmt.Sprint(row.ID))))
-		for _, h := range row.Values {
-			g = append(g, Td(Text(h)))
-		}
-		g = append(g,
-			Td(
-				ButtonLink(
-					r.Path(routenames.AdminEntityEdit(params.EntityType.Name), row.ID),
-					"is-link",
-					"Edit",
-				),
-			),
-			Td(
-				ButtonLink(r.Path(routenames.AdminEntityDelete(params.EntityType.Name), row.ID),
-					"is-danger",
-					"Delete",
-				),
-			),
-		)
-		return g
-	}
-
-	genRows := func() Node {
-		g := make(Group, 0, len(params.EntityList.Entities))
-		for _, row := range params.EntityList.Entities {
-			g = append(g, Tr(genRow(row)))
-		}
-		return g
-	}
-
-	pagedHref := func(page int) string {
-		return fmt.Sprintf("%s?%s=%d",
-			r.Path(routenames.AdminEntityList(params.EntityType.Name)),
-			pager.QueryKey,
-			page,
-		)
-	}
-
-	return r.Render(layouts.Primary, Group{
-		ButtonLink(
-			r.Path(routenames.AdminEntityAdd(params.EntityType.Name)),
-			"is-primary",
-			fmt.Sprintf("Add %s", params.EntityType.Name),
-		),
-		Table(
-			Class("table"),
-			THead(
-				Tr(genHeader()),
-			),
-			TBody(genRows()),
-		),
-		Nav(
-			Class("pagination"),
-			A(
-				Classes{
-					"pagination-previous": true,
-					"is-disabled":         params.EntityList.Page == 1,
-				},
-				If(params.EntityList.Page != 1, Href(pagedHref(params.EntityList.Page-1))),
-				Text("Previous page"),
-			),
-			A(
-				Classes{
-					"pagination-previous": true,
-					"is-disabled":         !params.EntityList.HasNextPage,
-				},
-				If(params.EntityList.HasNextPage, Href(pagedHref(params.EntityList.Page+1))),
-				Text("Next page"),
-			),
-		),
-	})
-}