Make PRs and Issues views have same commands (microsoft#1760)

* Make PRs and Issues views have same commands
Fixes microsoft#1744

* Properly reset credential store state

Co-authored-by: RMacfarlane <ramacfar@microsoft.com>

Author: alexr00

package.json

@@ -702,6 +702,11 @@
         "command": "issue.userCompletion",
         "title": "User Completion Chosen"
       },
+      {
+        "command": "issue.signinAndRefreshList",
+        "title": "Sign in and Refresh",
+        "category": "GitHub Issues"
+      },
       {
         "command": "github.publish",
         "title": "Publish to GitHub"
@@ -929,6 +934,10 @@
           "command": "issue.userCompletion",
           "when": "false"
         },
+        {
+          "command": "issue.signinAndRefreshList",
+          "when": "false"
+        },
         {
           "command": "github.publish",
           "when": "false"
@@ -942,7 +951,7 @@
         },
         {
           "command": "pr.configurePRViewlet",
-          "when": "gitOpenRepositoryCount != 0 && github:initialized && view =~ /pr:/",
+          "when": "gitOpenRepositoryCount != 0 && github:initialized && view =~ /(pr|issues):/",
           "group": "navigation"
         },
         {
@@ -1257,4 +1266,4 @@
     "webpack/**/tar": "^4.4.2"
   },
   "license": "MIT"
-}
+}

src/github/credentials.ts

@@ -54,8 +54,9 @@ export class CredentialStore {
 		}
 	}
 
