Moku/Work
1
0
Fork 0
Code Issues Pull Requests Activity

Feat: add persisted account theme settings

Browse Source
This commit is contained in:
MangoPig
2026-07-06 17:02:40 +01:00
parent 715661a4d2
commit dc081ccc5b
14 changed files with 653 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Backend/internal/bootstrap/bootstrap_types.go
+13 -8
View File
@@ -91,6 +91,11 @@ type AdminRecord struct {
DisplayName string `json:"displayName"`
IsInstanceAdmin bool `json:"isInstanceAdmin"`
HomeTitle string `json:"homeTitle"`
ThemePresetID string `json:"themePresetId,omitempty"`
}
type SaveThemePresetInput struct {
PresetID string
}
type OrganizationRecord struct {
@@ -243,8 +248,8 @@ type MoveProjectItemInput struct {
}
type CreateProjectFolderResult struct {
ProjectID string `json:"projectId"`
CreatedFolder ProjectHierarchyFolderRecord `json:"createdFolder"`
ProjectID string `json:"projectId"`
CreatedFolder ProjectHierarchyFolderRecord `json:"createdFolder"`
Folders []ProjectHierarchyFolderRecord `json:"folders"`
}
@@ -272,8 +277,8 @@ type MoveProjectFolderResult struct {
}
type CreateProjectItemResult struct {
ProjectID string `json:"projectId"`
CreatedItem ProjectTreeNodeRecord `json:"createdItem"`
ProjectID string `json:"projectId"`
CreatedItem ProjectTreeNodeRecord `json:"createdItem"`
Nodes []ProjectTreeNodeRecord `json:"nodes"`
}
@@ -285,10 +290,10 @@ type DeleteProjectItemResult struct {
}
type MoveProjectItemResult struct {
ProjectID string `json:"projectId"`
PreviousItemStableID string `json:"previousItemId"`
PreviousItemPath string `json:"previousItemPath"`
MovedItem ProjectTreeNodeRecord `json:"movedItem"`
ProjectID string `json:"projectId"`
PreviousItemStableID string `json:"previousItemId"`
PreviousItemPath string `json:"previousItemPath"`
MovedItem ProjectTreeNodeRecord `json:"movedItem"`
Nodes []ProjectTreeNodeRecord `json:"nodes"`
}
Backend/internal/bootstrap/project_disk_bootstrap.go
+3
View File
@@ -232,6 +232,9 @@ func (service *Service) ensureBootstrapPOSIXSkeleton(
"type": "personal",
"name": personalName,
"slug": personalSlug,
"theme": map[string]any{
"presetId": "moku-midnight",
},
}); err != nil {
return fmt.Errorf("write personal %s: %w", posixSettingsFileName, err)
}
Backend/internal/bootstrap/service.go
+8
View File
@@ -318,6 +318,14 @@ func (service *Service) GetAdmin(ctx context.Context) (*AdminRecord, error) {
return nil, err
}
themePresetID, err := service.loadAdminThemePresetID(ctx, record.DisplayName)
if err != nil {
return nil, err
}
if themePresetID != "" {
record.ThemePresetID = themePresetID
}
return &record, nil
}
Backend/internal/bootstrap/service_test.go
+40
View File
@@ -206,6 +206,13 @@ func TestEnsureBootstrapPOSIXSkeletonInitializesEmptyRoot(t *testing.T) {
if personalSettings["slug"] != "ronald" {
t.Fatalf("expected personal slug ronald, got %#v", personalSettings["slug"])
}
personalTheme, ok := personalSettings["theme"].(map[string]any)
if !ok {
t.Fatalf("expected personal settings to contain theme object, got %#v", personalSettings)
}
if personalTheme["presetId"] != defaultThemePresetID {
t.Fatalf("expected personal theme preset %s, got %#v", defaultThemePresetID, personalTheme["presetId"])
}
personalHome := readStructuredFileForTest[map[string]any](t, filepath.Join(rootPath, "users", "personals", "personal-ronald", posixHomeFileName))
if personalHome["type"] != "personal-home" {
@@ -277,6 +284,39 @@ func TestCreateProjectHierarchyFolderOnDiskCreatesExpectedFolderShape(t *testing
}
}
func TestPersonalSettingsPathForDisplayName(t *testing.T) {
path := personalSettingsPathForDisplayName(" Ronald ")
if path != "users/personals/personal-ronald/settings.cbor" {
t.Fatalf("unexpected personal settings path: %s", path)
}
}
func TestApplyThemePresetToSettingsPreservesExistingFields(t *testing.T) {
settings := map[string]any{
"type": "personal",
"slug": "ronald",
"theme": map[string]any{
"density": "comfortable",
},
}
updated := applyThemePresetToSettings(settings, "moku-default")
if updated["type"] != "personal" {
t.Fatalf("expected type personal, got %#v", updated["type"])
}
theme, ok := updated["theme"].(map[string]any)
if !ok {
t.Fatalf("expected theme object, got %#v", updated["theme"])
}
if theme["presetId"] != "moku-default" {
t.Fatalf("expected presetId moku-default, got %#v", theme["presetId"])
}
if theme["density"] != "comfortable" {
t.Fatalf("expected density to be preserved, got %#v", theme["density"])
}
}
func TestCreateProjectTreeFolderOnDiskCreatesExpectedFolderShape(t *testing.T) {
rootPath := filepath.Join(t.TempDir(), "POSIX")
service := NewService(nil, rootPath)
Backend/internal/bootstrap/settings_theme.go
+111
View File
@@ -0,0 +1,111 @@
package bootstrap
import (
"context"
"errors"
"fmt"
"path/filepath"
"strings"
"github.com/jackc/pgx/v5"
)
const defaultThemePresetID = "moku-midnight"
func personalSettingsPathForDisplayName(displayName string) string {
personalName := strings.TrimSpace(displayName)
if personalName == "" {
personalName = defaultPersonalDisplayName
}
personalSlug := normalizePOSIXSlug(personalName)
return filepath.ToSlash(filepath.Join("users", "personals", slugDir("personal", personalSlug), posixSettingsFileName))
}
func extractThemePresetID(settings map[string]any) string {
theme, ok := settings["theme"].(map[string]any)
if !ok {
return ""
}
presetID, _ := theme["presetId"].(string)
return strings.TrimSpace(presetID)
}
func applyThemePresetToSettings(settings map[string]any, presetID string) map[string]any {
normalized := settings
if normalized == nil {
normalized = map[string]any{}
}
theme, ok := normalized["theme"].(map[string]any)
if !ok || theme == nil {
theme = map[string]any{}
}
theme["presetId"] = presetID
normalized["theme"] = theme
return normalized
}
func (service *Service) SaveThemePreset(ctx context.Context, input SaveThemePresetInput) (*AdminRecord, error) {
admin, err := service.GetAdmin(ctx)
if err != nil {
return nil, err
}
if admin == nil {
return nil, ErrAdminNotConfigured
}
presetID := strings.TrimSpace(input.PresetID)
if presetID == "" {
return nil, fmt.Errorf("theme preset id is required")
}
rootPath := strings.TrimSpace(service.posixRoot)
if rootPath == "" {
return nil, fmt.Errorf("posix root is not configured")
}
relativeSettingsPath := personalSettingsPathForDisplayName(admin.DisplayName)
absoluteSettingsPath := filepath.Join(rootPath, filepath.FromSlash(relativeSettingsPath))
settings := readStructuredFileMap(absoluteSettingsPath)
if len(settings) == 0 {
return nil, fmt.Errorf("personal settings file is missing")
}
updatedSettings := applyThemePresetToSettings(settings, presetID)
if err := writeCBORFile(absoluteSettingsPath, updatedSettings); err != nil {
return nil, fmt.Errorf("write personal %s: %w", posixSettingsFileName, err)
}
if err := service.rebuildProjection(ctx); err != nil {
return nil, err
}
return service.GetAdmin(ctx)
}
func (service *Service) loadAdminThemePresetID(ctx context.Context, displayName string) (string, error) {
path := personalSettingsPathForDisplayName(displayName)
var presetID *string
err := service.db.Pool.QueryRow(ctx, `
SELECT content_json->'theme'->>'presetId'
FROM posix_nodes
WHERE path = $1
LIMIT 1;
`, path).Scan(&presetID)
if err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return "", nil
}
return "", err
}
if presetID == nil {
return "", nil
}
return strings.TrimSpace(*presetID), nil
}
Backend/internal/httpx/api_routes.go
+1
View File
@@ -31,6 +31,7 @@ func (routes apiRoutes) Register(router chi.Router) {
bootstrapRouter.Post("/structure", routes.handleBootstrapStructureStep)
})
apiRouter.Get("/app-shell", routes.handleAppShellState)
apiRouter.Put("/settings/theme", routes.handleSaveThemePreset)
apiRouter.Get("/organizations", routes.handleOrganizations)
apiRouter.Get("/workspaces", routes.handleWorkspaces)
apiRouter.Route("/projects/{projectId}", func(projectRouter chi.Router) {
Backend/internal/httpx/api_settings_routes.go
+43
View File
@@ -0,0 +1,43 @@
package httpx
import (
"net/http"
"strings"
bootstrapservice "moku-backend/internal/bootstrap"
)
type saveThemePresetRequest struct {
PresetID string `json:"presetId"`
}
func (routes apiRoutes) handleSaveThemePreset(w http.ResponseWriter, r *http.Request) {
payload, ok := decodeBootstrapRequest[saveThemePresetRequest](w, r)
if !ok {
return
}
payload.PresetID = strings.TrimSpace(payload.PresetID)
if payload.PresetID == "" {
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Theme preset ID is required.")
return
}
admin, err := routes.bootstrapService().SaveThemePreset(r.Context(), bootstrapservice.SaveThemePresetInput{
PresetID: payload.PresetID,
})
if err != nil {
routes.writeBootstrapPersistenceError(w, r, err)
return
}
WriteJSON(w, http.StatusOK, map[string]any{
"data": map[string]any{
"presetId": payload.PresetID,
"admin": admin,
},
"meta": map[string]any{
"resource": "settings-theme",
},
})
}