Merge pull request #146 from NatLabRockies/fix/dash

Fix Dash bugs

Author: daniel-thom

Cargo.lock

@@ -5,7 +5,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.15.1"
+version = "0.15.2"
 authors = ["Daniel Thom", "Joseph McKinsey"]
 license = "BSD-3-Clause"
 edition = "2024"
@@ -14,7 +14,7 @@ description = "Workflow management system"
 
 [workspace.dependencies]
 # Self-reference for sub-crates (version only specified here)
-torc = { version = "0.15.1", path = "." }
+torc = { version = "0.15.2", path = "." }
 
 # Shared dependencies
 serde = { version = "1.0", features = ["derive"] }

Cargo.toml

@@ -1,6 +1,6 @@
 # Usage:
 #   # Download and extract release binaries
-#   VERSION=0.15.1
+#   VERSION=0.15.2
 #   mkdir -p artifact
 #   curl -fsSL "https://github.com/NatLabRockies/torc/releases/download/v${VERSION}/torc-x86_64-unknown-linux-musl.tar.gz" \
 #     | tar xz -C artifact/

Dockerfile

@@ -53,9 +53,9 @@ listed below.
 
 ```
 /scratch/dthom/torc/
-├── 0.15.1/
+├── 0.15.2/
 ├── ...
-└── latest -> 0.15.1  (symlink to current version)
+└── latest -> 0.15.2  (symlink to current version)
 ```
 
 > **Recommended**: Use the `latest` directory. Torc maintains backwards compatibility, so you'll
