Merge pull request #813 from stopfstedt/tagging_agendas

Makes deck tagging (slighly) more useful
ThronesDB · Dec 11, 2021 · b59b9d0 · b59b9d0
2 parents 7ae09bc + 3388314
commit b59b9d0
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 12 deletions.
diff --git a/assets/js/ui.decks.js b/assets/js/ui.decks.js
@@ -2,6 +2,8 @@
 
 (function ui_decks(ui, $)
 {
+    var tag_row_tpl = _.template('<span class="tag" data-tag="<%- tag %>"><%- tag %></span>');
+    var tag_button_tpl = _.template('<button type="button" class="btn btn-default btn-xs" data-toggle="button" data-tag="<%- tag %>"><%- tag %></button>');
 
     ui.decks = [];
 
@@ -27,7 +29,7 @@
         var div = elt.find('div.tags').empty();
         tags.forEach(function (tag)
         {
-            div.append($('<span class="tag">' + tag + '</span>'));
+            div.append($(tag_row_tpl({tag: tag})));
         });
 
         ui.update_tag_toggles();
@@ -47,7 +49,7 @@
     {
         event.preventDefault();
         var ids = $('#tag_add_ids').val().split(/,/);
-        var tags = $('#tag_add_tags').val().split(/\s+/);
+        var tags = $('#tag_add_tags').val().trim().split(/\s+/);
         if(!ids.length || !tags.length)
             return;
         ui.tag_process_any('tag_add', {ids: ids, tags: tags});
@@ -132,10 +134,11 @@
             tags.push($(elt).data('tag'));
           }
         });
+        tags.sort();
         $('#tag_toggles').empty();
         _.uniq(tags).forEach(function (tag)
         {
-            $('<button type="button" class="btn btn-default btn-xs" data-toggle="button" data-tag="' + tag + '">' + tag + '</button>').appendTo('#tag_toggles');
+            $(tag_button_tpl({tag: tag})).appendTo('#tag_toggles');
         });
     };
 
@@ -149,11 +152,11 @@
         });
         if(tags.length) {
             $('#decks tr').hide();
-            tags.forEach(function (tag)
-            {
-                $('#decks span[data-tag="' + tag + '"]').each(function (index, elt)
-                {
-                    $(elt).closest('tr').show();
+            tags.forEach(function (tag) {
+                $('#decks span.tag').each(function (index, elt) {
+                    if ($(elt).data('tag') === tag) {
+                        $(elt).closest('tr').show();
+                    }
                 });
             });
         } else {

diff --git a/src/Controller/BuilderController.php b/src/Controller/BuilderController.php
@@ -141,7 +141,7 @@ public function initbuildAction(
                 )
             );
             $pack = $agenda->getPack();
-            $tags[] = $agendaHelper->getMinorFactionCode($agenda);
+            $tags[] = $agendaHelper->agendaToTag($agenda);
         }
 
         /** @var UserInterface $user */

diff --git a/src/Controller/TagController.php b/src/Controller/TagController.php
@@ -44,9 +44,20 @@ public function addAction(Request $request)
             if ($this->getUser()->getId() != $deck->getUser()->getId()) {
                 continue;
             }
-            $tags = array_unique(array_values(array_merge(preg_split('/\s+/', $deck->getTags()), $list_tag)));
-            $response['tags'][$deck->getId()] = $tags;
+            $tags = array_unique(
+                array_values(
+                    array_merge(
+                        preg_split(
+                            '/\s+/',
+                            $deck->getTags()
+                        ),
+                        $list_tag
+                    )
+                )
+            );
+            array_filter($tags);
             $deck->setTags(implode(' ', $tags));
+            $response['tags'][$deck->getId()] = explode(' ', $deck->getTags());
         }
         $em->flush();
 

diff --git a/src/Services/AgendaHelper.php b/src/Services/AgendaHelper.php
@@ -57,4 +57,15 @@ public function getMinorFaction(CardInterface $agenda)
         }
         return null;
     }
+
+    /**
+     * @param CardInterface $agenda
+     * @return string
+     * @todo added here for convenience, this should probably be part of a generic string helper class. [ST 2021/12/11]
+     */
+    public function agendaToTag(CardInterface $agenda): string
+    {
+        $name = $agenda->getName();
+        return preg_replace('/[^a-zA-Z]/', '', strtolower($name));
+    }
 }
diff --git a/templates/Builder/decks.html.twig b/templates/Builder/decks.html.twig
@@ -207,7 +207,7 @@
                                     </div>
                                 {% endif %}
                                 <div class="tags">
-                                    {% for tag in deck.tags|split(' ') %}
+                                    {% for tag in deck.tags|trim|split(' ')|sort %}
                                         <span class="tag" data-tag="{{ tag }}">{{ tag }}</span>
                                     {% endfor %}
                                 </div>