From e00c26177751a8984f0ccb7c217926e60f377b93 Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Mon, 1 Jul 2024 17:11:26 +0800
Subject: [PATCH 1/6] Fix #4358: RichTextEditor Provider Abstraction.

---
 Oqtane.Client/Modules/Admin/Site/Index.razor  | 344 +++++++++++-------
 ...xtEditor.razor => QuillJSTextEditor.razor} |  95 +++--
 .../Controls/QuillJSTextEditorSettings.razor  |  99 +++++
 .../Modules/Controls/RichTextEditor.razor     | 104 +++---
 .../Modules/Controls/TextAreaTextEditor.razor |  31 ++
 Oqtane.Client/Modules/HtmlText/Edit.razor     |  60 ++-
 Oqtane.Client/Modules/HtmlText/ModuleInfo.cs  |   2 +-
 Oqtane.Client/Modules/HtmlText/Settings.razor |  61 ----
 Oqtane.Client/Modules/ModuleBase.cs           |  36 ++
 .../Providers/QuillJSTextEditorProvider.cs    |  13 +
 .../Providers/QuillTextEditorProvider.cs      |  11 -
 .../Providers/TextAreaTextEditorProvider.cs   |  13 +
 .../Resources/Modules/Admin/Site/Index.resx   |   6 +
 ...TextEditor.resx => QuillJSTextEditor.resx} |   0
 .../Controls/QuillJSTextEditorSettings.resx   | 156 ++++++++
 Oqtane.Server/Components/App.razor            |   6 +-
 .../OqtaneServiceCollectionExtensions.cs      |   3 +-
 Oqtane.Server/wwwroot/css/app.css             |   6 +
 Oqtane.Shared/Interfaces/IModuleControl.cs    |  13 +
 .../Interfaces/ITextEditorProvider.cs         |   5 +
 Oqtane.Shared/Shared/Constants.cs             |   4 +-
 21 files changed, 726 insertions(+), 342 deletions(-)
 rename Oqtane.Client/Modules/Controls/{QuillTextEditor.razor => QuillJSTextEditor.razor} (83%)
 create mode 100644 Oqtane.Client/Modules/Controls/QuillJSTextEditorSettings.razor
 create mode 100644 Oqtane.Client/Modules/Controls/TextAreaTextEditor.razor
 delete mode 100644 Oqtane.Client/Modules/HtmlText/Settings.razor
 create mode 100644 Oqtane.Client/Providers/QuillJSTextEditorProvider.cs
 delete mode 100644 Oqtane.Client/Providers/QuillTextEditorProvider.cs
 create mode 100644 Oqtane.Client/Providers/TextAreaTextEditorProvider.cs
 rename Oqtane.Client/Resources/Modules/Controls/{QuillTextEditor.resx => QuillJSTextEditor.resx} (100%)
 create mode 100644 Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditorSettings.resx

diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index a5626a5d..5d813d27 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.Site
 @inherits ModuleBase
 @using System.Text.RegularExpressions
+@using Microsoft.Extensions.DependencyInjection
 @inject NavigationManager NavigationManager
 @inject ISiteService SiteService
 @inject ITenantService TenantService
@@ -8,6 +9,7 @@
 @inject IAliasService AliasService
 @inject IThemeService  ThemeService
 @inject ISettingService  SettingService
+@inject IServiceProvider ServiceProvider
 @inject IStringLocalizer<Index> Localizer
 @inject INotificationService NotificationService
 @inject IStringLocalizer<SharedResources> SharedLocalizer
@@ -123,6 +125,28 @@
                         </select>
                     </div>
                 </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="textEditorProvider" HelpText="Select the text editor provider for the site" ResourceKey="TextEditorProvider">Text Editor Provider: </Label>
+                    <div class="col-sm-9">
+                        <select id="textEditorProvider" class="form-select" value="@_textEditorProvider" required @onchange="TextEditorProviderChanged">
+                            @if (_textEditorProviders != null)
+                            {
+                                @foreach (var provider in _textEditorProviders)
+                                {
+                                    <option value="@provider.EditorType">@provider.Name</option>
+                                }
+                            }
+                        </select>
+                    </div>
+                </div>
+                @if (_textEditorProviderSettings != null)
+                {
+                    <div class="row mb-1 align-items-center">
+                        <div class="col-sm-9 offset-sm-3">
+                        @_textEditorProviderSettings
+                        </div>
+                    </div>
+                }
             </div>
         </Section>
         <Section Name="FileExtensions" Heading="File Extensions" ResourceKey="FileExtensions">
@@ -438,6 +462,10 @@
     private string _tenant = string.Empty;
     private string _database = string.Empty;
     private string _connectionstring = string.Empty;
+    private string _textEditorProvider = "";
+    private IEnumerable<ITextEditorProvider> _textEditorProviders;
+    private RenderFragment _textEditorProviderSettings;
+    private ISettingsControl _textEditorProviderSettingsControl;
     private string _createdby;
     private DateTime _createdon;
     private string _modifiedby;
@@ -479,6 +507,7 @@
                 _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
                 _containertype = (!string.IsNullOrEmpty(site.DefaultContainerType)) ? site.DefaultContainerType : Constants.DefaultContainer;
                 _admincontainertype = (!string.IsNullOrEmpty(site.AdminContainerType)) ? site.AdminContainerType : Constants.DefaultAdminContainer;
+                _textEditorProviders = ServiceProvider.GetServices<ITextEditorProvider>();
 
                 // page content
                 _headcontent = site.HeadContent;
@@ -517,6 +546,10 @@
                 // aliases
                 await GetAliases();
 
+                //text editor
+                _textEditorProvider = SettingService.GetSetting(settings, "TextEditorProvider", Constants.DefaultTextEditorProvider);
+                LoadTextEditorProviderSettingsControl();
+
                 // hosting model
                 _rendermode = site.RenderMode;
                 _runtime = site.Runtime;
@@ -673,17 +706,17 @@
                             }
                         }
 
-						site = await SiteService.UpdateSiteAsync(site);
+                        site = await SiteService.UpdateSiteAsync(site);
 
                         // SMTP
-						var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+                        var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
                         settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
-						settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
-						settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
-						settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
-						settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
-						settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
-						settings = SettingService.SetSetting(settings, "SMTPRelay", _smtprelay, true);
+                        settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
+                        settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+                        settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
+                        settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+                        settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+                        settings = SettingService.SetSetting(settings, "SMTPRelay", _smtprelay, true);
                         settings = SettingService.SetSetting(settings, "SMTPEnabled", _smtpenabled, true);
                         settings = SettingService.SetSetting(settings, "SiteGuid", _siteguid, true);
                         settings = SettingService.SetSetting(settings, "NotificationRetention", _retention.ToString(), true);
@@ -692,141 +725,149 @@
                         settings = SettingService.SetSetting(settings, "ImageFiles", (_ImageFiles != Constants.ImageFiles) ? _ImageFiles.Replace(" ", "") : "", false);
                         settings = SettingService.SetSetting(settings, "UploadableFiles", (_UploadableFiles != Constants.UploadableFiles) ? _UploadableFiles.Replace(" ", "") : "", false);
 
-						await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
+                        //text editor
+                        settings = SettingService.SetSetting(settings, "TextEditorProvider", _textEditorProvider);
 
-						await logger.LogInformation("Site Settings Saved {Site}", site);
+                        await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
-					    NavigationManager.NavigateTo(NavigateUrl(), true); // reload
-					}
-				}
-				else
-				{
-					AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
-				}
-			}
-			catch (Exception ex)
-			{
-				await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-				AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error);
-			}
-		}
-		else
-		{
-			AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
-		}
-	}
+                        await logger.LogInformation("Site Settings Saved {Site}", site);
 
-	private async Task DeleteSite()
-	{
-		try
-		{
-			var aliases = await AliasService.GetAliasesAsync();
-			if (aliases.Any(item => item.SiteId != PageState.Site.SiteId || item.TenantId != PageState.Site.TenantId))
-			{
-				await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
-				await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
+                        if(_textEditorProviderSettingsControl != null)
+                        {
+                            await _textEditorProviderSettingsControl.UpdateSettings();
+                        }
 
-				foreach (Alias alias in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
-				{
-					await AliasService.DeleteAliasAsync(alias.AliasId);
-				}
+                        NavigationManager.NavigateTo(NavigateUrl(), true); // reload
+                    }
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
+                }
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+                AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error);
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
 
-				var redirect = aliases.First(item => item.SiteId != PageState.Site.SiteId || item.TenantId != PageState.Site.TenantId);
-				NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + redirect.Name, true);
-			}
-			else
-			{
-				AddModuleMessage(Localizer["Message.FailAuth.DeleteSite"], MessageType.Warning);
-			}
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Deleting Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-			AddModuleMessage(Localizer["Error.DeleteSite"], MessageType.Error);
-		}
-	}
+    private async Task DeleteSite()
+    {
+        try
+        {
+            var aliases = await AliasService.GetAliasesAsync();
+            if (aliases.Any(item => item.SiteId != PageState.Site.SiteId || item.TenantId != PageState.Site.TenantId))
+            {
+                await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
+                await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
 
-	private async Task SendEmail()
-	{
-		if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
-		{
-			try
-			{
-				var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-				settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
-				settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
-				settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
-				settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
-				settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
-				settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
-				await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
-				await logger.LogInformation("Site SMTP Settings Saved");
+                foreach (Alias alias in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
+                {
+                    await AliasService.DeleteAliasAsync(alias.AliasId);
+                }
 
-				await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
-				AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
+                var redirect = aliases.First(item => item.SiteId != PageState.Site.SiteId || item.TenantId != PageState.Site.TenantId);
+                NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + redirect.Name, true);
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.FailAuth.DeleteSite"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+            AddModuleMessage(Localizer["Error.DeleteSite"], MessageType.Error);
+        }
+    }
+
+    private async Task SendEmail()
+    {
+        if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
+        {
+            try
+            {
+                var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+                settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
+                settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
+                settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+                settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
+                settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+                settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+                await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+                await logger.LogInformation("Site SMTP Settings Saved");
+
+                await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
+                AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
                 await ScrollToPageTop();
             }
-			catch (Exception ex)
-			{
-				await logger.LogError(ex, "Error Testing SMTP Configuration");
-				AddModuleMessage(Localizer["Error.Smtp.TestConfig"], MessageType.Error);
-			}
-		}
-		else
-		{
-			AddModuleMessage(Localizer["Message.Required.Smtp"], MessageType.Warning);
-		}
-	}
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Testing SMTP Configuration");
+                AddModuleMessage(Localizer["Error.Smtp.TestConfig"], MessageType.Error);
+            }
+        }
+        else
+        {
+            AddModuleMessage(Localizer["Message.Required.Smtp"], MessageType.Warning);
+        }
+    }
 
-	private void ToggleSMTPPassword()
-	{
-		if (_smtppasswordtype == "password")
-		{
-			_smtppasswordtype = "text";
-			_togglesmtppassword = SharedLocalizer["HidePassword"];
-		}
-		else
-		{
-			_smtppasswordtype = "password";
-			_togglesmtppassword = SharedLocalizer["ShowPassword"];
-		}
-	}
+    private void ToggleSMTPPassword()
+    {
+        if (_smtppasswordtype == "password")
+        {
+            _smtppasswordtype = "text";
+            _togglesmtppassword = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _smtppasswordtype = "password";
+            _togglesmtppassword = SharedLocalizer["ShowPassword"];
+        }
+    }
 
-	private async Task GetAliases()
-	{
-		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-		{
-			_aliases = await AliasService.GetAliasesAsync();
-			_aliases = _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).OrderBy(item => item.AliasId).ToList();
-		}
-	}
+    private async Task GetAliases()
+    {
+        if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        {
+            _aliases = await AliasService.GetAliasesAsync();
+            _aliases = _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).OrderBy(item => item.AliasId).ToList();
+        }
+    }
 
