From fa18467cdd34f19c84c50a3a564e6cb711d6b089 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Thu, 3 Aug 2023 15:26:23 -0400
Subject: [PATCH] fix #3069 - exclude templates from release packages

---
 Oqtane.Package/release.cmd                    |  4 +--
 .../Controllers/ModuleDefinitionController.cs | 29 ++++++++++---------
 Oqtane.Server/Controllers/ThemeController.cs  | 29 ++++++++++---------
 .../SiteTemplates/DefaultSiteTemplate.cs      | 29 -------------------
 4 files changed, 34 insertions(+), 57 deletions(-)

diff --git a/Oqtane.Package/release.cmd b/Oqtane.Package/release.cmd
index c3e281c9..299aa439 100644
--- a/Oqtane.Package/release.cmd
+++ b/Oqtane.Package/release.cmd
@@ -14,7 +14,7 @@ dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release
 del /F/Q/S "..\Oqtane.Server\bin\Release\net7.0\publish\wwwroot\Content" > NUL
 rmdir /Q/S "..\Oqtane.Server\bin\Release\net7.0\publish\wwwroot\Content"
 setlocal ENABLEDELAYEDEXPANSION
-set retain=Oqtane.Modules.Admin.Login,Oqtane.Modules.HtmlText,Templates
+set retain=Oqtane.Modules.Admin.Login,Oqtane.Modules.HtmlText
 for /D %%i in ("..\Oqtane.Server\bin\Release\net7.0\publish\wwwroot\Modules\*") do (
 set /A found=0
 for %%j in (%retain%) do (
@@ -22,7 +22,7 @@ if "%%~nxi" == "%%j" set /A found=1
 )
 if not !found! == 1 rmdir /Q/S "%%i"
 )
-set retain=Oqtane.Themes.BlazorTheme,Oqtane.Themes.OqtaneTheme,Templates
+set retain=Oqtane.Themes.BlazorTheme,Oqtane.Themes.OqtaneTheme
 for /D %%i in ("..\Oqtane.Server\bin\Release\net7.0\publish\wwwroot\Themes\*") do (
 set /A found=0
 for %%j in (%retain%) do (
diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
index 21379582..95380bef 100644
--- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs
+++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
@@ -283,23 +283,26 @@ namespace Oqtane.Controllers
             var templates = new List<Template>();
             var root = Directory.GetParent(_environment.ContentRootPath);
             string templatePath = Utilities.PathCombine(_environment.WebRootPath, "Modules", "Templates", Path.DirectorySeparatorChar.ToString());
-            foreach (string directory in Directory.GetDirectories(templatePath))
+            if (Directory.Exists(templatePath))
             {
-                string name = directory.Replace(templatePath, "");
-                if (System.IO.File.Exists(Path.Combine(directory, "template.json")))
+                foreach (string directory in Directory.GetDirectories(templatePath))
                 {
-                    var template = JsonSerializer.Deserialize<Template>(System.IO.File.ReadAllText(Path.Combine(directory, "template.json")));
-                    template.Name = name;
-                    template.Location = "";
-                    if (template.Type.ToLower() != "internal")
+                    string name = directory.Replace(templatePath, "");
+                    if (System.IO.File.Exists(Path.Combine(directory, "template.json")))
                     {
-                        template.Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString());
+                        var template = JsonSerializer.Deserialize<Template>(System.IO.File.ReadAllText(Path.Combine(directory, "template.json")));
+                        template.Name = name;
+                        template.Location = "";
+                        if (template.Type.ToLower() != "internal")
+                        {
+                            template.Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString());
+                        }
+                        templates.Add(template);
+                    }
+                    else
+                    {
+                        templates.Add(new Template { Name = name, Title = name, Type = "External", Version = "", Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString()) });
                     }
-                    templates.Add(template);
-                }
-                else
-                {
-                    templates.Add(new Template { Name = name, Title = name, Type = "External", Version = "", Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString()) });
                 }
             }
             return templates;
diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs
index 6606f8f9..5135ef22 100644
--- a/Oqtane.Server/Controllers/ThemeController.cs
+++ b/Oqtane.Server/Controllers/ThemeController.cs
@@ -137,23 +137,26 @@ namespace Oqtane.Controllers
             var templates = new List<Template>();
             var root = Directory.GetParent(_environment.ContentRootPath);
             string templatePath = Utilities.PathCombine(_environment.WebRootPath, "Themes", "Templates", Path.DirectorySeparatorChar.ToString());
-            foreach (string directory in Directory.GetDirectories(templatePath))
+            if (Directory.Exists(templatePath))
             {
-                string name = directory.Replace(templatePath, "");
-                if (System.IO.File.Exists(Path.Combine(directory, "template.json")))
+                foreach (string directory in Directory.GetDirectories(templatePath))
                 {
-                    var template = JsonSerializer.Deserialize<Template>(System.IO.File.ReadAllText(Path.Combine(directory, "template.json")));
-                    template.Name = name;
-                    template.Location = "";
-                    if (template.Type.ToLower() != "internal")
+                    string name = directory.Replace(templatePath, "");
+                    if (System.IO.File.Exists(Path.Combine(directory, "template.json")))
                     {
-                        template.Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString());
+                        var template = JsonSerializer.Deserialize<Template>(System.IO.File.ReadAllText(Path.Combine(directory, "template.json")));
+                        template.Name = name;
+                        template.Location = "";
+                        if (template.Type.ToLower() != "internal")
+                        {
+                            template.Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString());
+                        }
+                        templates.Add(template);
+                    }
+                    else
+                    {
+                        templates.Add(new Template { Name = name, Title = name, Type = "External", Version = "", Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString()) });
                     }
-                    templates.Add(template);
-                }
-                else
-                {
-                    templates.Add(new Template { Name = name, Title = name, Type = "External", Version = "", Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString()) });
                 }
             }
             return templates;
diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
index 6a20b984..6819277a 100644
--- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
+++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
@@ -133,35 +133,6 @@ namespace Oqtane.SiteTemplates
                     }
                 }
             });
-            _pageTemplates.Add(new PageTemplate
-            {
-                Name = "Develop",
-                Parent = "",
-                Order = 7,
-                Path = "develop",
-                Icon = "oi oi-wrench",
-                IsNavigation = true,
-                IsPersonalizable = false,
-                PermissionList = new List<Permission> {
-                    new Permission(PermissionNames.View, RoleNames.Host, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                },
-                PageTemplateModules = new List<PageTemplateModule> {
-                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Software Development", Pane = PaneNames.Default,
-                        PermissionList = new List<Permission> {
-                            new Permission(PermissionNames.View, RoleNames.Host, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                        },
-                        Content = "<p>Oqtane offers a Module Creator which allows you to create new modules to extend the framework with additional capabilities. Simply provide some basic information and the system will scaffold a completely functional module which includes all of the necessary code files and assets to get you up and running as quickly as possible.</p>"
-                    },
-                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.ModuleCreator, Oqtane.Client", Title = "Module Creator", Pane = PaneNames.Default,
-                        PermissionList = new List<Permission> {
-                            new Permission(PermissionNames.View, RoleNames.Host, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Host, true)
-                        }
-                    }
-                }
-            });
 
             if (System.IO.File.Exists(Path.Combine(_environment.WebRootPath, "images", "logo-white.png")))
             {