Fix some nullability errors

IntelliTect · Apr 29, 2022 · affd5fa · affd5fa
1 parent f1c5944
commit affd5fa
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/src/Coalesce.Domain/Person.cs b/src/Coalesce.Domain/Person.cs
@@ -329,7 +329,7 @@ public override ItemResult BeforeSave(SaveKind kind, Person? oldItem, Person ite
 
                 if (item.FirstName?.Contains("[user]") ?? false)
                 {
-                    item.FirstName = item.FirstName.Replace("[user]", User?.Identity.Name);
+                    item.FirstName = item.FirstName.Replace("[user]", User?.Identity?.Name);
                 }
                 return true;
             }

diff --git a/src/IntelliTect.Coalesce.Tests/TargetClasses/CaseDtoStandalone.cs b/src/IntelliTect.Coalesce.Tests/TargetClasses/CaseDtoStandalone.cs
@@ -6,6 +6,8 @@
 using IntelliTect.Coalesce.DataAnnotations;
 using IntelliTect.Coalesce.Tests.TargetClasses.TestDbContext;
 
+#nullable enable
+
 namespace IntelliTect.Coalesce.Tests.TargetClasses
 {
     [Coalesce]

diff --git a/src/IntelliTect.Coalesce.Tests/TargetClasses/WeatherService.cs b/src/IntelliTect.Coalesce.Tests/TargetClasses/WeatherService.cs
@@ -6,6 +6,8 @@
 using System.Text;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace IntelliTect.Coalesce.Tests.TargetClasses
 {
     [Coalesce, Service]

diff --git a/src/IntelliTect.Coalesce/Application/SecurityOverview.html b/src/IntelliTect.Coalesce/Application/SecurityOverview.html
@@ -34,7 +34,7 @@ <h1 id="top" class="display-1 text-center">Coalesce Security Overview</h1>
 
     <div id="app" class="mt-1" v-cloak>
       <div class="row m-0">
-        <div class="col" style="max-width: 220px">
+        <div class="col" style="max-width: 240px">
           <nav
             class="toc p-2"
             style="

diff --git a/src/IntelliTect.Coalesce/TypeDefinition/Security/PropertySecurityPermission.cs b/src/IntelliTect.Coalesce/TypeDefinition/Security/PropertySecurityPermission.cs
@@ -9,7 +9,7 @@ namespace IntelliTect.Coalesce.TypeDefinition
 {
     public class PropertySecurityPermission : SecurityPermissionBase
     {
-        private readonly Func<PropertyViewModel, HashSet<PropertyViewModel>, bool?>? computeIsUnused;
+        private readonly Func<PropertyViewModel, HashSet<PropertyViewModel>, bool?> computeIsUnused;
         private PropertyViewModel prop { get; }
 
         internal PropertySecurityPermission(

diff --git a/src/IntelliTect.Coalesce/TypeDefinition/Security/SecurityPermissionBase.cs b/src/IntelliTect.Coalesce/TypeDefinition/Security/SecurityPermissionBase.cs
@@ -36,7 +36,7 @@ public IReadOnlyList<string> RoleList
         }
 
         // For inclusion of the string representation when serializing
-        public string Display => ToString();
+        public string Display => ToString() ?? "";
 
         public string ToStringWithName() => $"{Name}: {ToString()}";