-	private void AddAlias()
-	{
-		_aliases.Add(new Alias { AliasId = 0, Name = "", IsDefault = false });
-		_aliasid = 0;
-		_aliasname = "";
-		_defaultalias = "False";
-		StateHasChanged();
-	}
+    private void AddAlias()
+    {
+        _aliases.Add(new Alias { AliasId = 0, Name = "", IsDefault = false });
+        _aliasid = 0;
+        _aliasname = "";
+        _defaultalias = "False";
+        StateHasChanged();
+    }
 
-	private void EditAlias(Alias alias)
-	{
-		_aliasid = alias.AliasId;
-		_aliasname = alias.Name;
-		_defaultalias = alias.IsDefault.ToString();
-		StateHasChanged();
-	}
+    private void EditAlias(Alias alias)
+    {
+        _aliasid = alias.AliasId;
+        _aliasname = alias.Name;
+        _defaultalias = alias.IsDefault.ToString();
+        StateHasChanged();
+    }
 
-	private async Task DeleteAlias(Alias alias)
-	{
-		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-		{
-			await AliasService.DeleteAliasAsync(alias.AliasId);
-			await GetAliases();
-			StateHasChanged();
-		}
-	}
+    private async Task DeleteAlias(Alias alias)
+    {
+        if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        {
+            await AliasService.DeleteAliasAsync(alias.AliasId);
+            await GetAliases();
+            StateHasChanged();
+        }
+    }
 
     private async Task SaveAlias()
     {
@@ -878,11 +919,42 @@
         }
     }
 
-	private async Task CancelAlias()
-	{
-		await GetAliases();
-		_aliasid = -1;
-		_aliasname = "";
-		StateHasChanged();
-	}
+    private async Task CancelAlias()
+    {
+        await GetAliases();
+        _aliasid = -1;
+        _aliasname = "";
+        StateHasChanged();
+    }
+
+    private void TextEditorProviderChanged(ChangeEventArgs e)
+    {
+        _textEditorProvider = e.Value.ToString();
+        LoadTextEditorProviderSettingsControl();
+
+        StateHasChanged();
+    }
+
+    private void LoadTextEditorProviderSettingsControl()
+    {
+        var provider = _textEditorProviders.FirstOrDefault(i => i.EditorType == _textEditorProvider);
+        var settingsType = provider != null && !string.IsNullOrEmpty(provider.SettingsType) ? Type.GetType(provider.SettingsType) : null;
+        if (settingsType != null)
+        {
+            _textEditorProviderSettings = builder =>
+            {
+                builder.OpenComponent(0, settingsType);
+                builder.AddComponentReferenceCapture(1, (c) =>
+                {
+                    _textEditorProviderSettingsControl = (ISettingsControl)c;
+                });
+                builder.CloseComponent();
+            };
+        }
+        else
+        {
+            _textEditorProviderSettings = null;
+            _textEditorProviderSettingsControl = null;
+        }
+    }
 }
diff --git a/Oqtane.Client/Modules/Controls/QuillTextEditor.razor b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
similarity index 83%
rename from Oqtane.Client/Modules/Controls/QuillTextEditor.razor
rename to Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
index c64a5c6f..e0e86139 100644
--- a/Oqtane.Client/Modules/Controls/QuillTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
@@ -1,11 +1,12 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleControlBase
 @implements ITextEditor
-@inject IStringLocalizer<QuillTextEditor> Localizer
+@inject ISettingService SettingService
+@inject IStringLocalizer<QuillJSTextEditor> Localizer
 
 <div class="quill-text-editor">
     <TabStrip ActiveTab="@_activetab">
-        @if (AllowRichText)
+        @if (_allowRichText)
         {
             <TabPanel Name="Rich" Heading="Rich Text Editor" ResourceKey="RichTextEditor">
                 @if (_richfilemanager)
@@ -15,7 +16,7 @@
                     <br />
                 }
                 <div class="d-flex justify-content-center mb-2">
-                    @if (AllowFileManagement)
+                    @if (_allowFileManagement)
                     {
                         <button type="button" class="btn btn-primary" @onclick="InsertRichImage">@Localizer["InsertImage"]</button>
                     }
@@ -28,9 +29,9 @@
                 <div class="row">
                     <div class="col">
                         <div @ref="@_toolBar">
-                            @if (ToolbarContent != null)
+                            @if (!string.IsNullOrEmpty(_toolbarContent))
                             {
-                                @ToolbarContent
+                                @((MarkupString)_toolbarContent)
                             }
                             else
                             {
@@ -66,7 +67,7 @@
                 </div>
             </TabPanel>
         }
-        @if (AllowRawHtml)
+        @if (_allowRawHtml)
         {
             <TabPanel Name="Raw" Heading="Raw HTML Editor" ResourceKey="HtmlEditor">
                 @if (_rawfilemanager)
@@ -76,7 +77,7 @@
                     <br />
                 }
                 <div class="d-flex justify-content-center mb-2">
-                    @if (AllowFileManagement)
+                    @if (_allowFileManagement)
                     {
                         <button type="button" class="btn btn-primary" @onclick="InsertRawImage">@Localizer["InsertImage"]</button>
                     }
@@ -106,6 +107,14 @@
     private FileManager _fileManager;
     private string _activetab = "Rich";
 
+    private bool _allowFileManagement = false;
+    private bool _allowRawHtml = false;
+    private bool _allowRichText = false;
+    private string _theme = "snow";
+    private string _debugLevel = "info";
+    private string _toolbarContent = string.Empty;
+    private bool _settingsLoaded;
+
     private ElementReference _editorElement;
     private ElementReference _toolBar;
     private bool _richfilemanager = false;
@@ -121,38 +130,22 @@
     private bool _contentchanged = false;
     private int _editorIndex;
 
-    [Parameter]
-    public bool AllowFileManagement{ get; set; }
-
-    [Parameter]
-    public bool AllowRichText { get; set; } = true;
-
-    [Parameter]
-    public bool AllowRawHtml { get; set; } = true;
-
     [Parameter]
     public bool ReadOnly { get; set; }
 
     [Parameter]
     public string Placeholder { get; set; }
 
-    [Parameter]
-    public string Theme { get; set; } = "snow";
-
-    [Parameter]
-    public string DebugLevel { get; set; } = "info";
-
-    [Parameter]
-    public RenderFragment ToolbarContent { get; set; }
-
     public override List<Resource> Resources { get; set; } = new List<Resource>()
     {
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill.min.js", Location = ResourceLocation.Body },
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-blot-formatter.min.js", Location = ResourceLocation.Body },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js", Location = ResourceLocation.Body }
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js", Location = ResourceLocation.Body },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.bubble.css" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.snow.css" }
     };
 
-    protected override void OnInitialized()
+    protected override async Task OnInitializedAsync()
     {
         interop = new QuillEditorInterop(JSRuntime);
 
@@ -160,11 +153,13 @@
         {
             Placeholder = Localizer["Placeholder"];
         }
+
+        await LoadSettings();
     }
 
     protected override void OnParametersSet()
     {
-        if (!AllowRichText)
+        if (!_allowRichText)
         {
             _activetab = "Raw";
         }
@@ -174,17 +169,17 @@
     {
         await base.OnAfterRenderAsync(firstRender);
 
-        if (AllowRichText)
+        if (_allowRichText)
         {
-            if (firstRender)
+            if (_settingsLoaded && !_initialized)
             {
                 await interop.CreateEditor(
                     _editorElement,
                     _toolBar,
                     ReadOnly,
                     Placeholder,
-                    Theme,
-                    DebugLevel);
+                    _theme,
+                    _debugLevel);
 
                 await interop.LoadEditorContent(_editorElement, _richhtml);
 
@@ -202,6 +197,8 @@
                         // reload editor if Content passed to component has changed
                         await interop.LoadEditorContent(_editorElement, _richhtml);
                         _originalrichhtml = await interop.GetHtml(_editorElement);
+
+                        _contentchanged = false;
                     }
                     else
                     {
@@ -215,8 +212,6 @@
                     }
                 }
             }
-
-            _contentchanged = false;
         }
     }
 
@@ -224,10 +219,14 @@
     {
         _richhtml = content;
         _rawhtml = content;
-        _originalrawhtml = _rawhtml; // preserve for comparison later
         _originalrichhtml = "";
         _richhtml = content;
-        _contentchanged = content != _originalrawhtml;
+        if (!_contentchanged)
+        {
+            _contentchanged = content != _originalrawhtml;
+        }
+
+        _originalrawhtml = _rawhtml; // preserve for comparison later
 
         StateHasChanged();
     }
@@ -243,7 +242,7 @@
         {
             var richhtml = "";
 
-            if (AllowRichText)
+            if (_allowRichText)
             {
                 richhtml = await interop.GetHtml(_editorElement);
             }
@@ -290,7 +289,7 @@
         {
             var richhtml = "";
 
-            if (AllowRichText)
+            if (_allowRichText)
             {
                 richhtml = await interop.GetHtml(_editorElement);
             }
@@ -362,4 +361,24 @@
         }
         StateHasChanged();
     }
