Handle cases where preference model is null

Azure · Aug 3, 2022 · 78e3dfc · 78e3dfc
1 parent fe45cc8
commit 78e3dfc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Conversation.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Conversation.cshtml
@@ -1,10 +1,11 @@
 @page "{id?}"
 @model APIViewWeb.Pages.Assemblies.ConversationModel
 @using APIViewWeb.Helpers
+@using APIViewWeb.Models
 @{
     Layout = "ReviewLayout";
     ViewData["Title"] = "Conversation";
-    ViewData["UserPreference"] = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin());
+    ViewData["UserPreference"] = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin()) ?? new UserPreferenceModel();
 }
 <div class="container-fluid">
     <div class="mx-5 mt-2">

diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Delete.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Delete.cshtml
@@ -1,9 +1,10 @@
 @page
 @model APIViewWeb.Pages.Assemblies.DeleteModel
 @using APIViewWeb.Helpers
+@using APIViewWeb.Models
 @{
     ViewData["Title"] = "Delete";
-    ViewData["UserPreference"] = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin());
+    ViewData["UserPreference"] = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin()) ?? new UserPreferenceModel();
 }
 <div class="container-fluid">
     <div class="mx-5 mt-2">

diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Index.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Index.cshtml
@@ -4,9 +4,10 @@
 @using System
 @using System.Text.RegularExpressions
 @using APIViewWeb.Helpers
+@using APIViewWeb.Models
 @{
     ViewData["Title"] = "Reviews";
-    ViewData["UserPreference"] = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin());
+    ViewData["UserPreference"] = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin()) ?? new UserPreferenceModel();
 }
 @section Scripts
 {

diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/LegacyReview.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/LegacyReview.cshtml
@@ -1,9 +1,10 @@
 @page
 @model APIViewWeb.Pages.Assemblies.LegacyReview
 @using APIViewWeb.Helpers
+@using APIViewWeb.Models
 @{
     ViewData["Title"] = "Legacy Review";
-    ViewData["UserPreference"] = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin());
+    ViewData["UserPreference"] = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin()) ?? new UserPreferenceModel();
 }
 
 <h2>This review can not be viewed anymore but here are the comments:</h2>

diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml
@@ -1,10 +1,11 @@
 @page "{id}/{revisionId?}"
 @model APIViewWeb.Pages.Assemblies.ReviewPageModel
 @using APIViewWeb.Helpers
+@using APIViewWeb.Models
 @{
     Layout = "ReviewLayout";
     ViewData["Title"] = Model.Review.DisplayName;
-    var userPreference = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin());
+    var userPreference = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin()) ?? new UserPreferenceModel();
     ViewData["UserPreference"] = userPreference;
 }
 

diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Revisions.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Revisions.cshtml
@@ -1,10 +1,11 @@
 @page "{id?}"
 @model APIViewWeb.Pages.Assemblies.RevisionsPageModel
 @using APIViewWeb.Helpers
+@using APIViewWeb.Models
 @{
     Layout = "ReviewLayout";
     ViewData["Title"] = "Revisions";
-    ViewData["UserPreference"] = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin());
+    ViewData["UserPreference"] = PageModelHelpers.GetUserPreference(Model._preferenceCache, User.GetGitHubLogin()) ?? new UserPreferenceModel();
 }
 <div class="container-fluid">
     <div class="mx-5 mt-2">