rolled back change creating an Infrastructure.Interfaces namespace, modified IModule interface to be strongly typed (#343)

* upgrade to .NET Core 3.2 Preview 3 and fixes for issues created by #314

* Components based on Bootstrap4 for Sections and  TabStrip to increase productivity and promote uniformity in Module UIs

* rolled back change creating an Infrastructure.Interfaces namespace, modified IModule interface to be strongly typed

Oqtane.Client/Modules/Admin/ModuleCreator/Module.cs

@@ -1,22 +1,15 @@
-using System.Collections.Generic;
+using Oqtane.Models;
 
 namespace Oqtane.Modules.Admin.ModuleCreator
 {
     public class Module : IModule
     {
-        public Dictionary<string, string> Properties
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
         {
-            get
+            Name = "Module Creator",
-            {
+            Description = "Enables software developers to quickly create modules by automating many of the initial module creation tasks",
-                Dictionary<string, string> properties = new Dictionary<string, string>
+            Version = "1.0.0",
-                {
+            Categories = "Developer"
-                    { "Name", "Module Creator" },
+        };
-                    { "Description", "Enables software developers to quickly create modules by automating many of the initial module creation tasks" },
-                    { "Version", "1.0.0" },
-                    { "Categories", "Developer" }
-                };
-                return properties;
-            }
-        }
     }
 }

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Oqtane.Client/Modules/[Module]/[Module].cs

@@ -1,22 +1,16 @@
-using System.Collections.Generic;
+using Oqtane.Models;
+using Oqtane.Modules;
 
 namespace Oqtane.Modules.[Module]s
 {
     public class Module : IModule
     {
-        public Dictionary<string, string> Properties
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
         {
-            get
+            Name = "[Module]",
-            {
+            Description = "[Module]",
-                Dictionary<string, string> properties = new Dictionary<string, string>
+            Version = "1.0.0",
-                {
+            ServerAssemblyName = "Oqtane.Server"
-                    { "Name", "[Module]" },
+        };
-                    { "Description", "[Module]" },
-                    { "Version", "1.0.0" },
-                    { "ServerAssemblyName", "Oqtane.Server" }
-                };
-                return properties;
-            }
-        }
     }
 }

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Oqtane.Server/Modules/[Module]/Controllers/[Module]Controller.cs

@@ -5,7 +5,7 @@ using Oqtane.Repository.[Module]s;
 using Oqtane.Shared;
 using System.Collections.Generic;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 
 namespace Oqtane.Controllers.[Module]s
 {

Oqtane.Client/Modules/Counter/Module.cs

@@ -1,21 +1,14 @@
-using System.Collections.Generic;
+using Oqtane.Models;
 
 namespace Oqtane.Modules.Counter
 {
     public class Module : IModule
     {
-        public Dictionary<string, string> Properties
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
         {
-            get
+            Name = "Counter",
-            {
+            Description = "Increments a counter",
-                Dictionary<string, string> properties = new Dictionary<string, string>
+            Version = "1.0.0"
-                {
+        };
-                    { "Name", "Counter" },
-                    { "Description", "Increments a counter" },
-                    { "Version", "1.0.0" }
-                };
-                return properties;
-            }
-        }
     }
 }

Oqtane.Client/Modules/HtmlText/ModuleInfo.cs

@@ -1,22 +1,15 @@
-using System.Collections.Generic;
+using Oqtane.Models;
 
 namespace Oqtane.Modules.HtmlText
 {
     public class ModuleInfo : IModule
     {
-        public Dictionary<string, string> Properties
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
         {
-            get
+            Name = "HtmlText",
-            {
+            Description = "Renders HTML or Text",
-                Dictionary<string, string> properties = new Dictionary<string, string>
+            Version = "1.0.0",
-                {
+            ServerAssemblyName = "Oqtane.Server"
-                    { "Name", "HtmlText" },
+        };
-                    { "Description", "Renders HTML or Text" },
-                    { "Version", "1.0.0" },
-                    { "ServerAssemblyName", "Oqtane.Server" }
-                };
-                return properties;
-            }
-        }
     }
 }

