From 4e6b9cf4f8e7ff35beed08497ee01dc9c04219df Mon Sep 17 00:00:00 2001 From: Darren Hoehna Date: Fri, 10 Nov 2023 15:09:03 -0800 Subject: [PATCH] Moving over lost changes --- src/AzureExtension/Providers/RepositoryProvider.cs | 4 ++-- .../Widgets/Templates/AzurePullRequestsTemplate.json | 4 ++-- .../Widgets/Templates/AzureQueryListTemplate.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/AzureExtension/Providers/RepositoryProvider.cs b/src/AzureExtension/Providers/RepositoryProvider.cs index 6be975f0..fecc5308 100644 --- a/src/AzureExtension/Providers/RepositoryProvider.cs +++ b/src/AzureExtension/Providers/RepositoryProvider.cs @@ -78,10 +78,10 @@ public IAsyncOperation IsUriSupportedAsync(Uri uri, /// A list of projects the organization has. private List GetProjects(Microsoft.VisualStudio.Services.Account.Account organization, DeveloperId.DeveloperId azureDeveloperId) { - var connection = AzureClientProvider.GetConnectionForLoggedInDeveloper(organization.AccountUri, azureDeveloperId); - try { + var connection = AzureClientProvider.GetConnectionForLoggedInDeveloper(organization.AccountUri, azureDeveloperId); + // connection can be null if the organization is disabled. if (connection != null) { diff --git a/src/AzureExtension/Widgets/Templates/AzurePullRequestsTemplate.json b/src/AzureExtension/Widgets/Templates/AzurePullRequestsTemplate.json index 7e7d7541..1eb739e1 100644 --- a/src/AzureExtension/Widgets/Templates/AzurePullRequestsTemplate.json +++ b/src/AzureExtension/Widgets/Templates/AzurePullRequestsTemplate.json @@ -16,7 +16,7 @@ "items": [ { "type": "TextBlock", - "text": "${if(is_loading_data, '%Widget_Template/ContentLoading%', '%Widget_Template/EmptyWorkItems%')}", + "text": "%Widget_Template/EmptyWorkItems%", "wrap": true, "weight": "bolder", "horizontalAlignment": "center" @@ -85,7 +85,7 @@ }, { "type": "Container", - "$when": "${(count(items) >= maxItemsDisplayed)}", + "$when": "${(count(items) >= 25)}", "items": [ { "type": "TextBlock", diff --git a/src/AzureExtension/Widgets/Templates/AzureQueryListTemplate.json b/src/AzureExtension/Widgets/Templates/AzureQueryListTemplate.json index c022b4be..dfc9c1f1 100644 --- a/src/AzureExtension/Widgets/Templates/AzureQueryListTemplate.json +++ b/src/AzureExtension/Widgets/Templates/AzureQueryListTemplate.json @@ -16,7 +16,7 @@ "items": [ { "type": "TextBlock", - "text": "${if(is_loading_data, '%Widget_Template/ContentLoading%', '%Widget_Template/EmptyWorkItems%')}", + "text": "%Widget_Template/EmptyWorkItems%", "wrap": true, "weight": "bolder", "horizontalAlignment": "center" @@ -151,7 +151,7 @@ }, { "type": "Container", - "$when": "${workItemCount > maxItemsDisplayed}", + "$when": "${workItemCount > 25}", "items": [ { "type": "TextBlock",