Merge pull request #114 from nookat-io/sidebar_config

[feat]: Sidebar config

Author: Almaz-KG

.github/labels/ready-for-review.yml

@@ -1,3 +1,3 @@
 name: ready-for-review
 color: "0E8A16"
-description: "PR is ready for platform testing and review"
+description: "PR is ready for review"

.github/labels/ready-to-merge.yml

@@ -0,0 +1,3 @@
+name: ready-to-merge
+color: "1D76DB"
+description: "PR is ready for merging to main"

.github/workflows/ci-builds.yml

@@ -40,10 +40,10 @@ jobs:
           exit 0
         fi
 
-        # Check if PR has ready-for-review label
-        if [[ "$PR_LABELS" =~ "ready-for-review" ]]; then
+        # Check if PR has ready-to-merge label
+        if [[ "$PR_LABELS" =~ "ready-to-merge" ]]; then
           echo "should_build=true" >> $GITHUB_OUTPUT
-          echo "reason=PR has ready-for-review label" >> $GITHUB_OUTPUT
+          echo "reason=PR has ready-to-merge label" >> $GITHUB_OUTPUT
           exit 0
         fi
 

package-lock.json

@@ -23,15 +23,12 @@
     "@radix-ui/react-progress": "^1.1.7",
     "@radix-ui/react-select": "^2.2.6",
     "@radix-ui/react-separator": "^1.1.0",
-    "@radix-ui/react-slider": "^1.3.6",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.2.6",
     "@radix-ui/react-tabs": "^1.1.13",
-    "@radix-ui/react-toast": "^1.2.15",
     "@sentry/react": "^10.5.0",
     "@tauri-apps/api": "^2",
     "@tauri-apps/plugin-autostart": "^2.5.0",
-    "@tauri-apps/plugin-opener": "^2",
     "@tauri-apps/plugin-updater": "^2.9.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",

package.json

@@ -13,6 +13,7 @@ pub struct AppConfigV2 {
     pub language: Language,
     pub telemetry: TelemetrySettings,
     pub startup: StartupSettings,
+    pub sidebar_collapsed: bool,
 }
 
 impl From<AppConfigV1> for AppConfigV2 {
@@ -22,6 +23,7 @@ impl From<AppConfigV1> for AppConfigV2 {
             language: v1.language,
             telemetry: v1.telemetry,
             startup: v1.startup,
+            sidebar_collapsed: false,
         }
     }
 }
@@ -77,6 +79,7 @@ mod tests {
             language: Language::English,
             telemetry: TelemetrySettings::default(),
             startup: StartupSettings::default(),
+            sidebar_collapsed: false,
         };
 
         // Serialize to JSON
@@ -94,6 +97,7 @@ mod tests {
             language: Language::English,
             telemetry: TelemetrySettings::default(),
             startup: StartupSettings::default(),
+            sidebar_collapsed: false,
         };
 
         let versioned_config = VersionedAppConfig::V2(v2_config);

src-tauri/src/entities/config/v2.rs

@@ -82,3 +82,15 @@ pub async fn update_last_update_check() -> Result<(), String> {
     UpdaterService::update_last_update_check()
         .map_err(|e| format!("Failed to update last update check: {}", e))
 }
+
+/// Update sidebar collapsed state
+#[tauri::command]
+#[instrument(skip_all, err)]
+pub async fn update_sidebar_collapsed(sidebar_collapsed: bool) -> Result<(), String> {
+    debug!("Updating sidebar collapsed state to: {}", sidebar_collapsed);
+
+    let mut config = get_config().await?;
+    config.sidebar_collapsed = sidebar_collapsed;
+
+    ConfigService::save_config(&config)
+}

src-tauri/src/handlers/config.rs

@@ -14,7 +14,7 @@ use crate::handlers::{
     open_terminal, open_url, pause_container, prune_containers, prune_images, prune_volumes,
     remove_container, remove_network, remove_volume, restart_container, start_colima_vm_command,
     start_container, stop_container, unpause_container, update_language, update_last_update_check,
-    update_startup_settings, update_telemetry_settings, update_theme,
+    update_sidebar_collapsed, update_startup_settings, update_telemetry_settings, update_theme,
 };
 use crate::sentry::flush_sentry;
 use crate::services::ConfigService;
@@ -101,6 +101,7 @@ pub fn run() {
             update_language,
             update_telemetry_settings,
             update_startup_settings,
+            update_sidebar_collapsed,
             update_last_update_check,
             // Containers
             list_containers,

src-tauri/src/lib.rs

@@ -95,6 +95,7 @@ impl ConfigService {
         let config_path = ConfigService::get_config_path()?;
 
         let versioned_config = VersionedAppConfig::from(config.clone());
+
         let content = serde_json::to_string_pretty(&versioned_config)
             .map_err(|e| format!("Failed to serialize config: {}", e))?;
 

src-tauri/src/services/config.rs

@@ -1,6 +1,6 @@
 'use client';
 
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 import {
   Container,
@@ -13,6 +13,7 @@ import {
 } from 'lucide-react';
 import { cn } from '../../lib/utils';
 import { Button } from '../ui/button';
+import { useConfig } from '../../hooks/use-config';
 
 const navigation = [
   { name: 'Containers', href: '/', icon: Container },
@@ -23,9 +24,39 @@ const navigation = [
 ];
 
 export function Sidebar() {
+  const { config, updateSidebarCollapsed } = useConfig();
   const [collapsed, setCollapsed] = useState(false);
+  const [isSaving, setIsSaving] = useState(false);
   const location = useLocation();
 
+  // Initialize from config whenever config changes
+  useEffect(() => {
+    if (config) {
+      setCollapsed(config.sidebar_collapsed);
+    }
+  }, [config]);
+
+  const handleToggleCollapsed = async () => {
+    // Prevent rapid clicks while saving is in progress
+    if (isSaving) {
+      return;
+    }
+
+    setIsSaving(true);
+
+    try {
+      // Use functional update to get the latest state value
+      await updateSidebarCollapsed(!collapsed);
+      // Update local state only after save succeeds
+      setCollapsed(prevCollapsed => !prevCollapsed);
+    } catch (error) {
+      console.error('Failed to persist sidebar state:', error);
+      // Keep current state on error - don't update local state
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
   return (
     <div
       className={cn(
@@ -50,7 +81,12 @@ export function Sidebar() {
         <Button
           variant="ghost"
           size="sm"
-          onClick={() => setCollapsed(!collapsed)}
+          onClick={handleToggleCollapsed}
+          disabled={isSaving}
+          aria-busy={isSaving}
+          aria-pressed={!collapsed}
+          aria-expanded={!collapsed}
+          aria-label={collapsed ? 'Expand sidebar' : 'Collapse sidebar'}
           draggable="false"
         >
           {collapsed ? (