+
+    private async Task LoadSettings()
+    {
+        try
+        {
+            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            _allowFileManagement = SettingService.GetSetting(settings, "QuillTextEditor_AllowFileManagement", "true") == "true";
+            _allowRawHtml = SettingService.GetSetting(settings, "QuillTextEditor_AllowRawHtml", "true") == "true";
+            _allowRichText = SettingService.GetSetting(settings, "QuillTextEditor_AllowRichText", "true") == "true";
+            _theme = SettingService.GetSetting(settings, "QuillTextEditor_Theme", "snow");
+            _debugLevel = SettingService.GetSetting(settings, "QuillTextEditor_DebugLevel", "info");
+            _toolbarContent = SettingService.GetSetting(settings, "QuillTextEditor_ToolbarContent", string.Empty);
+
+            _settingsLoaded = true;
+        }
+        catch (Exception ex)
+        {
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
 }
diff --git a/Oqtane.Client/Modules/Controls/QuillJSTextEditorSettings.razor b/Oqtane.Client/Modules/Controls/QuillJSTextEditorSettings.razor
new file mode 100644
index 00000000..fb41a2ef
--- /dev/null
+++ b/Oqtane.Client/Modules/Controls/QuillJSTextEditorSettings.razor
@@ -0,0 +1,99 @@
+@namespace Oqtane.Modules.Controls
+@inherits ModuleBase
+@inject ISettingService SettingService
+@implements Oqtane.Interfaces.ISettingsControl
+@inject IStringLocalizer<QuillJSTextEditorSettings> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="AllowFileManagement" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
+        <div class="col-sm-9">
+            <input type="checkbox" id="AllowFileManagement" class="form-check-input" @bind="_allowFileManagement" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="AllowRawHtml" ResourceKey="AllowRawHtml" ResourceType="@resourceType" HelpText="Specify If Editors Can Enter Raw HTML">Allow Raw HTML: </Label>
+        <div class="col-sm-9">
+            <input type="checkbox" id="AllowRawHtml" class="form-check-input" @bind="_allowRawHtml" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="AllowRichText" ResourceKey="AllowRichText" ResourceType="@resourceType" HelpText="Specify If Editors Can Use Rich Text Editor">Allow Rich Text: </Label>
+        <div class="col-sm-9">
+            <input type="checkbox" id="AllowRichText" class="form-check-input" @bind="_allowRichText" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="Theme" ResourceKey="Theme" ResourceType="@resourceType" HelpText="Specify the Rich Text Editor's Theme">Theme: </Label>
+        <div class="col-sm-9">
+            <input type="text" id="Theme" class="form-control" @bind="_theme" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="DebugLevel" ResourceKey="DebugLevel" ResourceType="@resourceType" HelpText="Specify the Debug Level">Debug Level: </Label>
+        <div class="col-sm-9">
+            <select id="DebugLevel" class="form-select" @bind="_debugLevel">
+                @foreach (var level in _debugLevels)
+                {
+                    <option value="@level">@level</option>
+                }
+            </select>
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="ToolbarContent" ResourceKey="ToolbarContent" ResourceType="@resourceType" HelpText="Specify the Toolbar Content">Toolbar Content: </Label>
+        <div class="col-sm-9">
+            <textarea id="ToolbarContent" class="form-control" @bind="_toolbarContent" rows="5" />
+        </div>
+    </div>
+</div>
+
+@code {
+    private string resourceType = "Oqtane.Modules.Controls.QuillJSTextEditorSettings, Oqtane.Client";
+    private bool _allowFileManagement;
+    private bool _allowRawHtml;
+    private bool _allowRichText;
+    private string _theme;
+    private string _debugLevel;
+    private string _toolbarContent;
+
+    private List<string> _debugLevels = new List<string> { "info", "log", "warn", "error" };
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            _allowFileManagement = SettingService.GetSetting(settings, "QuillTextEditor_AllowFileManagement", "true") == "true";
+            _allowRawHtml = SettingService.GetSetting(settings, "QuillTextEditor_AllowRawHtml", "true") == "true";
+            _allowRichText = SettingService.GetSetting(settings, "QuillTextEditor_AllowRichText", "true") == "true";
+            _theme = SettingService.GetSetting(settings, "QuillTextEditor_Theme", "snow");
+            _debugLevel = SettingService.GetSetting(settings, "QuillTextEditor_DebugLevel", "info");
+            _toolbarContent = SettingService.GetSetting(settings, "QuillTextEditor_ToolbarContent", string.Empty);
+        }
+        catch (Exception ex)
+        {
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_AllowFileManagement", _allowFileManagement.ToString().ToLower());
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_AllowRawHtml", _allowRawHtml.ToString().ToLower());
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_AllowRichText", _allowRichText.ToString().ToLower());
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_Theme", _theme);
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_DebugLevel", _debugLevel);
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_ToolbarContent", _toolbarContent);
+            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+        }
+        catch (Exception ex)
+        {
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index 52d03be8..4a8540f7 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -4,7 +4,6 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleControlBase
 @inject IServiceProvider ServiceProvider
-@inject ISettingService SettingService
 @inject IStringLocalizer<RichTextEditor> Localizer 
 
 <div class="row" style="margin-bottom: 50px;">
@@ -14,7 +13,7 @@
 </div>
 
 @code {
-    private ITextEditorProvider _textEditorProvider;
+    private string _textEditorProvider;
     private RenderFragment _textEditorComponent;
     private ITextEditor _textEditor;
 
@@ -28,29 +27,14 @@
     public string Placeholder { get; set; }
 
     [Parameter]
-    public bool AllowFileManagement { get; set; } = true;
+    public string Provider { get; set; }
 
-    [Parameter]
-    public bool AllowRichText { get; set; } = true;  
-
-    [Parameter]
-    public bool AllowRawHtml { get; set; } = true;  
-
-    // parameters only applicable to rich text editor
-    [Parameter]
-    public RenderFragment ToolbarContent { get; set; }
-
-    [Parameter]
-    public string Theme { get; set; }
-
-    [Parameter]
-    public string DebugLevel { get; set; }
-
-    public override List<Resource> Resources { get; set; } = new List<Resource>();
+    [Parameter(CaptureUnmatchedValues = true)]
+    public Dictionary<string, object> AdditionalAttributes { get; set; } = new Dictionary<string, object>();
 
     protected override async Task OnInitializedAsync()
     {
-        _textEditorProvider = await GetTextEditorProvider();
+        _textEditorProvider = await GetTextEditorType(ServiceProvider, PageState.Site.SiteId);
     }
 
     protected override void OnParametersSet()
@@ -71,6 +55,22 @@
         await base.OnAfterRenderAsync(firstRender);
     }
 
+    public override async Task<List<Resource>> GetResources(IServiceProvider serviceProvider, Page page)
+    {
+        var type = await GetTextEditorType(serviceProvider, page.SiteId);
+        if (!string.IsNullOrEmpty(type))
+        {
+            var editorType = Type.GetType(type);
+            if (editorType != null && editorType.GetInterfaces().Contains(typeof(IModuleControl)))
+            {
+                var control = Activator.CreateInstance(editorType) as IModuleControl;
+                return await control?.GetResources(serviceProvider, page);
+            }
+        }
+
+        return await base.GetResources(serviceProvider, page);
+    }
+
     public async Task<string> GetHtml()
     {
         return await _textEditor.GetContent();
@@ -78,37 +78,32 @@
 
     private void CreateTextEditor(RenderTreeBuilder builder)
     {
-        if(_textEditorProvider != null)
+        if(!string.IsNullOrEmpty(_textEditorProvider))
         {
-            var editorType = Type.GetType(_textEditorProvider.EditorType);
+            var editorType = Type.GetType(_textEditorProvider);
             if (editorType != null)
             {
                 builder.OpenComponent(0, editorType);
 
-                //set editor parameters if available.
                 var attributes = new Dictionary<string, object>
                 {
-                    { "AllowFileManagement", AllowFileManagement },
-                    { "AllowRichText", AllowRichText },
-                    { "AllowRawHtml", AllowRawHtml },
+                    { "Placeholder", Placeholder },
                     { "ReadOnly", ReadOnly }
                 };
 
-                if(!string.IsNullOrEmpty(Theme))
+                if (AdditionalAttributes != null)
                 {
-                    attributes.Add("Theme", Theme);
-                }
-                if (!string.IsNullOrEmpty(DebugLevel))
-                {
-                    attributes.Add("DebugLevel", DebugLevel);
-                }
-                if (!string.IsNullOrEmpty(Placeholder))
-                {
-                    attributes.Add("Placeholder", Placeholder);
-                }
-                if(ToolbarContent != null)
-                {
-                    attributes.Add("ToolbarContent", ToolbarContent);
+                    foreach(var key in AdditionalAttributes.Keys)
+                    {
+                        if(!attributes.ContainsKey(key))
+                        {
+                            attributes.Add(key, AdditionalAttributes[key]);
+                        }
+                        else
+                        {
+                            attributes[key] = AdditionalAttributes[key];
+                        }
+                    }
                 }
 
                 var index = 1;
@@ -129,26 +124,21 @@
         }
     }
 
-    private async Task<ITextEditorProvider> GetTextEditorProvider()
+    private async Task<string> GetTextEditorType(IServiceProvider serviceProvider, int siteId)
     {
-        const string DefaultEditorName = "Quill";
+        const string EditorSettingName = "TextEditorProvider";
 
-        var editorName = await GetTextEditorName(DefaultEditorName);
-        var editorProviders = ServiceProvider.GetServices<ITextEditorProvider>();
-        var editorProvider = editorProviders.FirstOrDefault(i => i.Name == editorName);
-        if(editorProvider == null)
+        if(!string.IsNullOrEmpty(Provider))
         {
-            editorProvider = editorProviders.FirstOrDefault(i => i.Name == DefaultEditorName);
+            var provider = serviceProvider.GetServices<ITextEditorProvider>().FirstOrDefault(i => i.Name.Equals(Provider, StringComparison.OrdinalIgnoreCase));
+            if(provider != null)
+            {
+                return provider.EditorType;
+            }
         }
 
-        return editorProvider;
-    }
-
-    private async Task<string> GetTextEditorName(string defaultName)
-    {
-        const string EditorSettingName = "TextEditor";
-
-        var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-        return SettingService.GetSetting(settings, EditorSettingName, defaultName);
+        var settingService = serviceProvider.GetService<ISettingService>();
+        var settings = await settingService.GetSiteSettingsAsync(siteId);
+        return settingService.GetSetting(settings, EditorSettingName, Constants.DefaultTextEditorProvider);
     }
 }
diff --git a/Oqtane.Client/Modules/Controls/TextAreaTextEditor.razor b/Oqtane.Client/Modules/Controls/TextAreaTextEditor.razor
new file mode 100644
index 00000000..d2e0185c
--- /dev/null
+++ b/Oqtane.Client/Modules/Controls/TextAreaTextEditor.razor
@@ -0,0 +1,31 @@
+@namespace Oqtane.Modules.Controls
+@inherits ModuleControlBase
+@implements ITextEditor
+
+<div class="text-area-editor">
+    <textarea @bind="_content" @ref="_editor" placeholder="@Placeholder" readonly="@ReadOnly" />
+</div>
+
+@code {
+    private ElementReference _editor;
+    private string _content;
+
+    [Parameter]
+    public bool ReadOnly { get; set; }
+
+    [Parameter]
+    public string Placeholder { get; set; }
+
+    public void Initialize(string content)
+    {
+        _content = content;
+
+        StateHasChanged();
+    }
+
+    public async Task<string> GetContent()
+    {
+        await Task.CompletedTask;
+        return _content;
+    }
+}
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 72a9662c..6675fbed 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -13,7 +13,7 @@
     <TabPanel Name="Edit" Heading="Edit" ResourceKey="Edit">
 		@if (_content != null)
 		{
-			<RichTextEditor Content="@_content" AllowFileManagement="@_allowfilemanagement" AllowRawHtml="@_allowrawhtml" @ref="@RichTextEditorHtml"></RichTextEditor>
+			<RichTextEditor Content="@_content" @ref="@RichTextEditorHtml"></RichTextEditor>
 			<br />
 			<button type="button" class="btn btn-success" @onclick="SaveContent">@SharedLocalizer["Save"]</button>
 			<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
@@ -47,44 +47,36 @@
 </TabStrip>
 
 @code {
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
-	public override string Title => "Edit Html/Text";
+    public override string Title => "Edit Html/Text";
 
-	public override List<Resource> Resources => new List<Resource>()
-	{
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.bubble.css" },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.snow.css" }
-    };
+    private RichTextEditor RichTextEditorHtml;
+    private string _content = null;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+    private List<Models.HtmlText> _htmltexts;
+    private string _view = "";
 
-	private RichTextEditor RichTextEditorHtml;
-	private bool _allowfilemanagement;
-	private bool _allowrawhtml;
-	private string _content = null;
-	private string _createdby;
-	private DateTime _createdon;
-	private string _modifiedby;
-	private DateTime _modifiedon;
-	private List<Models.HtmlText> _htmltexts;
-	private string _view = "";
+    public override List<string> ResourcesRegistrationTypes => new List<string> { typeof(RichTextEditor).FullName };
 
-	protected override async Task OnInitializedAsync()
-	{
-		try
-		{
-			_allowfilemanagement = bool.Parse(SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true"));
-			_allowrawhtml = bool.Parse(SettingService.GetSetting(ModuleState.Settings, "AllowRawHtml", "true"));
-			await LoadContent();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Loading Content {Error}", ex.Message);
-			AddModuleMessage(Localizer["Error.Content.Load"], MessageType.Error);
-		}
-	}
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            await LoadContent();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Content {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Content.Load"], MessageType.Error);
+        }
+    }
 
-	private async Task LoadContent()
-	{
+    private async Task LoadContent()
+    {
 		var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
 		if (htmltext != null)
 		{
diff --git a/Oqtane.Client/Modules/HtmlText/ModuleInfo.cs b/Oqtane.Client/Modules/HtmlText/ModuleInfo.cs
index 59a473c4..ecd90c8b 100644
--- a/Oqtane.Client/Modules/HtmlText/ModuleInfo.cs
+++ b/Oqtane.Client/Modules/HtmlText/ModuleInfo.cs
@@ -15,7 +15,7 @@ namespace Oqtane.Modules.HtmlText
             Version = "1.0.1",
             ServerManagerType = "Oqtane.Modules.HtmlText.Manager.HtmlTextManager, Oqtane.Server",
             ReleaseVersions = "1.0.0,1.0.1",
-            SettingsType = "Oqtane.Modules.HtmlText.Settings, Oqtane.Client",
+            SettingsType = string.Empty,
             Resources = new List<Resource>()
             {
                 new Resource { ResourceType = ResourceType.Stylesheet, Url = "~/Module.css" }
diff --git a/Oqtane.Client/Modules/HtmlText/Settings.razor b/Oqtane.Client/Modules/HtmlText/Settings.razor
deleted file mode 100644
index f08074c1..00000000
--- a/Oqtane.Client/Modules/HtmlText/Settings.razor
+++ /dev/null
@@ -1,61 +0,0 @@
-@namespace Oqtane.Modules.HtmlText
-@inherits ModuleBase
-@inject ISettingService SettingService
-@implements Oqtane.Interfaces.ISettingsControl
-@inject IStringLocalizer<Settings> Localizer
-@inject IStringLocalizer<SharedResources> SharedLocalizer
-
-<div class="container">
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="files" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
-        <div class="col-sm-9">
-            <select id="files" class="form-select" @bind="@_allowfilemanagement">
-                <option value="true">@SharedLocalizer["Yes"]</option>
-                <option value="false">@SharedLocalizer["No"]</option>
-            </select>
-        </div>
-    </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="files" ResourceKey="AllowRawHtml" ResourceType="@resourceType" HelpText="Specify If Editors Can Enter Raw HTML">Allow Raw HTML: </Label>
-        <div class="col-sm-9">
-            <select id="files" class="form-select" @bind="@_allowrawhtml">
-                <option value="true">@SharedLocalizer["Yes"]</option>
-                <option value="false">@SharedLocalizer["No"]</option>
-            </select>
-        </div>
-    </div>
-</div>
-
-@code {		
-	private string resourceType = "Oqtane.Modules.HtmlText.Settings, Oqtane.Client"; // for localization
-    private string _allowfilemanagement;
-	private string _allowrawhtml;
-
-    protected override void OnInitialized()
-    {
-        try
-        {
-			_allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
-			_allowrawhtml = SettingService.GetSetting(ModuleState.Settings, "AllowRawHtml", "true");
-		}
-        catch (Exception ex)
-        {
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
-
-    public async Task UpdateSettings()
-    {
-        try
-        {
-			var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
-            settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
-			settings = SettingService.SetSetting(settings, "AllowRawHtml", _allowrawhtml);
-			await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-        }
-        catch (Exception ex)
-        {
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
-}
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 1731e22d..71fed0aa 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -50,6 +50,8 @@ namespace Oqtane.Modules
 
         public virtual List<Resource> Resources { get; set; }
 
+        public virtual List<string> ResourcesRegistrationTypes { get; }
+
         public virtual string RenderMode { get { return RenderModes.Interactive; } } // interactive by default
 
         public virtual bool? Prerender { get { return null; } } // allows the Site Prerender property to be overridden
@@ -71,6 +73,21 @@ namespace Oqtane.Modules
 
         // base lifecycle method for handling JSInterop script registration
 
+        public virtual async Task<List<Resource>> GetResources(IServiceProvider serviceProvider, Page page)
+        {
+            var resources = Resources ?? new List<Resource>();
+
+            if(ResourcesRegistrationTypes != null)
+            {
+                foreach(var type in ResourcesRegistrationTypes)
+                {
+                    resources.AddRange(await LoadResourcesFromType(serviceProvider, page, type));
+                }
+            }
+
+            return resources;
+        }
+
         protected override async Task OnAfterRenderAsync(bool firstRender)
         {
             if (firstRender)
@@ -482,6 +499,25 @@ namespace Oqtane.Modules
             }
         }
 
+        private async Task<List<Resource>> LoadResourcesFromType(IServiceProvider serviceProvider, Page page, string typeName)
+        {
+            try
+            {
+                var type = Type.GetType(typeName, false, true);
+                if (type != null && type.GetInterfaces().Contains(typeof(IModuleControl)))
+                {
+                    var control = Activator.CreateInstance(type) as IModuleControl;
+                    return await control?.GetResources(serviceProvider, page);
+                }
+            }
+            catch(Exception ex)
+            {
+                //await Log(null, LogLevel.Error, string.Empty, ex, "Load Resources From Type {Type} Failed. {Message}", typeName, ex.Message);
+            }
+
+            return null;
+        }
+
         [Obsolete("ContentUrl(int fileId) is deprecated. Use FileUrl(int fileId) instead.", false)]
         public string ContentUrl(int fileid)
         {
diff --git a/Oqtane.Client/Providers/QuillJSTextEditorProvider.cs b/Oqtane.Client/Providers/QuillJSTextEditorProvider.cs
new file mode 100644
index 00000000..d815ba60
--- /dev/null
+++ b/Oqtane.Client/Providers/QuillJSTextEditorProvider.cs
@@ -0,0 +1,13 @@
+using Oqtane.Interfaces;
+
+namespace Oqtane.Providers
+{
+    public class QuillJSTextEditorProvider : ITextEditorProvider
+    {
+        public string Name => "QuillJS";
+
+        public string EditorType => "Oqtane.Modules.Controls.QuillJSTextEditor, Oqtane.Client";
+
+        public string SettingsType => "Oqtane.Modules.Controls.QuillJSTextEditorSettings, Oqtane.Client";
+    }
+}
diff --git a/Oqtane.Client/Providers/QuillTextEditorProvider.cs b/Oqtane.Client/Providers/QuillTextEditorProvider.cs
deleted file mode 100644
index d591a590..00000000
--- a/Oqtane.Client/Providers/QuillTextEditorProvider.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Oqtane.Interfaces;
-
-namespace Oqtane.Providers
-{
-    public class QuillTextEditorProvider : ITextEditorProvider
-    {
-        public string Name => "Quill";
-
-        public string EditorType => "Oqtane.Modules.Controls.QuillTextEditor, Oqtane.Client";
-    }
-}
diff --git a/Oqtane.Client/Providers/TextAreaTextEditorProvider.cs b/Oqtane.Client/Providers/TextAreaTextEditorProvider.cs
new file mode 100644
index 00000000..010680f9
--- /dev/null
+++ b/Oqtane.Client/Providers/TextAreaTextEditorProvider.cs
@@ -0,0 +1,13 @@
+using Oqtane.Interfaces;
+
+namespace Oqtane.Providers
+{
+    public class TextAreaTextEditorProvider : ITextEditorProvider
+    {
+        public string Name => "TextArea";
+
+        public string EditorType => "Oqtane.Modules.Controls.TextAreaTextEditor, Oqtane.Client";
+
+        public string SettingsType => string.Empty;
+    }
+}
diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
index babf23e0..9483f926 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
@@ -429,4 +429,10 @@
   <data name="Runtime.Text" xml:space="preserve">
     <value>Interactivity:</value>
   </data>
+  <data name="TextEditorProvider.HelpText" xml:space="preserve">
+    <value>Select the text editor provider for the site</value>
+  </data>
+  <data name="TextEditorProvider.Text" xml:space="preserve">
+    <value>Text Editor Provider:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Controls/QuillTextEditor.resx b/Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditor.resx
similarity index 100%
rename from Oqtane.Client/Resources/Modules/Controls/QuillTextEditor.resx
rename to Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditor.resx
diff --git a/Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditorSettings.resx b/Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditorSettings.resx
new file mode 100644
index 00000000..c467248e
--- /dev/null
+++ b/Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditorSettings.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AllowFileManagement.HelpText" xml:space="preserve">
+    <value>Specify If Editors Can Upload and Select Files</value>
+  </data>
+  <data name="AllowFileManagement.Text" xml:space="preserve">
+    <value>Allow File Management:</value>
+  </data>
+  <data name="AllowRawHtml.HelpText" xml:space="preserve">
+    <value>Specify If Editors Can Enter Raw HTML</value>
+  </data>
+  <data name="AllowRawHtml.Text" xml:space="preserve">
+    <value>Allow Raw HTML:</value>
+  </data>
+  <data name="AllowRichText.HelpText" xml:space="preserve">
+    <value>Specify If Editors Can Use Rich Text Editor</value>
+  </data>
+  <data name="AllowRichText.Text" xml:space="preserve">
+    <value>Allow Rich Text: </value>
+  </data>
+  <data name="DebugLevel.HelpText" xml:space="preserve">
+    <value>Specify the Debug Level</value>
+  </data>
+  <data name="DebugLevel.Text" xml:space="preserve">
+    <value>Debug Level:</value>
+  </data>
+  <data name="Theme.HelpText" xml:space="preserve">
+    <value>Specify the Rich Text Editor's Theme</value>
+  </data>
+  <data name="Theme.Text" xml:space="preserve">
+    <value>Theme:</value>
+  </data>
+  <data name="ToolbarContent.HelpText" xml:space="preserve">
+    <value>Specify the Toolbar Content</value>
+  </data>
+  <data name="ToolbarContent.Text" xml:space="preserve">
+    <value>Toolbar Content:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor
index 3c53c820..84e4c323 100644
--- a/Oqtane.Server/Components/App.razor
+++ b/Oqtane.Server/Components/App.razor
@@ -5,6 +5,7 @@
 @using Microsoft.AspNetCore.Http.Extensions
 @using Microsoft.AspNetCore.Antiforgery
 @using Microsoft.AspNetCore.Localization
+@using Microsoft.Extensions.DependencyInjection
 @using Microsoft.Net.Http.Headers
 @using Microsoft.Extensions.Primitives
 @using Oqtane.Client
@@ -30,6 +31,7 @@
 @inject IUrlMappingRepository UrlMappingRepository
 @inject IVisitorRepository VisitorRepository
 @inject IJwtManager JwtManager
+@inject IServiceProvider ServiceProvider
 
 @if (_initialized)
 {
@@ -674,7 +676,7 @@
                 var obj = Activator.CreateInstance(moduletype) as IModuleControl;
                 if (obj != null)
                 {
-                    resources = AddResources(resources, obj.Resources, ResourceLevel.Module, alias, "Modules", moduletype.Namespace, site.RenderMode);
+                    resources = AddResources(resources, await obj.GetResources(ServiceProvider, page), ResourceLevel.Module, alias, "Modules", moduletype.Namespace, site.RenderMode);
                     if (action.ToLower() == "settings" && module.ModuleDefinition != null)
                     {
                         // settings components are embedded within a framework settings module
@@ -682,7 +684,7 @@
                         if (moduletype != null)
                         {
                             obj = Activator.CreateInstance(moduletype) as IModuleControl;
-                            resources = AddResources(resources, obj.Resources, ResourceLevel.Module, alias, "Modules", moduletype.Namespace, site.RenderMode);
+                            resources = AddResources(resources, await obj.GetResources(ServiceProvider, page), ResourceLevel.Module, alias, "Modules", moduletype.Namespace, site.RenderMode);
                         }
                     }
                 }
diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
index 0eaf05dd..883d5033 100644
--- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
+++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
@@ -151,7 +151,8 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddTransient<IUserManager, UserManager>();
 
             // providers
-            services.AddTransient<ITextEditorProvider, QuillTextEditorProvider>();
+            services.AddTransient<ITextEditorProvider, QuillJSTextEditorProvider>();
+            services.AddTransient<ITextEditorProvider, TextAreaTextEditorProvider>();
 
             // obsolete - replaced by ITenantManager
             services.AddTransient<ITenantResolver, TenantResolver>();
diff --git a/Oqtane.Server/wwwroot/css/app.css b/Oqtane.Server/wwwroot/css/app.css
index 941ff5f1..da6944cb 100644
--- a/Oqtane.Server/wwwroot/css/app.css
+++ b/Oqtane.Server/wwwroot/css/app.css
@@ -248,4 +248,10 @@ app {
 }
 .app-search input + button .oi{
     top: 0;
+}
+
+/* Text Editor */
+.text-area-editor > textarea {
+    width: 100%;
+    min-height: 250px;
 }
\ No newline at end of file
diff --git a/Oqtane.Shared/Interfaces/IModuleControl.cs b/Oqtane.Shared/Interfaces/IModuleControl.cs
index df607f8f..bb2e72b8 100644
--- a/Oqtane.Shared/Interfaces/IModuleControl.cs
+++ b/Oqtane.Shared/Interfaces/IModuleControl.cs
@@ -1,6 +1,8 @@
 using Oqtane.Models;
 using Oqtane.Shared;
+using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Oqtane.Modules
 {
@@ -31,6 +33,17 @@ namespace Oqtane.Modules
         /// </summary>
         List<Resource> Resources { get; }
 
+        /// <summary>
+        /// The component types which need to register it's own resources.
+        /// </summary>
+        List<string> ResourcesRegistrationTypes { get; }
+
+        /// <summary>
+        /// Identifies all resources in a module including resources from resources registration types.
+        /// </summary>
+        /// <returns></returns>
+        Task<List<Resource>> GetResources(IServiceProvider serviceProvider, Page page);
+
         /// <summary>
         /// Specifies the required render mode for the module control ie. Static,Interactive
         /// </summary>
diff --git a/Oqtane.Shared/Interfaces/ITextEditorProvider.cs b/Oqtane.Shared/Interfaces/ITextEditorProvider.cs
index a00c6817..2673f445 100644
--- a/Oqtane.Shared/Interfaces/ITextEditorProvider.cs
+++ b/Oqtane.Shared/Interfaces/ITextEditorProvider.cs
@@ -14,5 +14,10 @@ namespace Oqtane.Interfaces
         /// The text editor type full name.
         /// </summary>
         string EditorType { get; }
+
+        /// <summary>
+        /// The text editor settings type full name.
+        /// </summary>
+        string SettingsType { get; }
     }
 }
diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index 3abb1ed5..54444dbd 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -81,7 +81,9 @@ namespace Oqtane.Shared
         public const string DefaultSearchProviderName = "Database";
         public const string SearchPageIdPropertyName = "PageId";
         public const string SearchModuleIdPropertyName = "ModuleId";
-        
+
+        public const string DefaultTextEditorProvider = "Oqtane.Modules.Controls.QuillJSTextEditor, Oqtane.Client";
+
         // Obsolete constants
 
         const string RoleObsoleteMessage = "Use the corresponding member from Oqtane.Shared.RoleNames";

From 6701e49f9a83d464ba1d8fe65e04f90271927c99 Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Tue, 2 Jul 2024 09:50:53 +0800
Subject: [PATCH 2/6] move the editor settings into editor self control.

---
 Oqtane.Client/Modules/Admin/Site/Index.razor  |  49 +-----
 .../Modules/Controls/QuillJSTextEditor.razor  | 106 +++++++++++-
 .../Controls/QuillJSTextEditorSettings.razor  |  99 -----------
 .../Modules/Controls/RichTextEditor.razor     |  28 +---
 Oqtane.Client/Modules/HtmlText/Edit.razor     |   8 +-
 Oqtane.Client/Modules/ModuleBase.cs           |  36 ----
 .../Modules/Controls/QuillJSTextEditor.resx   |  39 +++++
 .../Controls/QuillJSTextEditorSettings.resx   | 156 ------------------
 Oqtane.Server/Components/App.razor            |   6 +-
 Oqtane.Shared/Interfaces/IModuleControl.cs    |  13 --
 .../Interfaces/ITextEditorProvider.cs         |   5 -
 11 files changed, 151 insertions(+), 394 deletions(-)
 delete mode 100644 Oqtane.Client/Modules/Controls/QuillJSTextEditorSettings.razor
 delete mode 100644 Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditorSettings.resx

diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index 5d813d27..1b7f3758 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -128,7 +128,7 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="textEditorProvider" HelpText="Select the text editor provider for the site" ResourceKey="TextEditorProvider">Text Editor Provider: </Label>
                     <div class="col-sm-9">
-                        <select id="textEditorProvider" class="form-select" value="@_textEditorProvider" required @onchange="TextEditorProviderChanged">
+                        <select id="textEditorProvider" class="form-select" @bind="@_textEditorProvider" required>
                             @if (_textEditorProviders != null)
                             {
                                 @foreach (var provider in _textEditorProviders)
@@ -139,14 +139,6 @@
                         </select>
                     </div>
                 </div>
-                @if (_textEditorProviderSettings != null)
-                {
-                    <div class="row mb-1 align-items-center">
-                        <div class="col-sm-9 offset-sm-3">
-                        @_textEditorProviderSettings
-                        </div>
-                    </div>
-                }
             </div>
         </Section>
         <Section Name="FileExtensions" Heading="File Extensions" ResourceKey="FileExtensions">
@@ -464,8 +456,6 @@
     private string _connectionstring = string.Empty;
     private string _textEditorProvider = "";
     private IEnumerable<ITextEditorProvider> _textEditorProviders;
-    private RenderFragment _textEditorProviderSettings;
-    private ISettingsControl _textEditorProviderSettingsControl;
     private string _createdby;
     private DateTime _createdon;
     private string _modifiedby;
@@ -548,7 +538,6 @@
 
                 //text editor
                 _textEditorProvider = SettingService.GetSetting(settings, "TextEditorProvider", Constants.DefaultTextEditorProvider);
-                LoadTextEditorProviderSettingsControl();
 
                 // hosting model
                 _rendermode = site.RenderMode;
@@ -732,11 +721,6 @@
 
                         await logger.LogInformation("Site Settings Saved {Site}", site);
 
-                        if(_textEditorProviderSettingsControl != null)
-                        {
-                            await _textEditorProviderSettingsControl.UpdateSettings();
-                        }
-
                         NavigationManager.NavigateTo(NavigateUrl(), true); // reload
                     }
                 }
@@ -926,35 +910,4 @@
         _aliasname = "";
         StateHasChanged();
     }
-
-    private void TextEditorProviderChanged(ChangeEventArgs e)
-    {
-        _textEditorProvider = e.Value.ToString();
-        LoadTextEditorProviderSettingsControl();
-
-        StateHasChanged();
-    }
-
-    private void LoadTextEditorProviderSettingsControl()
-    {
-        var provider = _textEditorProviders.FirstOrDefault(i => i.EditorType == _textEditorProvider);
-        var settingsType = provider != null && !string.IsNullOrEmpty(provider.SettingsType) ? Type.GetType(provider.SettingsType) : null;
-        if (settingsType != null)
-        {
-            _textEditorProviderSettings = builder =>
-            {
-                builder.OpenComponent(0, settingsType);
-                builder.AddComponentReferenceCapture(1, (c) =>
-                {
-                    _textEditorProviderSettingsControl = (ISettingsControl)c;
-                });
-                builder.CloseComponent();
-            };
-        }
-        else
-        {
-            _textEditorProviderSettings = null;
-            _textEditorProviderSettingsControl = null;
-        }
-    }
 }
diff --git a/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
index e0e86139..403b7264 100644
--- a/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
@@ -2,7 +2,9 @@
 @inherits ModuleControlBase
 @implements ITextEditor
 @inject ISettingService SettingService
+@inject NavigationManager NavigationManager
 @inject IStringLocalizer<QuillJSTextEditor> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="quill-text-editor">
     <TabStrip ActiveTab="@_activetab">
@@ -97,15 +99,69 @@
                 }
             </TabPanel>
         }
+        @if (_hasAdminPermission)
+        {
+            <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings" ResourceType="@resourceType">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="AllowFileManagement" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
+                    <div class="col-sm-9">
+                        <input type="checkbox" id="AllowFileManagement" class="form-check-input" @bind="_allowFileManagementSetting" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="AllowRawHtml" ResourceKey="AllowRawHtml" ResourceType="@resourceType" HelpText="Specify If Editors Can Enter Raw HTML">Allow Raw HTML: </Label>
+                    <div class="col-sm-9">
+                        <input type="checkbox" id="AllowRawHtml" class="form-check-input" @bind="_allowRawHtmlSetting" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="AllowRichText" ResourceKey="AllowRichText" ResourceType="@resourceType" HelpText="Specify If Editors Can Use Rich Text Editor">Allow Rich Text: </Label>
+                    <div class="col-sm-9">
+                        <input type="checkbox" id="AllowRichText" class="form-check-input" @bind="_allowRichTextSetting" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="Theme" ResourceKey="Theme" ResourceType="@resourceType" HelpText="Specify the Rich Text Editor's Theme">Theme: </Label>
+                    <div class="col-sm-9">
+                        <input type="text" id="Theme" class="form-control" @bind="_themeSetting" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="DebugLevel" ResourceKey="DebugLevel" ResourceType="@resourceType" HelpText="Specify the Debug Level">Debug Level: </Label>
+                    <div class="col-sm-9">
+                        <select id="DebugLevel" class="form-select" @bind="_debugLevelSetting">
+                            @foreach (var level in _debugLevels)
+                            {
+                                <option value="@level">@level</option>
+                            }
+                        </select>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="ToolbarContent" ResourceKey="ToolbarContent" ResourceType="@resourceType" HelpText="Specify the Toolbar Content">Toolbar Content: </Label>
+                    <div class="col-sm-9">
+                        <textarea id="ToolbarContent" class="form-control" @bind="_toolbarContentSetting" rows="5" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <div class="col-sm-9 offset-sm-3">
+                        <button type="button" class="btn btn-success" @onclick="@(async () => await UpdateSettings())">@SharedLocalizer["Save"]</button>
+                    </div>
+                </div>
+            </TabPanel>
+        }
     </TabStrip>
 </div>
 
 @code {
+    private string resourceType = "Oqtane.Modules.Controls.QuillJSTextEditor, Oqtane.Client";
+
     private bool _initialized = false;
 
     private QuillEditorInterop interop;
     private FileManager _fileManager;
     private string _activetab = "Rich";
+    private bool _hasAdminPermission;
 
     private bool _allowFileManagement = false;
     private bool _allowRawHtml = false;
@@ -113,6 +169,15 @@
     private string _theme = "snow";
     private string _debugLevel = "info";
     private string _toolbarContent = string.Empty;
+
+    //adjust settings variables won't affect UI
+    private bool _allowFileManagementSetting = false;
+    private bool _allowRawHtmlSetting = false;
+    private bool _allowRichTextSetting = false;
+    private string _themeSetting = "snow";
+    private string _debugLevelSetting = "info";
+    private string _toolbarContentSetting = string.Empty;
+
     private bool _settingsLoaded;
 
     private ElementReference _editorElement;
@@ -130,6 +195,8 @@
     private bool _contentchanged = false;
     private int _editorIndex;
 
+    private List<string> _debugLevels = new List<string> { "info", "log", "warn", "error" };
+
     [Parameter]
     public bool ReadOnly { get; set; }
 
@@ -140,9 +207,7 @@
     {
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill.min.js", Location = ResourceLocation.Body },
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-blot-formatter.min.js", Location = ResourceLocation.Body },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js", Location = ResourceLocation.Body },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.bubble.css" },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.snow.css" }
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js", Location = ResourceLocation.Body }
     };
 
     protected override async Task OnInitializedAsync()
@@ -367,12 +432,14 @@
         try
         {
             var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-            _allowFileManagement = SettingService.GetSetting(settings, "QuillTextEditor_AllowFileManagement", "true") == "true";
-            _allowRawHtml = SettingService.GetSetting(settings, "QuillTextEditor_AllowRawHtml", "true") == "true";
-            _allowRichText = SettingService.GetSetting(settings, "QuillTextEditor_AllowRichText", "true") == "true";
-            _theme = SettingService.GetSetting(settings, "QuillTextEditor_Theme", "snow");
-            _debugLevel = SettingService.GetSetting(settings, "QuillTextEditor_DebugLevel", "info");
-            _toolbarContent = SettingService.GetSetting(settings, "QuillTextEditor_ToolbarContent", string.Empty);
+            _allowFileManagementSetting = _allowFileManagement = SettingService.GetSetting(settings, "QuillTextEditor_AllowFileManagement", "true") == "true";
+            _allowRawHtmlSetting = _allowRawHtml = SettingService.GetSetting(settings, "QuillTextEditor_AllowRawHtml", "true") == "true";
+            _allowRichTextSetting = _allowRichText = SettingService.GetSetting(settings, "QuillTextEditor_AllowRichText", "true") == "true";
+            _themeSetting = _theme = SettingService.GetSetting(settings, "QuillTextEditor_Theme", "snow");
+            _debugLevelSetting = _debugLevel = SettingService.GetSetting(settings, "QuillTextEditor_DebugLevel", "info");
+            _toolbarContentSetting = _toolbarContent = SettingService.GetSetting(settings, "QuillTextEditor_ToolbarContent", string.Empty);
+
+            _hasAdminPermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);
 
             _settingsLoaded = true;
         }
@@ -381,4 +448,25 @@
             AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
+
+    private async Task UpdateSettings()
+    {
+        try
+        {
+            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_AllowFileManagement", _allowFileManagementSetting.ToString().ToLower());
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_AllowRawHtml", _allowRawHtmlSetting.ToString().ToLower());
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_AllowRichText", _allowRichTextSetting.ToString().ToLower());
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_Theme", _themeSetting);
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_DebugLevel", _debugLevelSetting);
+            settings = SettingService.SetSetting(settings, "QuillTextEditor_ToolbarContent", _toolbarContentSetting);
+            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+
+            NavigationManager.NavigateTo(NavigationManager.Uri);
+        }
+        catch (Exception ex)
+        {
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
 }
diff --git a/Oqtane.Client/Modules/Controls/QuillJSTextEditorSettings.razor b/Oqtane.Client/Modules/Controls/QuillJSTextEditorSettings.razor
deleted file mode 100644
index fb41a2ef..00000000
--- a/Oqtane.Client/Modules/Controls/QuillJSTextEditorSettings.razor
+++ /dev/null
@@ -1,99 +0,0 @@
-@namespace Oqtane.Modules.Controls
-@inherits ModuleBase
-@inject ISettingService SettingService
-@implements Oqtane.Interfaces.ISettingsControl
-@inject IStringLocalizer<QuillJSTextEditorSettings> Localizer
-@inject IStringLocalizer<SharedResources> SharedLocalizer
-
-<div class="container">
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="AllowFileManagement" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
-        <div class="col-sm-9">
-            <input type="checkbox" id="AllowFileManagement" class="form-check-input" @bind="_allowFileManagement" />
-        </div>
-    </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="AllowRawHtml" ResourceKey="AllowRawHtml" ResourceType="@resourceType" HelpText="Specify If Editors Can Enter Raw HTML">Allow Raw HTML: </Label>
-        <div class="col-sm-9">
-            <input type="checkbox" id="AllowRawHtml" class="form-check-input" @bind="_allowRawHtml" />
-        </div>
-    </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="AllowRichText" ResourceKey="AllowRichText" ResourceType="@resourceType" HelpText="Specify If Editors Can Use Rich Text Editor">Allow Rich Text: </Label>
-        <div class="col-sm-9">
-            <input type="checkbox" id="AllowRichText" class="form-check-input" @bind="_allowRichText" />
-        </div>
-    </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="Theme" ResourceKey="Theme" ResourceType="@resourceType" HelpText="Specify the Rich Text Editor's Theme">Theme: </Label>
-        <div class="col-sm-9">
-            <input type="text" id="Theme" class="form-control" @bind="_theme" />
-        </div>
-    </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="DebugLevel" ResourceKey="DebugLevel" ResourceType="@resourceType" HelpText="Specify the Debug Level">Debug Level: </Label>
-        <div class="col-sm-9">
-            <select id="DebugLevel" class="form-select" @bind="_debugLevel">
-                @foreach (var level in _debugLevels)
-                {
-                    <option value="@level">@level</option>
-                }
-            </select>
-        </div>
-    </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="ToolbarContent" ResourceKey="ToolbarContent" ResourceType="@resourceType" HelpText="Specify the Toolbar Content">Toolbar Content: </Label>
-        <div class="col-sm-9">
-            <textarea id="ToolbarContent" class="form-control" @bind="_toolbarContent" rows="5" />
-        </div>
-    </div>
-</div>
-
-@code {
-    private string resourceType = "Oqtane.Modules.Controls.QuillJSTextEditorSettings, Oqtane.Client";
-    private bool _allowFileManagement;
-    private bool _allowRawHtml;
-    private bool _allowRichText;
-    private string _theme;
-    private string _debugLevel;
-    private string _toolbarContent;
-
-    private List<string> _debugLevels = new List<string> { "info", "log", "warn", "error" };
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-            _allowFileManagement = SettingService.GetSetting(settings, "QuillTextEditor_AllowFileManagement", "true") == "true";
-            _allowRawHtml = SettingService.GetSetting(settings, "QuillTextEditor_AllowRawHtml", "true") == "true";
-            _allowRichText = SettingService.GetSetting(settings, "QuillTextEditor_AllowRichText", "true") == "true";
-            _theme = SettingService.GetSetting(settings, "QuillTextEditor_Theme", "snow");
-            _debugLevel = SettingService.GetSetting(settings, "QuillTextEditor_DebugLevel", "info");
-            _toolbarContent = SettingService.GetSetting(settings, "QuillTextEditor_ToolbarContent", string.Empty);
-        }
-        catch (Exception ex)
-        {
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
-
-    public async Task UpdateSettings()
-    {
-        try
-        {
-            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-            settings = SettingService.SetSetting(settings, "QuillTextEditor_AllowFileManagement", _allowFileManagement.ToString().ToLower());
-            settings = SettingService.SetSetting(settings, "QuillTextEditor_AllowRawHtml", _allowRawHtml.ToString().ToLower());
-            settings = SettingService.SetSetting(settings, "QuillTextEditor_AllowRichText", _allowRichText.ToString().ToLower());
-            settings = SettingService.SetSetting(settings, "QuillTextEditor_Theme", _theme);
-            settings = SettingService.SetSetting(settings, "QuillTextEditor_DebugLevel", _debugLevel);
-            settings = SettingService.SetSetting(settings, "QuillTextEditor_ToolbarContent", _toolbarContent);
-            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
-        }
-        catch (Exception ex)
-        {
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
-}
diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index 4a8540f7..4a369952 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -4,6 +4,7 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleControlBase
 @inject IServiceProvider ServiceProvider
+@inject ISettingService SettingService
 @inject IStringLocalizer<RichTextEditor> Localizer 
 
 <div class="row" style="margin-bottom: 50px;">
@@ -34,7 +35,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        _textEditorProvider = await GetTextEditorType(ServiceProvider, PageState.Site.SiteId);
+        _textEditorProvider = await GetTextEditorType();
     }
 
     protected override void OnParametersSet()
@@ -55,22 +56,6 @@
         await base.OnAfterRenderAsync(firstRender);
     }
 
-    public override async Task<List<Resource>> GetResources(IServiceProvider serviceProvider, Page page)
-    {
-        var type = await GetTextEditorType(serviceProvider, page.SiteId);
-        if (!string.IsNullOrEmpty(type))
-        {
-            var editorType = Type.GetType(type);
-            if (editorType != null && editorType.GetInterfaces().Contains(typeof(IModuleControl)))
-            {
-                var control = Activator.CreateInstance(editorType) as IModuleControl;
-                return await control?.GetResources(serviceProvider, page);
-            }
-        }
-
-        return await base.GetResources(serviceProvider, page);
-    }
-
     public async Task<string> GetHtml()
     {
         return await _textEditor.GetContent();
@@ -124,21 +109,20 @@
         }
     }
 
-    private async Task<string> GetTextEditorType(IServiceProvider serviceProvider, int siteId)
+    private async Task<string> GetTextEditorType()
     {
         const string EditorSettingName = "TextEditorProvider";
 
         if(!string.IsNullOrEmpty(Provider))
         {
-            var provider = serviceProvider.GetServices<ITextEditorProvider>().FirstOrDefault(i => i.Name.Equals(Provider, StringComparison.OrdinalIgnoreCase));
+            var provider = ServiceProvider.GetServices<ITextEditorProvider>().FirstOrDefault(i => i.Name.Equals(Provider, StringComparison.OrdinalIgnoreCase));
             if(provider != null)
             {
                 return provider.EditorType;
             }
         }
 
-        var settingService = serviceProvider.GetService<ISettingService>();
-        var settings = await settingService.GetSiteSettingsAsync(siteId);
-        return settingService.GetSetting(settings, EditorSettingName, Constants.DefaultTextEditorProvider);
+        var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+        return SettingService.GetSetting(settings, EditorSettingName, Constants.DefaultTextEditorProvider);
     }
 }
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 6675fbed..27a6f6ed 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -51,6 +51,12 @@
 
     public override string Title => "Edit Html/Text";
 
+    public override List<Resource> Resources => new List<Resource>()
+    {
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.bubble.css" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.snow.css" }
+    };
+
     private RichTextEditor RichTextEditorHtml;
     private string _content = null;
     private string _createdby;
@@ -60,8 +66,6 @@
     private List<Models.HtmlText> _htmltexts;
     private string _view = "";
 
-    public override List<string> ResourcesRegistrationTypes => new List<string> { typeof(RichTextEditor).FullName };
-
     protected override async Task OnInitializedAsync()
     {
         try
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 71fed0aa..1731e22d 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -50,8 +50,6 @@ namespace Oqtane.Modules
 
         public virtual List<Resource> Resources { get; set; }
 
-        public virtual List<string> ResourcesRegistrationTypes { get; }
-
         public virtual string RenderMode { get { return RenderModes.Interactive; } } // interactive by default
 
         public virtual bool? Prerender { get { return null; } } // allows the Site Prerender property to be overridden
@@ -73,21 +71,6 @@ namespace Oqtane.Modules
 
         // base lifecycle method for handling JSInterop script registration
 
-        public virtual async Task<List<Resource>> GetResources(IServiceProvider serviceProvider, Page page)
-        {
-            var resources = Resources ?? new List<Resource>();
-
-            if(ResourcesRegistrationTypes != null)
-            {
-                foreach(var type in ResourcesRegistrationTypes)
-                {
-                    resources.AddRange(await LoadResourcesFromType(serviceProvider, page, type));
-                }
-            }
-
-            return resources;
-        }
-
         protected override async Task OnAfterRenderAsync(bool firstRender)
         {
             if (firstRender)
@@ -499,25 +482,6 @@ namespace Oqtane.Modules
             }
         }
 
-        private async Task<List<Resource>> LoadResourcesFromType(IServiceProvider serviceProvider, Page page, string typeName)
-        {
-            try
-            {
-                var type = Type.GetType(typeName, false, true);
-                if (type != null && type.GetInterfaces().Contains(typeof(IModuleControl)))
-                {
-                    var control = Activator.CreateInstance(type) as IModuleControl;
-                    return await control?.GetResources(serviceProvider, page);
-                }
-            }
-            catch(Exception ex)
-            {
-                //await Log(null, LogLevel.Error, string.Empty, ex, "Load Resources From Type {Type} Failed. {Message}", typeName, ex.Message);
-            }
-
-            return null;
-        }
-
         [Obsolete("ContentUrl(int fileId) is deprecated. Use FileUrl(int fileId) instead.", false)]
         public string ContentUrl(int fileid)
         {
diff --git a/Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditor.resx b/Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditor.resx
index e8180682..6a2b85fc 100644
--- a/Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditor.resx
+++ b/Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditor.resx
@@ -117,9 +117,33 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="AllowFileManagement.HelpText" xml:space="preserve">
+    <value>Specify If Editors Can Upload and Select Files</value>
+  </data>
+  <data name="AllowFileManagement.Text" xml:space="preserve">
+    <value>Allow File Management:</value>
+  </data>
+  <data name="AllowRawHtml.HelpText" xml:space="preserve">
+    <value>Specify If Editors Can Enter Raw HTML</value>
+  </data>
+  <data name="AllowRawHtml.Text" xml:space="preserve">
+    <value>Allow Raw HTML:</value>
+  </data>
+  <data name="AllowRichText.HelpText" xml:space="preserve">
+    <value>Specify If Editors Can Use Rich Text Editor</value>
+  </data>
+  <data name="AllowRichText.Text" xml:space="preserve">
+    <value>Allow Rich Text: </value>
+  </data>
   <data name="Close" xml:space="preserve">
     <value>Close</value>
   </data>
+  <data name="DebugLevel.HelpText" xml:space="preserve">
+    <value>Specify the Debug Level</value>
+  </data>
+  <data name="DebugLevel.Text" xml:space="preserve">
+    <value>Debug Level:</value>
+  </data>
   <data name="InsertImage" xml:space="preserve">
     <value>Insert Image</value>
   </data>
@@ -129,4 +153,19 @@
   <data name="Placeholder" xml:space="preserve">
     <value>Enter Your Content...</value>
   </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Theme.HelpText" xml:space="preserve">
+    <value>Specify the Rich Text Editor's Theme</value>
+  </data>
+  <data name="Theme.Text" xml:space="preserve">
+    <value>Theme:</value>
+  </data>
+  <data name="ToolbarContent.HelpText" xml:space="preserve">
+    <value>Specify the Toolbar Content</value>
+  </data>
+  <data name="ToolbarContent.Text" xml:space="preserve">
+    <value>Toolbar Content:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditorSettings.resx b/Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditorSettings.resx
deleted file mode 100644
index c467248e..00000000
--- a/Oqtane.Client/Resources/Modules/Controls/QuillJSTextEditorSettings.resx
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AllowFileManagement.HelpText" xml:space="preserve">
-    <value>Specify If Editors Can Upload and Select Files</value>
-  </data>
-  <data name="AllowFileManagement.Text" xml:space="preserve">
-    <value>Allow File Management:</value>
-  </data>
-  <data name="AllowRawHtml.HelpText" xml:space="preserve">
-    <value>Specify If Editors Can Enter Raw HTML</value>
-  </data>
-  <data name="AllowRawHtml.Text" xml:space="preserve">
-    <value>Allow Raw HTML:</value>
-  </data>
-  <data name="AllowRichText.HelpText" xml:space="preserve">
-    <value>Specify If Editors Can Use Rich Text Editor</value>
-  </data>
-  <data name="AllowRichText.Text" xml:space="preserve">
-    <value>Allow Rich Text: </value>
-  </data>
-  <data name="DebugLevel.HelpText" xml:space="preserve">
-    <value>Specify the Debug Level</value>
-  </data>
-  <data name="DebugLevel.Text" xml:space="preserve">
-    <value>Debug Level:</value>
-  </data>
-  <data name="Theme.HelpText" xml:space="preserve">
-    <value>Specify the Rich Text Editor's Theme</value>
-  </data>
-  <data name="Theme.Text" xml:space="preserve">
-    <value>Theme:</value>
-  </data>
-  <data name="ToolbarContent.HelpText" xml:space="preserve">
-    <value>Specify the Toolbar Content</value>
-  </data>
-  <data name="ToolbarContent.Text" xml:space="preserve">
-    <value>Toolbar Content:</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor
index 84e4c323..3c53c820 100644
--- a/Oqtane.Server/Components/App.razor
+++ b/Oqtane.Server/Components/App.razor
@@ -5,7 +5,6 @@
 @using Microsoft.AspNetCore.Http.Extensions
 @using Microsoft.AspNetCore.Antiforgery
 @using Microsoft.AspNetCore.Localization
-@using Microsoft.Extensions.DependencyInjection
 @using Microsoft.Net.Http.Headers
 @using Microsoft.Extensions.Primitives
 @using Oqtane.Client
@@ -31,7 +30,6 @@
 @inject IUrlMappingRepository UrlMappingRepository
 @inject IVisitorRepository VisitorRepository
 @inject IJwtManager JwtManager
-@inject IServiceProvider ServiceProvider
 
 @if (_initialized)
 {
@@ -676,7 +674,7 @@
                 var obj = Activator.CreateInstance(moduletype) as IModuleControl;
                 if (obj != null)
                 {
-                    resources = AddResources(resources, await obj.GetResources(ServiceProvider, page), ResourceLevel.Module, alias, "Modules", moduletype.Namespace, site.RenderMode);
+                    resources = AddResources(resources, obj.Resources, ResourceLevel.Module, alias, "Modules", moduletype.Namespace, site.RenderMode);
                     if (action.ToLower() == "settings" && module.ModuleDefinition != null)
                     {
                         // settings components are embedded within a framework settings module
@@ -684,7 +682,7 @@
                         if (moduletype != null)
                         {
                             obj = Activator.CreateInstance(moduletype) as IModuleControl;
-                            resources = AddResources(resources, await obj.GetResources(ServiceProvider, page), ResourceLevel.Module, alias, "Modules", moduletype.Namespace, site.RenderMode);
+                            resources = AddResources(resources, obj.Resources, ResourceLevel.Module, alias, "Modules", moduletype.Namespace, site.RenderMode);
                         }
                     }
                 }
diff --git a/Oqtane.Shared/Interfaces/IModuleControl.cs b/Oqtane.Shared/Interfaces/IModuleControl.cs
index bb2e72b8..df607f8f 100644
--- a/Oqtane.Shared/Interfaces/IModuleControl.cs
+++ b/Oqtane.Shared/Interfaces/IModuleControl.cs
@@ -1,8 +1,6 @@
 using Oqtane.Models;
 using Oqtane.Shared;
-using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Oqtane.Modules
 {
@@ -33,17 +31,6 @@ namespace Oqtane.Modules
         /// </summary>
         List<Resource> Resources { get; }
 
-        /// <summary>
-        /// The component types which need to register it's own resources.
-        /// </summary>
-        List<string> ResourcesRegistrationTypes { get; }
-
-        /// <summary>
-        /// Identifies all resources in a module including resources from resources registration types.
-        /// </summary>
-        /// <returns></returns>
-        Task<List<Resource>> GetResources(IServiceProvider serviceProvider, Page page);
-
         /// <summary>
         /// Specifies the required render mode for the module control ie. Static,Interactive
         /// </summary>
diff --git a/Oqtane.Shared/Interfaces/ITextEditorProvider.cs b/Oqtane.Shared/Interfaces/ITextEditorProvider.cs
index 2673f445..a00c6817 100644
--- a/Oqtane.Shared/Interfaces/ITextEditorProvider.cs
+++ b/Oqtane.Shared/Interfaces/ITextEditorProvider.cs
@@ -14,10 +14,5 @@ namespace Oqtane.Interfaces
         /// The text editor type full name.
         /// </summary>
         string EditorType { get; }
-
-        /// <summary>
-        /// The text editor settings type full name.
-        /// </summary>
-        string SettingsType { get; }
     }
 }

From f60c8078e44a23c49f2b627fcfed168bf4cdeff4 Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Tue, 2 Jul 2024 09:55:38 +0800
Subject: [PATCH 3/6] cleanup the code.

---
 Oqtane.Client/Providers/QuillJSTextEditorProvider.cs  | 2 --
 Oqtane.Client/Providers/TextAreaTextEditorProvider.cs | 2 --
 2 files changed, 4 deletions(-)

diff --git a/Oqtane.Client/Providers/QuillJSTextEditorProvider.cs b/Oqtane.Client/Providers/QuillJSTextEditorProvider.cs
index d815ba60..311743f8 100644
--- a/Oqtane.Client/Providers/QuillJSTextEditorProvider.cs
+++ b/Oqtane.Client/Providers/QuillJSTextEditorProvider.cs
@@ -7,7 +7,5 @@ namespace Oqtane.Providers
         public string Name => "QuillJS";
 
         public string EditorType => "Oqtane.Modules.Controls.QuillJSTextEditor, Oqtane.Client";
-
-        public string SettingsType => "Oqtane.Modules.Controls.QuillJSTextEditorSettings, Oqtane.Client";
     }
 }
diff --git a/Oqtane.Client/Providers/TextAreaTextEditorProvider.cs b/Oqtane.Client/Providers/TextAreaTextEditorProvider.cs
index 010680f9..3fde4231 100644
--- a/Oqtane.Client/Providers/TextAreaTextEditorProvider.cs
+++ b/Oqtane.Client/Providers/TextAreaTextEditorProvider.cs
@@ -7,7 +7,5 @@ namespace Oqtane.Providers
         public string Name => "TextArea";
 
         public string EditorType => "Oqtane.Modules.Controls.TextAreaTextEditor, Oqtane.Client";
-
-        public string SettingsType => string.Empty;
     }
 }

