Merge pull request #4027 from zyhfish/task/fix-issue-4025

Fix #4025: add user setting to keep the view mode.

Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor

@@ -2,6 +2,7 @@
 @inherits ThemeControlBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
+@inject ISettingService SettingService
 
 @if (ShowLanguageSwitcher)
 {
@@ -99,7 +100,7 @@
         return false;
     }
 
-    private async Task ToggleEditMode(bool EditMode)
+    private async Task ToggleEditMode(bool editMode)
     {
         Page page = null;
         if (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered))
@@ -109,13 +110,23 @@
 
         if (_showEditMode)
         {
-            if (EditMode)
+            PageState.EditMode = !editMode;
+
+            if(PageState.User != null) //keep edit mode for authenticated users.
             {
-                PageState.EditMode = false;
-            }
-            else
-            {
-                PageState.EditMode = true;
+                if(PageState.EditMode)
+                {
+                    var userSettings = new Dictionary<string, string>
+                    {
+                        { UserSetting.LastViewPageId, PageState.Page.PageId.ToString() }
+                    };
+
+                    await SettingService.UpdateUserSettingsAsync(userSettings, PageState.User.UserId);
+                }
+                else
+                {
+                    await SettingService.DeleteSettingAsync(EntityNames.User, PageState.User.UserId, UserSetting.LastViewPageId);
+                }
             }
 
             // preserve other querystring parameters