From 0f09df13b54b2b8789e4680a1dcfba164de484fa Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Thu, 28 May 2020 14:48:00 -0400
Subject: [PATCH] page redirect support and added missing unique indexes on
 database tables

---
 Oqtane.Client/UI/ThemeBuilder.razor    |  7 ++++++
 Oqtane.Server/Oqtane.Server.csproj     |  6 +++++
 Oqtane.Server/Scripts/Master.1.0.1.sql | 29 ++++++++++++++++++++++
 Oqtane.Server/Scripts/Tenant.1.0.1.sql | 33 ++++++++++++++++++++++++++
 4 files changed, 75 insertions(+)
 create mode 100644 Oqtane.Server/Scripts/Master.1.0.1.sql
 create mode 100644 Oqtane.Server/Scripts/Tenant.1.0.1.sql

diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 792572b8..8857bad9 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -13,6 +13,13 @@
     {
         var interop = new Interop(JsRuntime);
 
+        // handle page redirection
+        if (!string.IsNullOrEmpty(PageState.Page.Url))
+        {
+            NavigationManager.NavigateTo(PageState.Page.Url);
+            return;
+        }
+
         // set page title
         if (!string.IsNullOrEmpty(PageState.Page.Title))
         {
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index ccc27cd2..dae3eed2 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -23,7 +23,13 @@
     <EmbeddedResource Remove="wwwroot\Modules\Templates\**" />
   </ItemGroup>
   <ItemGroup>
+    <None Remove="Scripts\Master.1.0.1.sql" />
+    <None Remove="Scripts\Tenant.1.0.1.sql" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Scripts\Master.1.0.1.sql" />
     <EmbeddedResource Include="Scripts\Master.0.9.0.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.1.0.1.sql" />
     <EmbeddedResource Include="Scripts\Tenant.0.9.0.sql" />
     <EmbeddedResource Include="Scripts\Tenant.0.9.1.sql" />
     <EmbeddedResource Include="Scripts\Tenant.0.9.2.sql" />
diff --git a/Oqtane.Server/Scripts/Master.1.0.1.sql b/Oqtane.Server/Scripts/Master.1.0.1.sql
new file mode 100644
index 00000000..e742869d
--- /dev/null
+++ b/Oqtane.Server/Scripts/Master.1.0.1.sql
@@ -0,0 +1,29 @@
+/*  
+
+Version 1.0.1 Master migration script
+
+*/
+
+CREATE UNIQUE NONCLUSTERED INDEX IX_Tenant ON [dbo].[Tenant]
+	(
+	[Name]
+	) ON [PRIMARY]
+GO
+
+CREATE UNIQUE NONCLUSTERED INDEX IX_Alias ON [dbo].[Alias]
+	(
+	[Name]
+	) ON [PRIMARY]
+GO
+
+CREATE UNIQUE NONCLUSTERED INDEX IX_ModuleDefinition ON [dbo].[ModuleDefinition]
+	(
+	[ModuleDefinitionName]
+	) ON [PRIMARY]
+GO
+
+CREATE UNIQUE NONCLUSTERED INDEX IX_Job ON [dbo].[Job]
+	(
+	[JobType]
+	) ON [PRIMARY]
+GO
diff --git a/Oqtane.Server/Scripts/Tenant.1.0.1.sql b/Oqtane.Server/Scripts/Tenant.1.0.1.sql
new file mode 100644
index 00000000..83904a29
--- /dev/null
+++ b/Oqtane.Server/Scripts/Tenant.1.0.1.sql
@@ -0,0 +1,33 @@
+/*  
+
+Version 1.0.1 Tenant migration script
+
+*/
+
+CREATE UNIQUE NONCLUSTERED INDEX IX_Site ON [dbo].[Site]
+	(
+	[TenantId],
+	[Name]
+	) ON [PRIMARY]
+GO
+
+CREATE UNIQUE NONCLUSTERED INDEX IX_Role ON [dbo].[Role]
+	(
+	[SiteId],
+	[Name]
+	) ON [PRIMARY]
+GO
+
+CREATE UNIQUE NONCLUSTERED INDEX IX_Profile ON [dbo].[Profile]
+	(
+	[SiteId],
+	[Name]
+	) ON [PRIMARY]
+GO
+
+CREATE UNIQUE NONCLUSTERED INDEX IX_File ON [dbo].[File]
+	(
+	[FolderId],
+	[Name]
+	) ON [PRIMARY]
+GO