From 2bacee919d1185cbbd2b143f908378115e0da3cb Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Wed, 3 Jul 2024 12:26:36 +0800
Subject: [PATCH 4/6] update the settings UI.

---
 .../Modules/Controls/QuillJSTextEditor.razor  | 118 ++++++++++--------
 Oqtane.Server/wwwroot/js/quill-interop.js     |   5 +
 2 files changed, 71 insertions(+), 52 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
index 403b7264..b5eb7ade 100644
--- a/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
@@ -6,7 +6,7 @@
 @inject IStringLocalizer<QuillJSTextEditor> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<div class="quill-text-editor">
+<div class="quill-text-editor @(_settingsVisible ? "d-none" : "d-block")">
     <TabStrip ActiveTab="@_activetab">
         @if (_allowRichText)
         {
@@ -63,6 +63,12 @@
                                     <button class="ql-link"></button>
                                 </span>
                             }
+                            @if (_hasAdminPermission)
+                            {
+                                <span class="ql-formats">
+                                    <button class="ql-settings" @onclick="OpenSettings"></button>
+                                </span>
+                            }
                         </div>
                         <div @ref="@_editorElement"></div>
                     </div>
@@ -88,6 +94,10 @@
                         @((MarkupString)"&nbsp;&nbsp;")
                         <button type="button" class="btn btn-secondary" @onclick="CloseRawFileManager">@Localizer["Close"]</button>
                     }
