From e8e9b505af292a2e0f7c899d0190c51fd8bfdee3 Mon Sep 17 00:00:00 2001 From: Anya Tokugawa Date: Sun, 31 May 2026 22:44:40 +0900 Subject: [PATCH] Add feature: system nav editor in config --- internal/server/config_handler.go | 161 ++++++++++++++++------- internal/server/handlers.go | 12 ++ internal/server/i18n.go | 2 +- internal/server/nav.go | 62 ++++----- internal/server/nav_resolver.go | 69 ++++++++++ internal/server/object_uri_handlers.go | 33 ++++- internal/server/render.go | 21 ++- internal/server/revision_browser.go | 4 + internal/server/revision_routes.go | 4 + internal/server/semantic_handlers.go | 8 ++ internal/server/tree_handler.go | 4 + templates/pages/config.gohtml | 175 ++++++++++++++++++------- templates/pages/home.gohtml | 2 +- templates/pages/object_editor.gohtml | 2 +- templates/pages/object_view.gohtml | 2 +- templates/pages/page.gohtml | 2 +- templates/pages/tree.gohtml | 2 +- 17 files changed, 409 insertions(+), 156 deletions(-) create mode 100644 internal/server/nav_resolver.go diff --git a/internal/server/config_handler.go b/internal/server/config_handler.go index 00aa237..759d264 100644 --- a/internal/server/config_handler.go +++ b/internal/server/config_handler.go @@ -6,6 +6,71 @@ import ( "strings" ) +func parseNavItemsFromForm( + r *http.Request, +) []NavItem { + + labels := r.Form["nav_label"] + hrefs := r.Form["nav_href"] + + var items []NavItem + + for i := range labels { + + label := + strings.TrimSpace( + labels[i], + ) + + if label == "" { + continue + } + + if i >= len(hrefs) { + continue + } + + href := + strings.TrimSpace( + hrefs[i], + ) + + if href == "" { + continue + } + + items = append( + items, + NavItem{ + Label: label, + Href: href, + }, + ) + } + + return items +} + +func (s *Server) saveNavConfig( + key string, + items []NavItem, +) error { + + raw, err := + json.Marshal( + items, + ) + + if err != nil { + return err + } + + return s.store.SetConfig( + key, + string(raw), + ) +} + func (s *Server) handleConfig( w http.ResponseWriter, r *http.Request, @@ -20,7 +85,10 @@ func (s *Server) handleConfig( return } - section := r.FormValue("section") + section := + r.FormValue( + "section", + ) switch section { @@ -28,7 +96,9 @@ func (s *Server) handleConfig( err = s.store.SetConfig( "home_path", - strings.TrimSpace(r.FormValue("home_path")), + strings.TrimSpace( + r.FormValue("home_path"), + ), ) if err != nil { @@ -38,7 +108,9 @@ func (s *Server) handleConfig( err = s.store.SetConfig( "wiki_name", - strings.TrimSpace(r.FormValue("wiki_name")), + strings.TrimSpace( + r.FormValue("wiki_name"), + ), ) if err != nil { @@ -49,7 +121,9 @@ func (s *Server) handleConfig( err = s.store.SetConfig( "locale", normalizeLocale( - strings.TrimSpace(r.FormValue("locale")), + strings.TrimSpace( + r.FormValue("locale"), + ), ), ) @@ -58,50 +132,23 @@ func (s *Server) handleConfig( return } - case "nav": + case "nav-home": - labels := r.Form["nav_label"] - hrefs := r.Form["nav_href"] - - var items []NavItem - - for i := range labels { - - label := strings.TrimSpace(labels[i]) - - if label == "" { - continue - } - - if i >= len(hrefs) { - continue - } - - href := strings.TrimSpace(hrefs[i]) - - if href == "" { - continue - } - - items = append( - items, - NavItem{ - Label: label, - Href: href, - }, - ) - } - - raw, err := json.Marshal(items) + err = s.saveNavConfig( + "home_nav_items", + parseNavItemsFromForm(r), + ) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } - err = s.store.SetConfig( - "nav_items", - string(raw), + case "nav-system": + + err = s.saveNavConfig( + "system_nav_items", + parseNavItemsFromForm(r), ) if err != nil { @@ -113,7 +160,7 @@ func (s *Server) handleConfig( http.Error( w, - "unknown config section", + "unknown config section: "+section, http.StatusBadRequest, ) @@ -130,14 +177,20 @@ func (s *Server) handleConfig( return } - homePath, err := s.store.GetConfig("home_path") + homePath, err := + s.store.GetConfig( + "home_path", + ) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } - wikiName, err := s.store.GetConfig("wiki_name") + wikiName, err := + s.store.GetConfig( + "wiki_name", + ) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) @@ -148,7 +201,10 @@ func (s *Server) handleConfig( wikiName = "Pages Wiki" } - recent, err := s.store.ListRecentObjects(50) + recent, err := + s.store.ListRecentObjects( + 50, + ) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) @@ -159,11 +215,16 @@ func (s *Server) handleConfig( w, "config.gohtml", map[string]any{ - "HomePath": homePath, - "WikiName": wikiName, - "Locale": s.getLocale(), - "Objects": recent, - "NavItemsConfig": s.getNavItems(), + "NavItems": resolveNavItems( + s.getSystemNavItems(), + NavContext{}, + ), + "HomePath": homePath, + "WikiName": wikiName, + "Locale": s.getLocale(), + "Objects": recent, + "HomeNavItemsConfig": s.getHomeNavItems(), + "SystemNavItemsConfig": s.getSystemNavItems(), }, ) } diff --git a/internal/server/handlers.go b/internal/server/handlers.go index 573b7f6..c72d864 100644 --- a/internal/server/handlers.go +++ b/internal/server/handlers.go @@ -74,6 +74,14 @@ func (s *Server) handleHome( w, "page.gohtml", map[string]any{ + "NavItems": resolveNavItems( + s.getHomeNavItems(), + NavContext{ + Path: homePath, + ObjectUUID: objectUUID, + ObjectURI: "uuid:" + objectUUID, + }, + ), "Title": homePath, "Path": homePath, "ObjectUUID": objectUUID, @@ -96,6 +104,10 @@ func (s *Server) handleHome( w, "home.gohtml", map[string]any{ + "NavItems": resolveNavItems( + s.getHomeNavItems(), + NavContext{}, + ), "RenderedHTML": template.HTML( rendered, ), diff --git a/internal/server/i18n.go b/internal/server/i18n.go index a3065ce..ca45692 100644 --- a/internal/server/i18n.go +++ b/internal/server/i18n.go @@ -26,7 +26,7 @@ var translations = map[string]map[string]string{ "ja": { "config.title": "設定", "config.home": "ホーム", - "config.wiki_name": "Wiki名", + "config.wiki_name": "Wiki名称", "config.locale": "言語", "config.home_path": "トップページ", "config.save": "保存", diff --git a/internal/server/nav.go b/internal/server/nav.go index 62da393..e05b155 100644 --- a/internal/server/nav.go +++ b/internal/server/nav.go @@ -5,53 +5,53 @@ import ( ) type NavItem struct { - Label string `json:"label"` - Href string `json:"href"` + Label string `json:"label"` + Href string `json:"href"` + ResolvedHref string `json:"-"` } func defaultNavItems() []NavItem { - return []NavItem{ - { - Label: "Home", - Href: "/", - }, - { - Label: "Tree", - Href: "/v/tree", - }, - { - Label: "Config", - Href: "/-/sys/config", - }, + {Label: "Home", Href: "/"}, + {Label: "Tree", Href: "/v/tree"}, + {Label: "Config", Href: "/-/sys/config"}, } } -func (s *Server) getNavItems() []NavItem { - - raw, err := - s.store.GetConfig( - "nav_items", - ) - - if err != nil || - raw == "" { +func (s *Server) getNavItemsByKey(key string) []NavItem { + raw, err := s.store.GetConfig(key) + if err != nil || raw == "" { return defaultNavItems() } var items []NavItem - err = json.Unmarshal( - []byte(raw), - &items, - ) - - if err != nil || - len(items) == 0 { + err = json.Unmarshal([]byte(raw), &items) + if err != nil || len(items) == 0 { return defaultNavItems() } return items } + +func (s *Server) getHomeNavItems() []NavItem { + raw, err := s.store.GetConfig("home_nav_items") + + if err == nil && raw != "" { + return s.getNavItemsByKey("home_nav_items") + } + + raw, err = s.store.GetConfig("nav_items") + + if err == nil && raw != "" { + return s.getNavItemsByKey("nav_items") + } + + return defaultNavItems() +} + +func (s *Server) getSystemNavItems() []NavItem { + return s.getNavItemsByKey("system_nav_items") +} diff --git a/internal/server/nav_resolver.go b/internal/server/nav_resolver.go new file mode 100644 index 0000000..795d819 --- /dev/null +++ b/internal/server/nav_resolver.go @@ -0,0 +1,69 @@ +package server + +import "strings" + +type NavContext struct { + Path string + ObjectUUID string + ObjectURI string + RevisionHash string +} + +func expandNavHref( + href string, + ctx NavContext, +) (string, bool) { + + replacements := map[string]string{ + "{path}": ctx.Path, + "{object_uuid}": ctx.ObjectUUID, + "{object_uri}": ctx.ObjectURI, + "{revision_hash}": ctx.RevisionHash, + } + + for key, value := range replacements { + + if strings.Contains(href, key) { + + if value == "" { + return "", false + } + + href = + strings.ReplaceAll( + href, + key, + value, + ) + } + } + + return href, true +} + +func resolveNavItems( + items []NavItem, + ctx NavContext, +) []NavItem { + + var out []NavItem + + for _, item := range items { + + href, ok := + expandNavHref( + item.Href, + ctx, + ) + + if !ok { + continue + } + + item.ResolvedHref = href + + out = append(out, item) + } + + return out +} diff --git a/internal/server/object_uri_handlers.go b/internal/server/object_uri_handlers.go index 501651c..aa20f84 100644 --- a/internal/server/object_uri_handlers.go +++ b/internal/server/object_uri_handlers.go @@ -53,9 +53,16 @@ func (s *Server) handleObjectView( w, "object_view.gohtml", map[string]any{ - "Title": "Object View", - "ObjectUUID": objectUUID, - "ObjectURI": uri, + "Title": "Object View", + "ObjectUUID": objectUUID, + "ObjectURI": uri, + "NavItems": resolveNavItems( + s.getSystemNavItems(), + NavContext{ + ObjectUUID: objectUUID, + ObjectURI: uri, + }, + ), "RenderedHTML": template.HTML(latest.Body), }, ) @@ -91,8 +98,15 @@ func (s *Server) handleObjectEdit( "Title": "Object Edit", "ObjectUUID": objectUUID, "ObjectURI": uri, - "Body": body, - "EditType": "html", + "NavItems": resolveNavItems( + s.getSystemNavItems(), + NavContext{ + ObjectUUID: objectUUID, + ObjectURI: uri, + }, + ), + "Body": body, + "EditType": "html", }, ) } @@ -131,7 +145,14 @@ func (s *Server) handleObjectRevisionHistory( map[string]any{ "Title": "Object Revision History", "ObjectUUID": objectUUID, - "Revisions": revisions, + "NavItems": resolveNavItems( + s.getSystemNavItems(), + NavContext{ + ObjectUUID: objectUUID, + ObjectURI: uri, + }, + ), + "Revisions": revisions, }, ) } diff --git a/internal/server/render.go b/internal/server/render.go index bae7e73..1325a26 100644 --- a/internal/server/render.go +++ b/internal/server/render.go @@ -6,14 +6,11 @@ import ( func mergeTemplateData( data any, - nav []NavItem, wikiName string, ) map[string]any { out := map[string]any{ - "NavItems": nav, "WikiName": wikiName, - "Locale": "en", } if data == nil { @@ -40,16 +37,14 @@ func (s *Server) render( data any, ) { - err := - s.templates.ExecuteTemplate( - w, - name, - mergeTemplateData( - data, - s.getNavItems(), - s.getWikiName(), - ), - ) + err := s.templates.ExecuteTemplate( + w, + name, + mergeTemplateData( + data, + s.getWikiName(), + ), + ) if err != nil { diff --git a/internal/server/revision_browser.go b/internal/server/revision_browser.go index 20a6aa7..6ca4325 100644 --- a/internal/server/revision_browser.go +++ b/internal/server/revision_browser.go @@ -35,6 +35,10 @@ func (s *Server) handleRevisionBrowser( w, "revisions.gohtml", map[string]any{ + "NavItems": resolveNavItems( + s.getSystemNavItems(), + NavContext{}, + ), "Title": "Revision History", "ObjectUUID": objectUUID, "Revisions": revisions, diff --git a/internal/server/revision_routes.go b/internal/server/revision_routes.go index 835358d..d0e2949 100644 --- a/internal/server/revision_routes.go +++ b/internal/server/revision_routes.go @@ -36,6 +36,10 @@ func (s *Server) handleRevisionView( w, "revision_view.gohtml", map[string]any{ + "NavItems": resolveNavItems( + s.getSystemNavItems(), + NavContext{}, + ), "Title": "Revision View", "Revision": revision, "RenderedHTML": template.HTML( diff --git a/internal/server/semantic_handlers.go b/internal/server/semantic_handlers.go index 4879df6..678a8aa 100644 --- a/internal/server/semantic_handlers.go +++ b/internal/server/semantic_handlers.go @@ -52,6 +52,14 @@ func (s *Server) handleSemanticRoute( "Title": path, "Path": path, "ObjectUUID": objectUUID, + "NavItems": resolveNavItems( + s.getSystemNavItems(), + NavContext{ + Path: path, + ObjectUUID: objectUUID, + ObjectURI: "uuid:" + objectUUID, + }, + ), "RenderedHTML": template.HTML( rendered, ), diff --git a/internal/server/tree_handler.go b/internal/server/tree_handler.go index 5ada158..1e3efbb 100644 --- a/internal/server/tree_handler.go +++ b/internal/server/tree_handler.go @@ -68,6 +68,10 @@ func (s *Server) handleTree( w, "tree.gohtml", map[string]any{ + "NavItems": resolveNavItems( + s.getSystemNavItems(), + NavContext{}, + ), "Nodes": nodes, }, ) diff --git a/templates/pages/config.gohtml b/templates/pages/config.gohtml index 0bf90f0..c1f12d2 100644 --- a/templates/pages/config.gohtml +++ b/templates/pages/config.gohtml @@ -3,7 +3,7 @@ -Config +{{ T "config.title" }} @@ -18,7 +18,7 @@ @@ -42,15 +42,19 @@ @@ -64,9 +68,9 @@ Navigation class="config-section config-panel active" > -

Config

+

{{ T "config.title" }}

-

Home

+

{{ T "config.home" }}

- -

-If empty, the top page shows child pages like an Apache-style index. -

- +
@@ -190,12 +190,13 @@ Save +
-

{{ T "config.nav" }}

+

Home Navigation

@@ -220,8 +221,7 @@ Save - -{{ range .NavItemsConfig }} +{{ range .HomeNavItemsConfig }} - {{ end }} @@ -278,36 +266,116 @@ Save - -
@@ -241,21 +241,9 @@ Save - - - + +
- - - + +
+
+ +

System Navigation

+ +
+ + + + + + + + + + + + + + + +{{ range .SystemNavItemsConfig }} + + + + + + + + + +{{ end }} + + + + + + + + + + + +
{{ T "config.nav_label" }}{{ T "config.nav_href" }}{{ T "config.nav_order" }}
+ + + + + + +
+ + + + + + +
+ + + +
+ +
+ + @@ -380,8 +448,15 @@ document.addEventListener( location.search ) - showConfigPanel( + let panel = params.get("panel") || "home" + + if (panel === "nav") { + panel = "nav-home" + } + + showConfigPanel( + panel ) }, ) diff --git a/templates/pages/home.gohtml b/templates/pages/home.gohtml index 2c867be..2cd40bd 100644 --- a/templates/pages/home.gohtml +++ b/templates/pages/home.gohtml @@ -18,7 +18,7 @@ diff --git a/templates/pages/object_editor.gohtml b/templates/pages/object_editor.gohtml index b89d49a..2fa3901 100644 --- a/templates/pages/object_editor.gohtml +++ b/templates/pages/object_editor.gohtml @@ -18,7 +18,7 @@ diff --git a/templates/pages/object_view.gohtml b/templates/pages/object_view.gohtml index 03aa03f..14f2842 100644 --- a/templates/pages/object_view.gohtml +++ b/templates/pages/object_view.gohtml @@ -18,7 +18,7 @@ diff --git a/templates/pages/page.gohtml b/templates/pages/page.gohtml index 43b66ff..39c4d67 100644 --- a/templates/pages/page.gohtml +++ b/templates/pages/page.gohtml @@ -31,7 +31,7 @@ diff --git a/templates/pages/tree.gohtml b/templates/pages/tree.gohtml index 4781540..24e5436 100644 --- a/templates/pages/tree.gohtml +++ b/templates/pages/tree.gohtml @@ -558,7 +558,7 @@ Pages Wiki