Add feature: system nav editor in config

This commit is contained in:
Anya Tokugawa committed 2026-05-31 22:44:40 +09:00
1 parent e3a28c9f62
commit e8e9b505af
17 files changed
+409 -156

No files matched your search

+111 -50
View File
@@ -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(),
},
)
}
+12
View File
@@ -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,
),
+1 -1
View File
@@ -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": "保存",
+31 -31
View File
@@ -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")
}
+69
View File
@@ -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
}
+27 -6
View File
@@ -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,
},
)
}
+8 -13
View File
@@ -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 {
+4
View File
@@ -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,
+4
View File
@@ -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(
+8
View File
@@ -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,
),
+4
View File
@@ -68,6 +68,10 @@ func (s *Server) handleTree(
w,
"tree.gohtml",
map[string]any{
"NavItems": resolveNavItems(
s.getSystemNavItems(),
NavContext{},
),
"Nodes": nodes,
},
)