From aed71fbf96f51fad9b961e1b8cb13c76b44bc8a1 Mon Sep 17 00:00:00 2001
From: Pavel Vesely <pavel@vesely.dev>
Date: Thu, 4 Jun 2020 07:10:45 +0200
Subject: [PATCH 01/24] Add possibility to switch off swagger on production.

---
 Oqtane.Server/Startup.cs | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs
index 183547d2..b9f001bc 100644
--- a/Oqtane.Server/Startup.cs
+++ b/Oqtane.Server/Startup.cs
@@ -29,7 +29,8 @@ namespace Oqtane
         public IConfigurationRoot Configuration { get; }
         private string _webRoot;
         private Runtime _runtime;
-        
+        private bool _useSwagger;
+
         public Startup(IWebHostEnvironment env)
         {
             var builder = new ConfigurationBuilder()
@@ -37,9 +38,12 @@ namespace Oqtane
                 .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true);
             Configuration = builder.Build();
 
-             _runtime = (Configuration.GetSection("Runtime").Value == "WebAssembly") ? Runtime.WebAssembly : Runtime.Server;
+            _runtime = (Configuration.GetSection("Runtime").Value == "WebAssembly") ? Runtime.WebAssembly : Runtime.Server;
+            
+            //add possibility to switch off swagger on production.
+            _useSwagger = Configuration.GetSection("UseSwagger").Value != "false";
 
-            _webRoot = env.WebRootPath;              
+            _webRoot = env.WebRootPath;
             AppDomain.CurrentDomain.SetData("DataDirectory", Path.Combine(env.ContentRootPath, "Data"));
         }
 
@@ -47,7 +51,6 @@ namespace Oqtane
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
-            
             services.AddServerSideBlazor();
 
             // setup HttpClient for server side in a client side compatible fashion ( with auth cookie )
@@ -59,7 +62,7 @@ namespace Oqtane
                     var navigationManager = s.GetRequiredService<NavigationManager>();
                     var httpContextAccessor = s.GetRequiredService<IHttpContextAccessor>();
                     var authToken = httpContextAccessor.HttpContext.Request.Cookies[".AspNetCore.Identity.Application"];
-                    var client = new HttpClient(new HttpClientHandler { UseCookies = false });
+                    var client = new HttpClient(new HttpClientHandler {UseCookies = false});
                     if (authToken != null)
                     {
                         client.DefaultRequestHeaders.Add("Cookie", ".AspNetCore.Identity.Application=" + authToken);
@@ -121,7 +124,7 @@ namespace Oqtane
                 .AddEntityFrameworkStores<TenantDBContext>()
                 .AddSignInManager()
                 .AddDefaultTokenProviders();
-            
+
             services.Configure<IdentityOptions>(options =>
             {
                 // Password settings
@@ -199,14 +202,12 @@ namespace Oqtane
             services.AddMvc()
                 .AddNewtonsoftJson()
                 .AddOqtaneApplicationParts() // register any Controllers from custom modules
-                .ConfigureOqtaneMvc();       // any additional configuration from IStart classes.
+                .ConfigureOqtaneMvc(); // any additional configuration from IStart classes.
 
-            services.AddSwaggerGen(c =>
+            if (_useSwagger)
             {
-                c.SwaggerDoc("v1", new OpenApiInfo { Title = "Oqtane", Version = "v1" });
-            });
-
-
+                services.AddSwaggerGen(c => { c.SwaggerDoc("v1", new OpenApiInfo {Title = "Oqtane", Version = "v1"}); });
+            }
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -230,11 +231,11 @@ namespace Oqtane
             app.UseRouting();
             app.UseAuthentication();
             app.UseAuthorization();
-            app.UseSwagger();
-            app.UseSwaggerUI(c =>
+            if (_useSwagger)
             {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", "Oqtane V1");
-            });
+                app.UseSwagger();
+                app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "Oqtane V1"); });
+            }
 
             app.UseEndpoints(endpoints =>
             {
@@ -242,7 +243,6 @@ namespace Oqtane
                 endpoints.MapControllers();
                 endpoints.MapFallbackToPage("/_Host");
             });
-
         }
     }
 }

From 6f6f2b77d7151bebe5355d1e3574dee6109e9a7d Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 4 Jun 2020 21:11:24 -0700
Subject: [PATCH 02/24] '...' added, Reply Removed

---
 .../Modules/Admin/UserProfile/Index.razor      | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index b47eb3fe..4579d138 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -126,7 +126,14 @@ else
                     </Row>
                     <Detail>
                         <td colspan="2"></td>
-                        <td colspan="3">@(context.Body.Length > 100 ? context.Body.Substring(0, 100) : context.Body)</td>
+                        <td colspan="3">
+                            @{ 
+                            string input = "---";
+                            if (context.Body.Contains(input)){ 
+                            context.Body = context.Body.Split(input)[0];
+                            } }
+                            @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
+                        </td>
                     </Detail>
                 </Pager>
             }
@@ -149,7 +156,14 @@ else
                     </Row>
                     <Detail>
                         <td colspan="2"></td>
-                        <td colspan="3">@(context.Body.Length > 100 ? context.Body.Substring(0, 100) : context.Body)</td>
+                        <td colspan="3">
+                            @{ 
+                            string input = "---";
+                            if (context.Body.Contains(input)){ 
+                            context.Body = context.Body.Split(input)[0];
+                            } }
+                            @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
+                        </td>
                     </Detail>
                 </Pager>
             }

From 7b9cd39cb7163a530b5c8d7a6938bbb26d58bc3c Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 4 Jun 2020 21:20:48 -0700
Subject: [PATCH 03/24] To/From Fields enabled/disabled, reply message fix

---
 .../Modules/Admin/UserProfile/View.razor      | 86 +++++++++++++------
 1 file changed, 61 insertions(+), 25 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 5d5a43f5..39fb13d3 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -1,15 +1,9 @@
-@namespace Oqtane.Modules.Admin.UserProfile
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject IUserService UserService
-@inject INotificationService NotificationService
-
-@if (PageState.User != null)
+@if (PageState.User != null)
 {
     <table class="table table-borderless">
         <tr>
             <td>
-                <label  class="control-label">@title: </label>
+                <label class="control-label">@title: </label>
             </td>
             <td>
                 <input class="form-control" @bind="@username" />
@@ -17,47 +11,85 @@
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Subject: </label>
+                <label class="control-label">Subject: </label>
             </td>
             <td>
                 <input class="form-control" @bind="@subject" />
             </td>
         </tr>
+        @if (title == "From")
+        {
+            <td>
+                <input class="form-control" @bind="@subject" readonly />
+            </td>
+        }
+        @if (title == "To")
+        {
+            <td>
+                <input class="form-control" @bind="@subject" />
+            </td>
+            </tr>}
+
         @if (title == "From")
         {
             <tr>
                 <td>
-                    <label  class="control-label">Date: </label>
+                    <label class="control-label">Date: </label>
                 </td>
                 <td>
-                    <input class="form-control" @bind="@createdon" />
+                    <input class="form-control" @bind="@createdon" readonly />
+                </td>
+            </tr>
+        }
+        @if (title == "From")
+        {
+            <tr>
+                <td>
+                    <label class="control-label">Message: </label>
+                </td>
+                <td>
+                    <textarea class="form-control" @bind="@body" rows="5" readonly />
+                </td>
+            </tr>
+        }
+        @if (title == "To")
+        {
+            <tr>
+                <td>
+                    <label class="control-label">Message: </label>
+                </td>
+                <td>
+                    <textarea class="form-control" @bind="@body" rows="5" />
                 </td>
             </tr>
         }
-        <tr>
-            <td>
-                <label  class="control-label">Message: </label>
-            </td>
-            <td>
-                <textarea class="form-control" @bind="@body" rows="5" />
-            </td>
-        </tr>
     </table>
+
     @if (reply != string.Empty)
     {
-        <button type="button" class="btn btn-primary" @onclick="Send">Send</button>
-    }
+        <button type="button" class="btn btn-primary" @onclick="Send">Send</button> }
     else
     {
         if (title == "From")
         {
-            <button type="button" class="btn btn-primary" @onclick="Reply">Reply</button>
-        }
+            <button type="button" class="btn btn-primary" @onclick="Reply">Reply</button>}
     }
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
     <br />
     <br />
-    <p>@reply</p>
+    @if (title == "To")
+    {
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <label class="control-label">Original Message: </label>
+                </td>
+                <td>
+                    <textarea class="form-control" @bind="@reply" rows="5" readonly />
+                </td>
+            </tr>
+        </table>
+    }
 }
 
 @code {
@@ -124,8 +156,12 @@
     private void Reply()
     {
         title = "To";
-        subject = "RE: " + subject;
+        if (!subject.Contains("RE:"))
+        {
+            subject = "RE: " + subject;
+        }
         reply = body;
+        body = "\n\n--------------------------------------------\nSent: " + createdon + "\nSubject: " + subject + "\n\n" + body;
         StateHasChanged();
     }
 

From f854b948ce291be6236a2303939e2b887b030486 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 4 Jun 2020 21:22:48 -0700
Subject: [PATCH 04/24] namespaces removed last commit

---
 Oqtane.Client/Modules/Admin/UserProfile/View.razor | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 39fb13d3..15c2302c 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -1,4 +1,10 @@
-@if (PageState.User != null)
+@namespace Oqtane.Modules.Admin.UserProfile
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUserService UserService
+@inject INotificationService NotificationService
+
+@if (PageState.User != null)
 {
     <table class="table table-borderless">
         <tr>

From af1aab5b8dd3531746732c7cc11c84831b7f53d4 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Fri, 5 Jun 2020 17:57:25 -0700
Subject: [PATCH 05/24] Updated to latest framework message username

addresses conflicts
---
 .../Modules/Admin/UserProfile/View.razor      | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 15c2302c..c13ef4a9 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -11,31 +11,36 @@
             <td>
                 <label class="control-label">@title: </label>
             </td>
-            <td>
-                <input class="form-control" @bind="@username" />
-            </td>
+            @if (title == "From")
+            {
+                <td>
+                    <input class="form-control" @bind="@username" readonly />
+                </td>
+            }
+            @if (title == "To")
+            {
+                <td>
+                    <input class="form-control" @bind="@username" />
+                </td>
+            }
         </tr>
         <tr>
             <td>
                 <label class="control-label">Subject: </label>
             </td>
-            <td>
-                <input class="form-control" @bind="@subject" />
-            </td>
+            @if (title == "From")
+            {
+                <td>
+                    <input class="form-control" @bind="@subject" readonly />
+                </td>
+}
+            @if (title == "To")
+            {
+                <td>
+                    <input class="form-control" @bind="@subject" />
+                </td>
+            }
         </tr>
-        @if (title == "From")
-        {
-            <td>
-                <input class="form-control" @bind="@subject" readonly />
-            </td>
-        }
-        @if (title == "To")
-        {
-            <td>
-                <input class="form-control" @bind="@subject" />
-            </td>
-            </tr>}
-
         @if (title == "From")
         {
             <tr>
@@ -46,7 +51,7 @@
                     <input class="form-control" @bind="@createdon" readonly />
                 </td>
             </tr>
-        }
+}
         @if (title == "From")
         {
             <tr>
@@ -57,7 +62,7 @@
                     <textarea class="form-control" @bind="@body" rows="5" readonly />
                 </td>
             </tr>
-        }
+}
         @if (title == "To")
         {
             <tr>
@@ -68,9 +73,10 @@
                     <textarea class="form-control" @bind="@body" rows="5" />
                 </td>
             </tr>
-        }
+}
     </table>
 