+                    else if(_hasAdminPermission)
+                    {
+                        <button type="button" class="btn btn-primary ms-1" @onclick="OpenSettings">@Localizer["Settings"]</button>
+                    }
                 </div>
                 @if (ReadOnly)
                 {
@@ -99,59 +109,56 @@
                 }
             </TabPanel>
         }
-        @if (_hasAdminPermission)
-        {
-            <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings" ResourceType="@resourceType">
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="AllowFileManagement" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
-                    <div class="col-sm-9">
-                        <input type="checkbox" id="AllowFileManagement" class="form-check-input" @bind="_allowFileManagementSetting" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="AllowRawHtml" ResourceKey="AllowRawHtml" ResourceType="@resourceType" HelpText="Specify If Editors Can Enter Raw HTML">Allow Raw HTML: </Label>
-                    <div class="col-sm-9">
-                        <input type="checkbox" id="AllowRawHtml" class="form-check-input" @bind="_allowRawHtmlSetting" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="AllowRichText" ResourceKey="AllowRichText" ResourceType="@resourceType" HelpText="Specify If Editors Can Use Rich Text Editor">Allow Rich Text: </Label>
-                    <div class="col-sm-9">
-                        <input type="checkbox" id="AllowRichText" class="form-check-input" @bind="_allowRichTextSetting" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="Theme" ResourceKey="Theme" ResourceType="@resourceType" HelpText="Specify the Rich Text Editor's Theme">Theme: </Label>
-                    <div class="col-sm-9">
-                        <input type="text" id="Theme" class="form-control" @bind="_themeSetting" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="DebugLevel" ResourceKey="DebugLevel" ResourceType="@resourceType" HelpText="Specify the Debug Level">Debug Level: </Label>
-                    <div class="col-sm-9">
-                        <select id="DebugLevel" class="form-select" @bind="_debugLevelSetting">
-                            @foreach (var level in _debugLevels)
-                            {
-                                <option value="@level">@level</option>
-                            }
-                        </select>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="ToolbarContent" ResourceKey="ToolbarContent" ResourceType="@resourceType" HelpText="Specify the Toolbar Content">Toolbar Content: </Label>
-                    <div class="col-sm-9">
-                        <textarea id="ToolbarContent" class="form-control" @bind="_toolbarContentSetting" rows="5" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <div class="col-sm-9 offset-sm-3">
-                        <button type="button" class="btn btn-success" @onclick="@(async () => await UpdateSettings())">@SharedLocalizer["Save"]</button>
-                    </div>
-                </div>
-            </TabPanel>
-        }
     </TabStrip>
 </div>
