fix(ui): state filtering was not working

kestra-io · Oct 21, 2022 · 7465de2 · 7465de2
1 parent be88d52
commit 7465de2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 23 deletions.
diff --git a/ui/src/components/executions/Executions.vue b/ui/src/components/executions/Executions.vue
@@ -10,8 +10,8 @@
                     @input="onDataTableValue('namespace', $event)"
                 />
                 <status-filter-buttons
-                    :value="$route.query.status"
-                    @input="onDataTableValue('status', $event)"
+                    :value="$route.query.state"
+                    @input="onDataTableValue('state', $event)"
                 />
                 <date-range
                     :start-date="$route.query.startDate"
@@ -282,7 +282,7 @@
                     size: parseInt(this.$route.query.size || this.internalPageSize),
                     page: parseInt(this.$route.query.page || this.internalPageNumber),
                     sort: this.$route.query.sort || "state.startDate:desc",
-                    state: this.$route.query.status ? [this.$route.query.status] : this.statuses
+                    state: this.$route.query.state ? [this.$route.query.state] : this.statuses
                 }, false)).finally(callback);
             },
             durationFrom(item) {

diff --git a/ui/src/components/taskruns/TaskRuns.vue b/ui/src/components/taskruns/TaskRuns.vue
@@ -10,8 +10,8 @@
                     @input="onDataTableValue('namespace', $event)"
                 />
                 <status-filter-buttons
-                    :value="$route.query.status"
-                    @input="onDataTableValue('status', $event)"
+                    :value="$route.query.state"
+                    @input="onDataTableValue('state', $event)"
                 />
                 <date-range
                     :start-date="$route.query.startDate"
@@ -265,7 +265,7 @@
                     .dispatch("taskrun/findTaskRuns", this.loadQuery({
                         size: parseInt(this.$route.query.size || 25),
                         page: parseInt(this.$route.query.page || 1),
-                        state: this.$route.query.status ? [this.$route.query.status] : this.statuses
+                        state: this.$route.query.state ? [this.$route.query.state] : this.statuses
                     }, false))
                     .finally(callback);
             },

diff --git a/ui/src/mixins/dataTableActions.js b/ui/src/mixins/dataTableActions.js
@@ -45,9 +45,7 @@ export default {
     methods: {
         onSort(sortItem) {
             if (!this.embed && sortItem && sortItem.sortBy) {
-                const sort = [
-                    `${sortItem.sortBy}:${sortItem.sortDesc ? "desc" : "asc"}`
-                ];
+                const sort = `${sortItem.sortBy}:${sortItem.sortDesc ? "desc" : "asc"}`;
                 this.$router.push({
                     query: {...this.$route.query, sort}
                 });

diff --git a/ui/src/stores/executions.js b/ui/src/stores/executions.js
@@ -56,13 +56,7 @@ export default {
             })
         },
         findExecutions({commit}, options) {
-            const sort = options.sort
-            delete options.sort
-            let sortQueryString = ""
-            if (sort) {
-                sortQueryString = `?sort=${sort}`
-            }
-            return Vue.axios.get(`/api/v1/executions/search${sortQueryString}`, {params: options}).then(response => {
+            return Vue.axios.get("/api/v1/executions/search", {params: options}).then(response => {
                 commit("setExecutions", response.data.results)
                 commit("setTotal", response.data.total)
             })

diff --git a/ui/src/stores/taskruns.js b/ui/src/stores/taskruns.js
@@ -8,13 +8,7 @@ export default {
     },
     actions: {
         findTaskRuns({commit}, options) {
-            const sort = options.sort
-            delete options.sort
-            let sortQueryString = ""
-            if (sort) {
-                sortQueryString = `?sort=${sort}`
-            }
-            return Vue.axios.get(`/api/v1/taskruns/search${sortQueryString}`, {params: options}).then(response => {
+            return Vue.axios.get("/api/v1/taskruns/search", {params: options}).then(response => {
                 commit("setTaskruns", response.data.results)
                 commit("setTotal", response.data.total)
             })