Show no queries in VSO

Author: RMacfarlane

src/extension.ts

@@ -62,7 +62,7 @@ async function init(context: vscode.ExtensionContext, git: ApiImpl, gitAPI: GitA
 		}
 	});
 	const reviewManager = new ReviewManager(context, repository, prManager, tree, telemetry);
-	tree.initialize(prManager);
+	await tree.initialize(prManager);
 	registerCommands(context, prManager, reviewManager, telemetry, credentialStore);
 
 	git.onDidChangeState(() => {

src/test/view/prsTree.test.ts

@@ -95,7 +95,7 @@ describe('GitHub Pull Requests view', function() {
 		repository.addRemote('origin', 'git@github.com:aaa/bbb');
 
 		const manager = new PullRequestManager(repository, telemetry, new ApiImpl(), credentialStore);
-		provider.initialize(manager);
+		await provider.initialize(manager);
 
 		const rootNodes = await provider.getChildren();
 		assert.strictEqual(rootNodes.length, 1);
@@ -117,7 +117,7 @@ describe('GitHub Pull Requests view', function() {
 		});
 		sinon.stub(credentialStore, 'hasOctokit').returns(Promise.resolve(false));
 		await manager.updateRepositories();
-		provider.initialize(manager);
+		await provider.initialize(manager);
 
 		const rootNodes = await provider.getChildren();
 		assert.strictEqual(rootNodes.length, 1);
@@ -140,7 +140,7 @@ describe('GitHub Pull Requests view', function() {
 		});
 		sinon.stub(credentialStore, 'hasOctokit').returns(Promise.resolve(true));
 		await manager.updateRepositories();
-		provider.initialize(manager);
+		await provider.initialize(manager);
 
 		const rootNodes = await provider.getChildren();
 
@@ -207,7 +207,7 @@ describe('GitHub Pull Requests view', function() {
 			});
 			sinon.stub(credentialStore, 'hasOctokit').returns(Promise.resolve(true));
 			await manager.updateRepositories();
-			provider.initialize(manager);
+			await provider.initialize(manager);
 			manager.activePullRequest = pullRequest1;
 
 			const rootNodes = await provider.getChildren();

src/view/prsTreeDataProvider.ts

@@ -30,6 +30,7 @@ export class PullRequestsTreeDataProvider implements vscode.TreeDataProvider<Tre
 	private _prManager: PullRequestManager;
 	private _initialized: boolean = false;
 	private _queries: IQueryInfo[];
+	private _isVSO: boolean | undefined;
 
 	get view(): vscode.TreeView<TreeNode> {
 		return this._view;
@@ -86,7 +87,7 @@ export class PullRequestsTreeDataProvider implements vscode.TreeDataProvider<Tre
 
 	}
 
-	initialize(prManager: PullRequestManager) {
+	async initialize(prManager: PullRequestManager) {
 		if (this._initialized) {
 			throw new Error('Tree has already been initialized!');
 		}
@@ -96,20 +97,33 @@ export class PullRequestsTreeDataProvider implements vscode.TreeDataProvider<Tre
 		this._disposables.push(this._prManager.onDidChangeState(() => {
 			this._onDidChangeTreeData.fire();
 		}));
-		this.initializeCategories();
+		await this.initializeCategories();
 		this.refresh();
 	}
 
-	public updateQueries() {
-		this._queries = vscode.workspace.getConfiguration(SETTINGS_NAMESPACE, this._prManager.repository.rootUri).get<IQueryInfo[]>(QUERIES_SETTING) || [];
+	private async isVSO(): Promise<boolean> {
+		if (this._isVSO !== undefined) {
+			return this._isVSO;
+		}
+
+		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication`));
+		const isVSO = callbackUri.authority.endsWith('workspaces.github.com');
+		this._isVSO = isVSO;
+		return isVSO;
 	}
 
-	private initializeCategories() {
-		this.updateQueries();
+	public async updateQueries() {
+		this._queries = await this.isVSO()
+			? []
+			: vscode.workspace.getConfiguration(SETTINGS_NAMESPACE, this._prManager.repository.rootUri).get<IQueryInfo[]>(QUERIES_SETTING) || [];
+	}
 
-		this._disposables.push(vscode.workspace.onDidChangeConfiguration(e => {
+	private async initializeCategories() {
+		await this.updateQueries();
+
+		this._disposables.push(vscode.workspace.onDidChangeConfiguration(async e => {
 			if (e.affectsConfiguration(`${SETTINGS_NAMESPACE}.${QUERIES_SETTING}`)) {
-				this.updateQueries();
+				await this.updateQueries();
 				this.refresh();
 			}
 		}));

src/view/reviewManager.ts

@@ -136,7 +136,7 @@ export class ReviewManager {
 	}
 
 	private registerListeners(): void {
-		this._disposables.push(vscode.workspace.onDidChangeConfiguration(e => {
+		this._disposables.push(vscode.workspace.onDidChangeConfiguration(async e => {
 			if (e.affectsConfiguration('githubPullRequests.showInSCM')) {
 				if (this._prFileChangesProvider) {
 					this._prFileChangesProvider.dispose();
@@ -149,7 +149,7 @@ export class ReviewManager {
 
 				this._prsTreeDataProvider.dispose();
 				this._prsTreeDataProvider = new PullRequestsTreeDataProvider(this._telemetry);
-				this._prsTreeDataProvider.initialize(this._prManager);
+				await this._prsTreeDataProvider.initialize(this._prManager);
 				this._disposables.push(this._prsTreeDataProvider);
 			}
 		}));