Merge branch 'bugfix/import-export-testing' into develop

Author: JeremyCaney

OnTopic.Editor.AspNetCore/Components/DefaultAttributeTypeViewComponent.cs

@@ -20,9 +20,9 @@ namespace OnTopic.Editor.AspNetCore.Components {
   ///   The <see cref="AttributeTypeViewComponentBase"/> class provides a foundation for all attribute editors. That said, most
   ///   attribute editors won't need to deliver a custom <see cref="AttributeViewModel"/> or provide any customized logic. For
   ///   those, the <see cref="DefaultAttributeTypeViewComponent"/> provides a default implementation of the <see
-  ///   cref="InvokeAsync(AttributeDescriptorTopicViewModel, string)"/> method that should satisfy most requirements. It is
+  ///   cref="InvokeAsync(AttributeDescriptorTopicViewModel, String)"/> method that should satisfy most requirements. It is
   ///   still expected that derived classes be created, but by deriving from <see cref="DefaultAttributeTypeViewComponent"/>,
-  ///   they do not need to implement their own <see cref="InvokeAsync(AttributeDescriptorTopicViewModel, string)"/> method.
+  ///   they do not need to implement their own <see cref="InvokeAsync(AttributeDescriptorTopicViewModel, String)"/> method.
   /// </remarks>
   public class DefaultAttributeTypeViewComponent : ViewComponent {
 

OnTopic.Editor.AspNetCore/Controllers/EditorController.cs

@@ -4,7 +4,6 @@
 | Project       Topics Library
 \=============================================================================================================================*/
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;

OnTopic.Editor.AspNetCore/Models/ContentTypeListViewModel.cs

@@ -6,7 +6,8 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OnTopic.Editor.Models;
-using OnTopic.Editor.Models.Metadata;
+
+#nullable enable
 
 namespace OnTopic.Editor.AspNetCore.Models {
 
@@ -32,7 +33,7 @@ public ContentTypeListViewModel() { }
     /// <summary>
     ///   Provides a reference to the <see cref="EditingTopicViewModel"/> that the user is currently editing.
     /// </summary>
-    public EditingTopicViewModel CurrentTopic { get; set; }
+    public EditingTopicViewModel? CurrentTopic { get; set; }
 
     /*==========================================================================================================================
     | TOPIC LIST
@@ -73,7 +74,9 @@ public ContentTypeListViewModel() { }
     /// <summary>
     ///   If supplied, sets a reference to a callback function to execute on close of the editor modal window.
     /// </summary>
-    public string OnModalClose { get; set; }
+    public string? OnModalClose { get; set; }
 
   } // Class
 } // Namespace
+
+#nullable disable

OnTopic.Editor.Models/AttributeViewModel{T}.cs

@@ -32,8 +32,8 @@ public AttributeViewModel(
       attributeDescriptor
     ) {
       AttributeDescriptor       = attributeDescriptor;
-      Value                     = value;
-      InheritedValue            = inheritedValue;
+      Value                     = value?? Value;
+      InheritedValue            = inheritedValue?? InheritedValue;
     }
 
     /*==========================================================================================================================

OnTopic.Editor.Models/Transfer/ExportViewModel.cs

@@ -3,7 +3,6 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
-using OnTopic.Editor.Models.Metadata;
 using OnTopic.Data.Transfer.Interchange;
 
 namespace OnTopic.Editor.Models.Transfer {

OnTopic.Editor.Models/Transfer/ImportViewModel.cs

@@ -3,7 +3,6 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
-using OnTopic.Editor.Models.Metadata;
 using OnTopic.Data.Transfer.Interchange;
 
 namespace OnTopic.Editor.Models.Transfer {