From 1c2abe794a3e88f4d2c9a3df17184bf12fe74861 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Mon, 10 Jun 2024 12:33:09 -0400
Subject: [PATCH] move Search page/module to Admin template so that it is
 always provisioned

---
 .../SiteTemplates/DefaultSiteTemplate.cs      | 24 -----------------
 .../Infrastructure/UpgradeManager.cs          |  4 +--
 Oqtane.Server/Repository/SiteRepository.cs    | 27 +++++++++++++++++++
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
index 447678ed..7cf27808 100644
--- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
+++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
@@ -133,30 +133,6 @@ namespace Oqtane.SiteTemplates
                     }
                 }
             });
-            _pageTemplates.Add(new PageTemplate
-            {
-                Name = "Search Results",
-                Parent = "",
-                Order = 7,
-                Path = "search",
-                Icon = "oi oi-magnifying-glass",
-                IsNavigation = false,
-                IsPersonalizable = false,
-                PermissionList = new List<Permission> {
-                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
-                    new Permission(PermissionNames.View, RoleNames.Admin, true),
-                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                },
-                PageTemplateModules = new List<PageTemplateModule> {
-                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.SearchResults, Oqtane.Client", Title = "Search Results", Pane = PaneNames.Default,
-                        PermissionList = new List<Permission> {
-                            new Permission(PermissionNames.View, RoleNames.Everyone, true),
-                            new Permission(PermissionNames.View, RoleNames.Admin, true),
-                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
-                        }
-                    }
-                }
-            });
 
             if (System.IO.File.Exists(Path.Combine(_environment.WebRootPath, "images", "logo-white.png")))
             {
diff --git a/Oqtane.Server/Infrastructure/UpgradeManager.cs b/Oqtane.Server/Infrastructure/UpgradeManager.cs
index 8737dd65..903c612d 100644
--- a/Oqtane.Server/Infrastructure/UpgradeManager.cs
+++ b/Oqtane.Server/Infrastructure/UpgradeManager.cs
@@ -399,7 +399,7 @@ namespace Oqtane.Infrastructure
             var pageTemplates = new List<PageTemplate>();
             pageTemplates.Add(new PageTemplate
             {
-                Name = "Search Results",
+                Name = "Search",
                 Parent = "",
                 Path = "search",
                 Icon = "oi oi-magnifying-glass",
@@ -411,7 +411,7 @@ namespace Oqtane.Infrastructure
                     new Permission(PermissionNames.Edit, RoleNames.Admin, true)
                 },
                 PageTemplateModules = new List<PageTemplateModule> {
-                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.SearchResults, Oqtane.Client", Title = "Search Results", Pane = PaneNames.Default,
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.SearchResults, Oqtane.Client", Title = "Search", Pane = PaneNames.Default,
                         PermissionList = new List<Permission> {
                             new Permission(PermissionNames.View, RoleNames.Everyone, true),
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
index 3328461b..cc8afd58 100644
--- a/Oqtane.Server/Repository/SiteRepository.cs
+++ b/Oqtane.Server/Repository/SiteRepository.cs
@@ -607,6 +607,7 @@ namespace Oqtane.Repository
                     }
                 }
             });
+
             pageTemplates.Add(new PageTemplate
             {
                 Name = "Register",
@@ -666,6 +667,7 @@ namespace Oqtane.Repository
                     }
                 }
             });
+
             pageTemplates.Add(new PageTemplate
             {
                 Name = "Profile",
@@ -695,6 +697,31 @@ namespace Oqtane.Repository
                     }
                 }
             });
+
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Search",
+                Parent = "",
+                Path = "search",
+                Icon = "oi oi-magnifying-glass",
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PermissionList = new List<Permission> {
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                },
+                PageTemplateModules = new List<PageTemplateModule> {
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.Admin.SearchResults, Oqtane.Client", Title = "Search", Pane = PaneNames.Default,
+                        PermissionList = new List<Permission> {
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }
+                    }
+                }
+            });
+
             pageTemplates.Add(new PageTemplate
             {
                 Name = "Not Found",