v0.33.3

src/admin/preferences.rs

@@ -27,29 +27,6 @@ fn default_admin_table_density() -> String {
 fn default_admin_dashboard_density() -> String {
     DASHBOARD_DEFAULT_PRESET.dashboard_density.clone()
 }
-fn default_admin_dashboard_widgets() -> Vec<String> {
-    let mut order = DASHBOARD_DEFAULT_PRESET.dashboard_widgets.clone();
-    for widget in DASHBOARD_WIDGETS.iter() {
-        if !order.contains(&widget.id) {
-            order.push(widget.id.clone());
-        }
-    }
-    order
-}
-fn default_hidden_dashboard_widgets() -> Vec<String> {
-    let mut hidden = DASHBOARD_DEFAULT_PRESET.dashboard_hidden_widgets.clone();
-    for widget in DASHBOARD_WIDGETS.iter() {
-        if !DASHBOARD_DEFAULT_PRESET
-            .dashboard_widgets
-            .contains(&widget.id)
-            && widget.default_hidden
-        {
-            hidden.push(widget.id.clone());
-        }
-    }
-    hidden
-}
-
 // Preserve the user's saved order/visibility, drop identifiers unknown to this
 // binary, and append new registry widgets according to their opt-in policy.
 // Stored preferences from older/newer releases are normalized on read.
@@ -62,6 +39,13 @@ fn reconcile_dashboard_widgets(prefs: &mut AdminPreferences) {
     prefs.dashboard_hidden_widgets.retain(|id| {
         DASHBOARD_WIDGETS.iter().any(|widget| widget.id == *id) && seen_hidden.insert(id.clone())
     });
+    if let Some(sizes) = prefs.dashboard_widget_sizes.as_mut() {
+        sizes.retain(|id, span| {
+            DASHBOARD_WIDGETS
+                .iter()
+                .any(|widget| widget.id == *id && valid_dashboard_span(&widget.display_type, *span))
+        });
+    }
     for widget in DASHBOARD_WIDGETS.iter() {
         if !seen.contains(&widget.id) {
             prefs.dashboard_widgets.push(widget.id.clone());
@@ -147,6 +131,10 @@ struct AdminPreferences {
     dashboard_widgets: Vec<String>,
     #[serde(default = "default_hidden_dashboard_widgets")]
     dashboard_hidden_widgets: Vec<String>,
+    // Null/absent: retain legacy visual grouping for existing installations.
+    // A map (including {}) means that order is fully user-controlled.
+    #[serde(default)]
+    dashboard_widget_sizes: Option<std::collections::BTreeMap<String, u8>>,
     #[serde(default = "default_file_log_columns")]
     file_log_columns: Vec<String>,
     #[serde(default = "default_file_log_sort")]
@@ -200,6 +188,7 @@ impl Default for AdminPreferences {
             dashboard_density: default_admin_dashboard_density(),
             dashboard_widgets: default_admin_dashboard_widgets(),
             dashboard_hidden_widgets: default_hidden_dashboard_widgets(),
+            dashboard_widget_sizes: None,
             file_log_columns: default_file_log_columns(),
             file_log_sort: default_file_log_sort(),
             file_log_descending: default_file_log_descending(),
@@ -385,6 +374,12 @@ fn validate_admin_preferences(preferences: &AdminPreferences) -> Result<(), ApiE
             ));
         }
     }
+    if !valid_dashboard_sizes(&preferences.dashboard_widget_sizes) {
+        return Err(ApiError(
+            StatusCode::UNPROCESSABLE_ENTITY,
+            "invalid dashboard card width preference".into(),
+        ));
+    }
     if preferences.backend_table_columns.is_empty()
         || preferences.backend_table_columns.len() > BACKEND_TABLE_COLUMNS.len()
     {