+
     @if (reply != string.Empty)
     {
         <button type="button" class="btn btn-primary" @onclick="Send">Send</button> }
@@ -95,8 +101,8 @@
                 </td>
             </tr>
         </table>
+        }
     }
-}
 
 @code {
     private int notificationid;
@@ -207,5 +213,5 @@
             AddModuleMessage("Error Adding Notification", MessageType.Error);
         }
     }
-
 }
+

From 6efbeeb2b41aa7b5802ea501bde2f97c08b97755 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Sat, 6 Jun 2020 08:02:08 -0700
Subject: [PATCH 06/24] Change dashes to underscores

---
 Oqtane.Client/Modules/Admin/UserProfile/View.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index c13ef4a9..33365065 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -173,7 +173,7 @@
             subject = "RE: " + subject;
         }
         reply = body;
-        body = "\n\n--------------------------------------------\nSent: " + createdon + "\nSubject: " + subject + "\n\n" + body;
+        body = "\n\n____________________________________________\nSent: " + createdon + "\nSubject: " + subject + "\n\n" + body;
         StateHasChanged();
     }
 

From 8d1715368603fdba89ab649da7bf9bbd1f93589b Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Sat, 6 Jun 2020 08:03:42 -0700
Subject: [PATCH 07/24] replace dashes with underscores

---
 Oqtane.Client/Modules/Admin/UserProfile/Index.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 4579d138..5010fa99 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -128,7 +128,7 @@ else
                         <td colspan="2"></td>
                         <td colspan="3">
                             @{ 
-                            string input = "---";
+                            string input = "___";
                             if (context.Body.Contains(input)){ 
                             context.Body = context.Body.Split(input)[0];
                             } }
@@ -158,7 +158,7 @@ else
                         <td colspan="2"></td>
                         <td colspan="3">
                             @{ 
-                            string input = "---";
+                            string input = "___";
                             if (context.Body.Contains(input)){ 
                             context.Body = context.Body.Split(input)[0];
                             } }

From 095a95a3a95940c692579339d24e2282bc64de81 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Sat, 6 Jun 2020 11:46:35 -0700
Subject: [PATCH 08/24] removes message carriage returns

---
 Oqtane.Client/Modules/Admin/UserProfile/Index.razor | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 5010fa99..af9d2a11 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -131,6 +131,8 @@ else
                             string input = "___";
                             if (context.Body.Contains(input)){ 
                             context.Body = context.Body.Split(input)[0];
+                            context.Body = context.Body.Replace("\n", "");
+                            context.Body = context.Body.Replace("\r", "");
                             } }
                             @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
                         </td>
@@ -161,6 +163,8 @@ else
                             string input = "___";
                             if (context.Body.Contains(input)){ 
                             context.Body = context.Body.Split(input)[0];
+                            context.Body = context.Body.Replace("\n", "");
+                            context.Body = context.Body.Replace("\r", "");
                             } }
                             @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
                         </td>

From 51b69e05fbe3cd311bf5020412179b259431c019 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Sat, 6 Jun 2020 15:28:48 -0700
Subject: [PATCH 09/24] Original Message text area full bottom screen

---
 Oqtane.Client/Modules/Admin/UserProfile/View.razor | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 33365065..2e48fcb1 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -91,16 +91,10 @@
     <br />
     @if (title == "To")
     {
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <label class="control-label">Original Message: </label>
-                </td>
-                <td>
-                    <textarea class="form-control" @bind="@reply" rows="5" readonly />
-                </td>
-            </tr>
-        </table>
+        <div class="control-group">
+            <label class="control-label">Original Message </label>
+            <textarea class="form-control" @bind="@reply" rows="5" readonly />
+        </div>
         }
     }
 

From 3e56e9cc040587f92cb992bdfc57f757a51bfd4d Mon Sep 17 00:00:00 2001
From: Bhanu Prakash Korthiwada <hi@bhanu.dev>
Date: Tue, 9 Jun 2020 09:57:09 +0530
Subject: [PATCH 10/24] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d80d120a..ec9fb2c7 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Please note that this project is owned by the .NET Foundation and is governed by
 
 **To get started with Oqtane:**
 
-   1.&nbsp;Install **[.NET Core 3.2 SDK (v3.1.300)](https://dotnet.microsoft.com/download/dotnet-core/thank-you/sdk-3.1.300-windows-x64-installer)**.
+   1.&nbsp;Install **[.NET Core 3.1 SDK (v3.1.300)](https://dotnet.microsoft.com/download/dotnet-core/thank-you/sdk-3.1.300-windows-x64-installer)**.
    
    2.&nbsp;Install the Preview edition of [Visual Studio 2019](https://visualstudio.microsoft.com/vs/preview/) (version 16.6 or higher) with the **ASP.NET and web development** workload enabled. Oqtane works with all editions of Visual Studio from Community to Enterprise. If you do not have a SQL Server installation available already and you wish to use LocalDB for development, you must also install the **.NET desktop development workload**.  
 

From 5124dea72c0ddede75fdf311f3d85466caab0054 Mon Sep 17 00:00:00 2001
From: Jim Spillane <james.a.spillane@gmail.com>
Date: Wed, 10 Jun 2020 21:09:10 -0400
Subject: [PATCH 11/24] Add JS dependency manager

Added LoadJS(https://github.com/muicss/loadjs) and migrated Quill interop to use LoadJS.
---
 .../Modules/Controls/RichTextEditor.razor     |  5 +++
 .../Modules/Controls/RichTextEditorInterop.cs | 11 +++----
 Oqtane.Client/Modules/HtmlText/Edit.razor     |  6 ++--
 Oqtane.Client/UI/Interop.cs                   | 13 ++++++++
 Oqtane.Server/Pages/_Host.cshtml              |  1 +
 Oqtane.Server/wwwroot/js/interop.js           | 10 ++++++
 Oqtane.Server/wwwroot/js/loadjs.min.js        |  1 +
 Oqtane.Server/wwwroot/js/quill-interop.js     | 33 +++++++++++--------
 8 files changed, 58 insertions(+), 22 deletions(-)
 create mode 100644 Oqtane.Server/wwwroot/js/loadjs.min.js

diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index c588274f..6b15441c 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -117,6 +117,11 @@
     {
         if (firstRender)
         {
+            var oqtaneInterop = new Interop(JsRuntime);
+
+            await oqtaneInterop.LoadInteropScript("js/quill-interop.js");
+
+
             var interop = new RichTextEditorInterop(JsRuntime);
 
             await interop.CreateEditor(
diff --git a/Oqtane.Client/Modules/Controls/RichTextEditorInterop.cs b/Oqtane.Client/Modules/Controls/RichTextEditorInterop.cs
index a5bd4ffa..0ecce251 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditorInterop.cs
+++ b/Oqtane.Client/Modules/Controls/RichTextEditorInterop.cs
@@ -13,7 +13,7 @@ namespace Oqtane.Modules.Controls
             _jsRuntime = jsRuntime;
         }
 
-        public Task CreateEditor(
+        public async Task CreateEditor(
             ElementReference quillElement,
             ElementReference toolbar,
             bool readOnly,
@@ -23,15 +23,14 @@ namespace Oqtane.Modules.Controls
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
+                await _jsRuntime.InvokeAsync<object>(
                     "Oqtane.RichTextEditor.createQuill",
-                    quillElement, toolbar, readOnly,
-                    placeholder, theme, debugLevel);
-                return Task.CompletedTask;
+                    quillElement, toolbar, readOnly, placeholder, theme, debugLevel);
+                return;
             }
             catch
             {
-                return Task.CompletedTask;
+                // handle exception
             }
         }
 
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 292706e2..c0051048 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -30,9 +30,9 @@
         // the following resources should be declared in the RichTextEditor component however the framework currently only supports resource management for modules and themes
         new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.bubble.css" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.snow.css" },
-        new Resource { ResourceType = ResourceType.Script, Url = "js/quill1.3.6.min.js" },
-        new Resource { ResourceType = ResourceType.Script, Url = "js/quill-blot-formatter.min.js" },
-        new Resource { ResourceType = ResourceType.Script, Url = "js/quill-interop.js" }
+        //new Resource { ResourceType = ResourceType.Script, Url = "js/quill1.3.6.min.js" },
+        //new Resource { ResourceType = ResourceType.Script, Url = "js/quill-blot-formatter.min.js" },
+        //new Resource { ResourceType = ResourceType.Script, Url = "js/quill-interop.js" }
     };
 
     private RichTextEditor RichTextEditorHtml;
diff --git a/Oqtane.Client/UI/Interop.cs b/Oqtane.Client/UI/Interop.cs
index 3bdbe0bb..c6981b9e 100644
--- a/Oqtane.Client/UI/Interop.cs
+++ b/Oqtane.Client/UI/Interop.cs
@@ -234,5 +234,18 @@ namespace Oqtane.UI
                 return Task.CompletedTask;
             }
         }
+
+        public async Task LoadInteropScript(string filePath)
+        {
+            try
+            {
+                await  _jsRuntime.InvokeAsync<bool>("Oqtane.Interop.loadInteropScript", filePath);
+            }
+            catch
+            {
+                // handle exception
+            }
+
+        }
     }
 }
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index e8795611..a214e706 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -16,6 +16,7 @@
     <link id="app-manifest" rel="manifest" />
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" href="css/app.css" />
+    <script src="js/loadjs.min.js"></script>
 </head>
 <body>
     @(Html.AntiForgeryToken())
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index 5b516f99..e978c591 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -321,5 +321,15 @@ Oqtane.Interop = {
         setInterval(function () {
             window.location.href = url;
         }, wait * 1000);
+    },
+    loadInteropScript: async function (filePath) {
+        const promise = new Promise((resolve, reject) => {
+            loadjs(filePath, { returnPromise: true })
+                .then(function () { resolve(true) })
+                .catch(function (pathsNotFound) { reject(false) });
+        });
+
+        const result = await promise;
+        return;
     }
 };
