Cleanup

Author: mjbvz

package.json

@@ -885,13 +885,6 @@
 			]
 		},
 		"commands": [
-			{
-				"command": "pr.openTasksDashboard",
-				"title": "%command.pr.openTasksDashboard.title%",
-				"category": "%command.pull.request.category%",
-				"icon": "$(dashboard)",
-				"when": "config.githubPullRequests.projectTasksDashboard.enabled"
-			},
 			{
 				"command": "githubpr.remoteAgent",
 				"title": "%command.githubpr.remoteAgent.title%",
@@ -1809,6 +1802,13 @@
 				"command": "pr.cancelCodingAgent",
 				"title": "%command.pr.cancelCodingAgent.title%",
 				"category": "%command.pull.request.category%"
+			},
+			{
+				"command": "pr.projectTasksDashboard.open",
+				"title": "%command.pr.projectTasksDashboard.open.title%",
+				"category": "%command.pull.request.category%",
+				"icon": "$(dashboard)",
+				"when": "config.githubPullRequests.projectTasksDashboard.enabled"
 			}
 		],
 		"languages": [

package.nls.json

@@ -175,7 +175,7 @@
 	"view.github.active.pull.request.name": "Review Pull Request",
 	"view.github.active.pull.request.welcome.name": "Active Pull Request",
 	"command.pull.request.category": "GitHub Pull Requests",
-	"command.pr.openTasksDashboard.title": "Open Dashboard",
+	"command.pr.projectTasksDashboard.open.title": "Open Dashboard",
 	"command.pr.createDashboard.title": "Create Dashboard",
 	"customEditor.github.tasks.displayName": "GitHub Tasks Editor",
 	"command.githubpr.remoteAgent.title": "Remote agent integration",

src/commands.ts

@@ -1132,7 +1132,7 @@ export function registerCommands(
 	));
 
 	context.subscriptions.push(
-		vscode.commands.registerCommand('pr.openTasksDashboard', async () => {
+		vscode.commands.registerCommand('pr.projectTasksDashboard.open', async () => {
 			tasksDashboard.showOrCreateDashboard();
 		})
 	);

src/github/tasksDashboard.ts

@@ -12,16 +12,15 @@ import { RepositoriesManager } from './repositoriesManager';
 
 export class TasksDashboardManager extends Disposable implements vscode.WebviewPanelSerializer {
 	public static readonly viewType = 'github-pull-request.projectTasksDashboard';
+	private static readonly viewTitle = vscode.l10n.t('Tasks Dashboard');
 
 	private _currentView: {
 		readonly webview: vscode.WebviewPanel;
 		readonly dashboardProvider: DashboardWebviewProvider;
 		readonly disposables: vscode.Disposable[];
 	} | undefined;
 
-	private readonly statusBarItem?: vscode.StatusBarItem;
-
-	private readonly viewTitle = vscode.l10n.t('Tasks Dashboard');
+	private _statusBarItem?: vscode.StatusBarItem;
 
 	constructor(
 		private readonly _context: vscode.ExtensionContext,
@@ -31,15 +30,14 @@ export class TasksDashboardManager extends Disposable implements vscode.WebviewP
 	) {
 		super();
 
-		// Create status bar item for task dashboard if enabled
-		const dashboardEnabled = vscode.workspace.getConfiguration('githubPullRequests').get<boolean>('projectTasksDashboard.enabled', false);
-		if (dashboardEnabled) {
-			(this as any).statusBarItem = this._register(vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 100));
-			this.statusBarItem!.text = '$(dashboard) Tasks';
-			this.statusBarItem!.tooltip = vscode.l10n.t('Open GitHub Tasks Dashboard');
-			this.statusBarItem!.command = 'pr.openTasksDashboard';
-			this.statusBarItem!.show();
-		}
+		// Create status bar item for launching dashboard
+		this.updateStatusBarItem();
+
+		this._register(vscode.workspace.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('githubPullRequests.projectTasksDashboard.enabled')) {
+				this.updateStatusBarItem();
+			}
+		}));
 
 		// Register webview panel serializer for tasks dashboard
 		this._register(vscode.window.registerWebviewPanelSerializer(TasksDashboardManager.viewType, this));
