fix dashboard kind filter

Signed-off-by: Frank Jogeleit <[email protected]>
kyverno · Apr 29, 2024 · 8ce8c59 · 8ce8c59
1 parent 538cb9c
commit 8ce8c59
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/frontend/composables/source.ts b/frontend/composables/source.ts
@@ -5,22 +5,28 @@ type Store = {
     kinds: { namespaced: string[]; cluster: string[] },
     namespaces: string[]
     categories: string[]
+    key: string
 }
 
 const sources: { [source: string]: Store } = reactive({})
 
-export const useSourceStore = (key?: string) => {
+const getStore = (key?: string) => {
     if (!key) { key = 'global' }
 
     if (!sources[key]) {
         sources[key] = {
             kinds: { namespaced: [], cluster: [] },
             namespaces: [],
             categories: [],
+            key,
         }
     }
 
-    const store = sources[key]
+    return sources[key]
+} 
+
+export const useSourceStore = (key?: string) => {
+    const store = getStore(key)
 
     const loading = ref(false)
     const error = ref<Error | null>(null)
@@ -29,7 +35,10 @@ export const useSourceStore = (key?: string) => {
         loading.value = true
         error.value = null
 
+        let loadStore = store
+
         if (typeof source === 'string') {
+            loadStore = getStore(source)
             source = [source]
         } else if (Array.isArray(source) && !source.length) {
             source = undefined
@@ -41,10 +50,10 @@ export const useSourceStore = (key?: string) => {
             callAPI(api => api.clusterKinds(source as string[])),
             callAPI(api => api.categoryTree(undefined, { sources: source as string[] })),
         ]).then(([namespaces, nsKinds, clusterKinds, categoryTrees]) => {
-            store.kinds.namespaced = nsKinds || []
-            store.kinds.cluster = clusterKinds || []
-            store.namespaces = namespaces || []
-            store.categories = (categoryTrees || []).reduce<string[]>((categories, source) => {
+            loadStore.kinds.namespaced = nsKinds || []
+            loadStore.kinds.cluster = clusterKinds || []
+            loadStore.namespaces = namespaces || []
+            loadStore.categories = (categoryTrees || []).reduce<string[]>((categories, source) => {
                 return [...categories, ...source.categories.map(c => c.name)]
             }, [])
         }).catch((err) => {

diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
@@ -51,11 +51,18 @@ watch(filter, onChange(refresh))
 
 provide(APIFilter, filter)
 
-useSourceContext(computed(() => {
+const source = computed(() => {
   if (data.value?.sources.length !== 1) return undefined
 
   return data.value?.sources[0]
-}))
+})
+
+watch(source, (s?: string) => {
+  if (!s) return
+  
+  store.load(s)
+})
 
+useSourceContext(source)
 useStatusProvider(data)
 </script>