diff --git a/Oqtane.Server/wwwroot/js/loadjs.min.js b/Oqtane.Server/wwwroot/js/loadjs.min.js
new file mode 100644
index 00000000..b2165fc3
--- /dev/null
+++ b/Oqtane.Server/wwwroot/js/loadjs.min.js
@@ -0,0 +1 @@
+loadjs=function(){var h=function(){},c={},u={},f={};function o(e,n){if(e){var r=f[e];if(u[e]=n,r)for(;r.length;)r[0](e,n),r.splice(0,1)}}function l(e,n){e.call&&(e={success:e}),n.length?(e.error||h)(n):(e.success||h)(e)}function d(r,t,s,i){var c,o,e=document,n=s.async,u=(s.numRetries||0)+1,f=s.before||h,l=r.replace(/[\?|#].*$/,""),a=r.replace(/^(css|img)!/,"");i=i||0,/(^css!|\.css$)/.test(l)?((o=e.createElement("link")).rel="stylesheet",o.href=a,(c="hideFocus"in o)&&o.relList&&(c=0,o.rel="preload",o.as="style")):/(^img!|\.(png|gif|jpg|svg|webp)$)/.test(l)?(o=e.createElement("img")).src=a:((o=e.createElement("script")).src=r,o.async=void 0===n||n),!(o.onload=o.onerror=o.onbeforeload=function(e){var n=e.type[0];if(c)try{o.sheet.cssText.length||(n="e")}catch(e){18!=e.code&&(n="e")}if("e"==n){if((i+=1)<u)return d(r,t,s,i)}else if("preload"==o.rel&&"style"==o.as)return o.rel="stylesheet";t(r,n,e.defaultPrevented)})!==f(r,o)&&e.head.appendChild(o)}function r(e,n,r){var t,s;if(n&&n.trim&&(t=n),s=(t?r:n)||{},t){if(t in c)throw"LoadJS";c[t]=!0}function i(n,r){!function(e,t,n){var r,s,i=(e=e.push?e:[e]).length,c=i,o=[];for(r=function(e,n,r){if("e"==n&&o.push(e),"b"==n){if(!r)return;o.push(e)}--i||t(o)},s=0;s<c;s++)d(e[s],r,n)}(e,function(e){l(s,e),n&&l({success:n,error:r},e),o(t,e)},s)}if(s.returnPromise)return new Promise(i);i()}return r.ready=function(e,n){return function(e,r){e=e.push?e:[e];var n,t,s,i=[],c=e.length,o=c;for(n=function(e,n){n.length&&i.push(e),--o||r(i)};c--;)t=e[c],(s=u[t])?n(t,s):(f[t]=f[t]||[]).push(n)}(e,function(e){l(n,e)}),r},r.done=function(e){o(e,[])},r.reset=function(){c={},u={},f={}},r.isDefined=function(e){return e in c},r}();
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/js/quill-interop.js b/Oqtane.Server/wwwroot/js/quill-interop.js
index abb1b35f..3745b705 100644
--- a/Oqtane.Server/wwwroot/js/quill-interop.js
+++ b/Oqtane.Server/wwwroot/js/quill-interop.js
@@ -1,24 +1,31 @@
 var Oqtane = Oqtane || {};
 
 Oqtane.RichTextEditor = {
-    createQuill: function (
+    createQuill: async function (
         quillElement, toolBar, readOnly,
         placeholder, theme, debugLevel) {
 
-        Quill.register('modules/blotFormatter', QuillBlotFormatter.default);
+        const loadQuill = loadjs(['js/quill1.3.6.min.js', 'js/quill-blot-formatter.min.js'], 'Quill',
+            { async: true, returnPromise: true })
+            .then(function () { /* foo.js & bar.js loaded */
+                Quill.register('modules/blotFormatter', QuillBlotFormatter.default);
 
-        var options = {
-            debug: debugLevel,
-            modules: {
-                toolbar: toolBar,
-                blotFormatter: {}
-            },
-            placeholder: placeholder,
-            readOnly: readOnly,
-            theme: theme
-        };
+                var options = {
+                    debug: debugLevel,
+                    modules: {
+                        toolbar: toolBar,
+                        blotFormatter: {}
+                    },
+                    placeholder: placeholder,
+                    readOnly: readOnly,
+                    theme: theme
+                };
 
-        new Quill(quillElement, options);
+                new Quill(quillElement, options);
+            })
+            .catch(function (pathsNotFound) { /* at least one didn't load */ });
+
+        await loadQuill;
     },
     getQuillContent: function (editorElement) {
         return JSON.stringify(editorElement.__quill.getContents());

From 937ae32a9e0a9a53964f65529d314e25e83a742d Mon Sep 17 00:00:00 2001
From: Jim Spillane <james.a.spillane@gmail.com>
Date: Fri, 12 Jun 2020 08:07:23 -0400
Subject: [PATCH 12/24] Add JS dependency manager

Added LoadJS(https://github.com/muicss/loadjs) and migrated Quill interop to use LoadJS.
---
 Oqtane.Client/Modules/HtmlText/Edit.razor | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index c0051048..f901d693 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -29,10 +29,7 @@
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" },
         // the following resources should be declared in the RichTextEditor component however the framework currently only supports resource management for modules and themes
         new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.bubble.css" },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.snow.css" },
-        //new Resource { ResourceType = ResourceType.Script, Url = "js/quill1.3.6.min.js" },
-        //new Resource { ResourceType = ResourceType.Script, Url = "js/quill-blot-formatter.min.js" },
-        //new Resource { ResourceType = ResourceType.Script, Url = "js/quill-interop.js" }
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.snow.css" }
     };
 
     private RichTextEditor RichTextEditorHtml;

From 8053cc0af61ce11b1ce271abd9ff053aea26a054 Mon Sep 17 00:00:00 2001
From: Pavel Vesely <pavel@vesely.dev>
Date: Fri, 12 Jun 2020 17:44:02 +0200
Subject: [PATCH 13/24] small fixes

---
 .../Modules/Controls/ActionLink.razor         |  3 ++-
 Oqtane.Client/UI/SiteRouter.razor             | 20 ++++++++++++-------
 Oqtane.Server/Controllers/UserController.cs   |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor
index 55c80411..39782c08 100644
--- a/Oqtane.Client/Modules/Controls/ActionLink.razor
+++ b/Oqtane.Client/Modules/Controls/ActionLink.razor
@@ -90,7 +90,8 @@
 
         if (!string.IsNullOrEmpty(IconName))
         {
-            _iconSpan = $"<span class=\"oi oi-{IconName}\"></span>&nbsp;";
+            _iconSpan = $"<span class=\"oi oi-{IconName}\"></span>{(IconOnly?"":"&nbsp")}";
+            
         }
 
         _url = EditUrl(Action, _parameters);
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 429ff29f..76874800 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -361,20 +361,26 @@
 
             string panes = "";
             Type themetype = Type.GetType(page.ThemeType);
-            var themeobject = Activator.CreateInstance(themetype) as IThemeControl;
-            if (themeobject != null)
+            if (themetype != null)
             {
-                panes = themeobject.Panes;
-                page.Resources = ManagePageResources(page.Resources, themeobject.Resources);
+                var themeobject = Activator.CreateInstance(themetype) as IThemeControl;
+                if (themeobject != null)
+                {
+                    panes = themeobject.Panes;
+                    page.Resources = ManagePageResources(page.Resources, themeobject.Resources);
+                }
             }
 
             if (!string.IsNullOrEmpty(page.LayoutType))
             {
                 Type layouttype = Type.GetType(page.LayoutType);
-                var layoutobject = Activator.CreateInstance(layouttype) as ILayoutControl;
-                if (layoutobject != null)
+                if (layouttype != null)
                 {
-                    panes = layoutobject.Panes;
+                    var layoutobject = Activator.CreateInstance(layouttype) as ILayoutControl;
+                    if (layoutobject != null)
+                    {
+                        panes = layoutobject.Panes;
+                    }
                 }
             }
 
diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
index b0dc919c..6fb3c93b 100644
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@@ -75,7 +75,7 @@ namespace Oqtane.Controllers
 
         private User Filter(User user)
         {
-            if (user != null && !User.IsInRole(Constants.AdminRole) && User.Identity.Name != user.Username)
+            if (user != null && !User.IsInRole(Constants.AdminRole) && User.Identity.Name?.ToLower() != user.Username.ToLower())
             {
                 user.DisplayName = "";
                 user.Email = "";

From 4e6b4a20ef6685ae74c08737f47f152d1adc5073 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sun, 14 Jun 2020 12:07:16 -0400
Subject: [PATCH 14/24] refactoring of #518 to simplify registration of scripts
 in modules and themes

---
 Oqtane.Client/Modules/Admin/Login/Index.razor |  3 +-
 .../Modules/Admin/ModuleDefinitions/Add.razor |  3 +-
 .../Admin/ModuleDefinitions/Index.razor       |  5 +-
 Oqtane.Client/Modules/Admin/Themes/Add.razor  |  3 +-
 .../Modules/Admin/Themes/Index.razor          |  5 +-
 .../Modules/Admin/Upgrade/Index.razor         |  5 +-
 .../Modules/Controls/FileManager.razor        |  3 +-
 .../Modules/Controls/RichTextEditor.razor     | 27 ++++-----
 Oqtane.Client/Modules/HtmlText/Edit.razor     |  1 -
 Oqtane.Client/Modules/ModuleBase.cs           | 22 +++++++-
 Oqtane.Client/Themes/ContainerBase.cs         | 55 +------------------
 Oqtane.Client/Themes/LayoutBase.cs            | 18 +-----
 Oqtane.Client/Themes/ThemeBase.cs             | 23 ++++++++
 Oqtane.Client/Themes/ThemeControlBase.cs      | 44 +--------------
 Oqtane.Client/UI/Interop.cs                   | 55 +++++++------------
 Oqtane.Client/UI/ThemeBuilder.razor           | 15 +----
 Oqtane.Server/wwwroot/js/interop.js           | 26 ++++-----
 17 files changed, 106 insertions(+), 207 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 106ee57f..91248ec7 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -1,7 +1,6 @@
 @namespace Oqtane.Modules.Admin.Login
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
-@inject IJSRuntime JsRuntime
 @inject IUserService UserService
 @inject IServiceProvider ServiceProvider
 
@@ -96,7 +95,7 @@
             {
                 await logger.LogInformation("Login Successful For Username {Username}", _username);
                 // complete the login on the server so that the cookies are set correctly on SignalR
-                var interop = new Interop(JsRuntime);
+                var interop = new Interop(JSRuntime);
                 string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken");
                 var fields = new { __RequestVerificationToken = antiforgerytoken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
                 await interop.SubmitForm($"/{PageState.Alias.AliasId}/pages/login/", fields);
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 49ea702d..4d13338e 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -4,7 +4,6 @@
 @inject IFileService FileService
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
-@inject IJSRuntime JsRuntime
 
 @if (_packages != null)
 {
@@ -79,7 +78,7 @@
         try
         {
             ShowProgressIndicator();
-            var interop = new Interop(JsRuntime);
+            var interop = new Interop(JSRuntime);
             await interop.RedirectBrowser(NavigateUrl(), 3);
             await ModuleDefinitionService.InstallModuleDefinitionsAsync();
         }
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index 3354ce5a..88590d5e 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -3,7 +3,6 @@
 @inject NavigationManager NavigationManager
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
-@inject IJSRuntime JsRuntime
 
 @if (_moduleDefinitions == null)
 {
@@ -86,7 +85,7 @@ else
             await PackageService.DownloadPackageAsync(moduledefinitionname, version, "Modules");
             await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", moduledefinitionname, version);
             ShowProgressIndicator();
-            var interop = new Interop(JsRuntime);
+            var interop = new Interop(JSRuntime);
             await interop.RedirectBrowser(NavigateUrl(), 3);
             await ModuleDefinitionService.InstallModuleDefinitionsAsync();
         }
@@ -102,7 +101,7 @@ else
         try
         {
             ShowProgressIndicator();
-            var interop = new Interop(JsRuntime);
+            var interop = new Interop(JSRuntime);
             await interop.RedirectBrowser(NavigateUrl(), 3);
             await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId);
         }
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index 4fc6b155..327a7d3a 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -4,7 +4,6 @@
 @inject IFileService FileService
 @inject IThemeService ThemeService
 @inject IPackageService PackageService
-@inject IJSRuntime JsRuntime
 
 @if (_packages != null)
 {
@@ -79,7 +78,7 @@
         try
         {
             ShowProgressIndicator();
-            var interop = new Interop(JsRuntime);
+            var interop = new Interop(JSRuntime);
             await interop.RedirectBrowser(NavigateUrl(), 3);
             await ThemeService.InstallThemesAsync();
         }
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
index fcb8b779..d2e6b2e9 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -4,7 +4,6 @@
 @inject NavigationManager NavigationManager
 @inject IThemeService ThemeService
 @inject IPackageService PackageService
-@inject IJSRuntime JsRuntime
 
 @if (_themes == null)
 {
@@ -86,7 +85,7 @@ else
             await PackageService.DownloadPackageAsync(themename, version, "Themes");
             await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version);
             ShowProgressIndicator();
-            var interop = new Interop(JsRuntime);
+            var interop = new Interop(JSRuntime);
             await interop.RedirectBrowser(NavigateUrl(), 3);
             await ThemeService.InstallThemesAsync();
         }
@@ -102,7 +101,7 @@ else
         try
         {
             ShowProgressIndicator();
-            var interop = new Interop(JsRuntime);
+            var interop = new Interop(JSRuntime);
             await interop.RedirectBrowser(NavigateUrl(), 3);
             await ThemeService.DeleteThemeAsync(Theme.ThemeName);
         }
diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
index f26d21d7..5eba7cbd 100644
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@@ -4,7 +4,6 @@
 @inject IFileService FileService
 @inject IPackageService PackageService
 @inject IInstallationService InstallationService
-@inject IJSRuntime JsRuntime
 
 @if (_package != null)
 {
@@ -71,7 +70,7 @@
         try
         {
             ShowProgressIndicator();
-            var interop = new Interop(JsRuntime);
+            var interop = new Interop(JSRuntime);
             await interop.RedirectBrowser(NavigateUrl(), 3);
             await InstallationService.Upgrade();
         }
@@ -88,7 +87,7 @@
         {
             await PackageService.DownloadPackageAsync(packageid, version, "Framework");
             ShowProgressIndicator();
-            var interop = new Interop(JsRuntime);
+            var interop = new Interop(JSRuntime);
             await interop.RedirectBrowser(NavigateUrl(), 3);
             await InstallationService.Upgrade();
         }
diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index 96196b06..bfeb0d57 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -4,7 +4,6 @@
 @attribute [OqtaneIgnore]
 @inject IFolderService FolderService
 @inject IFileService FileService
-@inject IJSRuntime JsRuntime
 
 @if (_folders != null)
 {
@@ -258,7 +257,7 @@
 
     private async Task UploadFile()
     {
-        var interop = new Interop(JsRuntime);
+        var interop = new Interop(JSRuntime);
         var upload = await interop.GetFiles(_fileinputid);
         if (upload.Length > 0)
         {
diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index 6b15441c..6a34e0f6 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -1,7 +1,6 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 @attribute [OqtaneIgnore]
-@inject IJSRuntime JsRuntime
 
 <div class="row" style="margin-bottom: 50px;">
     <div class="col">
@@ -108,6 +107,11 @@
     [Parameter]
     public string DebugLevel { get; set; } = "info";
 
+    public override List<Resource> Resources => new List<Resource>()
+    {
+        new Resource { ResourceType = ResourceType.Script, Url = "js/quill-interop.js" }
+    };
+    
     protected override void OnInitialized()
     {
         _content = Content; // raw HTML
@@ -117,12 +121,9 @@
     {
         if (firstRender)
         {
-            var oqtaneInterop = new Interop(JsRuntime);
+            await base.OnAfterRenderAsync(firstRender);
 
-            await oqtaneInterop.LoadInteropScript("js/quill-interop.js");
-
-
-            var interop = new RichTextEditorInterop(JsRuntime);
+            var interop = new RichTextEditorInterop(JSRuntime);
 
             await interop.CreateEditor(
                 _editorElement,
@@ -148,13 +149,13 @@
 
     public async Task RefreshRichText()
     {
-        var interop = new RichTextEditorInterop(JsRuntime);
+        var interop = new RichTextEditorInterop(JSRuntime);
         await interop.LoadEditorContent(_editorElement, _content);
     }
 
     public async Task RefreshRawHtml()
     {
-        var interop = new RichTextEditorInterop(JsRuntime);
+        var interop = new RichTextEditorInterop(JSRuntime);
         _content = await interop.GetHtml(_editorElement);
         StateHasChanged();
     }
@@ -162,7 +163,7 @@
     public async Task<string> GetHtml()
     {
         // get rich text content
-        var interop = new RichTextEditorInterop(JsRuntime);
+        var interop = new RichTextEditorInterop(JSRuntime);
         string content = await interop.GetHtml(_editorElement);
 
         if (_original != content)
@@ -184,7 +185,7 @@
             var fileid = _fileManager.GetFileId();
             if (fileid != -1)
             {
-                var interop = new RichTextEditorInterop(JsRuntime);
+                var interop = new RichTextEditorInterop(JSRuntime);
                 await interop.InsertImage(_editorElement, ContentUrl(fileid));
                 _filemanagervisible = false;
                 _message = string.Empty;
@@ -205,19 +206,19 @@
     // other rich text editor methods which can be used by developers
     public async Task<string> GetText()
     {
-        var interop = new RichTextEditorInterop(JsRuntime);
+        var interop = new RichTextEditorInterop(JSRuntime);
         return await interop.GetText(_editorElement);
     }
 
     public async Task<string> GetContent()
     {
-        var interop = new RichTextEditorInterop(JsRuntime);
+        var interop = new RichTextEditorInterop(JSRuntime);
         return await interop.GetContent(_editorElement);
     }
 
     public async Task EnableEditor(bool mode)
     {
-        var interop = new RichTextEditorInterop(JsRuntime);
+        var interop = new RichTextEditorInterop(JSRuntime);
         await interop.EnableEditor(_editorElement, mode);
     }
 }
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index f901d693..0e15706f 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -27,7 +27,6 @@
     public override List<Resource> Resources => new List<Resource>()
     {
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" },
-        // the following resources should be declared in the RichTextEditor component however the framework currently only supports resource management for modules and themes
         new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.bubble.css" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.snow.css" }
     };
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 9da4a090..b4d8eb7e 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -7,6 +7,8 @@ using System;
 using Oqtane.Enums;
 using Oqtane.UI;
 using System.Collections.Generic;
+using Microsoft.JSInterop;
+using System.Linq;
 
 namespace Oqtane.Modules
 {
@@ -19,6 +21,9 @@ namespace Oqtane.Modules
         [Inject]
         protected ILogService LoggingService { get; set; }
 
+        [Inject]
+        protected IJSRuntime JSRuntime { get; set; }
+
         [CascadingParameter]
         protected PageState PageState { get; set; }
 
@@ -28,7 +33,6 @@ namespace Oqtane.Modules
         [CascadingParameter] 
         protected ModuleInstance ModuleInstance { get; set; }
 
-
         // optional interface properties
         public virtual SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } set { } } // default security
 
@@ -40,7 +44,23 @@ namespace Oqtane.Modules
 
         public virtual List<Resource> Resources { get; set; }
 
+        // base lifecycle method for handling JSInterop script registration
 
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            if (firstRender)
+            {
+                if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
+                {
+                    var interop = new Interop(JSRuntime);
+                    foreach (var resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
+                    {
+                        await interop.LoadScript(resource.Url);
+                    }
+                }
+            }
+        }
+        
         // path method
 
         public string ModulePath()
diff --git a/Oqtane.Client/Themes/ContainerBase.cs b/Oqtane.Client/Themes/ContainerBase.cs
index 527ff0e1..86cf85bd 100644
--- a/Oqtane.Client/Themes/ContainerBase.cs
+++ b/Oqtane.Client/Themes/ContainerBase.cs
@@ -1,64 +1,11 @@
 using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
-using Oqtane.Shared;
 using Oqtane.Models;
-using Oqtane.UI;
 
 namespace Oqtane.Themes
 {
-    public abstract class ContainerBase : ComponentBase, IContainerControl
+    public abstract class ContainerBase : ThemeBase, IContainerControl
     {
-        [Inject]
-        protected IJSRuntime JSRuntime { get; set; }
-
-        [CascadingParameter]
-        protected PageState PageState { get; set; }
-
         [CascadingParameter]
         protected Module ModuleState { get; set; }
-
-        public virtual string Name { get; set; }
-        public virtual string Thumbnail { get; set; }
-
-        public string ThemePath()
-        {
-            return "Themes/" + GetType().Namespace + "/";
-        }
-
-        public string NavigateUrl()
-        {
-            return NavigateUrl(PageState.Page.Path);
-        }
-
-        public string NavigateUrl(string path)
-        {
-            return NavigateUrl(path, "");
-        }
-
-        public string NavigateUrl(string path, string parameters)
-        {
-            return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters);
-        }
-
-        public string EditUrl(string action, string parameters)
-        {
-            return EditUrl(ModuleState.ModuleId, action, parameters);
-        }
-
-        public string EditUrl(int moduleid, string action)
-        {
-            return EditUrl(moduleid, action, "");
-        }
-
-        public string EditUrl(int moduleid, string action, string parameters)
-        {
-            return EditUrl(PageState.Page.Path, moduleid, action, parameters);
-        }
-
-        public string EditUrl(string path, int moduleid, string action, string parameters)
-        {
-            return Utilities.EditUrl(PageState.Alias.Path, path, moduleid, action, parameters);
-        }
-
     }
 }
diff --git a/Oqtane.Client/Themes/LayoutBase.cs b/Oqtane.Client/Themes/LayoutBase.cs
index 29412338..5d3aadfa 100644
--- a/Oqtane.Client/Themes/LayoutBase.cs
+++ b/Oqtane.Client/Themes/LayoutBase.cs
@@ -1,21 +1,7 @@
-using Microsoft.AspNetCore.Components;
-using Oqtane.Shared;
-using Oqtane.UI;
-
-namespace Oqtane.Themes
+namespace Oqtane.Themes
 {
-    public abstract class LayoutBase : ComponentBase, ILayoutControl
+    public abstract class LayoutBase : ThemeBase, ILayoutControl
     {
-        [CascadingParameter]
-        protected PageState PageState { get; set; }
-        public virtual string Name { get; set; }
-        public virtual string Thumbnail { get; set; }
-        public virtual string Panes { get; set; }
-
-        public string LayoutPath()
-        {
-            return "Themes/" + GetType().Namespace + "/";
-        }
 
     }
 }
diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs
index 4083b796..d2289a8b 100644
--- a/Oqtane.Client/Themes/ThemeBase.cs
+++ b/Oqtane.Client/Themes/ThemeBase.cs
@@ -4,6 +4,7 @@ using Oqtane.Models;
 using Oqtane.Shared;
 using Oqtane.UI;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Oqtane.Themes
@@ -22,6 +23,23 @@ namespace Oqtane.Themes
         public virtual string Panes { get; set; }
         public virtual List<Resource> Resources { get; set; }
 
+        // base lifecycle method for handling JSInterop script registration
+
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            if (firstRender)
+            {
+                if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
+                {
+                    var interop = new Interop(JSRuntime);
+                    foreach (var resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
+                    {
+                        await interop.LoadScript(resource.Url);
+                    }
+                }
+            }
+        }
+
         // path method
 
         public string ThemePath()
@@ -60,5 +78,10 @@ namespace Oqtane.Themes
         {
             return Utilities.EditUrl(PageState.Alias.Path, path, moduleid, action, parameters);
         }
+
+        public string ContentUrl(int fileid)
+        {
+            return Utilities.ContentUrl(PageState.Alias, fileid);
+        }
     }
 }
diff --git a/Oqtane.Client/Themes/ThemeControlBase.cs b/Oqtane.Client/Themes/ThemeControlBase.cs
index 62d3ef13..8cb6e763 100644
--- a/Oqtane.Client/Themes/ThemeControlBase.cs
+++ b/Oqtane.Client/Themes/ThemeControlBase.cs
@@ -1,47 +1,7 @@
-using Microsoft.AspNetCore.Components;
-using Oqtane.Shared;
-using Oqtane.UI;
-
-namespace Oqtane.Themes
+namespace Oqtane.Themes
 {
-    public abstract class ThemeControlBase : ComponentBase
+    public abstract class ThemeControlBase : ThemeBase
     {
-        [CascadingParameter]
-        protected PageState PageState { get; set; }
 
-        public string NavigateUrl()
-        {
-            return NavigateUrl(PageState.Page.Path);
-        }
-
-        public string NavigateUrl(string path)
-        {
-            return NavigateUrl(path, "");
-        }
-
-        public string NavigateUrl(string path, string parameters)
-        {
-            return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters);
-        }
-
-        public string EditUrl(int moduleid, string action)
-        {
-            return EditUrl(moduleid, action, "");
-        }
-
-        public string EditUrl(int moduleid, string action, string parameters)
-        {
-            return EditUrl(PageState.Page.Path, moduleid, action, parameters);
-        }
-
-        public string EditUrl(string path, int moduleid, string action, string parameters)
-        {
-            return Utilities.EditUrl(PageState.Alias.Path, path, moduleid, action, parameters);
-        }
-
-        public string ContentUrl(int fileid)
-        {
-            return Utilities.ContentUrl(PageState.Alias, fileid);
-        }
     }
 }
diff --git a/Oqtane.Client/UI/Interop.cs b/Oqtane.Client/UI/Interop.cs
index c6981b9e..54f9ab22 100644
--- a/Oqtane.Client/UI/Interop.cs
+++ b/Oqtane.Client/UI/Interop.cs
@@ -17,9 +17,9 @@ namespace Oqtane.UI
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
-                "Oqtane.Interop.setCookie",
-                name, value, days);
+                _jsRuntime.InvokeVoidAsync(
+                    "Oqtane.Interop.setCookie",
+                    name, value, days);
                 return Task.CompletedTask;
             }
             catch
@@ -46,7 +46,7 @@ namespace Oqtane.UI
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
+                _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.updateTitle",
                     title);
                 return Task.CompletedTask;
@@ -61,7 +61,7 @@ namespace Oqtane.UI
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
+                _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.includeMeta",
                     id, attribute, name, content, key);
                 return Task.CompletedTask;
@@ -76,7 +76,7 @@ namespace Oqtane.UI
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
+                _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.includeLink",
                     id, rel, href, type, integrity, crossorigin, key);
                 return Task.CompletedTask;
@@ -91,7 +91,7 @@ namespace Oqtane.UI
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
+                _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.includeLinks", 
                     (object) links);
                 return Task.CompletedTask;
@@ -106,7 +106,7 @@ namespace Oqtane.UI
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
+                _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.includeScript",
                     id, src, integrity, crossorigin, content, location, key);
                 return Task.CompletedTask;
@@ -117,18 +117,15 @@ namespace Oqtane.UI
             }
         }
 
-        public Task IncludeScripts(object[] scripts)
+        public async Task LoadScript(string path)
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
-                    "Oqtane.Interop.includeScripts",
-                    (object)scripts);
-                return Task.CompletedTask;
+                await _jsRuntime.InvokeVoidAsync("Oqtane.Interop.loadScript", path);
             }
             catch
             {
-                return Task.CompletedTask;
+                // ignore exception
             }
         }
 
@@ -136,7 +133,7 @@ namespace Oqtane.UI
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
+                _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.removeElementsById",
                     prefix, first, last);
                 return Task.CompletedTask;
