51 UI 3 implement trackedtimeprovider 3 level treedataprovider

packages/vscode-ext/__tests__/extension.test.js

@@ -43,6 +43,23 @@ vi.mock('vscode', () => ({
         createTreeView: vi.fn(() => ({ dispose: vi.fn() })),
         registerWebviewViewProvider: vi.fn(() => ({ dispose: vi.fn() })),
     },
+    workspace: {
+        workspaceFolders: [],
+        onDidChangeWorkspaceFolders: vi.fn(() => ({ dispose: vi.fn() })),
+        fs: { readFile: vi.fn().mockRejectedValue(new Error('not found')) },
+    },
+    Uri: { joinPath: vi.fn((base, ...segs) => ({ ...base, path: `${base?.path ?? ''}/${segs.join('/')}` })) },
+    ThemeIcon: class ThemeIcon {
+        constructor(id, color) {
+            this.id = id;
+            this.color = color;
+        }
+    },
+    ThemeColor: class ThemeColor {
+        constructor(id) {
+            this.id = id;
+        }
+    },
 }));
 
 vi.mock('../../core/src/services/sync.service.js', () => ({

packages/vscode-ext/package.json

@@ -38,7 +38,6 @@
                     "name": "My Issues"
                 },
                 {
-                    "type": "webview",
                     "id": "octoclock.trackedTime",
                     "name": "Tracked Time"
                 },
@@ -100,6 +99,17 @@
                 "command": "octoclock.unpinRepo",
                 "title": "Unpin repository",
                 "category": "OctoClock"
+            },
+            {
+                "command": "octoclock.toggleWorkspaceFilter",
+                "title": "Toggle workspace filter",
+                "category": "OctoClock",
+                "icon": "$(filter)"
+            },
+            {
+                "command": "octoclock.openDashboard",
+                "title": "Open Dashboard",
+                "category": "OctoClock"
             }
         ],
         "menus": {
@@ -108,6 +118,11 @@
                     "command": "octoclock.pinRepo",
                     "when": "view == octoclock.repoTree",
                     "group": "navigation"
+                },
+                {
+                    "command": "octoclock.toggleWorkspaceFilter",
+                    "when": "view == octoclock.trackedTime",
+                    "group": "navigation"
                 }
             ],
             "view/item/context": [
@@ -125,6 +140,26 @@
                     "command": "octoclock.editSession",
                     "when": "viewItem == octoclock.session",
                     "group": "octoclock@2"
+                },
+                {
+                    "command": "octoclock.stopTimer",
+                    "when": "viewItem == oc-issue-active",
+                    "group": "inline"
+                },
+                {
+                    "command": "octoclock.startTimer",
+                    "when": "viewItem == oc-issue",
+                    "group": "inline"
+                },
+                {
+                    "command": "octoclock.editSession",
+                    "when": "viewItem == oc-session",
+                    "group": "inline"
+                },
+                {
+                    "command": "octoclock.deleteSession",
+                    "when": "viewItem == oc-session",
+                    "group": "inline"
                 }
             ]
         }
@@ -139,4 +174,4 @@
         "@vscode/test-cli": "0.0.12",
         "@vscode/test-electron": "2.5.2"
     }
-}
+}

packages/vscode-ext/src/commands.js

@@ -68,12 +68,13 @@ export function normalizeIssueUrl(raw) {
 export function registerCommands(context) {
     context.subscriptions.push(
         // ----------------------------------------------------------------
-        // octoclock.startTimer [issueUrl?]
-        // When called with a URL (e.g. from the My Issues panel), skip the
-        // input prompt and start immediately. Without an argument, fall back
-        // to the interactive InputBox flow.
+        // octoclock.startTimer [issueUrl? | TreeItem?]
+        // Accepts either a URL string (e.g. from My Issues), a TreeItem with an
+        // `issueUrl` property (Tracked Time inline action), or no argument
+        // (fall back to the interactive InputBox flow).
         // ----------------------------------------------------------------
-        vscode.commands.registerCommand('octoclock.startTimer', async (issueUrl) => {
+        vscode.commands.registerCommand('octoclock.startTimer', async (arg) => {
+            let issueUrl = typeof arg === 'string' ? arg : arg?.issueUrl;
             if (!issueUrl) {
                 const raw = await vscode.window.showInputBox({
                     prompt: 'Enter the GitHub issue URL',

packages/vscode-ext/src/extension.js

@@ -14,9 +14,12 @@ import { VSCodeMessagingAdapter } from './adapters/vscode-messaging.adapter.js';
 import { VSCodeStorageAdapter } from './adapters/vscode-storage.adapter.js';
 import { registerCommands } from './commands.js';
 import { createStatusBarController } from './status-bar.js';
+import { TrackedTimeProvider } from './tracked-time-tree.js';
 import { RepoTreeProvider } from './tree-view.js';
+import { DashboardPanel } from './webview/dashboard/panel.js';
 import { ActiveTimerProvider } from './webview/sidebar/active-timer/provider.js';
 import { MyIssuesProvider } from './webview/sidebar/my-issues/provider.js';
+import { TeamStatsProvider } from './webview/sidebar/team-stats/provider.js';
 
 /**
  * Called by VS Code when the extension is activated.
@@ -80,7 +83,32 @@ export function activate(context) {
         treeProvider,
     );
 
+    const trackedTimeProvider = new TrackedTimeProvider(context, storageEvents);
+    context.subscriptions.push(
+        vscode.window.createTreeView(TrackedTimeProvider.viewType, { treeDataProvider: trackedTimeProvider }),
+        trackedTimeProvider,
+        vscode.commands.registerCommand('octoclock.toggleWorkspaceFilter', () =>
+            trackedTimeProvider.toggleWorkspaceFilter(),
+        ),
+    );
+    // Initialise the `setContext` flag so the title-bar icon reflects the
+    // persisted toggle state from the moment the view loads.
+    vscode.commands.executeCommand(
+        'setContext',
+        'octoclock.trackedTime.workspaceFilter',
+        trackedTimeProvider.workspaceFilterEnabled,
+    );
+
+    const teamStatsProvider = new TeamStatsProvider(context, storageEvents);
+    context.subscriptions.push(
+        vscode.window.registerWebviewViewProvider(TeamStatsProvider.viewType, teamStatsProvider, {
+            webviewOptions: { retainContextWhenHidden: true },
+        }),
+        teamStatsProvider,
+        vscode.commands.registerCommand('octoclock.openDashboard', () => DashboardPanel.open(context)),
+    );
+
     console.log('OctoClock: activated');
 }
 
-export function deactivate() {}
+export function deactivate() { }