Preferred tree state persisted in localstorage. Fixes for the tree di…

…splay and config.
impworks · Jan 12, 2024 · e664524 · e664524
1 parent f1c8299
commit e664524
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/src/Bonsai/Areas/Admin/Controllers/DynamicConfigController.cs b/src/Bonsai/Areas/Admin/Controllers/DynamicConfigController.cs
@@ -2,6 +2,8 @@
 using Bonsai.Areas.Admin.Logic;
 using Bonsai.Areas.Admin.Logic.Tree;
 using Bonsai.Areas.Admin.ViewModels.DynamicConfig;
+using Bonsai.Areas.Front.ViewModels.Page;
+using Bonsai.Code.Services;
 using Bonsai.Code.Services.Config;
 using Bonsai.Code.Services.Jobs;
 using Bonsai.Data;
@@ -16,18 +18,20 @@ namespace Bonsai.Areas.Admin.Controllers
     [Route("admin/config")]
     public class DynamicConfigController: AdminControllerBase
     {
-        public DynamicConfigController(DynamicConfigManagerService configMgr, BonsaiConfigService config, IBackgroundJobService jobs, AppDbContext db)
+        public DynamicConfigController(DynamicConfigManagerService configMgr, BonsaiConfigService config, IBackgroundJobService jobs, AppDbContext db, CacheService cache)
         {
             _configMgr = configMgr;
             _config = config;
             _jobs = jobs;
             _db = db;
+            _cache = cache;
         }
 
         private readonly DynamicConfigManagerService _configMgr;
         private readonly BonsaiConfigService _config;
         private readonly IBackgroundJobService _jobs;
         private readonly AppDbContext _db;
+        private readonly CacheService _cache;
 
         /// <summary>
         /// Displays the form and edits the config.
@@ -54,7 +58,10 @@ public async Task<ActionResult> Update(UpdateDynamicConfigVM vm)
             _config.ResetCache();
 
             if (IsTreeConfigChanged())
+            {
+                _cache.Remove<PageTreeVM>();
                 await _jobs.RunAsync(JobBuilder.For<TreeLayoutJob>().SupersedeAll());
+            }
 
             return RedirectToSuccess("Настройки сохранены");
 

diff --git a/src/Bonsai/Areas/Admin/Logic/Tree/TreeLayoutJob.PartialTrees.cs b/src/Bonsai/Areas/Admin/Logic/Tree/TreeLayoutJob.PartialTrees.cs
@@ -71,7 +71,7 @@ private TreeLayoutVM GetCloseFamilyTree(RelationContext ctx, Guid pageId)
                 fc =>
                 {
                     // explicitly avoid e.g. other husbands of a man's wife
-                    if (fc is {Distance: 1, RelationType: RelationType.Spouse, LastRelationType: RelationType.Spouse})
+                    if (fc is {Distance: 2, RelationType: RelationType.Spouse, LastRelationType: RelationType.Spouse})
                         return null;
 
                     return fc.Distance switch

diff --git a/src/Bonsai/Areas/Admin/Views/DynamicConfig/Index.cshtml b/src/Bonsai/Areas/Admin/Views/DynamicConfig/Index.cshtml
@@ -61,7 +61,7 @@
                     @{ TreeKindOption(TreeKind.FullTree, "Полное дерево", "весь связанный граф родственников"); }
                     @{ TreeKindOption(TreeKind.CloseFamily, "Близкие родственники", "на два уровня вокруг, от бабушек до внуков"); }
                     @{ TreeKindOption(TreeKind.Ancestors, "Предки", "все кровные родственники вверх"); }
-                    @{ TreeKindOption(TreeKind.Descendants, "Потомки", "все кровные родственники вниз, включая супругов"); }
+                    @{ TreeKindOption(TreeKind.Descendants, "Потомки", "все кровные родственники вниз и их родители"); }
                 </div>
             </div>
             <div class="form-group row">

diff --git a/src/Bonsai/Areas/Front/Scripts/tree-view.js b/src/Bonsai/Areas/Front/Scripts/tree-view.js
@@ -1,21 +1,13 @@
 $(function () {
+    var key = 'bonsai.preferences.view-tree-kind';
+
     var $view = $('.tree-view'),
         $iframe = $view.find('iframe'),
         $toggles = $view.find('.cmd-switch-tree'),
         $newWin = $view.find('.cmd-new-window');
 
     if($view.length === 0)
         return;
-
-    // $iframe.on('load', function () {
-    //     setTimeout(
-    //         function() {
-    //             var size = $iframe[0].contentWindow.document.documentElement.scrollHeight;
-    //             $iframe.css('height', Math.min(size + 2, 1000) + 'px');
-    //         },
-    //         200
-    //     );
-    // });
 
     $view.find('.cmd-fullscreen').click(function () {
         $iframe.fullScreen(true);
@@ -32,5 +24,13 @@ $(function () {
         var url = $this.attr('href');
         $newWin.attr('href', url);
         $iframe.attr('src', url);
+
+        window.localStorage.setItem(key, $this.data('kind'));
     });
+
+    var state = window.localStorage.getItem(key);
+    if (state) {
+        $toggles.filter('[data-kind="' + state + '"]')
+                .trigger('click');
+    }
 });
diff --git a/src/Bonsai/Areas/Front/Views/Page/Tree.cshtml b/src/Bonsai/Areas/Front/Views/Page/Tree.cshtml
@@ -23,7 +23,7 @@
         <div class="float-left btn-group btn-group-toggle">
             @foreach (var kind in Model.Body.SupportedKinds)
             {
-                <a href="@GetTreeUrl(kind)" class="btn btn-sm btn-outline-primary cmd-switch-tree @(kind == Model.Body.TreeKind ? "active" : "")">@kind.GetEnumDescription()</a>
+                <a href="@GetTreeUrl(kind)" class="btn btn-sm btn-outline-primary cmd-switch-tree @(kind == Model.Body.TreeKind ? "active" : "")" data-kind="@kind">@kind.GetEnumDescription()</a>
             }
         </div>
         <div class="float-right btn-group">