@@ -165,9 +162,9 @@ namespace Oqtane.UI
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
-                "Oqtane.Interop.submitForm",
-                path, fields);
+                _jsRuntime.InvokeVoidAsync(
+                    "Oqtane.Interop.submitForm",
+                    path, fields);
                 return Task.CompletedTask;
             }
             catch
@@ -194,9 +191,9 @@ namespace Oqtane.UI
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
-                "Oqtane.Interop.uploadFiles",
-                posturl, folder, id);
+                _jsRuntime.InvokeVoidAsync(
+                    "Oqtane.Interop.uploadFiles",
+                    posturl, folder, id);
                 return Task.CompletedTask;
             }
             catch
@@ -209,7 +206,7 @@ namespace Oqtane.UI
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
+                _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.refreshBrowser",
                     force, wait);
                 return Task.CompletedTask;
@@ -224,7 +221,7 @@ namespace Oqtane.UI
         {
             try
             {
-                _jsRuntime.InvokeAsync<object>(
+                _jsRuntime.InvokeVoidAsync(
                     "Oqtane.Interop.redirectBrowser",
                     url, wait);
                 return Task.CompletedTask;
@@ -235,17 +232,5 @@ namespace Oqtane.UI
             }
         }
 
-        public async Task LoadInteropScript(string filePath)
-        {
-            try
-            {
-                await  _jsRuntime.InvokeAsync<bool>("Oqtane.Interop.loadInteropScript", filePath);
-            }
-            catch
-            {
-                // handle exception
-            }
-
-        }
     }
 }
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 30052342..35a9f331 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -30,27 +30,18 @@
             await interop.UpdateTitle(PageState.Site.Name + " - " + PageState.Page.Name);
         }
 
