From b8622e5943b4316fea0ba0f82ebac8287659d4bc Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Sun, 3 Jan 2021 14:02:48 +0300
Subject: [PATCH 1/3] Order users by display name

---
 Oqtane.Client/Modules/Admin/Roles/Users.razor | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor
index 9ceae846..3fb2bb95 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Users.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor
@@ -89,7 +89,10 @@ else
             Role role = await RoleService.GetRoleAsync(roleid);
             name = role.Name;
             users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-            users = users.Where(item => item.Role.Name == RoleNames.Registered).ToList();
+            users = users
+                .Where(u => u.Role.Name == RoleNames.Registered)
+                .OrderBy(u => u.User.DisplayName)
+                .ToList();
             await GetUserRoles();
         }
         catch (Exception ex)

From c86a8cbd2d8a8d1bf9f03569cf64c643d374c577 Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Tue, 5 Jan 2021 03:02:02 +0300
Subject: [PATCH 2/3] Fix ResourceKey property

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

diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
index 367abce8..70310bd4 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
@@ -60,7 +60,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="url" HelpText="The reference url of the module" resource="ReferenceUrl">Reference Url: </Label>
+                        <Label For="url" HelpText="The reference url of the module" ResourceKey="ReferenceUrl">Reference Url: </Label>
                     </td>
                     <td>
                         <input id="url" class="form-control" @bind="@_url" disabled />

From 91c5ff7b007c73889918035faf0a46041bc3b3f2 Mon Sep 17 00:00:00 2001
From: Pavel Vesely <pavel@vesely.dev>
Date: Tue, 5 Jan 2021 19:52:14 +0100
Subject: [PATCH 3/3] UpdateSettings bugfix ISettingControl introduction

---
 .../Modules/Admin/Modules/Settings.razor       | 18 ++++++++++--------
 Oqtane.Shared/Interfaces/ISettingsControl.cs   |  9 +++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 Oqtane.Shared/Interfaces/ISettingsControl.cs

diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
index a4bd4188..c6ebe5c3 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
@@ -1,4 +1,5 @@
 @namespace Oqtane.Modules.Admin.Modules
+@using Oqtane.Interfaces
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IThemeService ThemeService
@@ -137,7 +138,7 @@
                 builder.AddComponentReferenceCapture(1, inst => { _settings = Convert.ChangeType(inst, _settingsModuleType); });
                 builder.CloseComponent();
             };
-        }
+       }
     }
 
     private async Task SaveModule()
@@ -162,15 +163,16 @@
         module.Permissions = _permissionGrid.GetPermissions();
         await ModuleService.UpdateModuleAsync(module);
 
-        if (_settingsModuleType != null)
+        
+        if (_settings is ISettingsControl control)
         {
-            var moduleType = Type.GetType(ModuleState.ModuleType);
-            if (moduleType != null)
-            {
-                moduleType.GetMethod("UpdateSettings")?.Invoke(_settings, null); // method must be public in settings component
-            }
+             await control.UpdateSettings();
+        }
+        else
+        {
+            // Compatibility 2.0 fallback
+            _settings?.GetType().GetMethod("UpdateSettings")?.Invoke(_settings, null); // method must be public in settings component
         }
-
         NavigationManager.NavigateTo(NavigateUrl());
     }
 
diff --git a/Oqtane.Shared/Interfaces/ISettingsControl.cs b/Oqtane.Shared/Interfaces/ISettingsControl.cs
new file mode 100644
index 00000000..c5753099
--- /dev/null
+++ b/Oqtane.Shared/Interfaces/ISettingsControl.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Oqtane.Interfaces
+{
+    public interface ISettingsControl
+    {
+        Task UpdateSettings();
+    }
+}