From 436eb30490f1b6219768e6b048ee81ad9590ea57 Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Sat, 27 Apr 2024 12:32:31 +0800
Subject: [PATCH 1/3] Fix #4030: add copy module option for add existing module
 function.

---
 .../Controls/ControlPanelInteractive.resx     | 11 +++-
 .../Theme/ControlPanelInteractive.razor       | 65 ++++++++++++++-----
 2 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx b/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx
index 9fa2eac6c..4a0a6863c 100644
--- a/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx
+++ b/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx
@@ -154,7 +154,7 @@
     <value>Not Authorized</value>
   </data>
   <data name="Message.Require.ModuleSelect" xml:space="preserve">
-    <value>You Must Select A Module</value>
+    <value>You Must Select A Module And The Copy Mode.</value>
   </data>
   <data name="Module.Manage" xml:space="preserve">
     <value>Module Management:</value>
@@ -162,6 +162,15 @@
   <data name="Module.Select" xml:space="preserve">
     <value>Select Module</value>
   </data>
+  <data name="CopyMode.Select" xml:space="preserve">
+    <value>Select Copy Mode</value>
+  </data>
+  <data name="CopyMode.Sync" xml:space="preserve">
+    <value>Sync</value>
+  </data>
+  <data name="CopyMode.Copy" xml:space="preserve">
+    <value>Copy</value>
+  </data>
   <data name="Page.Manage" xml:space="preserve">
     <value>Page Management:</value>
   </data>
diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
index bd386c01e..239a57282 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
@@ -15,6 +15,7 @@
 @inject ILogService LoggingService
 @inject IStringLocalizer<ControlPanelInteractive> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
+@inject IServiceProvider ServiceProvider
 
 <button type="button" class="btn @ButtonClass ms-1" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel" @onclick="ClearMessage">
     <span class="oi oi-cog"></span>
@@ -155,6 +156,11 @@
                                     <option value="@module.ModuleId">@module.Title</option>
                                 }
                             </select>
+                            <select class="form-select mt-1" @bind="@_copyMode">
+                                <option value="-">&lt;@Localizer["CopyMode.Select"]&gt;</option>
+                                <option value="sync">&lt;@Localizer["CopyMode.Sync"]&gt;</option>
+                                <option value="copy">&lt;@Localizer["CopyMode.Copy"]&gt;</option>
+                            </select>
                         }
                     </div>
                 </div>
@@ -261,6 +267,7 @@
     protected string _moduleId { get; private set; } = "-";
     protected string _moduleType { get; private set; } = "new";
     protected string _moduleDefinitionName { get; private set; } = "-";
+    protected string _copyMode { get; private set; } = "-";
 
     protected string _title { get; private set; } = "";
     protected string _containerType { get; private set; } = "";