-        // include page resources
+        // manage stylesheets for this page 
         string batch = DateTime.Now.ToString("yyyyMMddHHmmssfff");
         var links = new List<object>();
-        var scripts = new List<object>();
         foreach (Resource resource in PageState.Page.Resources)
         {
-            switch (resource.ResourceType)
+            if (resource.ResourceType == ResourceType.Stylesheet)
             {
-                case ResourceType.Stylesheet:
-                    links.Add(new { id = "app-stylesheet-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = resource.Url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", key = "" });
-                    break;
-                case ResourceType.Script:
-                    scripts.Add(new { id = "app-script-" + batch + "-" + (scripts.Count + 1).ToString("00"), src = resource.Url, integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", content = "", location = "body", key = "" });
-                    break;
+                links.Add(new { id = "app-stylesheet-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = resource.Url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", key = "" });
             }
         }
         await interop.IncludeLinks(links.ToArray());
-        await interop.IncludeScripts(scripts.ToArray());
-        // remove any page resource references which are no longer required for this page
         await interop.RemoveElementsById("app-stylesheet", "", "app-stylesheet-" + batch + "-00");
-        await interop.RemoveElementsById("app-script", "", "app-script-" + batch + "-00");
 
         // add favicon
         if (PageState.Site.FaviconFileId != null)
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index e978c591..b5c866ec 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -145,7 +145,7 @@ Oqtane.Interop = {
                 script.innerHTML = content;
             }
             script.async = false;
-            this.loadScript(script, location)
+            this.addScript(script, location)
                 .then(() => {
                     console.log(src + ' loaded');
                 })
@@ -185,7 +185,7 @@ Oqtane.Interop = {
             }
         }
     },
-    loadScript: function (script, location) {
+    addScript: function (script, location) {
         if (location === 'head') {
             document.head.appendChild(script);
         }
@@ -198,10 +198,14 @@ Oqtane.Interop = {
             script.onerror = rej();
         });
     },
-    includeScripts: function (scripts) {
-        for (let i = 0; i < scripts.length; i++) {
-            this.includeScript(scripts[i].id, scripts[i].src, scripts[i].integrity, scripts[i].crossorigin, scripts[i].content, scripts[i].location, scripts[i].key);
-        }
+    loadScript: async function (path) {
+        const promise = new Promise((resolve, reject) => {
+            loadjs(path, { returnPromise: true })
+                .then(function () { resolve(true) })
+                .catch(function (pathsNotFound) { reject(false) });
+        });
+        const result = await promise;
+        return;
     },
     getAbsoluteUrl: function (url) {
         var a = document.createElement('a');
@@ -321,15 +325,5 @@ Oqtane.Interop = {
         setInterval(function () {
             window.location.href = url;
         }, wait * 1000);
-    },
-    loadInteropScript: async function (filePath) {
-        const promise = new Promise((resolve, reject) => {
-            loadjs(filePath, { returnPromise: true })
-                .then(function () { resolve(true) })
-                .catch(function (pathsNotFound) { reject(false) });
-        });
-
-        const result = await promise;
-        return;
     }
 };

From 428560356369c04d5dcf4d5ff0bf8741fd44bae4 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sun, 14 Jun 2020 13:06:33 -0400
Subject: [PATCH 15/24] migrate script naming convention

---
 .../Infrastructure/DatabaseManager.cs         | 24 +++++++++++++++----
 Oqtane.Server/Oqtane.Server.csproj            | 18 +++++++-------
 Oqtane.Server/Scripts/Master.00.00.00.00.sql  | 10 ++++++++
 ...aster.0.9.0.sql => Master.00.09.00.00.sql} |  0
 ...aster.1.0.1.sql => Master.01.00.01.00.sql} |  0
 Oqtane.Server/Scripts/Tenant.00.00.00.00.sql  | 14 +++++++++++
 ...enant.0.9.0.sql => Tenant.00.09.00.00.sql} |  0
 ...enant.0.9.1.sql => Tenant.00.09.01.00.sql} |  0
 ...enant.0.9.2.sql => Tenant.00.09.02.00.sql} |  0
 ...enant.1.0.1.sql => Tenant.01.00.01.00.sql} |  0
 10 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 Oqtane.Server/Scripts/Master.00.00.00.00.sql
 rename Oqtane.Server/Scripts/{Master.0.9.0.sql => Master.00.09.00.00.sql} (100%)
 rename Oqtane.Server/Scripts/{Master.1.0.1.sql => Master.01.00.01.00.sql} (100%)
 create mode 100644 Oqtane.Server/Scripts/Tenant.00.00.00.00.sql
 rename Oqtane.Server/Scripts/{Tenant.0.9.0.sql => Tenant.00.09.00.00.sql} (100%)
 rename Oqtane.Server/Scripts/{Tenant.0.9.1.sql => Tenant.00.09.01.00.sql} (100%)
 rename Oqtane.Server/Scripts/{Tenant.0.9.2.sql => Tenant.00.09.02.00.sql} (100%)
 rename Oqtane.Server/Scripts/{Tenant.1.0.1.sql => Tenant.01.00.01.00.sql} (100%)

diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index 6c3d50e1..7a7cff0d 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -194,10 +194,12 @@ namespace Oqtane.Infrastructure
 
             if (install.TenantName == Constants.MasterTenant)
             {
+                MigrateScriptNamingConvention("Master", install.ConnectionString);
+
                 var upgradeConfig = DeployChanges
-                    .To
-                    .SqlDatabase(NormalizeConnectionString(install.ConnectionString))
-                    .WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly(), s => s.Contains("Master.") && s.EndsWith(".sql",StringComparison.OrdinalIgnoreCase));
+                .To
+                .SqlDatabase(NormalizeConnectionString(install.ConnectionString))
+                .WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly(), s => s.Contains("Master.") && s.EndsWith(".sql",StringComparison.OrdinalIgnoreCase));
 
                 var upgrade = upgradeConfig.Build();
                 if (upgrade.IsUpgradeRequired())
@@ -285,6 +287,8 @@ namespace Oqtane.Infrastructure
                 {
                     foreach (var tenant in db.Tenant.ToList())
                     {
+                        MigrateScriptNamingConvention("Tenant", tenant.DBConnectionString);
+
                         var upgradeConfig = DeployChanges.To.SqlDatabase(NormalizeConnectionString(tenant.DBConnectionString))
                             .WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly(), s => s.Contains("Tenant.") && s.EndsWith(".sql", StringComparison.OrdinalIgnoreCase));
 
@@ -568,6 +572,18 @@ namespace Oqtane.Infrastructure
             if (string.IsNullOrEmpty(value)) value = defaultValue;
             return value;
         }
