abstract namespace specification to template.json so that module and theme templates can use their own naming conventions

Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor

@@ -115,7 +115,8 @@
             {
                 if (IsValid(_owner) && IsValid(_module) && _owner != _module && _template != "-")
                 {
-                    var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
+                    var template = _templates.FirstOrDefault(item => item.Name == _template); 
+                    var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference, ModuleDefinitionName = template.Namespace };
                     moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
                     GetLocation();
                     AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
@@ -139,7 +140,7 @@
     private bool IsValid(string name)
     {
         // must contain letters, underscores and digits and first character must be letter or underscore
-		return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && !name.ToLower().Contains("oqtane") && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+        return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && !name.ToLower().Contains("oqtane") && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)
@@ -151,7 +152,7 @@
             var template = _templates.FirstOrDefault(item => item.Name == _template);
             _minversion = template.Version;
         }
-		GetLocation();
+        GetLocation();
     }
 
     private void GetLocation()
@@ -160,8 +161,14 @@
         if (_owner != "" && _module != "" && _template != "-")
         {
             var template = _templates.FirstOrDefault(item => item.Name == _template);
-            _location = template.Location + _owner + ".Module." + _module;
+            if (!string.IsNullOrEmpty(template.Namespace))
-
+            {
+                _location = template.Location + template.Namespace.Replace("[Owner]", _owner).Replace("[Module]", _module);
+            }
+            else
+            {
+                _location = template.Location + _owner + ".Module." + _module;
+            }
         }
         StateHasChanged();
     }

Oqtane.Client/Modules/Admin/Themes/Create.razor

@@ -102,7 +102,8 @@
         {
             if (IsValid(_owner) && IsValid(_theme) && _owner != _theme && _template != "-")
             {
-                var theme = new Theme { Owner = _owner, Name = _theme, Template = _template, Version = _reference };
+                var template = _templates.FirstOrDefault(item => item.Name == _template);
+                var theme = new Theme { Owner = _owner, Name = _theme, Template = _template, Version = _reference, ThemeName = template.Namespace };
                 theme = await ThemeService.CreateThemeAsync(theme);
                 GetLocation();
                 AddModuleMessage(string.Format(Localizer["Success.Theme.Create"], NavigateUrl("admin/system")), MessageType.Success);
@@ -142,8 +143,14 @@
         if (_owner != "" && _theme != "" && _template != "-")
         {
             var template = _templates.FirstOrDefault(item => item.Name == _template);
-            _location = template.Location + _owner + ".Theme." + _theme;
+            if (!string.IsNullOrEmpty(template.Namespace))
-
+            {
+                _location = template.Location + template.Namespace.Replace("[Owner]", _owner).Replace("[Theme]", _theme);
+            }
+            else
+            {
+                _location = template.Location + _owner + ".Theme." + _theme;
+            }
         }
         StateHasChanged();
     }

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -127,17 +127,26 @@ namespace Oqtane.Controllers
                 DirectoryInfo rootFolder = Directory.GetParent(_environment.ContentRootPath);
                 string templatePath = Utilities.PathCombine(_environment.WebRootPath, "Modules", "Templates", moduleDefinition.Template, Path.DirectorySeparatorChar.ToString());
 
+                if (!string.IsNullOrEmpty(moduleDefinition.ModuleDefinitionName))
+                {
+                    moduleDefinition.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName.Replace("[Owner]", moduleDefinition.Owner).Replace("[Module]", moduleDefinition.Name);
+                }
+                else
+                {
+                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + ".Module." + moduleDefinition.Name;
+                }
+
                 if (moduleDefinition.Template.ToLower().Contains("internal"))
                 {
                     rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString());
-                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + ".Module." + moduleDefinition.Name + ", Oqtane.Client";
+                    moduleDefinition.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName + ", Oqtane.Client";
-                    moduleDefinition.ServerManagerType = moduleDefinition.Owner + ".Module." + moduleDefinition.Name + ".Manager." + moduleDefinition.Name + "Manager, Oqtane.Server";
+                    moduleDefinition.ServerManagerType = moduleDefinition.ModuleDefinitionName + ".Manager." + moduleDefinition.Name + "Manager, Oqtane.Server";
                 }
                 else
                 {
                     rootPath = Utilities.PathCombine(rootFolder.Parent.FullName, moduleDefinition.Owner + ".Module." + moduleDefinition.Name, Path.DirectorySeparatorChar.ToString());
-                    moduleDefinition.ModuleDefinitionName = moduleDefinition.Owner + ".Module." + moduleDefinition.Name + ", " + moduleDefinition.Owner + ".Module." + moduleDefinition.Name + ".Client.Oqtane";
+                    moduleDefinition.ModuleDefinitionName = moduleDefinition.ModuleDefinitionName + ", " + moduleDefinition.ModuleDefinitionName + ".Client.Oqtane";
-                    moduleDefinition.ServerManagerType = moduleDefinition.Owner + ".Module." + moduleDefinition.Name + ".Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.Owner + ".Module." + moduleDefinition.Name + ".Server.Oqtane";
+                    moduleDefinition.ServerManagerType = moduleDefinition.ModuleDefinitionName + ".Manager." + moduleDefinition.Name + "Manager, " + moduleDefinition.ModuleDefinitionName + ".Server.Oqtane";
                 }
 
                 ProcessTemplatesRecursively(new DirectoryInfo(templatePath), rootPath, rootFolder.Name, templatePath, moduleDefinition);
