krayin#137

shubhwebkul · Aug 12, 2021 · 8f5d069 · 8f5d069
1 parent 2704d14
commit 8f5d069
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/packages/Webkul/UI/publishable/assets/css/ui.css b/packages/Webkul/UI/publishable/assets/css/ui.css
diff --git a/packages/Webkul/UI/publishable/assets/js/ui.js b/packages/Webkul/UI/publishable/assets/js/ui.js
diff --git a/packages/Webkul/UI/publishable/assets/mix-manifest.json b/packages/Webkul/UI/publishable/assets/mix-manifest.json
@@ -1,6 +1,6 @@
 {
-    "/js/ui.js": "/js/ui.js?id=933aa7edce2c2c6d7918",
-    "/css/ui.css": "/css/ui.css?id=2cf42d7114015a1e4a2c",
+    "/js/ui.js": "/js/ui.js?id=df6b1eeb79fec939e87b",
+    "/css/ui.css": "/css/ui.css?id=fa35801a61df535b796f",
     "/images/add-icon.svg": "/images/add-icon.svg?id=9135b4e0e1c239c36981",
     "/images/align-justify-icon.svg": "/images/align-justify-icon.svg?id=ee8d48e636b80417a884",
     "/images/arrow-down-icon.svg": "/images/arrow-down-icon.svg?id=7b5c03f96be72c9a0bef",

diff --git a/packages/Webkul/UI/src/Resources/assets/js/components/datagrid/filters.vue b/packages/Webkul/UI/src/Resources/assets/js/components/datagrid/filters.vue
@@ -242,6 +242,12 @@
                 }
 
                 this.makeURL();
+            },
+
+            '$store.state.tableData.columns': function (newValue, oldValue) {
+                if (newValue.length != oldValue.length) {
+                    this.updateFilterValue();
+                }
             }
         },
 
@@ -471,6 +477,7 @@
 
                     obj.column = key.replace(']', '').split('[')[0];
                     obj.cond = key.replace(']', '').split('[')[1];
+
                     obj.val = value;
 
                     if (obj?.column?.replaceAll) {
@@ -537,17 +544,17 @@
 
                     if (key == "sort") {
                         data.prettyValue = `${data.cond.replaceAll("_", " ")} - ${data.val}`;
-                    } else {
-                        if (data.cond == 'bw') {
-                            var timestamp = Date.parse(data.val.split(",")[0]);
+                    } else if (data.cond == 'bw') {
+                        var timestamp = Date.parse(data.val.split(",")[0]);
 
-                            if (isNaN(timestamp) == false) {
-                                data.prettyValue = `${data.val.replaceAll(",", " - ")}`;
-                            }
+                        if (isNaN(timestamp) == false) {
+                            data.prettyValue = `${data.val.replaceAll(",", " - ")}`;
                         }
                     }
 
                     this.filters.push(data);
+
+                    this.updateFilterValue();
                 }
 
                 this.makeURL();
@@ -659,6 +666,20 @@
                     }
                 }
             },
+
+            updateFilterValue: function () {
+                this.filters = this.filters.map(filter => {
+                    let column = this.$store.state.tableData.columns.find(column => column.index == filter.column);
+
+                    if (column?.filterable_options) {
+                        let value = filter.val.split(",");
+                        value = value.map(id => column.filterable_options.find(option => option.value == id).label);
+                        filter.prettyValue = value.join(",");
+                    }
+
+                    return filter;
+                });
+            }
         }
     };
 </script>