Refactor batch component to utilize app state directly, streamline settings button implementation, and enhance toolbar layout by removing redundant settings button.

Author: andrewm4894

dashboard/components/batch.py

@@ -9,11 +9,10 @@
 
 from fasthtml.common import *
 from monsterui.all import *
-from dashboard.state import get_state
+from dashboard.app import app
 
 def create_batches_dropdown(batch_name: str) -> DropDownNavContainer:
     """Create the metric batches dropdown menu."""
-    state = get_state()
     return DropDownNavContainer(
         NavHeaderLi("metric batches"),
         *[
@@ -25,7 +24,7 @@ def create_batches_dropdown(batch_name: str) -> DropDownNavContainer:
                     hx_target="#main-content",
                     hx_indicator="#loading",
                     cls=f"{'uk-active' if name == batch_name else ''}",
-                )) for name in state.metric_batches
+                )) for name in app.state.metric_batches
         ],
         uk_dropdown="pos: bottom-right; boundary: window; shift: true; flip: true;")
 

dashboard/components/common.py

@@ -31,4 +31,4 @@ def create_controls(batch_name: str) -> Card:
                 cls="w-full",
             ), ),
         cls="mb-4 uk-padding-small py-2 shadow-sm",
-    ) 
+    )

dashboard/components/settings.py

@@ -16,16 +16,14 @@
 def create_settings_button(text: str, batch_name: str, action: str, tooltip: str) -> Li:
     """Create a settings dropdown button."""
     return Li(
-        DivLAligned(
-            Button(
-                P(text, cls="text-sm font-medium"),
-                hx_post=f"/batch/{batch_name}/{action}",
-                hx_target="#main-content",
-                cls=ButtonT.ghost,
-                uk_tooltip=tooltip,
-            ),
-            cls="flex items-center justify-between w-full py-2",
-        ))
+        A(
+            text,
+            hx_post=f"/batch/{batch_name}/{action}",
+            hx_target="#main-content",
+            cls="",  # Remove ghost button style to match batch dropdown
+            uk_tooltip=tooltip,
+        )
+    )
 
 def create_settings_dropdown(batch_name: str) -> DropDownNavContainer:
     """Create the settings dropdown menu."""
@@ -72,4 +70,7 @@ def create_settings_dropdown(batch_name: str) -> DropDownNavContainer:
         )
     ])
 
-    return DropDownNavContainer(NavHeaderLi("settings"), *menu_items)
+    return DropDownNavContainer(
+        NavHeaderLi("settings"), 
+        *menu_items,
+    )

dashboard/components/toolbar.py

@@ -30,19 +30,19 @@ def create_toolbar_buttons(batch_name: str) -> Div:
             uk_tooltip="Select metric batch to display",
         ),
         create_batches_dropdown(batch_name),
+        Button(
+            DivLAligned(UkIcon("settings")),
+            cls=ButtonT.secondary,
+            uk_tooltip="Customize chart display settings",
+        ),
+        create_settings_dropdown(batch_name),
         Button(
             DivLAligned(UkIcon("refresh-ccw")),
             hx_get=f"/batch/{batch_name}/refresh",
             hx_target="#main-content",
             cls=ButtonT.secondary,
             uk_tooltip="Refresh metrics data from source",
         ),
-        Button(
-            DivLAligned(UkIcon("settings")),
-            cls=ButtonT.secondary,
-            uk_tooltip="Customize chart display settings",
-        ),
-        create_settings_dropdown(batch_name),
         Button(
             DivLAligned(UkIcon("github")),
             cls=ButtonT.secondary,