@@ -301,7 +310,7 @@ namespace Oqtane.Controllers
                     }
                     else
                     {
-                        templates.Add(new Template { Name = name, Title = name, Type = "External", Version = "", Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString()) });
+                        templates.Add(new Template { Name = name, Title = name, Type = "External", Version = "", Namespace = "", Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString()) });
                     }
                 }
             }

Oqtane.Server/Controllers/ThemeController.cs

@@ -173,15 +173,24 @@ namespace Oqtane.Controllers
                 DirectoryInfo rootFolder = Directory.GetParent(_environment.ContentRootPath);
                 string templatePath = Utilities.PathCombine(_environment.WebRootPath, "Themes", "Templates", theme.Template, Path.DirectorySeparatorChar.ToString());
 
+                if (!string.IsNullOrEmpty(theme.ThemeName))
+                {
+                    theme.ThemeName = theme.ThemeName.Replace("[Owner]", theme.Owner).Replace("[Theme]", theme.Name);
+                }
+                else
+                {
+                    theme.ThemeName = theme.Owner + ".Theme." + theme.Name;
+                }
+
                 if (theme.Template.ToLower().Contains("internal"))
                 {
                     rootPath = Utilities.PathCombine(rootFolder.FullName, Path.DirectorySeparatorChar.ToString());
-                    theme.ThemeName = theme.Owner + ".Theme." + theme.Name + ", Oqtane.Client";
+                    theme.ThemeName = theme.ThemeName + ", Oqtane.Client";
                 }
                 else
                 {
                     rootPath = Utilities.PathCombine(rootFolder.Parent.FullName, theme.Owner + ".Theme." + theme.Name, Path.DirectorySeparatorChar.ToString());
-                    theme.ThemeName = theme.Owner + ".Theme." + theme.Name + ", " + theme.Owner + ".Theme." + theme.Name + ".Client.Oqtane";
+                    theme.ThemeName = theme.ThemeName + ", " + theme.ThemeName + ".Client.Oqtane";
                 }
 
                 ProcessTemplatesRecursively(new DirectoryInfo(templatePath), rootPath, rootFolder.Name, templatePath, theme);

Oqtane.Server/wwwroot/Modules/Templates/External/template.json

@@ -1,5 +1,6 @@
 {
   "Title": "Default Module Template",
   "Type": "External",
-  "Version": "4.0.2"
+  "Version": "4.0.3",
+  "Namespace": "[Owner].Module.[Module]"
 }

Oqtane.Server/wwwroot/Themes/Templates/External/template.json

@@ -1,5 +1,6 @@
 {
   "Title": "Default Theme Template",
   "Type": "External",
-  "Version": "4.0.0"
+  "Version": "4.0.3",
+  "Namespace": "[Owner].Theme.[Theme]"
 }

Oqtane.Shared/Models/Template.cs

@@ -25,6 +25,11 @@ namespace Oqtane.Models
         /// </summary>
         public string Version { get; set; }
 
+        /// <summary>
+        /// namespace (uses tokens)
+        /// </summary>
+        public string Namespace { get; set; }
+
         /// <summary>
         /// location where template will be created (dynamically set)
         /// </summary>