From 57fd4f7d64e10d0a3bbda863660e0f38f5ccfc3e Mon Sep 17 00:00:00 2001 From: Whitney Shake Date: Thu, 21 Mar 2024 16:56:24 -0700 Subject: [PATCH 1/3] Fixed spelling and hover errors --- src/dotnet/APIView/APIView/Properties/launchSettings.json | 4 ++++ .../APIView/APIViewWeb/Pages/Assemblies/Review.cshtml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/dotnet/APIView/APIView/Properties/launchSettings.json b/src/dotnet/APIView/APIView/Properties/launchSettings.json index 68de47267c5..c86d9ecbf0a 100644 --- a/src/dotnet/APIView/APIView/Properties/launchSettings.json +++ b/src/dotnet/APIView/APIView/Properties/launchSettings.json @@ -3,6 +3,10 @@ "TypeList": { "commandName": "Project", "commandLineArgs": "..\\..\\..\\TestLibrary\\Debug\\netcoreapp2.1\\TestLibrary.dll" + }, + "WSL": { + "commandName": "WSL2", + "distributionName": "" } } } \ No newline at end of file diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml index 074cb5da458..f610573a1a6 100644 --- a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml +++ b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml @@ -27,9 +27,9 @@
- - - + + + @if (Model.ReviewContent.ActiveConversationsInActiveAPIRevision > 0) { var count = (Model.ReviewContent.ActiveConversationsInActiveAPIRevision > 10) ? "9+" : $"{Model.ReviewContent.ActiveConversationsInActiveAPIRevision}"; From 0ff2561f2c6a7000ca383dd79cbd4f1e8172a3d5 Mon Sep 17 00:00:00 2001 From: Whitney Shake Date: Sun, 24 Mar 2024 20:19:29 -0700 Subject: [PATCH 2/3] Removed changes and corrected spelling errors --- src/dotnet/APIView/APIView/Properties/launchSettings.json | 4 ---- src/dotnet/APIView/APIViewWeb/Helpers/PageModelHelpers.cs | 2 +- .../APIView/APIViewWeb/Pages/Assemblies/Conversation.cshtml | 4 ++-- src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml | 2 +- .../APIView/APIViewWeb/Pages/Assemblies/Revisions.cshtml | 4 ++-- src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml | 4 ++-- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/dotnet/APIView/APIView/Properties/launchSettings.json b/src/dotnet/APIView/APIView/Properties/launchSettings.json index c86d9ecbf0a..68de47267c5 100644 --- a/src/dotnet/APIView/APIView/Properties/launchSettings.json +++ b/src/dotnet/APIView/APIView/Properties/launchSettings.json @@ -3,10 +3,6 @@ "TypeList": { "commandName": "Project", "commandLineArgs": "..\\..\\..\\TestLibrary\\Debug\\netcoreapp2.1\\TestLibrary.dll" - }, - "WSL": { - "commandName": "WSL2", - "distributionName": "" } } } \ No newline at end of file diff --git a/src/dotnet/APIView/APIViewWeb/Helpers/PageModelHelpers.cs b/src/dotnet/APIView/APIViewWeb/Helpers/PageModelHelpers.cs index 5d241c498f7..6ebb486e29c 100644 --- a/src/dotnet/APIView/APIViewWeb/Helpers/PageModelHelpers.cs +++ b/src/dotnet/APIView/APIViewWeb/Helpers/PageModelHelpers.cs @@ -270,7 +270,7 @@ public static async Task GetReviewContentAsync( if (activeRevision == null) { reviewPageContent.Directive = ReviewContentModelDirective.ErrorDueToInvalidAPIRevisonRedirectToIndexPage; - reviewPageContent.NotificationMessage = $"Review with ID {review.Id} has no valid APIRevisons"; + reviewPageContent.NotificationMessage = $"Review with ID {review.Id} has no valid APIRevisions"; return reviewPageContent; } diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Conversation.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Conversation.cshtml index beabfb91609..c0c660f43c0 100644 --- a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Conversation.cshtml +++ b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Conversation.cshtml @@ -22,8 +22,8 @@
- - + +
diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml index f610573a1a6..bff35486bab 100644 --- a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml +++ b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml @@ -27,7 +27,7 @@
- + @if (Model.ReviewContent.ActiveConversationsInActiveAPIRevision > 0) diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Revisions.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Revisions.cshtml index c7bd18d5535..b91d66c18b3 100644 --- a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Revisions.cshtml +++ b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Revisions.cshtml @@ -32,8 +32,8 @@
- - + +
diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml index 69f2b185cd3..c2b396e9b5c 100644 --- a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml +++ b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml @@ -33,8 +33,8 @@
- - + +
From cb3149a8640a5725a633dac4f29554c620f4387d Mon Sep 17 00:00:00 2001 From: Whitney Shake Date: Mon, 25 Mar 2024 10:23:26 -0700 Subject: [PATCH 3/3] Final spelling corrections --- src/dotnet/APIView/APIViewWeb/Helpers/PageModelHelpers.cs | 2 +- .../APIView/APIViewWeb/LeanModels/ReviewRevisionPageModels.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dotnet/APIView/APIViewWeb/Helpers/PageModelHelpers.cs b/src/dotnet/APIView/APIViewWeb/Helpers/PageModelHelpers.cs index 6ebb486e29c..8138cf90914 100644 --- a/src/dotnet/APIView/APIViewWeb/Helpers/PageModelHelpers.cs +++ b/src/dotnet/APIView/APIViewWeb/Helpers/PageModelHelpers.cs @@ -384,7 +384,7 @@ public static async Task GetReviewContentAsync( reviewPageContent.APIRevisions = apiRevisions.OrderByDescending(c => c.CreatedOn); reviewPageContent.ActiveAPIRevision = activeRevision; reviewPageContent.DiffAPIRevision = diffRevision; - reviewPageContent.TotalActiveConversiations = comments.Threads.Count(t => !t.IsResolved); + reviewPageContent.TotalActiveConversations = comments.Threads.Count(t => !t.IsResolved); reviewPageContent.ActiveConversationsInActiveAPIRevision = ComputeActiveConversationsInActiveRevision(activeRevisionHtmlLines, comments); reviewPageContent.ActiveConversationsInSampleRevisions = comments.Threads.Count(t => t.Comments.FirstOrDefault()?.CommentType == CommentType.SampleRevision); reviewPageContent.PreferredApprovers = preferredApprovers; diff --git a/src/dotnet/APIView/APIViewWeb/LeanModels/ReviewRevisionPageModels.cs b/src/dotnet/APIView/APIViewWeb/LeanModels/ReviewRevisionPageModels.cs index b0b5e28376c..21aafe22389 100644 --- a/src/dotnet/APIView/APIViewWeb/LeanModels/ReviewRevisionPageModels.cs +++ b/src/dotnet/APIView/APIViewWeb/LeanModels/ReviewRevisionPageModels.cs @@ -22,7 +22,7 @@ public class ReviewContentModel public IEnumerable APIRevisions { get; set; } public APIRevisionListItemModel ActiveAPIRevision { get; set; } public APIRevisionListItemModel DiffAPIRevision { get; set; } - public int TotalActiveConversiations { get; set; } + public int TotalActiveConversations { get; set; } public int ActiveConversationsInActiveAPIRevision { get; set; } public int ActiveConversationsInSampleRevisions { get; set; } public HashSet PreferredApprovers = new HashSet();