@@ -355,8 +362,9 @@
     {
         if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
         {
-            if ((_moduleType == "new" && _moduleDefinitionName != "-") || (_moduleType != "new" && _moduleId != "-"))
+            if ((_moduleType == "new" && _moduleDefinitionName != "-") || (_moduleType != "new" && _moduleId != "-" && _copyMode != "-"))
             {
+                var newModuleId = int.Parse(_moduleId);
                 if (_moduleType == "new")
                 {
                     Module module = new Module();
@@ -364,33 +372,37 @@
                     module.PageId = PageState.Page.PageId;
                     module.ModuleDefinitionName = _moduleDefinitionName;
                     module.AllPages = false;
+                    module.PermissionList = GenerateDefaultPermissions(module.SiteId);
 
-                    var permissions = new List<Permission>();
-                    if (_visibility == "view")
-                    {
-                        // set module view permissions to page view permissions
-                        permissions = SetPermissions(permissions, module.SiteId, PermissionNames.View, PermissionNames.View);
-                    }
-                    else
+                    module = await ModuleService.AddModuleAsync(module);
+                    newModuleId = module.ModuleId;
+                }
+                else if(_copyMode == "copy")
+                {
+                    var module = await ModuleService.GetModuleAsync(int.Parse(_moduleId));
+                    module.ModuleId = 0;
+                    module.SiteId = PageState.Site.SiteId;
+                    module.PageId = PageState.Page.PageId;
+                    module.AllPages = false;
+                    module.PermissionList = GenerateDefaultPermissions(module.SiteId);
+
+                    module = await ModuleService.AddModuleAsync(module);
+                    var moduleContent = await ModuleService.ExportModuleAsync(int.Parse(_moduleId), PageState.Page.PageId);
+                    if (!string.IsNullOrEmpty(moduleContent))
                     {
-                        // set module view permissions to page edit permissions
-                        permissions = SetPermissions(permissions, module.SiteId, PermissionNames.View, PermissionNames.Edit);
+                        await ModuleService.ImportModuleAsync(module.ModuleId, PageState.Page.PageId, moduleContent);
                     }
-                    // set module edit permissions to page edit permissions
-                    permissions = SetPermissions(permissions, module.SiteId, PermissionNames.Edit, PermissionNames.Edit);
-                    module.PermissionList = permissions;
 
-                    module = await ModuleService.AddModuleAsync(module);
-                    _moduleId = module.ModuleId.ToString();
+                    newModuleId = module.ModuleId;
                 }
 
                 var pageModule = new PageModule
                     {
                         PageId = PageState.Page.PageId,
-                        ModuleId = int.Parse(_moduleId),
+                        ModuleId = newModuleId,
                         Title = _title
                     };
-                if (pageModule.Title == "")
+                if (string.IsNullOrEmpty(pageModule.Title))
                 {
                     if (_moduleType == "new")
                     {
@@ -430,6 +442,25 @@
         }
     }
 
+    private List<Permission> GenerateDefaultPermissions(int siteId)
+    {
+        var permissions = new List<Permission>();
+        if (_visibility == "view")
+        {
+            // set module view permissions to page view permissions
+            permissions = SetPermissions(permissions, siteId, PermissionNames.View, PermissionNames.View);
+        }
+        else
+        {
+            // set module view permissions to page edit permissions
+            permissions = SetPermissions(permissions, siteId, PermissionNames.View, PermissionNames.Edit);
+        }
+        // set module edit permissions to page edit permissions
+        permissions = SetPermissions(permissions, siteId, PermissionNames.Edit, PermissionNames.Edit);
+
+        return permissions;
+    }
+
     private List<Permission> SetPermissions(List<Permission> permissions, int siteId, string modulePermission, string pagePermission)
     {
         foreach (var permission in PageState.Page.PermissionList.Where(item => item.PermissionName == pagePermission))

From b411b4e61b17e39af0b53122d95d9321539e41c5 Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Sat, 27 Apr 2024 19:32:07 +0800
Subject: [PATCH 2/3] display error message for different action.

---
 .../Resources/Themes/Controls/ControlPanelInteractive.resx   | 5 ++++-
 .../Themes/Controls/Theme/ControlPanelInteractive.razor      | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx b/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx
index 4a0a6863c..be3687eaa 100644
--- a/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx
+++ b/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx
@@ -154,7 +154,7 @@
     <value>Not Authorized</value>
   </data>
   <data name="Message.Require.ModuleSelect" xml:space="preserve">
-    <value>You Must Select A Module And The Copy Mode.</value>
+    <value>You Must Select A Module.</value>
   </data>
   <data name="Module.Manage" xml:space="preserve">
     <value>Module Management:</value>
@@ -207,4 +207,7 @@
   <data name="LocationTop" xml:space="preserve">
     <value>Top</value>
   </data>
+  <data name="Message.Require.ModuleAndCopyModeSelect" xml:space="preserve">
+    <value>You Must Select A Module And The Copy Mode.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
index 239a57282..5c855657f 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
@@ -433,7 +433,8 @@
             }
             else
             {
-                _message = $"<div class=\"alert alert-warning mt-2 text-center\" role=\"alert\">{Localizer["Message.Require.ModuleSelect"]}</div>";
+                var error = _moduleType == "new" ? Localizer["Message.Require.ModuleSelect"] : Localizer["Message.Require.ModuleAndCopyModeSelect"];
+                _message = $"<div class=\"alert alert-warning mt-2 text-center\" role=\"alert\">{error}</div>";
             }
         }
         else

From be1c936e907e0d76eb104361cf8fe76b3b3a1c79 Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Mon, 29 Apr 2024 22:04:01 +0800
Subject: [PATCH 3/3] Fix #4030: move copy option to the add module dropdown.

---
 .../Controls/ControlPanelInteractive.resx     |  6 ++++
 .../Theme/ControlPanelInteractive.razor       | 35 ++++++++++++-------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx b/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx
index be3687eaa..6a8302d75 100644
--- a/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx
+++ b/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx
@@ -210,4 +210,10 @@
   <data name="Message.Require.ModuleAndCopyModeSelect" xml:space="preserve">
     <value>You Must Select A Module And The Copy Mode.</value>
   </data>
+  <data name="Message.Module.NotPortable" xml:space="preserve">
+    <value>The Module's Content Will Not Be Synchronized.</value>
+  </data>
+  <data name="Module.CopyExisting" xml:space="preserve">
+    <value>Copy Existing Module</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
index 5c855657f..d33b1d21e 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
@@ -98,7 +98,8 @@
                             <option value="new">@Localizer["Module.AddNew"]</option>
                             @if (PageState.Page.UserId == null)
                             {
-                                <option value="existing">@Localizer["Module.AddExisting"]</option>
+                                <option value="existing.add">@Localizer["Module.AddExisting"]</option>
+                                <option value="existing.copy">@Localizer["Module.CopyExisting"]</option>
                             }
                         </select>
                         @if (_moduleType == "new")
@@ -149,18 +150,14 @@
                                     <option value="@p.PageId">@p.Name</option>
                                 }
                             </select>
-                            <select class="form-select mt-1" @bind="@_moduleId">
+                            <select class="form-select mt-1" @bind="@_moduleId" @bind:after="() => ModuleIdChanged()">
                                 <option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
                                 @foreach (Module module in _modules)
                                 {
                                     <option value="@module.ModuleId">@module.Title</option>
                                 }
                             </select>
-                            <select class="form-select mt-1" @bind="@_copyMode">
-                                <option value="-">&lt;@Localizer["CopyMode.Select"]&gt;</option>
-                                <option value="sync">&lt;@Localizer["CopyMode.Sync"]&gt;</option>
-                                <option value="copy">&lt;@Localizer["CopyMode.Copy"]&gt;</option>
-                            </select>
+                            @((MarkupString)_copyModuleMessage)
                         }
                     </div>
                 </div>
