Adjustments to #4382 (#4431)

Azure · Oct 24, 2022 · dd39b04 · dd39b04
1 parent 12236a2
commit dd39b04
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/dotnet/APIView/APIViewWeb/Controllers/UserProfileController.cs b/src/dotnet/APIView/APIViewWeb/Controllers/UserProfileController.cs
@@ -24,10 +24,10 @@ public async Task<ActionResult> Update(string email, string[] languages, string
             UserPreferenceModel preference = await _userPreferenceCache.GetUserPreferences(User);
 
             preference.Theme = theme;
-
-            HashSet<string> Languages = new HashSet<string>(languages);
-            preference.Language = Languages;
 
+            HashSet<string> Languages = new HashSet<string>(languages);
+            preference.ApprovedLanguages = Languages;
+
             if(profile.UserName == null)
             {
                 await _userProfileManager.createUserProfileAsync(User, email, Languages, preference);

diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml
@@ -30,7 +30,7 @@
                                 var anyChecked = false;
                             }
                             <div style="max-height:400px;width:max-content;overflow-y:auto">
-                                @foreach (var approver in Model.approvers) 
+                                @foreach (var approver in Model.PreferredApprovers)
                                 {
                                     <span class="checkbox dropdown-item-text">
                                         <label>
@@ -111,7 +111,7 @@
                         }
                         else
                         {
-                            @if (Model.ActiveConversations > 0 && Model.approvers.Contains(User.GetGitHubLogin()))
+                            @if (Model.ActiveConversations > 0 && Model.PreferredApprovers.Contains(User.GetGitHubLogin()))
                             {
                                 <button type="button" class="btn btn-sm shadow-sm btn-success ml-2" data-toggle="modal" data-target="#approveModel">
                                     <i class="far fa-thumbs-up" aria-hidden="true"></i>&nbsp;&nbsp;Approve
@@ -141,7 +141,7 @@
                             }
                             else
                             {
-                                @if (Model.approvers.Contains(User.GetGitHubLogin()))
+                                @if (Model.PreferredApprovers.Contains(User.GetGitHubLogin()))
                                 {
                                     <button type="submit" class="btn btn-sm shadow-sm btn-success ml-2">
                                         <i class="far fa-thumbs-up" aria-hidden="true"></i>&nbsp;&nbsp;Approve

diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml.cs b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml.cs
@@ -86,7 +86,7 @@ public ReviewPageModel(
 
         public IEnumerable<ReviewModel> ReviewsForPackage { get; set; } = new List<ReviewModel>();
 
-        public readonly HashSet<string> approvers = new HashSet<string>();
+        public readonly HashSet<string> PreferredApprovers = new HashSet<string>();
 
         public async Task<IActionResult> OnGetAsync(string id, string revisionId = null)
         {
@@ -156,18 +156,18 @@ public async Task<IActionResult> OnGetAsync(string id, string revisionId = null)
                             userCache.ApprovedLanguages = langs;
                             _preferenceCache.UpdateUserPreference(userCache, User);
                         }
-                        if (langs.Contains(Review.Language))
+                        if (langs.Contains(Review.Language) || !langs.Any())
                         {
-                            approvers.Add(username);
+                            PreferredApprovers.Add(username);
                         }
                     }
                     else
                     {
                         UserProfileModel user = await _userProfileRepository.tryGetUserProfileAsync(username);
                         var langs = user.Languages;
-                        if (langs.Contains(Review.Language))
+                        if (langs.Contains(Review.Language) || !langs.Any())
                         {
-                            approvers.Add(username);
+                            PreferredApprovers.Add(username);
                         }
                     }
                 }