Merge pull request #1746 from mercihabam/fix-tags-reload

fix(frontend/backend): reload folders state when adding/deleting/editing tags

Author: kroky

modules/core/navigation/routes.js

@@ -81,6 +81,10 @@ const modulesRoutes = [
     {
         page: 'shortcuts',
         handler: 'applyShortcutsPageHandlers'
+    },
+    {
+        page: 'tags',
+        handler: 'applyTagsPageHandlers'
     }
 ]
 

modules/tags/handler_modules.php

@@ -102,6 +102,7 @@ public function process() {
             Hm_Tags::add($tag);
             Hm_Msgs::add('Tag Created');
         }
+        $this->session->set('tags_updated', true);
     }
 }
 
@@ -117,6 +118,7 @@ public function process() {
         if (($tag = Hm_Tags::get($form['tag_id']))) {
             Hm_Tags::del($tag['id']);
             Hm_Msgs::add('Tag Deleted');
+            $this->session->set('tags_updated', true);
         } else {
             Hm_Msgs::add('Tag ID not found', 'warning');
             return;
@@ -189,6 +191,10 @@ class Hm_Handler_tag_data extends Hm_Handler_Module {
     public function process() {
         Hm_Tags::init($this);
         $this->out('tags', Hm_Tags::getAll());
+        if ($this->session->get('tags_updated')) {
+            $this->out('tags_updated', true);
+            $this->session->set('tags_updated', false);
+        }
     }
 }
 

modules/tags/js_modules/route_handlers.js

@@ -0,0 +1,5 @@
+function applyTagsPageHandlers() {
+    if (window.tagsUpdated) {
+        Hm_Folders.reload_folders(true);
+    }
+}

modules/tags/output_modules.php

@@ -117,7 +117,7 @@ protected function output() {
             // Generate the tree view HTML
             $treeViewHtml = generate_tree_view($folderTree, $this->html_safe(Hm_Request_Key::generate()));
             $treeContent = count($folderTree) > 0 ? $treeViewHtml : '<p>'. $this->trans('No tags available yet.') .'</p>';
-            return '<div class="tags_tree mt-3 col-lg-8 col-md-8 col-sm-12">
+            $out = '<div class="tags_tree mt-3 col-lg-8 col-md-8 col-sm-12">
                     <div class="card m-3 mr-0">
                         <div class="card-body">
                             <div class="tree-view">
@@ -126,7 +126,11 @@ protected function output() {
                         </div>
                     </div>
                 </div>';
-        
+
+            if ($this->get('tags_updated')) {
+                $out .= '<script>window.tagsUpdated = true;</script>';
+            }
+            return $out;
         }
     }
 }