Oqtane.Client/Modules/IModule.cs

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using Oqtane.Models;
 
 namespace Oqtane.Modules
 {
     public interface IModule
     {
-        Dictionary<string, string> Properties { get; }
+        ModuleDefinition ModuleDefinition { get; }
     }
 }

Oqtane.Client/Modules/Weather/Module.cs

@@ -1,21 +1,14 @@
-using System.Collections.Generic;
+using Oqtane.Models;
 
 namespace Oqtane.Modules.Weather
 {
     public class Module : IModule
     {
-        public Dictionary<string, string> Properties
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
         {
-            get
+            Name = "Weather",
-            {
+            Description = "Displays random weather using a service",
-                Dictionary<string, string> properties = new Dictionary<string, string>
+            Version = "1.0.0"
-                {
+        };
-                    { "Name", "Weather" },
-                    { "Description", "Displays random weather using a service" },
-                    { "Version", "1.0.0" }
-                };
-                return properties;
-            }
-        }
     }
 }

Oqtane.Server/Controllers/AliasController.cs

@@ -8,7 +8,7 @@ using System;
 using System.Net;
 using System.Globalization;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/FileController.cs

@@ -14,7 +14,7 @@ using System.Linq;
 using System.Drawing;
 using System.Net;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 // ReSharper disable StringIndexOfIsCultureSpecific.1

Oqtane.Server/Controllers/FolderController.cs

@@ -6,7 +6,7 @@ using Oqtane.Shared;
 using System.Linq;
 using System.Net;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
 

Oqtane.Server/Controllers/InstallationController.cs

@@ -4,7 +4,6 @@ using Microsoft.Extensions.Configuration;
 using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.Infrastructure;
-using Oqtane.Infrastructure.Interfaces;
 
 // ReSharper disable StringIndexOfIsCultureSpecific.1
 

Oqtane.Server/Controllers/JobController.cs

@@ -7,7 +7,7 @@ using System;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/JobLogController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authorization;
 using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/LogController.cs

@@ -2,7 +2,7 @@
 using Oqtane.Models;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Authorization;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Shared;
 

Oqtane.Server/Controllers/ModuleController.cs

@@ -5,7 +5,7 @@ using Oqtane.Models;
 using Oqtane.Shared;
 using System.Linq;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
 

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -8,7 +8,7 @@ using System.Reflection;
 using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
 using System;

Oqtane.Server/Controllers/NotificationController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authorization;
 using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
 

Oqtane.Server/Controllers/PageController.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using Oqtane.Security;
 using System.Net;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/PageModuleController.cs

@@ -5,7 +5,7 @@ using Oqtane.Models;
 using Oqtane.Shared;
 using System.Linq;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Security;
 

Oqtane.Server/Controllers/ProfileController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authorization;
 using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/RoleController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authorization;
 using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/SettingController.cs

@@ -5,7 +5,7 @@ using Oqtane.Shared;
 using Oqtane.Security;
 using System.Linq;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/SiteController.cs

@@ -5,7 +5,7 @@ using Oqtane.Models;
 using Oqtane.Shared;
 using System.Linq;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/SqlController.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization;
 using Oqtane.Models;
 using System.Collections.Generic;
 using Oqtane.Shared;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 using Oqtane.Enums;
 using System.Data.SqlClient;

Oqtane.Server/Controllers/TenantController.cs

@@ -4,7 +4,7 @@ using Oqtane.Models;
 using System.Collections.Generic;
 using Oqtane.Enums;
 using Oqtane.Shared;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/ThemeController.cs

@@ -8,7 +8,7 @@ using System.Reflection;
 using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 // ReSharper disable StringIndexOfIsCultureSpecific.1

Oqtane.Server/Controllers/UserController.cs

