From 6fc2f9f2b36fad39f151e909bb802c30667d0cd1 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Thu, 5 Jul 2018 13:57:56 -0300
Subject: [PATCH] TagInput for taxonomy now also sends tags to tags filters
 bar.

---
 .../components/search/filters-tags-list.vue   |  5 ++--
 src/admin/scss/_tags.scss                     |  2 +-
 .../filter-types/taginput/Taginput.vue        |  6 ++---
 .../filter-types/taxonomy/Taginput.vue        | 27 ++++++++++---------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/admin/components/search/filters-tags-list.vue b/src/admin/components/search/filters-tags-list.vue
index 6ee98c3d8..d312bd146 100644
--- a/src/admin/components/search/filters-tags-list.vue
+++ b/src/admin/components/search/filters-tags-list.vue
@@ -1,7 +1,8 @@
 <template>
-    <div class="is-inline-flex">
+    <div 
+            class="is-inline-flex"
+            v-if="filterTags != undefined && filterTags.length > 0">
         <b-tag            
-                v-if="filterTags != undefined && filterTags.length > 0"
                 v-for="(filterTag, index) of filterTags"
                 :key="index"       
                 attached
diff --git a/src/admin/scss/_tags.scss b/src/admin/scss/_tags.scss
index 770c687c1..c8070c14d 100644
--- a/src/admin/scss/_tags.scss
+++ b/src/admin/scss/_tags.scss
@@ -12,7 +12,7 @@
     }
 
     .tag {
-        background: none !important;
+        background-color: white;
         margin-bottom: 0 !important;
         max-width: calc(100% - 21px);
         justify-content: flex-start;
diff --git a/src/classes/filter-types/taginput/Taginput.vue b/src/classes/filter-types/taginput/Taginput.vue
index 638728b40..0ca6b9956 100644
--- a/src/classes/filter-types/taginput/Taginput.vue
+++ b/src/classes/filter-types/taginput/Taginput.vue
@@ -48,10 +48,10 @@
                
                 if (filterTag.filterId == this.filter.id) {
 
-                    let filterIndex = this.selected.findIndex(filter => filter.label == filterTag.singleValue);
-                    if (filterIndex >= 0) {
+                    let selectedIndex = this.selected.findIndex(option => option.label == filterTag.singleValue);
+                    if (selectedIndex >= 0) {
 
-                        this.selected.splice(filterIndex, 1);
+                        this.selected.splice(selectedIndex, 1);
 
                         let values = [];
                         let labels = [];  
diff --git a/src/classes/filter-types/taxonomy/Taginput.vue b/src/classes/filter-types/taxonomy/Taginput.vue
index f45e1ce07..08e178dd0 100644
--- a/src/classes/filter-types/taxonomy/Taginput.vue
+++ b/src/classes/filter-types/taxonomy/Taginput.vue
@@ -38,19 +38,18 @@
                
                 if (filterTag.filterId == this.filter.id) {
 
-                    // let selectedIndex = this.selected.findIndex(option => option.value == filterTag.singleValue);
-                    // if (selectedIndex >= 0) {
+                    let selectedIndex = this.selected.findIndex(option => option.label == filterTag.singleValue);
+                    if (selectedIndex >= 0) {
+
+                        this.selected.splice(selectedIndex, 1);
 
                         let values = [];
                         let labels = [];
-                        if( this.selected.length > 0 ){
-                            for(let val of this.selected){
-                                if (val.label != filterTag.singleValue) {
-                                    values.push( val.value );
-                                    labels.push( val.label );
-                                }
-                            }
+                        for(let val of this.selected){
+                            values.push( val.value );
+                            labels.push( val.label );
                         }
+                        
                         this.$emit('input', {
                             filter: 'taginput',
                             compare: 'IN',
@@ -63,8 +62,8 @@
                             filterId: this.filter.id,
                             value: labels
                         });
-                        this.selectedValues();
-                   // }
+
+                   }
                 }
             });
         },
@@ -96,10 +95,13 @@
         watch: {
             selected( value ){
                 this.selected = value;
+
                 let values = [];
+                let labels = [];
                 if( this.selected.length > 0 ){
                     for(let val of this.selected){
                         values.push( val.value );
+                        labels.push( val.label );
                     }
                 }
                 this.$emit('input', {
@@ -111,10 +113,9 @@
                     terms: values
                 });
 
-                let onlyLabels = this.selected.map((selected => selected.label))
                 this.$eventBusSearch.$emit("sendValuesToTags", {
                     filterId: this.filter.id,
-                    value: onlyLabels
+                    value: labels
                 });
             }
         },