From 167d5932451f81dfa1044c0daddc617dabcd1a80 Mon Sep 17 00:00:00 2001 From: mirivlad Date: Wed, 1 Jul 2026 07:44:28 +0800 Subject: [PATCH] Revert "fix: P1 shell tooltip fixes + Today routing + workspaces API" This reverts commit 9d06b164d3c86fc142c58cc2580ed165532f9cdc. --- frontend/src/App.svelte | 30 +++++++++++------- .../src/lib/plugin-host/VerstakPluginAPI.js | 9 ------ frontend/src/lib/shell/Sidebar.svelte | 29 ----------------- frontend/src/lib/shell/StatusBar.svelte | 6 ++-- frontend/src/lib/shell/TodaySurface.svelte | 31 +++++++++++-------- frontend/src/lib/shell/WorkspaceHost.svelte | 2 +- 6 files changed, 40 insertions(+), 67 deletions(-) diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index 9896c4b..6357562 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -7,7 +7,6 @@ import VaultSelection from './lib/shell/VaultSelection.svelte'; import WorkbenchHost from './lib/shell/WorkbenchHost.svelte'; import WorkspaceHost from './lib/shell/WorkspaceHost.svelte'; - import TodaySurface from './lib/shell/TodaySurface.svelte'; import * as App from '../wailsjs/go/api/App'; import { debug } from './lib/log/debug.js'; import { onMount } from 'svelte'; @@ -75,20 +74,33 @@ if (err || !workspaces || workspaces.length === 0) { workspaceNodes = []; selectedWorkspaceName = ''; - currentView = 'today'; + currentView = 'workspace-empty'; emitWorkspaceActive(''); return; } workspaceNodes = workspaces.map(workspaceAsNode); - selectedWorkspaceName = ''; - currentView = 'today'; - emitWorkspaceActive(''); + let currentWorkspace = null; + try { + currentWorkspace = await App.GetCurrentWorkspace(); + } catch { + currentWorkspace = null; + } + const currentName = workspaceName(currentWorkspace); + const selected = workspaces.find((workspace) => workspaceName(workspace) === currentName) || workspaces[0]; + selectedWorkspaceName = workspaceName(selected); + if (selectedWorkspaceName) { + try { await App.SetCurrentWorkspace(selectedWorkspaceName); } catch {} + currentView = 'workspace'; + } else { + currentView = 'workspace-empty'; + } + emitWorkspaceActive(selectedWorkspaceName); } catch (e) { debug.log('[App] openDefaultWorkspaceRoute ERROR', String(e)); workspaceNodes = []; selectedWorkspaceName = ''; - currentView = 'today'; + currentView = 'workspace-empty'; emitWorkspaceActive(''); } } @@ -382,12 +394,6 @@ {:else if currentView === 'workbench'} - {:else if currentView === 'today'} - {:else if currentView === 'workspace' || currentView === 'workspace-empty'} {/if} - {#if vaultOpen} -
- Overview - -
- {/if} - {#if sidebarItems.length > 0}
Tools @@ -216,21 +202,6 @@ color: #a78bfa; } - .today-item { - gap: 0.55rem; - } - - .nav-icon-today { - width: 0.9rem; - height: 0.9rem; - display: inline-flex; - align-items: center; - justify-content: center; - font-size: 0.85rem; - color: #4ecca3; - flex-shrink: 0; - } - .nav-label { overflow: hidden; text-overflow: ellipsis; diff --git a/frontend/src/lib/shell/StatusBar.svelte b/frontend/src/lib/shell/StatusBar.svelte index f856dde..93ecd88 100644 --- a/frontend/src/lib/shell/StatusBar.svelte +++ b/frontend/src/lib/shell/StatusBar.svelte @@ -95,7 +95,7 @@ class:status-bar-warning={item.handler} class="status-bar-item" data-status-item-id={item.id} - title={item.handler ? `${item.pluginId}: click for details` : (item.label || item.id)} + title={item.handler ? `${item.pluginId}: compact status only` : item.pluginId} > {#if item.handler}{/if} {item.label || item.id} @@ -108,7 +108,7 @@ class:status-bar-warning={item.handler} class="status-bar-item" data-status-item-id={item.id} - title={item.handler ? `${item.pluginId}: click for details` : (item.label || item.id)} + title={item.handler ? `${item.pluginId}: compact status only` : item.pluginId} > {#if item.handler}{/if} {item.label || item.id} @@ -121,7 +121,7 @@ class:status-bar-warning={item.handler} class="status-bar-item" data-status-item-id={item.id} - title={item.handler ? `${item.pluginId}: click for details` : (item.label || item.id)} + title={item.handler ? `${item.pluginId}: compact status only` : item.pluginId} > {#if item.handler}{/if} {item.label || item.id} diff --git a/frontend/src/lib/shell/TodaySurface.svelte b/frontend/src/lib/shell/TodaySurface.svelte index b623a18..7cd7f5a 100644 --- a/frontend/src/lib/shell/TodaySurface.svelte +++ b/frontend/src/lib/shell/TodaySurface.svelte @@ -13,7 +13,6 @@ let activity = []; let worklogSuggestions = []; - $: isGlobal = !workspaceRootPath || String(workspaceRootPath).trim() === ''; $: hasBrowserInbox = hasTool('browser inbox') || hasTool('inbox'); $: hasActivity = hasTool('activity'); $: hasFiles = hasTool('files'); @@ -112,18 +111,24 @@ readPluginSettings('verstak.journal'), ]); - if (isGlobal) { - captures = rowsFor(browserSettings, ['captures:global', 'captures']).slice(0, 4); - activity = rowsFor(activitySettings, ['events:global', 'events']).slice(0, 4); - worklogSuggestions = rowsFor(journalSettings, ['suggestions', 'worklog']).slice(0, 4); - } else { - captures = rowsFor(browserSettings, [workspaceKey('captures:workspace:')]).slice(0, 4); - activity = rowsFor(activitySettings, [workspaceKey('events:workspace:')]).slice(0, 4); - worklogSuggestions = rowsFor(journalSettings, [ - workspaceKey('suggestions:workspace:'), - workspaceKey('worklog:workspace:'), - ]).slice(0, 4); - } + captures = rowsFor(browserSettings, [ + workspaceKey('captures:workspace:'), + 'captures:global', + 'captures', + ]).slice(0, 4); + + activity = rowsFor(activitySettings, [ + workspaceKey('events:workspace:'), + 'events:global', + 'events', + ]).slice(0, 4); + + worklogSuggestions = rowsFor(journalSettings, [ + workspaceKey('suggestions:workspace:'), + workspaceKey('worklog:workspace:'), + 'suggestions', + 'worklog', + ]).slice(0, 4); loading = false; } diff --git a/frontend/src/lib/shell/WorkspaceHost.svelte b/frontend/src/lib/shell/WorkspaceHost.svelte index f38f3a8..7b3a69f 100644 --- a/frontend/src/lib/shell/WorkspaceHost.svelte +++ b/frontend/src/lib/shell/WorkspaceHost.svelte @@ -148,7 +148,7 @@ role="tab" aria-selected={toolKey(tool) === toolKey(activeTool)} type="button" - title={tool.title} + title={tool.pluginId} on:click={() => selectTool(tool)} > {tool.title || tool.id}