+<div class="quill-text-editor-settings @(_settingsVisible ? "d-block" : "d-none")">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="AllowFileManagement" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
+        <div class="col-sm-9">
+            <input type="checkbox" id="AllowFileManagement" class="form-check-input" @bind="_allowFileManagementSetting" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="AllowRawHtml" ResourceKey="AllowRawHtml" ResourceType="@resourceType" HelpText="Specify If Editors Can Enter Raw HTML">Allow Raw HTML: </Label>
+        <div class="col-sm-9">
+            <input type="checkbox" id="AllowRawHtml" class="form-check-input" @bind="_allowRawHtmlSetting" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="AllowRichText" ResourceKey="AllowRichText" ResourceType="@resourceType" HelpText="Specify If Editors Can Use Rich Text Editor">Allow Rich Text: </Label>
+        <div class="col-sm-9">
+            <input type="checkbox" id="AllowRichText" class="form-check-input" @bind="_allowRichTextSetting" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="Theme" ResourceKey="Theme" ResourceType="@resourceType" HelpText="Specify the Rich Text Editor's Theme">Theme: </Label>
+        <div class="col-sm-9">
+            <input type="text" id="Theme" class="form-control" @bind="_themeSetting" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="DebugLevel" ResourceKey="DebugLevel" ResourceType="@resourceType" HelpText="Specify the Debug Level">Debug Level: </Label>
+        <div class="col-sm-9">
+            <select id="DebugLevel" class="form-select" @bind="_debugLevelSetting">
+                @foreach (var level in _debugLevels)
+                {
+                    <option value="@level">@level</option>
+                }
+            </select>
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="ToolbarContent" ResourceKey="ToolbarContent" ResourceType="@resourceType" HelpText="Specify the Toolbar Content">Toolbar Content: </Label>
+        <div class="col-sm-9">
+            <textarea id="ToolbarContent" class="form-control" @bind="_toolbarContentSetting" rows="5" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <div class="col-sm-9 offset-sm-3">
+            <button type="button" class="btn btn-success" @onclick="@(async () => await UpdateSettings())">@SharedLocalizer["Save"]</button>
+        </div>
+    </div>
+</div>
 
 @code {
     private string resourceType = "Oqtane.Modules.Controls.QuillJSTextEditor, Oqtane.Client";
@@ -177,6 +184,7 @@
     private string _themeSetting = "snow";
     private string _debugLevelSetting = "info";
     private string _toolbarContentSetting = string.Empty;
+    private bool _settingsVisible;
 
     private bool _settingsLoaded;
 
@@ -427,6 +435,12 @@
         StateHasChanged();
     }
 