@@ -104,7 +104,7 @@ docker pull ghcr.io/natlabrockies/torc:latest
 ```
 
 > **Recommended**: Use the `latest` tag to automatically receive updates and bug fixes. Torc
-> maintains backwards compatibility across releases. Pinned version tags (e.g., `0.14.2`) are also
+> maintains backwards compatibility across releases. Pinned version tags (e.g., `0.15.2`) are also
 > available.
 
 ### Running the Server

docs/src/getting-started/installation.md

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "torc-client"
 # Note: Do not update manually. Use cargo-release from the repo root, such as
 # $ cargo release minor --execute
-version = "0.15.1"
+version = "0.15.2"
 description = "Workflow management system"
 requires-python = ">=3.11,<3.14"
 license = "BSD-3-Clause"

python_client/pyproject.toml

@@ -524,8 +524,18 @@ async fn proxy_handler(
 
 // ============== CLI Command Handlers ==============
 
-/// Extract workflow ID from CLI output like "Created workflow 123" or "ID: 123"
+/// Extract workflow ID from CLI output.
+/// Tries JSON first ({"workflow_id": 123}), then falls back to text patterns
+/// like "Created workflow 123" or "ID: 123".
 fn extract_workflow_id(stdout: &str) -> Option<String> {
+    // Try JSON parsing first
+    if let Ok(json) = serde_json::from_str::<serde_json::Value>(stdout)
+        && let Some(id) = json.get("workflow_id")
+    {
+        return Some(id.to_string().trim_matches('"').to_string());
+    }
+
+    // Fall back to text pattern matching
     for line in stdout.lines() {
         if line.contains("Created workflow") {
             // Extract the number after "Created workflow"
@@ -703,7 +713,7 @@ async fn cli_create_handler(
         // Spec is a file path
         run_torc_command(
             &state.torc_bin,
-            &["workflows", "create", &req.spec],
+            &["-f", "json", "workflows", "create", &req.spec],
             &state.api_url,
         )
         .await
@@ -722,7 +732,7 @@ async fn cli_create_handler(
 
         let result = run_torc_command(
             &state.torc_bin,
-            &["workflows", "create", &temp_path],
+            &["-f", "json", "workflows", "create", &temp_path],
             &state.api_url,
         )
         .await;
@@ -815,7 +825,14 @@ async fn cli_create_slurm_handler(
 
     let result = if req.is_file {
         // Spec is a file path
-        let mut args = vec!["workflows", "create-slurm", "--account", &req.account];
+        let mut args = vec![
+            "-f",
+            "json",
+            "workflows",
+            "create-slurm",
+            "--account",
+            &req.account,
+        ];
         if let Some(ref profile) = req.profile {
             args.push("--hpc-profile");
             args.push(profile);
@@ -835,7 +852,14 @@ async fn cli_create_slurm_handler(
             });
         }
 
-        let mut args = vec!["workflows", "create-slurm", "--account", &req.account];
+        let mut args = vec![
+            "-f",
+            "json",
+            "workflows",
+            "create-slurm",
+            "--account",
+            &req.account,
+        ];
         if let Some(ref profile) = req.profile {
             args.push("--hpc-profile");
             args.push(profile);

src/bin/torc-dash.rs

@@ -217,6 +217,26 @@ body {
     gap: 8px;
 }
 
+.sidebar-dark-toggle {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 6px 0;
+    margin-top: 8px;
+    font-size: 12px;
+    color: rgba(255, 255, 255, 0.5);
+    cursor: pointer;
+    transition: color 0.2s;
+}
+
+.sidebar-dark-toggle:hover {
+    color: rgba(255, 255, 255, 0.8);
+}
+
+.dark-toggle-icon {
+    font-size: 14px;
+}
+
 .connection-status {
     display: flex;
     align-items: center;
@@ -1829,14 +1849,16 @@ textarea.text-input {
     padding: 8px 16px;
     border: 1px solid var(--border-color);
     border-radius: var(--border-radius);
-    background: var(--bg-secondary);
+    background: var(--bg-tertiary);
+    color: var(--text-primary);
     cursor: pointer;
     font-size: 13px;
+    font-weight: 500;
     transition: var(--transition);
 }
 
 .plot-tab:hover {
-    background: var(--bg-tertiary);
+    background: var(--border-color);
 }
 
 .plot-tab.active {
@@ -2077,16 +2099,18 @@ textarea.text-input {
 .resource-preset-btn {
     padding: 6px 12px;
     font-size: 12px;
+    font-weight: 500;
     border: 1px solid var(--border-color);
     border-radius: var(--border-radius);
-    background: var(--bg-primary);
+    background: var(--bg-tertiary);
+    color: var(--text-primary);
     cursor: pointer;
     transition: var(--transition);
 }
 
 .resource-preset-btn:hover {
     border-color: var(--primary-color);
-    background: rgba(0, 123, 255, 0.05);
+    background: var(--border-color);
 }
 
 .resource-preset-btn.selected {

torc-dash/static/css/style.css

@@ -64,6 +64,10 @@ <h1><img src="/static/images/torc_icon.png" alt="Torc" class="header-icon"> Torc
                         <span class="version-text">v-.-.-</span>
                     </div>
                 </div>
+                <div class="sidebar-dark-toggle" id="sidebar-dark-toggle" title="Toggle dark mode (D)">
+                    <span class="dark-toggle-icon" id="dark-toggle-icon">&#9790;</span>
+                    <span class="dark-toggle-label" id="dark-toggle-label">Dark Mode</span>
+                </div>
                 <div class="keyboard-hint" id="keyboard-hint" title="Show keyboard shortcuts">
                     Press <kbd>?</kbd> for shortcuts
                 </div>
@@ -244,7 +248,7 @@ <h2>Job Debugging</h2>
                         <h3>Job Results Report</h3>
                         <div class="form-group">
                             <label for="debug-output-dir">Output Directory</label>
-                            <input type="text" id="debug-output-dir" class="text-input" value="output" placeholder="output">
+                            <input type="text" id="debug-output-dir" class="text-input" value="torc_output" placeholder="torc_output">
                             <small>Directory where job logs are stored</small>
                         </div>
                         <div class="form-group">
@@ -327,8 +331,8 @@ <h3>Resource Database Selection</h3>
                             <label for="resource-db-dir">Database Directory</label>
                             <div style="display: flex; gap: 10px;">
                                 <input type="text" id="resource-db-dir" class="text-input"
-                                       value="output/resource_utilization"
-                                       placeholder="output/resource_utilization">
+                                       value="torc_output/resource_utilization"
+                                       placeholder="torc_output/resource_utilization">
                                 <button class="btn btn-secondary" id="btn-scan-dbs">Scan</button>
                             </div>
                             <small>Directory containing resource monitoring database files (.db)</small>
@@ -669,10 +673,6 @@ <h4>Resource Monitoring</h4>
                         <input type="checkbox" id="create-option-initialize" checked>
                         Initialize workflow after creation
                     </label>
-                    <label class="toggle-label">
-                        <input type="checkbox" id="create-option-run">
-                        Run workflow immediately
-                    </label>
                 </div>
 
                 <!-- Slurm Options -->

torc-dash/static/index.html

@@ -23,6 +23,9 @@ Object.assign(TorcDashboard.prototype, {
         if (themeSelector) themeSelector.value = theme;
         if (themeSelectorGroup) themeSelectorGroup.style.display = darkMode ? 'block' : 'none';
 
+        // Sync sidebar dark mode toggle
+        this.updateSidebarDarkToggle(darkMode);
+
         const refreshInterval = localStorage.getItem('torc-refresh-interval') || '30';
         const intervalInput = document.getElementById('refresh-interval');
         if (intervalInput) intervalInput.value = refreshInterval;
@@ -51,13 +54,26 @@ Object.assign(TorcDashboard.prototype, {
             } else {
                 this.removeAllThemes();
             }
+            this.updateSidebarDarkToggle(e.target.checked);
         });
 
         // Apply theme immediately when selector changes
         themeSelector?.addEventListener('change', (e) => {
             this.applyTheme(e.target.value);
             localStorage.setItem('torc-theme', e.target.value);
         });
+
+        // Sidebar dark mode toggle
+        document.getElementById('sidebar-dark-toggle')?.addEventListener('click', () => {
+            this.toggleDarkMode();
+        });
+    },
+
+    updateSidebarDarkToggle(isDark) {
+        const icon = document.getElementById('dark-toggle-icon');
+        const label = document.getElementById('dark-toggle-label');
+        if (icon) icon.innerHTML = isDark ? '☼' : '☾';
+        if (label) label.textContent = isDark ? 'Light Mode' : 'Dark Mode';
     },
 
     applyTheme(theme) {
@@ -119,6 +135,7 @@ Object.assign(TorcDashboard.prototype, {
             if (selector) selector.value = nextTheme.id;
             const selectorGroup = document.getElementById('theme-selector-group');
             if (selectorGroup) selectorGroup.style.display = 'block';
+            this.updateSidebarDarkToggle(true);
         } else {
             document.body.classList.remove('dark-mode');
             this.removeAllThemes();
@@ -129,6 +146,7 @@ Object.assign(TorcDashboard.prototype, {
             if (checkbox) checkbox.checked = false;
             const selectorGroup = document.getElementById('theme-selector-group');
             if (selectorGroup) selectorGroup.style.display = 'none';
+            this.updateSidebarDarkToggle(false);
         }
 
         this.showToast(`Theme: ${nextTheme.name}`, 'info');
@@ -152,6 +170,7 @@ Object.assign(TorcDashboard.prototype, {
             document.body.classList.remove('dark-mode');
             this.removeAllThemes();
         }
+        this.updateSidebarDarkToggle(darkMode);
 
         this.showToast('Settings saved', 'success');
 
@@ -198,15 +217,19 @@ Object.assign(TorcDashboard.prototype, {
             dagVisualizer.loadJobDependencies(this.selectedWorkflowId);
         }
 
-        // Sync events workflow selector with selected workflow and clear badge
+        // Sync events workflow selector with selected workflow and start SSE stream
         if (tabName === 'events') {
             const badge = document.getElementById('event-badge');
             if (badge) badge.style.display = 'none';
             if (this.selectedWorkflowId) {
                 const eventsSelector = document.getElementById('events-workflow-selector');
-                if (eventsSelector) {
+                if (eventsSelector && eventsSelector.value !== this.selectedWorkflowId) {
                     eventsSelector.value = this.selectedWorkflowId;
                 }
+                // Start SSE stream if not already connected for this workflow
+                if (this._lastEventsWorkflowId !== this.selectedWorkflowId) {
+                    this.startEventStream(this.selectedWorkflowId);
+                }
             }
         }
 

torc-dash/static/js/app-core.js

@@ -41,7 +41,7 @@ Object.assign(TorcDashboard.prototype, {
         }
 
         // Get output directory from the input field
-        this.debugOutputDir = document.getElementById('debug-output-dir')?.value || 'output';
+        this.debugOutputDir = document.getElementById('debug-output-dir')?.value || 'torc_output';
 
         try {
             // Get jobs and results for the workflow
@@ -220,7 +220,7 @@ Object.assign(TorcDashboard.prototype, {
             return;
         }
 
-        const outputDir = document.getElementById('debug-output-dir')?.value || 'output';
+        const outputDir = document.getElementById('debug-output-dir')?.value || 'torc_output';
         const errorsOnly = document.getElementById('slurm-errors-only')?.checked || false;
         const resultsContainer = document.getElementById('slurm-logs-results');
 
@@ -339,7 +339,7 @@ Object.assign(TorcDashboard.prototype, {
             return;
         }
 
-        const outputDir = document.getElementById('debug-output-dir')?.value || 'output';
+        const outputDir = document.getElementById('debug-output-dir')?.value || 'torc_output';
         const resultsContainer = document.getElementById('slurm-sacct-results');
 
         resultsContainer.innerHTML = '<div class="loading-indicator">Collecting sacct data...</div>';