-        
+
+        private void MigrateScriptNamingConvention(string scriptType, string connectionString)
+        {
+            // migrate to new naming convention for scripts
+            var migrateConfig = DeployChanges.To.SqlDatabase(NormalizeConnectionString(connectionString))
+                .WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly(), s => s == scriptType + ".00.00.00.00.sql");
+            var migrate = migrateConfig.Build();
+            if (migrate.IsUpgradeRequired())
+            {
+                migrate.PerformUpgrade();
+            }
+        }
+
     }
 }
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index dae3eed2..0db9ece5 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -23,16 +23,14 @@
     <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" />
+    <EmbeddedResource Include="Scripts\Master.00.00.00.00.sql" />
+    <EmbeddedResource Include="Scripts\Master.00.09.00.00.sql" />
+    <EmbeddedResource Include="Scripts\Master.01.00.01.00.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.00.00.00.00.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.00.09.00.00.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.00.09.01.00.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.00.09.02.00.sql" />
+    <EmbeddedResource Include="Scripts\Tenant.01.00.01.00.sql" />
     <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.1.0.0.sql" />
     <EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.Uninstall.sql" />
   </ItemGroup>
diff --git a/Oqtane.Server/Scripts/Master.00.00.00.00.sql b/Oqtane.Server/Scripts/Master.00.00.00.00.sql
new file mode 100644
index 00000000..e94cd112
--- /dev/null
+++ b/Oqtane.Server/Scripts/Master.00.00.00.00.sql
@@ -0,0 +1,10 @@
+/*  
+
+migrate to new naming convention for scripts
+
+*/
+
+UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Master.00.09.00.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Master.0.9.0.sql'
+GO
+UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Master.01.00.01.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Master.1.0.1.sql'
+GO
\ No newline at end of file
diff --git a/Oqtane.Server/Scripts/Master.0.9.0.sql b/Oqtane.Server/Scripts/Master.00.09.00.00.sql
similarity index 100%
rename from Oqtane.Server/Scripts/Master.0.9.0.sql
rename to Oqtane.Server/Scripts/Master.00.09.00.00.sql
diff --git a/Oqtane.Server/Scripts/Master.1.0.1.sql b/Oqtane.Server/Scripts/Master.01.00.01.00.sql
similarity index 100%
rename from Oqtane.Server/Scripts/Master.1.0.1.sql
rename to Oqtane.Server/Scripts/Master.01.00.01.00.sql
diff --git a/Oqtane.Server/Scripts/Tenant.00.00.00.00.sql b/Oqtane.Server/Scripts/Tenant.00.00.00.00.sql
new file mode 100644
index 00000000..ffbe2d02
--- /dev/null
+++ b/Oqtane.Server/Scripts/Tenant.00.00.00.00.sql
@@ -0,0 +1,14 @@
+/*  
+
+migrate to new naming convention for scripts
+
+*/
+
+UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.00.09.00.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.0.9.0.sql'
+GO
+UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.00.09.01.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.0.9.1.sql'
+GO
+UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.00.09.02.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.0.9.2.sql'
+GO
+UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.01.00.01.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.1.0.1.sql'
+GO
diff --git a/Oqtane.Server/Scripts/Tenant.0.9.0.sql b/Oqtane.Server/Scripts/Tenant.00.09.00.00.sql
similarity index 100%
rename from Oqtane.Server/Scripts/Tenant.0.9.0.sql
rename to Oqtane.Server/Scripts/Tenant.00.09.00.00.sql
diff --git a/Oqtane.Server/Scripts/Tenant.0.9.1.sql b/Oqtane.Server/Scripts/Tenant.00.09.01.00.sql
similarity index 100%
rename from Oqtane.Server/Scripts/Tenant.0.9.1.sql
rename to Oqtane.Server/Scripts/Tenant.00.09.01.00.sql
diff --git a/Oqtane.Server/Scripts/Tenant.0.9.2.sql b/Oqtane.Server/Scripts/Tenant.00.09.02.00.sql
similarity index 100%
rename from Oqtane.Server/Scripts/Tenant.0.9.2.sql
rename to Oqtane.Server/Scripts/Tenant.00.09.02.00.sql
diff --git a/Oqtane.Server/Scripts/Tenant.1.0.1.sql b/Oqtane.Server/Scripts/Tenant.01.00.01.00.sql
similarity index 100%
rename from Oqtane.Server/Scripts/Tenant.1.0.1.sql
rename to Oqtane.Server/Scripts/Tenant.01.00.01.00.sql

From 42696eacbd48b95107bfea88a0eeaa15c28abdae Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sun, 14 Jun 2020 21:12:55 -0400
Subject: [PATCH 16/24] fix #600 Unhandled exception opening a user's profile

---
 Oqtane.Client/Modules/Admin/UserProfile/Index.razor | 2 +-
 Oqtane.Client/Services/SettingService.cs            | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index af9d2a11..82ff8309 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -73,7 +73,7 @@ else
         }
     </TabPanel>
     <TabPanel Name="Profile">
-        @if (profiles != null)
+        @if (profiles != null && settings != null)
         {
             <table class="table table-borderless">
                 @foreach (Profile profile in profiles)
diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs
index 451e97b8..97d52054 100644
--- a/Oqtane.Client/Services/SettingService.cs
+++ b/Oqtane.Client/Services/SettingService.cs
@@ -153,7 +153,7 @@ namespace Oqtane.Services
         public string GetSetting(Dictionary<string, string> settings, string settingName, string defaultValue)
         {
             string value = defaultValue;
-            if (settings.ContainsKey(settingName))
+            if (settings != null && settings.ContainsKey(settingName))
             {
                 value = settings[settingName];
             }
@@ -162,6 +162,10 @@ namespace Oqtane.Services
 
         public Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue)
         {
+            if (settings == null)
+            {
+                settings = new Dictionary<string, string>();
+            }
             if (settings.ContainsKey(settingName))
             { 
                 settings[settingName] = settingValue;

From ec416a7fefe380705b5cd95855f6638a6a8f1c1b Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sun, 14 Jun 2020 21:29:14 -0400
Subject: [PATCH 17/24] fix #595 - remove event log entry under scenario where
 a user is unauthenticated

---
 Oqtane.Client/UI/SiteRouter.razor | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 76874800..662202a7 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -277,7 +277,6 @@
             {
                 if (user == null)
                 {
-                    await LogService.Log(null, null, null, GetType().AssemblyQualifiedName, Utilities.GetTypeNameLastSegment(GetType().AssemblyQualifiedName, 1), LogFunction.Security, LogLevel.Error, null, "Page Does Not Exist Or User Is Not Authorized To View Page {Path}", path);
                     // redirect to login page
                     NavigationManager.NavigateTo(Utilities.NavigateUrl(alias.Path, "login", "returnurl=" + path));
                 }

From 1e4b2404c418512d97bfb06e2e782352119127a5 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sun, 14 Jun 2020 21:47:11 -0400
Subject: [PATCH 18/24] added general exception UI handler for #605

---
 Oqtane.Server/Pages/_Host.cshtml  | 11 +++++++++++
 Oqtane.Server/wwwroot/css/app.css | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index a214e706..35608c1e 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -24,6 +24,17 @@
         <component type="typeof(Oqtane.App)" render-mode="Server" />
     </app>
 
+    <div id="blazor-error-ui">
+        <environment include="Staging,Production">
+            An error has occurred. This application may no longer respond until reloaded.
+        </environment>
+        <environment include="Development">
+            An unhandled exception has occurred. See browser dev tools for details.
+        </environment>
+        <a href="~/" class="reload">Reload</a>
+        <a class="dismiss">🗙</a>
+    </div>
+
     <script src="js/interop.js"></script>
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
diff --git a/Oqtane.Server/wwwroot/css/app.css b/Oqtane.Server/wwwroot/css/app.css
index 403f803e..4c9ef493 100644
--- a/Oqtane.Server/wwwroot/css/app.css
+++ b/Oqtane.Server/wwwroot/css/app.css
@@ -163,4 +163,23 @@ app {
         margin-left: -5em;
         width: 10em;
     }
+}
+
+#blazor-error-ui {
+    background: lightyellow;
+    bottom: 0;
+    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+    display: none;
+    left: 0;
+    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+    position: fixed;
+    width: 100%;
+    z-index: 1000;
+}
+
+#blazor-error-ui .dismiss {
+    cursor: pointer;
+    position: absolute;
+    right: 0.75rem;
+    top: 0.5rem;
 }
\ No newline at end of file

From 288cad3d3fcaac2d23fde0e0e5c3426a0fdb0ddf Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sun, 14 Jun 2020 22:08:52 -0400
Subject: [PATCH 19/24] minor cleanup

---
 Oqtane.Server/wwwroot/js/quill-interop.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Server/wwwroot/js/quill-interop.js b/Oqtane.Server/wwwroot/js/quill-interop.js
index 3745b705..22332064 100644
--- a/Oqtane.Server/wwwroot/js/quill-interop.js
+++ b/Oqtane.Server/wwwroot/js/quill-interop.js
@@ -7,7 +7,7 @@ Oqtane.RichTextEditor = {
 
         const loadQuill = loadjs(['js/quill1.3.6.min.js', 'js/quill-blot-formatter.min.js'], 'Quill',
             { async: true, returnPromise: true })
-            .then(function () { /* foo.js & bar.js loaded */
+            .then(function () { 
                 Quill.register('modules/blotFormatter', QuillBlotFormatter.default);
 
                 var options = {
@@ -23,7 +23,7 @@ Oqtane.RichTextEditor = {
 
                 new Quill(quillElement, options);
             })
-            .catch(function (pathsNotFound) { /* at least one didn't load */ });
+            .catch(function (pathsNotFound) { });
 
         await loadQuill;
     },

From 7d7e8e9e6682fc92283d6ad3ce0b136a4f41f6d3 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Mon, 15 Jun 2020 09:22:35 -0400
Subject: [PATCH 20/24] quick fix for #475 - cannot save role

---
 Oqtane.Server/Repository/RoleRepository.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs
index 2814d7e0..9dd27988 100644
--- a/Oqtane.Server/Repository/RoleRepository.cs
+++ b/Oqtane.Server/Repository/RoleRepository.cs
@@ -24,9 +24,9 @@ namespace Oqtane.Repository
             return _db.Role.Where(item => item.SiteId == siteId || item.SiteId == null);
         }
 
-
         public Role AddRole(Role role)
         {
+            role.Description = role.Description.Substring(0, 256);
             _db.Role.Add(role);
             _db.SaveChanges();
             return role;
@@ -34,6 +34,7 @@ namespace Oqtane.Repository
 
         public Role UpdateRole(Role role)
         {
+            role.Description = role.Description.Substring(0, 256);
             _db.Entry(role).State = EntityState.Modified;
             _db.SaveChanges();
             return role;

From 71b3b695fcc654e1c4b1b73418f9f0ae24638e28 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Mon, 15 Jun 2020 15:47:35 -0400
Subject: [PATCH 21/24] fix #618

---
 Oqtane.Server/Repository/RoleRepository.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs
index 9dd27988..f41cc31f 100644
--- a/Oqtane.Server/Repository/RoleRepository.cs
+++ b/Oqtane.Server/Repository/RoleRepository.cs
@@ -26,7 +26,7 @@ namespace Oqtane.Repository
 
         public Role AddRole(Role role)
         {
-            role.Description = role.Description.Substring(0, 256);
+            role.Description = role.Description.Substring(0, (role.Description.Length > 256) ? 256 : role.Description.Length);
             _db.Role.Add(role);
             _db.SaveChanges();
             return role;
@@ -34,7 +34,7 @@ namespace Oqtane.Repository
 
         public Role UpdateRole(Role role)
         {
-            role.Description = role.Description.Substring(0, 256);
+            role.Description = role.Description.Substring(0, (role.Description.Length > 256) ? 256 : role.Description.Length);
             _db.Entry(role).State = EntityState.Modified;
             _db.SaveChanges();
             return role;

From 7c24bae753818b76906a7f84678683daeb9aca33 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Tue, 16 Jun 2020 17:38:06 -0400
Subject: [PATCH 22/24] resolve #566 by moving Bootstrap declaration into theme

---
 Oqtane.Client/Modules/Controls/Section.razor  |  4 +-
 Oqtane.Client/Modules/Controls/TabStrip.razor |  4 +-
 Oqtane.Client/Modules/ModuleBase.cs           |  2 +-
 .../Themes/BlazorTheme/Default.razor          | 11 ++++
 .../Themes/OqtaneTheme/Default.razor          | 13 +++--
 Oqtane.Client/Themes/ThemeBase.cs             |  4 +-
 Oqtane.Client/UI/Interop.cs                   | 16 +++++-
 Oqtane.Server/Pages/_Host.cshtml              |  4 --
 Oqtane.Server/wwwroot/js/interop.js           | 52 +++++++++++++++++--
 Oqtane.Server/wwwroot/js/quill-interop.js     | 39 +++++++-------
 10 files changed, 110 insertions(+), 39 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/Section.razor b/Oqtane.Client/Modules/Controls/Section.razor
index 4f33b42f..f21a7e17 100644
--- a/Oqtane.Client/Modules/Controls/Section.razor
+++ b/Oqtane.Client/Modules/Controls/Section.razor
@@ -4,12 +4,12 @@
 
 <div class="d-flex">
     <div>
-        <a data-toggle="collapse" class="app-link-unstyled" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name">
+        <a data-toggle="collapse" class="app-link-unstyled" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name" @onclick:preventDefault="true">
             <h5>@_heading</h5>
         </a>
     </div>
     <div class="ml-auto">
-        <a data-toggle="collapse" class="app-link-unstyled float-right" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name">
+        <a data-toggle="collapse" class="app-link-unstyled float-right" href="#@Name" aria-expanded="@_expanded" aria-controls="@Name" @onclick:preventDefault="true">
             <i class="oi oi-chevron-bottom"></i>&nbsp;
         </a>
     </div>
diff --git a/Oqtane.Client/Modules/Controls/TabStrip.razor b/Oqtane.Client/Modules/Controls/TabStrip.razor
index 8d8d3838..ee6a6c82 100644
--- a/Oqtane.Client/Modules/Controls/TabStrip.razor
+++ b/Oqtane.Client/Modules/Controls/TabStrip.razor
@@ -11,13 +11,13 @@
                     <li class="nav-item">
                         @if (tabPanel.Name == ActiveTab)
                         {
-                            <a class="nav-link active" data-toggle="tab" href="#@tabPanel.Name" role="tab">
+                            <a class="nav-link active" data-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
                                 @DisplayHeading(tabPanel.Name, tabPanel.Heading)
                             </a>
                         }
                         else
                         {
-                            <a class="nav-link" data-toggle="tab" href="#@tabPanel.Name" role="tab">
+                            <a class="nav-link" data-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
                                 @DisplayHeading(tabPanel.Name, tabPanel.Heading)
                             </a>
                         }
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index b4d8eb7e..ce4ed823 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -55,7 +55,7 @@ namespace Oqtane.Modules
                     var interop = new Interop(JSRuntime);
                     foreach (var resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
                     {
-                        await interop.LoadScript(resource.Url);
+                        await interop.LoadScript(resource.Url, resource.Integrity ?? "", resource.CrossOrigin ?? "");
                     }
                 }
             }
diff --git a/Oqtane.Client/Themes/BlazorTheme/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Default.razor
index 14b7df03..0b664c50 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Default.razor
@@ -1,5 +1,6 @@
 @namespace Oqtane.Themes.BlazorTheme
 @inherits ThemeBase
+@implements IThemeControl
 
 <div class="breadcrumbs">
     <Breadcrumbs />
@@ -30,6 +31,16 @@
 
     public override List<Resource> Resources => new List<Resource>()
     {
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css", Integrity = "sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T", CrossOrigin = "anonymous" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" }
     };
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            var interop = new Interop(JSRuntime);
+            await interop.LoadBootstrapJS();
+        }
+    }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
index 7d8fa135..09035b5a 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
@@ -1,5 +1,6 @@
 @namespace Oqtane.Themes.OqtaneTheme
 @inherits ThemeBase
+@implements IThemeControl
 
 <main role="main">
     <nav class="navbar navbar-expand-md navbar-dark bg-primary fixed-top">
@@ -23,10 +24,16 @@
 
     public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "BootswatchCyborg.css" },
-        // remote stylesheets can be linked using the format below, however we want the default theme to display properly in local development scenarios where an Internet connection is not available
-        //new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css", Integrity = "sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM", CrossOrigin = "anonymous" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css", Integrity = "sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM", CrossOrigin = "anonymous" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" }
     };
 
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            var interop = new Interop(JSRuntime);
+            await interop.LoadBootstrapJS();
+        }
+    }
 }
diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs
index d2289a8b..0d3d9454 100644
--- a/Oqtane.Client/Themes/ThemeBase.cs
+++ b/Oqtane.Client/Themes/ThemeBase.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace Oqtane.Themes
 {
-    public abstract class ThemeBase : ComponentBase, IThemeControl
+    public abstract class ThemeBase : ComponentBase
     {
         [Inject]
         protected IJSRuntime JSRuntime { get; set; }
@@ -34,7 +34,7 @@ namespace Oqtane.Themes
                     var interop = new Interop(JSRuntime);
                     foreach (var resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
                     {
-                        await interop.LoadScript(resource.Url);
+                        await interop.LoadScript(resource.Url, resource.Integrity ?? "", resource.CrossOrigin ?? "");
                     }
                 }
             }
diff --git a/Oqtane.Client/UI/Interop.cs b/Oqtane.Client/UI/Interop.cs
index 54f9ab22..f403ab23 100644
--- a/Oqtane.Client/UI/Interop.cs
+++ b/Oqtane.Client/UI/Interop.cs
@@ -117,11 +117,23 @@ namespace Oqtane.UI
             }
         }
 
-        public async Task LoadScript(string path)
+        public async Task LoadScript(string url, string integrity, string crossorigin)
         {
             try
             {
-                await _jsRuntime.InvokeVoidAsync("Oqtane.Interop.loadScript", path);
+                await _jsRuntime.InvokeVoidAsync("Oqtane.Interop.loadScript", url, integrity, crossorigin);
+            }
+            catch
+            {
+                // ignore exception
+            }
+        }
+
+        public async Task LoadBootstrapJS()
+        {
+            try
+            {
+                await _jsRuntime.InvokeVoidAsync("Oqtane.Interop.loadBootstrapJS");
             }
             catch
             {
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index 35608c1e..c48f226b 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -14,7 +14,6 @@
     <link id="app-favicon" rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
     <!-- stub the PWA manifest but defer the assignment of href -->
     <link id="app-manifest" rel="manifest" />
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" href="css/app.css" />
     <script src="js/loadjs.min.js"></script>
 </head>
@@ -36,9 +35,6 @@
     </div>
 
     <script src="js/interop.js"></script>
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
     @if (Configuration.GetSection("Runtime").Value == "WebAssembly")
     {
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index b5c866ec..7588de0f 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -198,12 +198,30 @@ Oqtane.Interop = {
             script.onerror = rej();
         });
     },
-    loadScript: async function (path) {
+    loadScript: async function (url, integrity, crossorigin) {
         const promise = new Promise((resolve, reject) => {
-            loadjs(path, { returnPromise: true })
-                .then(function () { resolve(true) })
-                .catch(function (pathsNotFound) { reject(false) });
+
+            if (loadjs.isDefined(url)) {
+                resolve(true);
+                return;
+            }
+
+            loadjs(url, url, {
+                async: false,
+                returnPromise: true,
+                before: function (path, element) {
+                    if (path === url && integrity !== '') {
+                        element.integrity = integrity;
+                    }
+                    if (path === url && crossorigin !== '') {
+                        element.crossOrigin = crossorigin;
+                    }
+                }
+            })
+            .then(function () { resolve(true) })
+            .catch(function (pathsNotFound) { reject(false) });
         });
+
         const result = await promise;
         return;
     },
@@ -325,5 +343,31 @@ Oqtane.Interop = {
         setInterval(function () {
             window.location.href = url;
         }, wait * 1000);
+    },
+    loadBootstrapJS: async function () {
+        if (!loadjs.isDefined('Bootstrap')) {
+            const bootstrap = loadjs(['https://code.jquery.com/jquery-3.3.1.slim.min.js', 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js', 'https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js'], 'Bootstrap', {
+                async: false,
+                returnPromise: true,
+                before: function (path, element) {
+                    if (path === 'https://code.jquery.com/jquery-3.3.1.slim.min.js') {
+                        element.integrity = 'sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo';
+                        element.crossOrigin = 'anonymous';
+                    }
+                    if (path === 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js') {
+                        element.integrity = 'sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1';
+                        element.crossOrigin = 'anonymous';
+                    }
+                    if (path === 'https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js') {
+                        element.integrity = 'sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM';
+                        element.crossOrigin = 'anonymous';
+                    }
+                }
+            })
+            .then(function () { })
+            .catch(function (pathsNotFound) { });
+
+            await bootstrap;
+        }
     }
 };
diff --git a/Oqtane.Server/wwwroot/js/quill-interop.js b/Oqtane.Server/wwwroot/js/quill-interop.js
index 22332064..9467584a 100644
--- a/Oqtane.Server/wwwroot/js/quill-interop.js
+++ b/Oqtane.Server/wwwroot/js/quill-interop.js
@@ -5,27 +5,28 @@ Oqtane.RichTextEditor = {
         quillElement, toolBar, readOnly,
         placeholder, theme, debugLevel) {
 
-        const loadQuill = loadjs(['js/quill1.3.6.min.js', 'js/quill-blot-formatter.min.js'], 'Quill',
-            { async: true, returnPromise: true })
-            .then(function () { 
-                Quill.register('modules/blotFormatter', QuillBlotFormatter.default);
+        if (!loadjs.isDefined('Quill')) {
+            const loadQuill = loadjs(['js/quill1.3.6.min.js', 'js/quill-blot-formatter.min.js'], 'Quill',
+                { async: true, returnPromise: true })
+                .then(function () {
+                    Quill.register('modules/blotFormatter', QuillBlotFormatter.default);
+                })
+                .catch(function (pathsNotFound) { });
+            await loadQuill;
+        }
 
-                var options = {
-                    debug: debugLevel,
-                    modules: {
-                        toolbar: toolBar,
-                        blotFormatter: {}
-                    },
-                    placeholder: placeholder,
-                    readOnly: readOnly,
-                    theme: theme
-                };
+        var options = {
+            debug: debugLevel,
+            modules: {
+                toolbar: toolBar,
+                blotFormatter: {}
+            },
+            placeholder: placeholder,
+            readOnly: readOnly,
+            theme: theme
+        };
 
-                new Quill(quillElement, options);
-            })
-            .catch(function (pathsNotFound) { });
-
-        await loadQuill;
+        new Quill(quillElement, options);
     },
     getQuillContent: function (editorElement) {
         return JSON.stringify(editorElement.__quill.getContents());

From 06362272848f99cfc0a141ae3c03efb741c0cd8b Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Wed, 17 Jun 2020 10:27:14 -0400
Subject: [PATCH 23/24] refactored script resource declaration to allow for
 bundling, made script loading async, refactored RichTextEditor to use new
 method

---
 .../Modules/Controls/RichTextEditor.razor     |  4 +-
 Oqtane.Client/Modules/ModuleBase.cs           |  8 +-
 .../Themes/BlazorTheme/Default.razor          | 13 +--
 .../Themes/OqtaneTheme/Default.razor          | 14 +--
 Oqtane.Client/Themes/ThemeBase.cs             |  8 +-
 Oqtane.Client/UI/Interop.cs                   | 18 +---
 Oqtane.Client/UI/ThemeBuilder.razor           |  7 +-
 Oqtane.Server/wwwroot/js/interop.js           | 91 +++++++++----------
 Oqtane.Server/wwwroot/js/quill-interop.js     | 10 +-
 Oqtane.Shared/Models/Resource.cs              |  1 +
 10 files changed, 70 insertions(+), 104 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index 6a34e0f6..28888050 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -109,7 +109,9 @@
 
     public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Script, Url = "js/quill-interop.js" }
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill1.3.6.min.js" },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-blot-formatter.min.js" },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" }
     };
     
     protected override void OnInitialized()
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index ce4ed823..f36a04ae 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -52,11 +52,13 @@ namespace Oqtane.Modules
             {
                 if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
                 {
-                    var interop = new Interop(JSRuntime);
-                    foreach (var resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
+                    var scripts = new List<object>();
+                    foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
                     {
-                        await interop.LoadScript(resource.Url, resource.Integrity ?? "", resource.CrossOrigin ?? "");
+                        scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "" });
                     }
+                    var interop = new Interop(JSRuntime);
+                    await interop.IncludeScripts(scripts.ToArray());
                 }
             }
         }