-	public reset() {
+	public async reset() {
 		this._githubAPI = undefined;
+		await this.initialize();
 	}
 
 	public isAuthenticated(): boolean {

src/github/pullRequestManager.ts

@@ -430,7 +430,7 @@ export class PullRequestManager implements vscode.Disposable {
 	}
 
 	async clearCredentialCache(): Promise<void> {
-		this._credentialStore.reset();
+		await this._credentialStore.reset();
 		this.state = PRManagerState.Initializing;
 	}
 

src/issues/issueFeatureRegistrar.ts

@@ -34,7 +34,7 @@ export class IssueFeatureRegistrar implements vscode.Disposable {
 
 	async initialize() {
 		this.registerCompletionProviders();
-		await this._stateManager.tryInitializeAndWait();
+		this.context.subscriptions.push(vscode.window.createTreeView('issues:github', { showCollapseAll: true, treeDataProvider: new IssuesTreeData(this._stateManager, this.manager, this.context) }));
 		this.context.subscriptions.push(vscode.commands.registerCommand('issue.createIssueFromSelection', (newIssue?: NewIssue, issueBody?: string) => {
 			/* __GDPR__
 				"issue.createIssueFromSelection" : {}
@@ -173,11 +173,15 @@ export class IssueFeatureRegistrar implements vscode.Disposable {
 			*/
 			this.telemetry.sendTelemetryEvent('issue.userCompletion');
 		}));
-		this.context.subscriptions.push(vscode.languages.registerHoverProvider('*', new IssueHoverProvider(this.manager, this._stateManager, this.context, this.telemetry)));
-		this.context.subscriptions.push(vscode.languages.registerHoverProvider('*', new UserHoverProvider(this.manager, this.telemetry)));
-		this.context.subscriptions.push(vscode.languages.registerCodeActionsProvider('*', new IssueTodoProvider(this.context)));
-		this.context.subscriptions.push(vscode.window.registerTreeDataProvider('issues:github', new IssuesTreeData(this._stateManager, this.context)));
-		this.context.subscriptions.push(vscode.workspace.registerFileSystemProvider('newIssue', new IssueFileSystemProvider()));
+		this.context.subscriptions.push(vscode.commands.registerCommand('issue.signinAndRefreshList', async () => {
+			return this.manager.authenticate();
+		}));
+		return this._stateManager.tryInitializeAndWait().then(() => {
+			this.context.subscriptions.push(vscode.languages.registerHoverProvider('*', new IssueHoverProvider(this.manager, this._stateManager, this.context, this.telemetry)));
+			this.context.subscriptions.push(vscode.languages.registerHoverProvider('*', new UserHoverProvider(this.manager, this.telemetry)));
+			this.context.subscriptions.push(vscode.languages.registerCodeActionsProvider('*', new IssueTodoProvider(this.context)));
+			this.context.subscriptions.push(vscode.workspace.registerFileSystemProvider('newIssue', new IssueFileSystemProvider()));
+		});
 	}
 
 	dispose() { }

src/issues/issuesView.ts

@@ -8,13 +8,16 @@ import { IssueModel } from '../github/issueModel';
 import { MilestoneModel } from '../github/milestoneModel';
 import { StateManager } from './stateManager';
 import { Resource } from '../common/resources';
+import { PullRequestManager, PRManagerState } from '../github/pullRequestManager';
 
 export class IssuesTreeData implements vscode.TreeDataProvider<IssueModel | MilestoneModel | vscode.TreeItem> {
 	private _onDidChangeTreeData: vscode.EventEmitter<IssueModel | MilestoneModel | null | undefined | void> = new vscode.EventEmitter();
 	public onDidChangeTreeData: vscode.Event<IssueModel | MilestoneModel | null | undefined | void> = this._onDidChangeTreeData.event;
-	private firstLabel: string | undefined;
 
-	constructor(private stateManager: StateManager, context: vscode.ExtensionContext) {
+	constructor(private stateManager: StateManager, private manager: PullRequestManager, context: vscode.ExtensionContext) {
+		context.subscriptions.push(this.manager.onDidChangeState(() => {
+			this._onDidChangeTreeData.fire();
+		}));
 		context.subscriptions.push(this.stateManager.onDidChangeIssueData(() => {
 			this._onDidChangeTreeData.fire();
 		}));
@@ -28,7 +31,6 @@ export class IssuesTreeData implements vscode.TreeDataProvider<IssueModel | Mile
 		let treeItem: vscode.TreeItem;
 		if (element instanceof vscode.TreeItem) {
 			treeItem = element;
-			treeItem.collapsibleState = element.label === this.firstLabel ? vscode.TreeItemCollapsibleState.Expanded : vscode.TreeItemCollapsibleState.Collapsed;
 		} else if (!(element instanceof IssueModel)) {
 			treeItem = new vscode.TreeItem(element.milestone.title, element.issues.length > 0 ? vscode.TreeItemCollapsibleState.Expanded : vscode.TreeItemCollapsibleState.None);
 		} else {
@@ -54,16 +56,39 @@ export class IssuesTreeData implements vscode.TreeDataProvider<IssueModel | Mile
 	}
 
 	getChildren(element: IssueModel | MilestoneModel | vscode.TreeItem | undefined): Promise<(IssueModel | MilestoneModel)[]> | IssueModel[] | vscode.TreeItem[] {
+		if (element === undefined && this.manager.state !== PRManagerState.RepositoriesLoaded) {
+			return this.getStateChildren();
+		} else {
+			return this.getIssuesChildren(element);
+		}
+	}
+
+	getStateChildren(): vscode.TreeItem[] {
+		if (this.manager.state === PRManagerState.NeedsAuthentication) {
+			const item = new vscode.TreeItem('Sign in');
+			item.command = {
+				title: 'Sign in',
+				command: 'issue.signinAndRefreshList',
+				arguments: []
+			};
+			return [item];
+		} else {
+			return [new vscode.TreeItem('Loading...')];
+		}
+	}
+
+	getIssuesChildren(element: IssueModel | MilestoneModel | vscode.TreeItem | undefined): Promise<(IssueModel | MilestoneModel)[]> | IssueModel[] | vscode.TreeItem[] {
 		if (element === undefined) {
 			// If there's only one query, don't display a title for it
 			if (this.stateManager.issueCollection.size === 1) {
 				return Array.from(this.stateManager.issueCollection.values())[0];
 			}
 			const queryLabels = Array.from(this.stateManager.issueCollection.keys());
-			this.firstLabel = queryLabels[0];
+			const firstLabel = queryLabels[0];
 			return queryLabels.map(label => {
 				const item = new vscode.TreeItem(label);
 				item.contextValue = 'query';
+				item.collapsibleState = label === firstLabel ? vscode.TreeItemCollapsibleState.Expanded : vscode.TreeItemCollapsibleState.Collapsed;
 				return item;
 			});
 		} else if (element instanceof vscode.TreeItem) {