@@ -50,6 +48,28 @@ export class TasksDashboardManager extends Disposable implements vscode.WebviewP
 
 		this._currentView?.disposables.forEach(d => d.dispose());
 		this._currentView = undefined;
+
+		this._statusBarItem?.dispose();
+		this._statusBarItem = undefined;
+	}
+
+	private updateStatusBarItem(): void {
+		const dashboardEnabled = vscode.workspace.getConfiguration('githubPullRequests')
+			.get<boolean>('projectTasksDashboard.enabled', false);
+
+		if (dashboardEnabled && !this._statusBarItem) {
+			// Create status bar item if it doesn't exist and is now enabled
+			this._statusBarItem = this._register(vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 100));
+			this._statusBarItem.text = '$(dashboard) Tasks';
+			this._statusBarItem.tooltip = vscode.l10n.t('Open GitHub Tasks Dashboard');
+			this._statusBarItem.command = 'pr.projectTasksDashboard.open';
+			this._statusBarItem.show();
+		} else if (!dashboardEnabled && this._statusBarItem) {
+			// Hide and dispose status bar item if it exists and is now disabled
+			this._statusBarItem.hide();
+			this._statusBarItem.dispose();
+			this._statusBarItem = undefined;
+		}
 	}
 
 	public async deserializeWebviewPanel(webviewPanel: vscode.WebviewPanel, _state: {}): Promise<void> {
@@ -69,7 +89,7 @@ export class TasksDashboardManager extends Disposable implements vscode.WebviewP
 		};
 
 		webviewPanel.iconPath = vscode.Uri.joinPath(this._context.extensionUri, 'resources/icons/github_logo.png');
-		webviewPanel.title = this.viewTitle;
+		webviewPanel.title = TasksDashboardManager.viewTitle;
 
 		const issueQuery = this.getIssueQuery();
 