diff --git a/Oqtane.Client/Themes/BlazorTheme/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Default.razor
index 0b664c50..81c7122a 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Default.razor
@@ -32,15 +32,10 @@
     public override List<Resource> Resources => new List<Resource>()
     {
         new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css", Integrity = "sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T", CrossOrigin = "anonymous" },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" }
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://code.jquery.com/jquery-3.3.1.slim.min.js", Integrity = "sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo", CrossOrigin = "anonymous" },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js", Integrity = "sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1", CrossOrigin = "anonymous" },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js", Integrity = "sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM", CrossOrigin = "anonymous" }
     };
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            var interop = new Interop(JSRuntime);
-            await interop.LoadBootstrapJS();
-        }
-    }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
index 09035b5a..5d4e4df9 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Default.razor
@@ -25,15 +25,9 @@
     public override List<Resource> Resources => new List<Resource>()
     {
         new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css", Integrity = "sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM", CrossOrigin = "anonymous" },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" }
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://code.jquery.com/jquery-3.3.1.slim.min.js", Integrity = "sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo", CrossOrigin = "anonymous" },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js", Integrity = "sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1", CrossOrigin = "anonymous" },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js", Integrity = "sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM", CrossOrigin = "anonymous" }
     };
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            var interop = new Interop(JSRuntime);
-            await interop.LoadBootstrapJS();
-        }
-    }
 }
diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs
index 0d3d9454..d4400ec1 100644
--- a/Oqtane.Client/Themes/ThemeBase.cs
+++ b/Oqtane.Client/Themes/ThemeBase.cs
@@ -31,11 +31,13 @@ namespace Oqtane.Themes
             {
                 if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
                 {
-                    var interop = new Interop(JSRuntime);
-                    foreach (var resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
+                    var scripts = new List<object>();
+                    foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
                     {
-                        await interop.LoadScript(resource.Url, resource.Integrity ?? "", resource.CrossOrigin ?? "");
+                        scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "" });
                     }
+                    var interop = new Interop(JSRuntime);
+                    await interop.IncludeScripts(scripts.ToArray());
                 }
             }
         }
diff --git a/Oqtane.Client/UI/Interop.cs b/Oqtane.Client/UI/Interop.cs
index f403ab23..53b8df4f 100644
--- a/Oqtane.Client/UI/Interop.cs
+++ b/Oqtane.Client/UI/Interop.cs
@@ -117,23 +117,13 @@ namespace Oqtane.UI
             }
         }
 
-        public async Task LoadScript(string url, string integrity, string crossorigin)
+        public async Task IncludeScripts(object[] scripts)
         {
             try
             {
-                await _jsRuntime.InvokeVoidAsync("Oqtane.Interop.loadScript", url, integrity, crossorigin);
-            }
-            catch
-            {
-                // ignore exception
-            }
-        }
-
-        public async Task LoadBootstrapJS()
-        {
-            try
-            {
-                await _jsRuntime.InvokeVoidAsync("Oqtane.Interop.loadBootstrapJS");
+                await _jsRuntime.InvokeVoidAsync(
+                    "Oqtane.Interop.includeScripts",
+                    (object)scripts);
             }
             catch
             {
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 35a9f331..60c40e59 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -33,12 +33,9 @@
         // manage stylesheets for this page 
         string batch = DateTime.Now.ToString("yyyyMMddHHmmssfff");
         var links = new List<object>();
-        foreach (Resource resource in PageState.Page.Resources)
+        foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet))
         {
-            if (resource.ResourceType == ResourceType.Stylesheet)
-            {
-                links.Add(new { id = "app-stylesheet-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = resource.Url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", key = "" });
-            }
+            links.Add(new { id = "app-stylesheet-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = resource.Url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", key = "" });
         }
         await interop.IncludeLinks(links.ToArray());
         await interop.RemoveElementsById("app-stylesheet", "", "app-stylesheet-" + batch + "-00");
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index 7588de0f..96cae4d4 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -198,32 +198,49 @@ Oqtane.Interop = {
             script.onerror = rej();
         });
     },
-    loadScript: async function (url, integrity, crossorigin) {
-        const promise = new Promise((resolve, reject) => {
-
-            if (loadjs.isDefined(url)) {
-                resolve(true);
-                return;
+    includeScripts: async function (scripts) {
+        const bundles = [];
+        for (let s = 0; s < scripts.length; s++) {
+            if (scripts[s].bundle === '') {
+                scripts[s].bundle = scripts[s].href;
             }
-
-            loadjs(url, url, {
-                async: false,
-                returnPromise: true,
-                before: function (path, element) {
-                    if (path === url && integrity !== '') {
-                        element.integrity = integrity;
-                    }
-                    if (path === url && crossorigin !== '') {
-                        element.crossOrigin = crossorigin;
-                    }
+            if (!bundles.includes(scripts[s].bundle)) {
+                bundles.push(scripts[s].bundle);
+            }
+        }
+        const urls = [];
+        for (let b = 0; b < bundles.length; b++) {
+            for (let s = 0; s < scripts.length; s++) {
+                if (scripts[s].bundle === bundles[b]) {
+                    urls.push(scripts[s].href);
                 }
-            })
-            .then(function () { resolve(true) })
-            .catch(function (pathsNotFound) { reject(false) });
-        });
-
-        const result = await promise;
-        return;
+            }
+            const promise = new Promise((resolve, reject) => {
+                if (loadjs.isDefined(bundles[b])) {
+                    resolve(true);
+                }
+                else {
+                    loadjs(urls, bundles[b], {
+                        async: true,
+                        returnPromise: true,
+                        before: function (path, element) {
+                            for (let s = 0; s < scripts.length; s++) {
+                                if (path === scripts[s].href && scripts[s].integrity !== '') {
+                                    element.integrity = scripts[s].integrity;
+                                }
+                                if (path === scripts[s].href && scripts[s].crossorigin !== '') {
+                                    element.crossOrigin = scripts[s].crossorigin;
+                                }
+                            }
+                        }
+                    })
+                    .then(function () { resolve(true) })
+                    .catch(function (pathsNotFound) { reject(false) });
+                }
+            });
+            await promise;
+            urls = [];
+        }
     },
     getAbsoluteUrl: function (url) {
         var a = document.createElement('a');
@@ -343,31 +360,5 @@ Oqtane.Interop = {
         setInterval(function () {
             window.location.href = url;
         }, wait * 1000);
-    },
-    loadBootstrapJS: async function () {
-        if (!loadjs.isDefined('Bootstrap')) {
-            const bootstrap = loadjs(['https://code.jquery.com/jquery-3.3.1.slim.min.js', 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js', 'https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js'], 'Bootstrap', {
-                async: false,
-                returnPromise: true,
-                before: function (path, element) {
-                    if (path === 'https://code.jquery.com/jquery-3.3.1.slim.min.js') {
-                        element.integrity = 'sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo';
-                        element.crossOrigin = 'anonymous';
-                    }
-                    if (path === 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js') {
-                        element.integrity = 'sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1';
-                        element.crossOrigin = 'anonymous';
-                    }
-                    if (path === 'https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js') {
-                        element.integrity = 'sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM';
-                        element.crossOrigin = 'anonymous';
-                    }
-                }
-            })
-            .then(function () { })
-            .catch(function (pathsNotFound) { });
-
-            await bootstrap;
-        }
     }
 };
diff --git a/Oqtane.Server/wwwroot/js/quill-interop.js b/Oqtane.Server/wwwroot/js/quill-interop.js
index 9467584a..13664fd4 100644
--- a/Oqtane.Server/wwwroot/js/quill-interop.js
+++ b/Oqtane.Server/wwwroot/js/quill-interop.js
@@ -5,15 +5,7 @@ Oqtane.RichTextEditor = {
         quillElement, toolBar, readOnly,
         placeholder, theme, debugLevel) {
 
-        if (!loadjs.isDefined('Quill')) {
-            const loadQuill = loadjs(['js/quill1.3.6.min.js', 'js/quill-blot-formatter.min.js'], 'Quill',
-                { async: true, returnPromise: true })
-                .then(function () {
-                    Quill.register('modules/blotFormatter', QuillBlotFormatter.default);
-                })
-                .catch(function (pathsNotFound) { });
-            await loadQuill;
-        }
+        Quill.register('modules/blotFormatter', QuillBlotFormatter.default);
 
         var options = {
             debug: debugLevel,
diff --git a/Oqtane.Shared/Models/Resource.cs b/Oqtane.Shared/Models/Resource.cs
index 81dc50fd..01bc57ba 100644
--- a/Oqtane.Shared/Models/Resource.cs
+++ b/Oqtane.Shared/Models/Resource.cs
@@ -8,5 +8,6 @@ namespace Oqtane.Models
         public string Url { get; set; }
         public string Integrity { get; set; }
         public string CrossOrigin { get; set; }
+        public string Bundle { get; set; }
     }
 }

From a57e25d3d3b5ac8e4bc83ee0424ed7195be04696 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Wed, 17 Jun 2020 11:27:44 -0400
Subject: [PATCH 24/24] add styling to install wizard

---
 Oqtane.Client/UI/Installer.razor | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/UI/Installer.razor
index 90d7dbd9..204197f6 100644
--- a/Oqtane.Client/UI/Installer.razor
+++ b/Oqtane.Client/UI/Installer.razor
@@ -3,6 +3,7 @@
 @inject IInstallationService InstallationService
 @inject ISiteService SiteService
 @inject IUserService UserService
+@inject IJSRuntime JSRuntime
 
 <div class="container">
     <div class="row">
@@ -138,6 +139,15 @@
     private string _integratedSecurityDisplay = "display: none;";
     private string _loadingDisplay = "display: none;";
 
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            var interop = new Interop(JSRuntime);
+            await interop.IncludeLink("app-stylesheet", "stylesheet", "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css", "text/css", "sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T", "anonymous", "");
+        }
+    }
+
     private void SetIntegratedSecurity(ChangeEventArgs e)
     {
         _integratedSecurityDisplay = Convert.ToBoolean((string)e.Value)