Merge branch 'master' into feat/store_global_user_preferences

kumahq · Jan 30, 2025 · f6933eb · f6933eb
2 parents edce765 + d5eef60
commit f6933eb
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 19 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -28,10 +28,10 @@ jobs:
         language: [javascript]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+      - uses: github/codeql-action/init@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
         with:
           languages: ${{ matrix.language }}
-      - uses: github/codeql-action/autobuild@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
-      - uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+      - uses: github/codeql-action/autobuild@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
+      - uses: github/codeql-action/analyze@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
         with:
           category: '/language:${{matrix.language}}'
diff --git a/Makefile b/Makefile
@@ -11,6 +11,7 @@ MK := $(KUMAHQ_CONFIG)/src/mk
 .DEFAULT_GOAL := help
 include $(MK)/help.mk
 
+include $(MK)/decorators.mk
 include $(MK)/install.mk
 include $(MK)/check.mk
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/config/src/mk/decorators.mk b/packages/config/src/mk/decorators.mk
@@ -0,0 +1,5 @@
+.PHONY: ws/%
+ws/%: ## Dev: Run the same command in every package in the workspace i.e. `make ws/lint`
+	@for dir in $(shell npm query .workspace | jq -r '.[].location'); do \
+		$(MAKE) -C $(NPM_WORKSPACE_ROOT)/$$dir $(subst ws/,,$@); \
+	done
diff --git a/packages/kuma-gui/package.json b/packages/kuma-gui/package.json
@@ -17,7 +17,7 @@
     "@kong/icons": "^1.20.2",
     "@kong/kongponents": "^9.16.1",
     "@vue/shared": "^3.5.13",
-    "@vueuse/core": "^12.4.0",
+    "@vueuse/core": "^12.5.0",
     "brandi": "^5.0.0",
     "deepmerge": "^4.3.1",
     "js-yaml": "^4.1.0",

diff --git a/packages/kuma-gui/src/app/x/components/x-select/XSelect.vue b/packages/kuma-gui/src/app/x/components/x-select/XSelect.vue
@@ -1,5 +1,6 @@
 <template>
   <KSelect
+    v-model="selected"
     :label="props.label"
     :items="items"
     @selected="emit('change', String($event.value))"
@@ -25,7 +26,7 @@
 </template>
 <script lang="ts" setup>
 import { KSelect } from '@kong/kongponents'
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 
 const emit = defineEmits<{
   (event: 'change', value: string): void
@@ -40,12 +41,13 @@ const props = withDefaults(defineProps<{
 
 const slots = defineSlots()
 
+const selected = ref(props.selected)
+
 const items = computed(() => {
   const items = Object.keys(slots).reduce<
     {
       value: string
       label: string
-      selected: boolean
     }[]
   >((prev, key) => {
     const pos = key.lastIndexOf('-option')
@@ -55,15 +57,11 @@ const items = computed(() => {
         {
           value: item,
           label: item,
-          selected: item === props.selected,
         },
       )
     }
     return prev
   }, [])
-  if (items.find(item => item.selected) === undefined) {
-    items[0].selected = true
-  }
   return items
 })
 

diff --git a/packages/kuma-gui/src/app/x/components/x-tabs/XTabs.vue b/packages/kuma-gui/src/app/x/components/x-tabs/XTabs.vue
@@ -82,13 +82,16 @@ watch(() => slots, () => {
 })
 </script>
 <style lang="scss" scoped>
+:deep(.tab-link) {
+  /* TODO(jc): override KTab's div styling  */
+  padding: 0 !important;
+}
 :deep(.tab-link) > * {
   transition: inherit;
   border-radius: inherit;
   color: inherit;
   outline: inherit;
-  /* TODO(jc): This can be removed if we ever get rid of the global link styling  */
-  text-decoration: none !important;
+  padding: $kui-space-30 $kui-space-50;
 }
 :deep(.tab-link) > *:focus-visible {
   background-color: $kui-color-background-neutral-weaker;