From f84c5812590bc2bc1363284e7a4dad544c3bc8a4 Mon Sep 17 00:00:00 2001
From: Joan <joan@debian>
Date: Thu, 15 Nov 2018 08:55:24 +0100
Subject: [PATCH] refresh filters on tag remove #818

---
 client/order/src/filter/index.js | 37 +++++++-------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/client/order/src/filter/index.js b/client/order/src/filter/index.js
index 0fd3c5f50..724f8ebb3 100644
--- a/client/order/src/filter/index.js
+++ b/client/order/src/filter/index.js
@@ -11,19 +11,6 @@ class Controller {
         this.$transitions = $transitions;
         this.itemTypes = [];
         this.tags = [];
-
-        /*         $transitions.onSuccess({}, transition => {
-            let params = {};
-            if (this.category)
-                params.category = this.category;
-
-            if (this.type)
-                params.type = this.type;
-
-            $window.history.replaceState(params);
-
-            this.applyFilters();
-        }); */
     }
 
     get order() {
@@ -42,15 +29,12 @@ class Controller {
             if (this.$stateParams.category)
                 category = JSON.parse(this.$stateParams.category);
 
-
             if (this.$stateParams.type)
                 type = JSON.parse(this.$stateParams.type);
 
-
             if (category && category.id)
                 this.category = category;
 
-
             if (type && type.id)
                 this.type = type;
         });
@@ -87,16 +71,15 @@ class Controller {
     set type(value) {
         if (value && this.type && this.type.id == value.id) return;
 
-        if (!value || !value.id) {
-            this._type = null;
-            this.updateStateParams();
-
-            return;
-        }
-
         this._type = value;
+
+        if (!value || !value.id)
+            this._type = null;
+
         this.updateStateParams();
-        this.applyFilters();
+
+        if ((value && value.id) || this.tags.length > 0)
+            this.applyFilters();
     }
 
     onSearch(event) {
@@ -111,7 +94,7 @@ class Controller {
     remove(index) {
         this.tags.splice(index, 1);
 
-        if (this.tags.length > 0)
+        if (this.tags.length == 0 && this.category && this.type)
             this.applyFilters();
     }
 
@@ -123,11 +106,9 @@ class Controller {
         if (this.category)
             newFilter.categoryFk = this.category.id;
 
-
         if (this.type)
             newFilter.typeFk = this.type.id;
 
-
         newParams = {
             orderFk: this.order.id,
             orderBy: this.catalog.getOrderBy(),
@@ -169,13 +150,11 @@ class Controller {
         if (this.category)
             params.category = JSON.stringify(this.category);
 
-
         if (this.type)
             params.type = JSON.stringify(this.type);
         else
             params.type = undefined;
 
-
         this.$state.go(this.$state.current.name, params);
     }
 }