+    private void OpenSettings()
+    {
+        _settingsVisible = true;
+        StateHasChanged();
+    }
+
     private async Task LoadSettings()
     {
         try
diff --git a/Oqtane.Server/wwwroot/js/quill-interop.js b/Oqtane.Server/wwwroot/js/quill-interop.js
index 4598d7aa..3b1fbc69 100644
--- a/Oqtane.Server/wwwroot/js/quill-interop.js
+++ b/Oqtane.Server/wwwroot/js/quill-interop.js
@@ -19,6 +19,11 @@ Oqtane.RichTextEditor = {
         };
 
         new Quill(quillElement, options);
+        
+        var settingsButton = document.querySelector('.ql-toolbar button.ql-settings');
+        if (settingsButton !== null) {
+            settingsButton.innerHTML = '<svg viewBox="0 0 46 46"><g><path class="ql-stroke" d="M43.454,18.443h-2.437c-0.453-1.766-1.16-3.42-2.082-4.933l1.752-1.756c0.473-0.473,0.733-1.104,0.733-1.774 c0-0.669-0.262-1.301-0.733-1.773l-2.92-2.917c-0.947-0.948-2.602-0.947-3.545-0.001l-1.826,1.815 C30.9,6.232,29.296,5.56,27.529,5.128V2.52c0-1.383-1.105-2.52-2.488-2.52h-4.128c-1.383,0-2.471,1.137-2.471,2.52v2.607 c-1.766,0.431-3.38,1.104-4.878,1.977l-1.825-1.815c-0.946-0.948-2.602-0.947-3.551-0.001L5.27,8.205 C4.802,8.672,4.535,9.318,4.535,9.978c0,0.669,0.259,1.299,0.733,1.772l1.752,1.76c-0.921,1.513-1.629,3.167-2.081,4.933H2.501 C1.117,18.443,0,19.555,0,20.935v4.125c0,1.384,1.117,2.471,2.501,2.471h2.438c0.452,1.766,1.159,3.43,2.079,4.943l-1.752,1.763 c-0.474,0.473-0.734,1.106-0.734,1.776s0.261,1.303,0.734,1.776l2.92,2.919c0.474,0.473,1.103,0.733,1.772,0.733 s1.299-0.261,1.773-0.733l1.833-1.816c1.498,0.873,3.112,1.545,4.878,1.978v2.604c0,1.383,1.088,2.498,2.471,2.498h4.128 c1.383,0,2.488-1.115,2.488-2.498v-2.605c1.767-0.432,3.371-1.104,4.869-1.977l1.817,1.812c0.474,0.475,1.104,0.735,1.775,0.735 c0.67,0,1.301-0.261,1.774-0.733l2.92-2.917c0.473-0.472,0.732-1.103,0.734-1.772c0-0.67-0.262-1.299-0.734-1.773l-1.75-1.77 c0.92-1.514,1.627-3.179,2.08-4.943h2.438c1.383,0,2.52-1.087,2.52-2.471v-4.125C45.973,19.555,44.837,18.443,43.454,18.443z M22.976,30.85c-4.378,0-7.928-3.517-7.928-7.852c0-4.338,3.55-7.85,7.928-7.85c4.379,0,7.931,3.512,7.931,7.85 C30.906,27.334,27.355,30.85,22.976,30.85z" /></g></svg>';
+        }
     },
     getQuillContent: function (editorElement) {
         return JSON.stringify(editorElement.__quill.getContents());

From 599071b68b0f65c991deeb5a6c12f40dbad17123 Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Wed, 3 Jul 2024 17:07:47 +0800
Subject: [PATCH 5/6] avoid race condition issue.

---
 .../Modules/Controls/QuillJSTextEditor.razor  | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
index b5eb7ade..9a744210 100644
--- a/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
@@ -244,8 +244,9 @@
 
         if (_allowRichText)
         {
-            if (_settingsLoaded && !_initialized)
+            if (firstRender)
             {
+                await LoadSettings();
                 await interop.CreateEditor(
                     _editorElement,
                     _toolBar,
@@ -445,17 +446,20 @@
     {
         try
         {
-            var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-            _allowFileManagementSetting = _allowFileManagement = SettingService.GetSetting(settings, "QuillTextEditor_AllowFileManagement", "true") == "true";
-            _allowRawHtmlSetting = _allowRawHtml = SettingService.GetSetting(settings, "QuillTextEditor_AllowRawHtml", "true") == "true";
-            _allowRichTextSetting = _allowRichText = SettingService.GetSetting(settings, "QuillTextEditor_AllowRichText", "true") == "true";
-            _themeSetting = _theme = SettingService.GetSetting(settings, "QuillTextEditor_Theme", "snow");
-            _debugLevelSetting = _debugLevel = SettingService.GetSetting(settings, "QuillTextEditor_DebugLevel", "info");
-            _toolbarContentSetting = _toolbarContent = SettingService.GetSetting(settings, "QuillTextEditor_ToolbarContent", string.Empty);
+            if (!_settingsLoaded)
+            {
+                var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+                _allowFileManagementSetting = _allowFileManagement = SettingService.GetSetting(settings, "QuillTextEditor_AllowFileManagement", "true") == "true";
+                _allowRawHtmlSetting = _allowRawHtml = SettingService.GetSetting(settings, "QuillTextEditor_AllowRawHtml", "true") == "true";
+                _allowRichTextSetting = _allowRichText = SettingService.GetSetting(settings, "QuillTextEditor_AllowRichText", "true") == "true";
+                _themeSetting = _theme = SettingService.GetSetting(settings, "QuillTextEditor_Theme", "snow");
+                _debugLevelSetting = _debugLevel = SettingService.GetSetting(settings, "QuillTextEditor_DebugLevel", "info");
+                _toolbarContentSetting = _toolbarContent = SettingService.GetSetting(settings, "QuillTextEditor_ToolbarContent", string.Empty);
 
-            _hasAdminPermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);
+                _hasAdminPermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);
 
-            _settingsLoaded = true;
+                _settingsLoaded = true;
+            }
         }
         catch (Exception ex)
         {
@@ -476,7 +480,7 @@
             settings = SettingService.SetSetting(settings, "QuillTextEditor_ToolbarContent", _toolbarContentSetting);
             await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
 
-            NavigationManager.NavigateTo(NavigationManager.Uri);
+            NavigationManager.NavigateTo(NavigationManager.Uri, true);
         }
         catch (Exception ex)
         {

From acbe000f97cab792ac4fb282f6452c0aebf76ce4 Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Wed, 3 Jul 2024 17:59:40 +0800
Subject: [PATCH 6/6] avoid race condition issue.

---
 Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
index 9a744210..95f9fb0c 100644
--- a/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
@@ -242,11 +242,11 @@
     {
         await base.OnAfterRenderAsync(firstRender);
 
+        await LoadSettings();
         if (_allowRichText)
         {
             if (firstRender)
             {
-                await LoadSettings();
                 await interop.CreateEditor(
                     _editorElement,
                     _toolBar,