Merged AttributeDescriptor and AttributeTypeDescriptor

JeremyCaney · JeremyCaney · commit 7b0027429248 · 2020-12-17T18:21:22.000-08:00
OnTopic Editor 4.0.0 formalized the idea of attribute types as content types, thus allowing each attribute type to have its own data model in the Editor. Prior to this, attribute type specific configuration values had to be configured via a single text attribute which was parsed and applied by each `{AttributeType}ViewModel` (or, prior to that, `{AttributeType}.ascx`). To continue supporting **OnTopic-Editor-WebForms**. the `AttributeDescriptor`'s `EditorType` and `ModelType` necessited complex logic, which was moved to a `ConfigurableAttributeDescriptor` in the **OnTopic-WebForms** project. As a result, the `AttributeDescriptor` acted as an abstract base class for both `ConfigurableAttributeDescriptor` as well as a simplified `AttributeTypeDescriptor` for the **OnTopic-Editor-AspNetCore** classes. Since we're no longer supporting .NET Framework (422e6ed), there's no need to maintain this abstraction. Instead, we can merge the simplified `AttributeTypeDescriptor` logic into `AttributeDescriptor` and use that as the base class for all of the `OnTopic.Metadata.AttributeTypes` base clases (which represent the strongly typed attribute descriptors, and map to their corresponding content types).
diff --git a/OnTopic.Tests/ViewModels/Metadata/TextAttributeTopicViewModel.cs b/OnTopic.Tests/ViewModels/Metadata/TextAttributeTopicViewModel.cs
@@ -3,6 +3,7 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
+using OnTopic.Metadata;
 using OnTopic.Metadata.AttributeTypes;
 
 namespace OnTopic.Tests.ViewModels.Metadata {
@@ -11,7 +12,7 @@ namespace OnTopic.Tests.ViewModels.Metadata {
   | VIEW MODEL: TEXT ATTRIBUTE (DESCRIPTOR)
   \---------------------------------------------------------------------------------------------------------------------------*/
   /// <summary>
-  ///   Provides a dummy implementation of a view model for an <see cref="AttributeTypeDescriptor"/> view model, in order to
+  ///   Provides a dummy implementation of a view model for an <see cref="AttributeDescriptor"/> view model, in order to
   ///   allow the dynamic resolution of mapping <see cref="TextAttribute"/> topics to view models.
   /// </summary>
   /// <remarks>
diff --git a/OnTopic.Tests/ViewModels/Metadata/TopicReferenceAttributeTopicViewModel.cs b/OnTopic.Tests/ViewModels/Metadata/TopicReferenceAttributeTopicViewModel.cs
@@ -3,6 +3,7 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
+using OnTopic.Metadata;
 using OnTopic.Metadata.AttributeTypes;
 
 namespace OnTopic.Tests.ViewModels.Metadata {
@@ -11,7 +12,7 @@ namespace OnTopic.Tests.ViewModels.Metadata {
   | VIEW MODEL: TOPIC REFERENCE ATTRIBUTE (DESCRIPTOR)
   \---------------------------------------------------------------------------------------------------------------------------*/
   /// <summary>
-  ///   Provides a dummy implementation of a view model for an <see cref="AttributeTypeDescriptor"/> view model, in order to
+  ///   Provides a dummy implementation of a view model for an <see cref="AttributeDescriptor"/> view model, in order to
   ///   allow the dynamic resolution of mapping <see cref="TopicReferenceAttribute"/> topics to view models.
   /// </summary>
   /// <remarks>
diff --git a/OnTopic/Metadata/AttributeDescriptor.cs b/OnTopic/Metadata/AttributeDescriptor.cs
@@ -88,7 +88,7 @@ protected AttributeDescriptor(
     ///   reduces these down into a single type based on how they're exposed in the Topic Library, not based on how they're
     ///   exposed in the editor.
     /// </remarks>
-    public abstract ModelType ModelType { get; }
+    public virtual ModelType ModelType => ModelType.ScalarValue;
 
     /*==========================================================================================================================
     | PROPERTY: EDITOR TYPE
@@ -109,7 +109,7 @@ protected AttributeDescriptor(
     ///   !value.Contains(" ") &amp;&amp; !value.Contains("/")
     /// </requires>
     [AttributeSetter]
-    public abstract string? EditorType { get; }
+    public virtual string EditorType => GetType().Name.Replace("Attribute", "", StringComparison.OrdinalIgnoreCase);
 
     /*==========================================================================================================================
     | PROPERTY: DISPLAY GROUP
diff --git a/OnTopic/Metadata/AttributeTypes/BooleanAttribute.cs b/OnTopic/Metadata/AttributeTypes/BooleanAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class BooleanAttribute : AttributeTypeDescriptor {
+  public class BooleanAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/DateTimeAttribute.cs b/OnTopic/Metadata/AttributeTypes/DateTimeAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class DateTimeAttribute : AttributeTypeDescriptor {
+  public class DateTimeAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/FileListAttribute.cs b/OnTopic/Metadata/AttributeTypes/FileListAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class FileListAttribute : AttributeTypeDescriptor {
+  public class FileListAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/FilePathAttribute.cs b/OnTopic/Metadata/AttributeTypes/FilePathAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class FilePathAttribute : AttributeTypeDescriptor {
+  public class FilePathAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/HtmlAttribute.cs b/OnTopic/Metadata/AttributeTypes/HtmlAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class HtmlAttribute : AttributeTypeDescriptor {
+  public class HtmlAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/IncomingRelationshipAttribute.cs b/OnTopic/Metadata/AttributeTypes/IncomingRelationshipAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class IncomingRelationshipAttribute : AttributeTypeDescriptor {
+  public class IncomingRelationshipAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/InstructionAttribute.cs b/OnTopic/Metadata/AttributeTypes/InstructionAttribute.cs
@@ -16,7 +16,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class InstructionAttribute : AttributeTypeDescriptor {
+  public class InstructionAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/LastModifiedAttribute.cs b/OnTopic/Metadata/AttributeTypes/LastModifiedAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class LastModifiedAttribute : AttributeTypeDescriptor {
+  public class LastModifiedAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/LastModifiedByAttribute.cs b/OnTopic/Metadata/AttributeTypes/LastModifiedByAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class LastModifiedByAttribute : AttributeTypeDescriptor {
+  public class LastModifiedByAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/NestedTopicListAttribute.cs b/OnTopic/Metadata/AttributeTypes/NestedTopicListAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class NestedTopicListAttribute : AttributeTypeDescriptor {
+  public class NestedTopicListAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/NumberAttribute.cs b/OnTopic/Metadata/AttributeTypes/NumberAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class NumberAttribute : AttributeTypeDescriptor {
+  public class NumberAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/QueryableTopicListAttribute.cs b/OnTopic/Metadata/AttributeTypes/QueryableTopicListAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class QueryableTopicListAttribute : AttributeTypeDescriptor {
+  public class QueryableTopicListAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/TextAreaAttribute.cs b/OnTopic/Metadata/AttributeTypes/TextAreaAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class TextAreaAttribute : AttributeTypeDescriptor {
+  public class TextAreaAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/TextAttribute.cs b/OnTopic/Metadata/AttributeTypes/TextAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class TextAttribute : AttributeTypeDescriptor {
+  public class TextAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
diff --git a/OnTopic/Metadata/AttributeTypes/TopicReferenceAttribute.cs b/OnTopic/Metadata/AttributeTypes/TopicReferenceAttribute.cs
@@ -17,7 +17,7 @@ namespace OnTopic.Metadata.AttributeTypes {
   ///   This class is primarily used by the Topic Editor interface to determine how attributes are displayed as part of the
   ///   CMS; except in very specific scenarios, it is not typically used elsewhere in the Topic Library itself.
   /// </remarks>
-  public class TopicReferenceAttribute : AttributeTypeDescriptor {
+  public class TopicReferenceAttribute : AttributeDescriptor {
 
     /*==========================================================================================================================
     | CONSTRUCTOR
