fix(ui): namespace tweaks (#4368)

* fix(ui): namespace flows filtered by single namespace * fix(ui): namespace key value pairs filtered by single namespace * fix(ui): single namespace properly filtered
kestra-io · Jul 19, 2024 · 7f17a97 · 7f17a97
1 parent ca78d85
commit 7f17a97
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 23 deletions.
diff --git a/ui/src/components/namespace/Namespace.vue b/ui/src/components/namespace/Namespace.vue
@@ -60,11 +60,11 @@
             ...mapState("auth", ["user"]),
             ...mapState("namespace", ["dependencies"]),
             canCreateSecret() {
-                return this.$route.params.namespace && this.user &&
-                    this.user.isAllowed(permission.SECRET, action.CREATE, this.$route.params.namespace);
+                return this.$route.params.id && this.user &&
+                    this.user.isAllowed(permission.SECRET, action.CREATE, this.$route.params.id);
             },
             canCreateKv() {
-                return this.$route.params.namespace;
+                return this.$route.params.id;
             },
             routeInfo() {
                 return {
@@ -217,12 +217,8 @@
         },
         methods: {
             loadItem() {
-                if (this.$route.params.namespace) {
-                    this.$store
-                        .dispatch(
-                            "namespace/load",
-                            this.$route.params
-                        )
+                if (this.$route.params.id) {
+                    this.$store.dispatch("namespace/load",this.$route.params.id)
                 }
             },
         }

diff --git a/ui/src/components/namespace/NamespaceDependenciesWrapper.vue b/ui/src/components/namespace/NamespaceDependenciesWrapper.vue
@@ -1,5 +1,5 @@
 <template>
-    <NamespaceDependencies :id="route.params.namespace" />
+    <NamespaceDependencies :id="route.params.id" />
 </template>
 
 <script setup>

diff --git a/ui/src/components/namespace/NamespaceFlows.vue b/ui/src/components/namespace/NamespaceFlows.vue
@@ -1,5 +1,5 @@
 <template>
-    <data-table :total="total">
+    <data-table @page-changed="onPageChanged" :size="pageSize" :page="pageNumber" :total="total">
         <template #table>
             <el-table
                 :data="flows"
@@ -111,6 +111,7 @@
     import StateChart from "../stats/StateChart.vue";
     import TriggerAvatar from "../flows/TriggerAvatar.vue";
     import Kicon from "../Kicon.vue"
+    import _merge from "lodash/merge";
 
     import TextSearch from "vue-material-design-icons/TextSearch.vue";
 
@@ -128,8 +129,17 @@
             }
         },
         methods: {
+            loadQuery(base) {               
+                return _merge(base, this.queryWithFilter())
+            },
             loadData(callback) {
-                this.$store.dispatch("flow/findFlows", {namespace: this.$route.params.namespace}).then((flows) => {
+                const params =  {
+                    namespace: this.$route.params.id,
+                    page: this.$route.query.page || this.internalPageNumber, 
+                    size: this.$route.query.size || this.internalPageSize
+                }
+
+                this.$store.dispatch("flow/findFlows", this.loadQuery(params)).then((flows) => {
                     this.dailyGroupByFlowReady = false;
                     this.lastExecutionByFlowReady = false;
 

diff --git a/ui/src/components/namespace/NamespaceKV.vue b/ui/src/components/namespace/NamespaceKV.vue
@@ -139,10 +139,10 @@
                 return this.kv.key ? this.$t("kv.update", {key: this.kv.key}) : this.$t("kv.add");
             },
             canUpdateKv() {
-                return this.$route.params.namespace                
+                return this.$route.params.id                
             },
             canDeleteKv() {
-                return this.$route.params.namespace
+                return this.$route.params.id
             },
             addKvDrawerVisible: {
                 get() {
@@ -216,8 +216,7 @@
                 }
             },
             loadKvs() {
-                this.$store
-                    .dispatch("namespace/kvsList", {id: this.$route.params.namespace})
+                this.$store.dispatch("namespace/kvsList", {id: this.$route.params.id})
             },
             kvKeyDuplicate(rule, value, callback) {
                 if (this.kv.update === undefined && this.kvs && this.kvs.find(r => r.key === value)) {
@@ -228,7 +227,7 @@
             },
             async updateKvModal(key) {
                 this.kv.key = key;
-                const {type, value} = await this.$store.dispatch("namespace/kv", {namespace: this.$route.params.namespace, key});
+                const {type, value} = await this.$store.dispatch("namespace/kv", {namespace: this.$route.params.id, key});
                 this.kv.type = type;
                 if (type === "JSON") {
                     this.kv.value = JSON.stringify(value);
@@ -243,7 +242,7 @@
             removeKv(key) {
                 this.$toast().confirm(this.$t("delete confirm", {name: key}), () => {
                     return this.$store
-                        .dispatch("namespace/deleteKv", {namespace: this.$route.params.namespace, key: key})
+                        .dispatch("namespace/deleteKv", {namespace: this.$route.params.id, key: key})
                         .then(() => {
                             this.$toast().deleted(key);
                         });
@@ -270,7 +269,7 @@
                     return this.$store
                         .dispatch(
                             "namespace/createKv",
-                            {namespace: this.$route.params.namespace, ...this.kv, value}
+                            {namespace: this.$route.params.id, ...this.kv, value}
                         )
                         .then(() => {
                             this.$toast().saved(this.kv.key);

diff --git a/ui/src/components/namespace/Overview.vue b/ui/src/components/namespace/Overview.vue
@@ -1,9 +1,9 @@
 <template>
     <div>
         <home
-            :namespace="$route.params.namespace || $route.query.id"
+            :namespace="$route.params.id || $route.query.id"
             :restore-url="false"
-            :description="$route.params.namespace ? namespace?.description : undefined"
+            :description="$route.params.id ? namespace?.description : undefined"
             embed
         />
     </div>

diff --git a/ui/src/stores/namespaces.js b/ui/src/stores/namespaces.js
@@ -27,8 +27,8 @@ export default {
                     return response.data.results;
                 })
         },
-        load({commit}, options) {
-            return this.$http.get(`${apiUrl(this)}/namespaces/${options.id}`, VALIDATE)
+        load({commit}, id) {
+            return this.$http.get(`${apiUrl(this)}/namespaces/${id}`, VALIDATE)
                 .then(response => {
                     if(response.status === 200) commit("setNamespace", response.data)
                     return response.data;