layout system refactor

Author: d-buckner

services/host-agent/internal/api/routes.go

@@ -308,14 +308,6 @@ func (s *Server) handleInstall(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Add app to all users' layouts (non-system apps only)
-	catalogApp, _ := s.catalog.Get(name)
-	if catalogApp != nil && !catalogApp.IsSystem {
-		if err := s.userStore.AddAppToAllUsersLayouts(name); err != nil {
-			s.logger.Warn("failed to add app to users layouts", "app", name, "error", err)
-		}
-	}
-
 	// Trigger reconciliation to configure dependent apps
 	s.triggerReconcile()
 
@@ -359,11 +351,6 @@ func (s *Server) handleUninstall(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Remove app from all users' layouts
-	if err := s.userStore.RemoveAppFromAllUsersLayouts(name); err != nil {
-		s.logger.Warn("failed to remove app from users layouts", "app", name, "error", err)
-	}
-
 	// Trigger reconciliation to update dependent apps
 	s.triggerReconcile()
 
@@ -563,22 +550,18 @@ func (s *Server) handleGetLayout(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	layout, err := s.userStore.GetLayout(user.ID)
+	elements, err := s.userStore.GetLayout(user.ID)
 	if err != nil {
 		s.logger.Error("failed to get layout", "error", err)
 		respondError(w, http.StatusInternalServerError, "failed to get layout")
 		return
 	}
 
-	if layout == nil {
-		// Return empty defaults
-		layout = &store.Layout{
-			Items:         []store.GridItem{},
-			WidgetConfigs: map[string]map[string]any{},
-		}
+	if elements == nil {
+		elements = []store.GridElement{}
 	}
 
-	respondJSON(w, http.StatusOK, layout)
+	respondJSON(w, http.StatusOK, elements)
 }
 
 // handleSetLayout updates the user's layout
@@ -589,13 +572,13 @@ func (s *Server) handleSetLayout(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var layout store.Layout
-	if err := json.NewDecoder(r.Body).Decode(&layout); err != nil {
+	var elements []store.GridElement
+	if err := json.NewDecoder(r.Body).Decode(&elements); err != nil {
 		respondError(w, http.StatusBadRequest, "invalid request body")
 		return
 	}
 
-	if err := s.userStore.SetLayout(user.ID, &layout); err != nil {
+	if err := s.userStore.SetLayout(user.ID, elements); err != nil {
 		s.logger.Error("failed to set layout", "error", err)
 		respondError(w, http.StatusInternalServerError, "failed to save layout")
 		return

services/host-agent/internal/db/schema.sql

@@ -4,7 +4,7 @@
 CREATE TABLE IF NOT EXISTS users (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
     username TEXT UNIQUE NOT NULL,
-    layout JSONB DEFAULT '{"items":[],"widgetConfigs":{}}',
+    layout JSONB DEFAULT '[]',
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 );
 

services/host-agent/internal/store/users.go

@@ -14,8 +14,8 @@ type User struct {
 	CreatedAt time.Time `json:"created_at"`
 }
 
-// GridItem represents an item (app or widget) in the layout grid
-type GridItem struct {
+// GridElement represents an element (app or widget) in the layout grid
+type GridElement struct {
 	Type    string `json:"type"`    // "app" or "widget"
 	ID      string `json:"id"`      // app name or widget id
 	Col     int    `json:"col"`     // 1-based column position
@@ -24,12 +24,6 @@ type GridItem struct {
 	Rowspan int    `json:"rowspan"` // number of rows to span
 }
 
-// Layout represents the user's home page layout
-type Layout struct {
-	Items         []GridItem                `json:"items"`
-	WidgetConfigs map[string]map[string]any `json:"widgetConfigs"`
-}
-
 // UserStore manages users in the database
 type UserStore struct {
 	db *sql.DB
@@ -78,204 +72,49 @@ func (s *UserStore) GetByUsername(username string) (*User, error) {
 	return &user, nil
 }
 
-// GetLayout returns the user's layout preferences
-func (s *UserStore) GetLayout(userID string) (*Layout, error) {
-	var prefsJSON []byte
+// GetLayout returns the user's layout as an array of grid elements
+func (s *UserStore) GetLayout(userID string) ([]GridElement, error) {
+	var layoutJSON []byte
 	err := s.db.QueryRow(
-		"SELECT COALESCE(layout, '{\"items\":[],\"widgetConfigs\":{}}') FROM users WHERE id = $1",
+		"SELECT COALESCE(layout, '[]') FROM users WHERE id = $1",
 		userID,
-	).Scan(&prefsJSON)
+	).Scan(&layoutJSON)
 	if err == sql.ErrNoRows {
 		return nil, nil
 	}
 	if err != nil {
 		return nil, fmt.Errorf("failed to get layout: %w", err)
 	}
 
-	var prefs Layout
-	if err := json.Unmarshal(prefsJSON, &prefs); err != nil {
+	// Try to parse as array first (new format)
+	var elements []GridElement
+	if err := json.Unmarshal(layoutJSON, &elements); err == nil {
+		return elements, nil
+	}
+
+	// Fall back to old format {elements: [...], widgetConfigs: {...}}
+	var oldFormat struct {
+		Elements []GridElement `json:"elements"`
+	}
+	if err := json.Unmarshal(layoutJSON, &oldFormat); err != nil {
 		return nil, fmt.Errorf("failed to parse layout: %w", err)
 	}
-	return &prefs, nil
+	return oldFormat.Elements, nil
 }
 
-// SetLayout updates the user's layout preferences
-func (s *UserStore) SetLayout(userID string, prefs *Layout) error {
-	prefsJSON, err := json.Marshal(prefs)
+// SetLayout updates the user's layout
+func (s *UserStore) SetLayout(userID string, elements []GridElement) error {
+	layoutJSON, err := json.Marshal(elements)
 	if err != nil {
 		return fmt.Errorf("failed to marshal layout: %w", err)
 	}
 
 	_, err = s.db.Exec(
 		"UPDATE users SET layout = $1 WHERE id = $2",
-		prefsJSON, userID,
+		layoutJSON, userID,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to update layout: %w", err)
 	}
 	return nil
 }
-
-// AddAppToLayout adds an app to the user's layout at the next available position
-func (s *UserStore) AddAppToLayout(userID string, appName string) error {
-	prefs, err := s.GetLayout(userID)
-	if err != nil {
-		return err
-	}
-	if prefs == nil {
-		prefs = &Layout{Items: []GridItem{}, WidgetConfigs: map[string]map[string]any{}}
-	}
-
-	// Check if app already exists
-	for _, item := range prefs.Items {
-		if item.Type == "app" && item.ID == appName {
-			return nil // Already exists
-		}
-	}
-
-	// Find next available position (simple algorithm: find first empty 1x1 slot)
-	pos := findNextAvailablePosition(prefs.Items, 1, 1)
-
-	prefs.Items = append(prefs.Items, GridItem{
-		Type:    "app",
-		ID:      appName,
-		Col:     pos.col,
-		Row:     pos.row,
-		Colspan: 1,
-		Rowspan: 1,
-	})
-
-	return s.SetLayout(userID, prefs)
-}
-
-// RemoveAppFromLayout removes an app from the user's layout
-func (s *UserStore) RemoveAppFromLayout(userID string, appName string) error {
-	prefs, err := s.GetLayout(userID)
-	if err != nil {
-		return err
-	}
-	if prefs == nil {
-		return nil // No prefs, nothing to remove
-	}
-
-	// Filter out the app
-	newItems := make([]GridItem, 0, len(prefs.Items))
-	for _, item := range prefs.Items {
-		if !(item.Type == "app" && item.ID == appName) {
-			newItems = append(newItems, item)
-		}
-	}
-	prefs.Items = newItems
-
-	return s.SetLayout(userID, prefs)
-}
-
-// position helper for grid placement
-type position struct {
-	col int
-	row int
-}
-
-// findNextAvailablePosition finds the next available grid position for an item
-func findNextAvailablePosition(items []GridItem, colspan, rowspan int) position {
-	const gridCols = 6
-
-	// Find max row currently in use
-	maxRow := 0
-	for _, item := range items {
-		endRow := item.Row + item.Rowspan - 1
-		if endRow > maxRow {
-			maxRow = endRow
-		}
-	}
-
-	// Search for available space row by row
-	for row := 1; row <= maxRow+10; row++ {
-		for col := 1; col <= gridCols-colspan+1; col++ {
-			canPlace := true
-			for c := col; c < col+colspan && canPlace; c++ {
-				for r := row; r < row+rowspan && canPlace; r++ {
-					if isCellOccupied(items, c, r) {
-						canPlace = false
-					}
-				}
-			}
-			if canPlace {
-				return position{col: col, row: row}
-			}
-		}
-	}
-
-	// Fallback: place at end
-	return position{col: 1, row: maxRow + 1}
-}
-
-// isCellOccupied checks if a cell is occupied by any item
-func isCellOccupied(items []GridItem, col, row int) bool {
-	for _, item := range items {
-		endCol := item.Col + item.Colspan - 1
-		endRow := item.Row + item.Rowspan - 1
-		if col >= item.Col && col <= endCol && row >= item.Row && row <= endRow {
-			return true
-		}
-	}
-	return false
-}
-
-// AddAppToAllUsersLayouts adds an app to all users' layouts
-// Called when an app is installed
-func (s *UserStore) AddAppToAllUsersLayouts(appName string) error {
-	// Get all user IDs
-	rows, err := s.db.Query("SELECT id FROM users")
-	if err != nil {
-		return fmt.Errorf("failed to get users: %w", err)
-	}
-	defer rows.Close()
-
-	var userIDs []string
-	for rows.Next() {
-		var id string
-		if err := rows.Scan(&id); err != nil {
-			return fmt.Errorf("failed to scan user id: %w", err)
-		}
-		userIDs = append(userIDs, id)
-	}
-
-	// Add app to each user's layout
-	for _, userID := range userIDs {
-		if err := s.AddAppToLayout(userID, appName); err != nil {
-			return fmt.Errorf("failed to add app to user %s layout: %w", userID, err)
-		}
-	}
-
-	return nil
-}
-
-// RemoveAppFromAllUsersLayouts removes an app from all users' layouts
-// Called when an app is uninstalled
-func (s *UserStore) RemoveAppFromAllUsersLayouts(appName string) error {
-	// Get all user IDs
-	rows, err := s.db.Query("SELECT id FROM users")
-	if err != nil {
-		return fmt.Errorf("failed to get users: %w", err)
-	}
-	defer rows.Close()
-
-	var userIDs []string
-	for rows.Next() {
-		var id string
-		if err := rows.Scan(&id); err != nil {
-			return fmt.Errorf("failed to scan user id: %w", err)
-		}
-		userIDs = append(userIDs, id)
-	}
-
-	// Remove app from each user's layout
-	for _, userID := range userIDs {
-		if err := s.RemoveAppFromLayout(userID, appName); err != nil {
-			return fmt.Errorf("failed to remove app from user %s layout: %w", userID, err)
-		}
-	}
-
-	return nil
-}