@@ -267,13 +264,13 @@
     protected string _moduleId { get; private set; } = "-";
     protected string _moduleType { get; private set; } = "new";
     protected string _moduleDefinitionName { get; private set; } = "-";
-    protected string _copyMode { get; private set; } = "-";
 
     protected string _title { get; private set; } = "";
     protected string _containerType { get; private set; } = "";
     protected int _location { get; private set; } = int.MaxValue;
     protected string _visibility { get; private set; } = "view";
     protected string _message { get; private set; } = "";
+    protected string _copyModuleMessage { get; private set; } = "";
 
     private string settingCategory = "CP-category";
     private string settingPane = "CP-pane";
@@ -358,13 +355,26 @@
         StateHasChanged();
     }
 
+    private void ModuleIdChanged()
+    {
+        _copyModuleMessage = string.Empty;
+        if(_moduleId != "-")
+        {
+            var module = _modules.FirstOrDefault(item => item.ModuleId == int.Parse(_moduleId));
+            if (module != null && !module.ModuleDefinition.IsPortable)
+            {
+                _copyModuleMessage = $"<div class=\"alert alert-warning mt-2 text-center\" role=\"alert\">{Localizer["Message.Module.NotPortable"]}</div>";
+            }
+        }
+    }
+
     private async Task AddModule()
     {
         if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
         {
-            if ((_moduleType == "new" && _moduleDefinitionName != "-") || (_moduleType != "new" && _moduleId != "-" && _copyMode != "-"))
+            if ((_moduleType == "new" && _moduleDefinitionName != "-") || (_moduleType != "new" && _moduleId != "-"))
             {
-                var newModuleId = int.Parse(_moduleId);
+                var newModuleId = _moduleId != "-" ? int.Parse(_moduleId) : 0;
                 if (_moduleType == "new")
                 {
                     Module module = new Module();
@@ -377,7 +387,7 @@
                     module = await ModuleService.AddModuleAsync(module);
                     newModuleId = module.ModuleId;
                 }
-                else if(_copyMode == "copy")
+                else if (_moduleType == "exsiting.copy")
                 {
                     var module = await ModuleService.GetModuleAsync(int.Parse(_moduleId));
                     module.ModuleId = 0;
@@ -433,8 +443,7 @@
             }
             else
             {
-                var error = _moduleType == "new" ? Localizer["Message.Require.ModuleSelect"] : Localizer["Message.Require.ModuleAndCopyModeSelect"];
-                _message = $"<div class=\"alert alert-warning mt-2 text-center\" role=\"alert\">{error}</div>";
+                _message = $"<div class=\"alert alert-warning mt-2 text-center\" role=\"alert\">{Localizer["Message.Require.ModuleSelect"]}</div>";
             }
         }
         else