@@ -114,7 +134,7 @@ export class TasksDashboardManager extends Disposable implements vscode.WebviewP
 
 		const newWebviewPanel = vscode.window.createWebviewPanel(
 			TasksDashboardManager.viewType,
-			this.viewTitle,
+			TasksDashboardManager.viewTitle,
 			vscode.ViewColumn.Active,
 			{
 				enableScripts: true,

webviews/dashboardView/app.tsx

@@ -2,12 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { render } from 'react-dom';
 import { ChatInput } from './components/ChatInput';
 import { EmptyState } from './components/EmptyState';
-import { FilterButton, FilterState } from './components/FilterButton';
 import { GlobalSessionItem } from './components/GlobalSessionItem';
 import { IssueItem } from './components/IssueItem';
 import { LoadingState } from './components/LoadingState';
@@ -19,27 +18,11 @@ export function main() {
 	render(<Dashboard />, document.getElementById('app'));
 }
 
-// Check if a session is associated with a specific issue
-function isSessionAssociatedWithIssue(session: SessionData, issue: IssueData): boolean {
-	if (session.isLocal) return false;
-
-	// Use the same logic as findAssociatedSession
-	const sessionTitle = session.title.toLowerCase();
-	const issueNumber = `#${issue.number}`;
-	const issueTitle = issue.title.toLowerCase();
-
-	// Match by issue number reference or similar title
-	return sessionTitle.includes(issueNumber) ||
-		sessionTitle.includes(issueTitle) ||
-		issueTitle.includes(sessionTitle);
-}
-
 function Dashboard() {
 	const [dashboardState, setDashboardState] = useState<DashboardState | null>(null);
 	const [refreshing, setRefreshing] = useState(false);
 	const [issueSort, setIssueSort] = useState<'date-oldest' | 'date-newest'>('date-oldest');
 	const [hoveredIssue, setHoveredIssue] = useState<IssueData | null>(null);
-	const [globalFilter, setGlobalFilter] = useState<FilterState>({ showTasks: true, showProjects: true });
 	const [chatInputValue, setChatInputValue] = useState('');
 	const [focusTrigger, setFocusTrigger] = useState(0);
 
@@ -185,74 +168,61 @@ function Dashboard() {
 	}, [dashboardState]);
 
 	// Derived state from discriminated union with proper type narrowing
-	const isGlobal = dashboardState?.isGlobal;
-	const issueQuery = dashboardState && !dashboardState.isGlobal ? (dashboardState as DashboardReady).issueQuery || '' : '';
-	const milestoneIssues = dashboardState && !dashboardState.isGlobal && dashboardState.state === 'ready' ? (dashboardState as DashboardReady).milestoneIssues : [];
-	const activeSessions = dashboardState?.state === 'ready' ? dashboardState.activeSessions : [];
-	const recentProjects = dashboardState && dashboardState.isGlobal && dashboardState.state === 'ready' ? (dashboardState as GlobalDashboardReady).recentProjects : [];
-	const currentBranch = dashboardState && !dashboardState.isGlobal && dashboardState.state === 'ready' ? (dashboardState as DashboardReady).currentBranch : undefined;
+	const isGlobal = dashboardState?.isGlobal ?? false;
+	const isReady = dashboardState?.state === 'ready';
+
+	const readyState = (isReady && !isGlobal) ? dashboardState as DashboardReady : null;
+	const globalReadyState = (isReady && isGlobal) ? dashboardState as GlobalDashboardReady : null;
+
+	const issueQuery = readyState?.issueQuery || '';
+	const milestoneIssues = readyState?.milestoneIssues || [];
+	const activeSessions = isReady ? dashboardState.activeSessions : [];
+	const recentProjects = globalReadyState?.recentProjects || [];
+	const currentBranch = readyState?.currentBranch;
 
 	// For global dashboards, create a mixed array of sessions and projects
-	const mixedItems = isGlobal ? (() => {
+	const mixedItems = useMemo(() => {
+		if (!isGlobal) return [];
+
 		const mixed: Array<{ type: 'session', data: SessionData, index: number } | { type: 'project', data: ProjectData }> = [];
 
-		// Add sessions based on filter
-		if (globalFilter.showTasks) {
-			activeSessions.forEach((session, index) => {
-				mixed.push({ type: 'session', data: session, index });
-			});
-		}
+		activeSessions.forEach((session, index) => {
+			mixed.push({ type: 'session', data: session, index });
+		});
 
-		// Add projects based on filter
-		if (globalFilter.showProjects) {
-			recentProjects.forEach((project: ProjectData) => {
-				mixed.push({ type: 'project', data: project });
-			});
-		}
+		recentProjects.forEach((project: ProjectData) => {
+			mixed.push({ type: 'project', data: project });
+		});
 
-		function shuffle<T>(array: T[]): T[] {
-			for (let i = array.length - 1; i > 0; i--) {
-				const j = Math.floor(Math.random() * (i + 1));
-				const tmp = array[i];
-				array[i] = array[j];
-				array[j] = tmp;
-			}
-			return array;
+		// Simple shuffle algorithm
+		for (let i = mixed.length - 1; i > 0; i--) {
+			const j = Math.floor(Math.random() * (i + 1));
+			[mixed[i], mixed[j]] = [mixed[j], mixed[i]];
 		}
 
-		shuffle(mixed);
-
-		// Sort by recency - sessions first, then projects, but could be enhanced with actual timestamps
 		return mixed;
-	})() : [];
+	}, [isGlobal, activeSessions, recentProjects]);
 
 	return (
 		<div className={`dashboard-container${isGlobal ? ' global-dashboard' : ''}`}>
 			{!isGlobal && (
 				<div className={`dashboard-header${isGlobal ? ' global-header' : ''}`}>
-					<h1 className="dashboard-title">
-						{isGlobal ? 'Visual Studio Code - Insiders' : 'My Tasks'}
-					</h1>
+					<h1 className="dashboard-title">My Tasks</h1>
 					<div className="header-buttons">
-						{dashboardState?.state === 'ready' && !dashboardState.isGlobal &&
-							((dashboardState as DashboardReady).currentBranch) &&
-							((dashboardState as DashboardReady).currentBranch !== 'main') &&
-							((dashboardState as DashboardReady).currentBranch !== 'master') && (
+						{readyState?.currentBranch &&
+							readyState.currentBranch !== 'main' &&
+							readyState.currentBranch !== 'master' && (
 								<button
 									className="switch-to-main-button"
 									onClick={handleSwitchToMain}
-									title={`Switch from ${(dashboardState as DashboardReady).currentBranch} to main`}
+									title={`Switch from ${readyState.currentBranch} to main`}
 								>
 									<span className="codicon codicon-git-branch"></span>
 									<span>Switch to main</span>
 								</button>
 							)}
 						<button className="refresh-button" onClick={handleRefresh} disabled={refreshing} title="Refresh dashboard">
-							{refreshing ? (
-								<span className="codicon codicon-sync codicon-modifier-spin"></span>
-							) : (
-								<span className="codicon codicon-refresh"></span>
-							)}
+							<span className={`codicon ${refreshing ? 'codicon-sync codicon-modifier-spin' : 'codicon-refresh'}`}></span>
 						</button>
 					</div>
 				</div>
@@ -274,11 +244,7 @@ function Dashboard() {
 
 				{/* Issues/Projects Area */}
 				<div className="issues-area">
-					{isGlobal ? (
-						<>
-							{/* Empty for now, everything moved to tasks area */}
-						</>
-					) : (
+					{!isGlobal && (
 						<>
 							<div className="area-header milestone-header">
 								<h3
@@ -287,14 +253,14 @@ function Dashboard() {
 								>
 									{issueQuery ? extractMilestoneFromQuery(issueQuery) : 'Issues'}
 								</h3>
-								{dashboardState?.state === 'ready' && (
+								{isReady && (
 									<SortDropdown
 										issueSort={issueSort}
 										onSortChange={setIssueSort}
 									/>
 								)}
 							</div>
-							{dashboardState?.state === 'ready' && (
+							{isReady && (
 								<div
 									className="section-count clickable-count"
 									onClick={handleIssueCountClick}
@@ -306,9 +272,9 @@ function Dashboard() {
 							<div className="area-content">
 								{dashboardState?.state === 'loading' ? (
 									<LoadingState message="Loading issues..." />
-								) : dashboardState?.state === 'ready' && !milestoneIssues.length ? (
+								) : isReady && !milestoneIssues.length ? (
 									<EmptyState message={`No issues found for ${issueQuery ? extractMilestoneFromQuery(issueQuery).toLowerCase() : 'issues'}`} />
-								) : dashboardState?.state === 'ready' ? (
+								) : isReady ? (
 									getSortedIssues(milestoneIssues).map((issue) => {
 										const associatedSession = findAssociatedSession(issue);
 										return (
@@ -339,24 +305,18 @@ function Dashboard() {
 					<div className="area-header-container">
 						<h2 className="area-header">
 							{isGlobal ? 'Continue working on...' :
-								dashboardState?.state === 'ready' ?
+								isReady ?
 									`${activeSessions.length || 0} active task${activeSessions.length !== 1 ? 's' : ''}` :
 									'Active tasks'
 							}
 						</h2>
-						{isGlobal && (
-							<FilterButton
-								filterState={globalFilter}
-								onFilterChange={setGlobalFilter}
-							/>
-						)}
 					</div>
 					<div className="area-content">
 						{dashboardState?.state === 'loading' ? (
 							<LoadingState message="Loading tasks..." />
-						) : dashboardState?.state === 'ready' && !activeSessions.length && (!isGlobal || !recentProjects.length) ? (
+						) : isReady && !activeSessions.length && (!isGlobal || !recentProjects.length) ? (
 							<EmptyState message="No active tasks found" />
-						) : dashboardState?.state === 'ready' ? (
+						) : isReady ? (
 							<>
 								{isGlobal ? (
 									// Render mixed items for global dashboard
@@ -401,7 +361,7 @@ function Dashboard() {
 											index={index}
 											onSessionClick={() => handleSessionClick(session)}
 											onPullRequestClick={handlePullRequestClick}
-											isHighlighted={hoveredIssue !== null && isSessionAssociatedWithIssue(session, hoveredIssue)}
+											isHighlighted={hoveredIssue !== null && findAssociatedSession(hoveredIssue)?.id === session.id}
 										/>
 									))
 								)}