@@ -11,7 +11,7 @@ using Oqtane.Shared;
 using System;
 using System.Net;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers

Oqtane.Server/Controllers/UserRoleController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authorization;
 using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Controllers

Oqtane.Server/Infrastructure/InstallationManager.cs

@@ -7,7 +7,6 @@ using System.Xml;
 using Oqtane.Shared;
 using System;
 using System.Diagnostics;
-using Oqtane.Infrastructure.Interfaces;
 using Microsoft.Extensions.Caching.Memory;
 
 namespace Oqtane.Infrastructure

Oqtane.Server/Infrastructure/Interfaces/IInstallationManager.cs

@@ -1,4 +1,4 @@
-namespace Oqtane.Infrastructure.Interfaces
+namespace Oqtane.Infrastructure
 {
     public interface IInstallationManager
     {

Oqtane.Server/Infrastructure/Interfaces/ILogManager.cs

@@ -3,7 +3,7 @@ using Oqtane.Enums;
 using Oqtane.Models;
 using Oqtane.Shared;
 
-namespace Oqtane.Infrastructure.Interfaces
+namespace Oqtane.Infrastructure
 {
     public interface ILogManager
     {

Oqtane.Server/Infrastructure/Interfaces/ISiteTemplate.cs

@@ -1,7 +1,7 @@
 using Oqtane.Models;
 using System.Collections.Generic;
 
-namespace Oqtane.Infrastructure.Interfaces
+namespace Oqtane.Infrastructure
 {
     public interface ISiteTemplate
     {

Oqtane.Server/Infrastructure/Interfaces/ISyncManager.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Oqtane.Models;
 
-namespace Oqtane.Infrastructure.Interfaces
+namespace Oqtane.Infrastructure
 {
     public interface ISyncManager
     {

Oqtane.Server/Infrastructure/LogManager.cs

@@ -6,7 +6,6 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.AspNetCore.Http;
 using System.Collections.Generic;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
 using Oqtane.Security;
 // ReSharper disable StringIndexOfIsCultureSpecific.2

Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs

@@ -1,5 +1,5 @@
 using Oqtane.Models;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using System.Collections.Generic;
 using Oqtane.Repository;
 using Microsoft.AspNetCore.Hosting;

Oqtane.Server/Infrastructure/SyncManager.cs

@@ -3,7 +3,7 @@ using Oqtane.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Repository;
 
 namespace Oqtane.Infrastructure

Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs

@@ -7,7 +7,7 @@ using Oqtane.Shared;
 using System;
 using System.Collections.Generic;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 
 namespace Oqtane.Modules.HtmlText.Controllers
 {

Oqtane.Server/Repository/ModuleDefinitionRepository.cs

@@ -148,50 +148,22 @@ namespace Oqtane.Repository
                         if (moduletype != null)
                         {
                             var moduleobject = Activator.CreateInstance(moduletype);
-                            Dictionary<string, string> properties = (Dictionary<string, string>)moduletype.GetProperty("Properties").GetValue(moduleobject);
+                            moduledefinition = (ModuleDefinition)moduletype.GetProperty("ModuleDefinition").GetValue(moduleobject);
-                            moduledefinition = new ModuleDefinition
-                            {
-                                ModuleDefinitionName = qualifiedModuleType,
-                                Name = GetProperty(properties, "Name"),
-                                Description = GetProperty(properties, "Description"),
-                                Categories = GetProperty(properties, "Categories"),
-                                Version = GetProperty(properties, "Version"),
-                                Owner = GetProperty(properties, "Owner"),
-                                Url = GetProperty(properties, "Url"),
-                                Contact = GetProperty(properties, "Contact"),
-                                License = GetProperty(properties, "License"),
-                                Dependencies = GetProperty(properties, "Dependencies"),
-                                PermissionNames = GetProperty(properties, "PermissionNames"),
-                                ServerAssemblyName = GetProperty(properties, "ServerAssemblyName"),
-                                ControlTypeTemplate = moduleType + "." + Constants.ActionToken + ", " + typename[1],
-                                ControlTypeRoutes = "",
-                                AssemblyName = assembly.FullName.Split(",")[0],
-                                Permissions = ""
-                            };
                         }
                         else
                         {
                             moduledefinition = new ModuleDefinition
                             {
-                                ModuleDefinitionName = qualifiedModuleType,
                                 Name = moduleType.Substring(moduleType.LastIndexOf(".") + 1),
                                 Description = moduleType.Substring(moduleType.LastIndexOf(".") + 1),
                                 Categories = ((qualifiedModuleType.StartsWith("Oqtane.Modules.Admin.")) ? "Admin" : ""),
-                                Version = new Version(1, 0, 0).ToString(),
+                                Version = new Version(1, 0, 0).ToString()
-                                Owner = "",
-                                Url = "",
-                                Contact = "",
-                                License = "",
-                                Dependencies = "",
-                                PermissionNames = "",
-                                ServerAssemblyName = "",
-                                ControlTypeTemplate = moduleType + "." + Constants.ActionToken + ", " + typename[1],
-                                ControlTypeRoutes = "",
-                                AssemblyName = assembly.FullName.Split(",")[0],
-                                Permissions = ""
                             };
                         }
-                        // permissions
+                        // set internal properties
+                        moduledefinition.ModuleDefinitionName = qualifiedModuleType;
+                        moduledefinition.ControlTypeTemplate = moduleType + "." + Constants.ActionToken + ", " + typename[1];
+                        moduledefinition.AssemblyName = assembly.FullName.Split(",")[0];
                         if (moduledefinition.Categories == "Admin")
                         {
                             moduledefinition.Permissions = "[{\"PermissionName\":\"Utilize\",\"Permissions\":\"" + Constants.AdminRole + "\"}]";

Oqtane.Server/Repository/SiteRepository.cs

@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Extensions;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Models;
 using Oqtane.Modules;
 using Oqtane.Shared;

Oqtane.Server/Repository/SiteTemplateRepository.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Models;
 
 namespace Oqtane.Repository

Oqtane.Server/Security/PermissionHandler.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Oqtane.Enums;
-using Oqtane.Infrastructure.Interfaces;
+using Oqtane.Infrastructure;
 using Oqtane.Shared;
 
 namespace Oqtane.Security

Oqtane.Server/Startup.cs

@@ -15,7 +15,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
 using Oqtane.Infrastructure;
-using Oqtane.Infrastructure.Interfaces;
 using Oqtane.Repository;
 using Oqtane.Security;
 using Oqtane.Services;

Oqtane.Shared/Models/ModuleDefinition.cs

@@ -5,6 +5,22 @@ namespace Oqtane.Models
 {
     public class ModuleDefinition : IAuditable
     {
+        public ModuleDefinition()
+        {
+            Name = "";
+            Description = "";
+            Categories = "";
+            Version = "";
+            Owner = "";
+            Url = "";
+            Contact = "";
+            License = "";
+            Dependencies = "";
+            PermissionNames = "";
+            ServerAssemblyName = "";
+            ControlTypeRoutes = "";
+        }
+
         public int ModuleDefinitionId { get; set; }
         public string ModuleDefinitionName { get; set; }
 
@@ -13,6 +29,8 @@ namespace Oqtane.Models
         public string ModifiedBy { get; set; }
         public DateTime ModifiedOn { get; set; }
 
+        [NotMapped]
+        public int SiteId { get; set; }
         [NotMapped]
         public string Name { get; set; }
         [NotMapped]
@@ -42,8 +60,6 @@ namespace Oqtane.Models
         [NotMapped]
         public string AssemblyName { get; set; }
         [NotMapped]
-        public int SiteId { get; set; }
-        [NotMapped]
         public string Permissions { get; set; }
     }
 }