Rollback a little

johncowen · johncowen · commit 4f31fd8d7e30 · 2025-09-18T14:55:42.000+01:00
Signed-off-by: John Cowen &lt;john.cowen@konghq.com&gt;
diff --git a/packages/kuma-gui/src/app/kuma/kri.spec.ts b/packages/kuma-gui/src/app/kuma/kri.spec.ts
@@ -8,8 +8,7 @@ describe('kri', () => {
     [
       Kri.fromString('kri_policy_mesh_zone_namespace_name_section'),
       {
-        id: 'name.namespace',
-        kind: 'policy',
+        shortName: 'policy',
         mesh: 'mesh',
         zone: 'zone',
         namespace: 'namespace',
@@ -20,8 +19,7 @@ describe('kri', () => {
     [
       Kri.fromString('kri_policy__zone__name_section'),
       {
-        id: 'name',
-        kind: 'policy',
+        shortName: 'policy',
         mesh: '',
         zone: 'zone',
         namespace: '',
@@ -32,8 +30,7 @@ describe('kri', () => {
     [
       Kri.fromString(''),
       {
-        id: '',
-        kind: '',
+        shortName: '',
         mesh: '',
         zone: '',
         namespace: '',
@@ -44,8 +41,7 @@ describe('kri', () => {
     [
       Kri.fromString('not-kri_foo_bar_baz_qux_quux_corge'),
       {
-        id: '',
-        kind: '',
+        shortName: '',
         mesh: '',
         zone: '',
         namespace: '',
@@ -55,7 +51,7 @@ describe('kri', () => {
     ],
     [
       Kri.toString({
-        kind: 'policy',
+        shortName: 'policy',
         mesh: 'mesh',
         zone: 'zone',
         namespace: 'namespace',
@@ -66,7 +62,7 @@ describe('kri', () => {
     ],
     [
       Kri.toString({
-        kind: 'policy',
+        shortName: 'policy',
         zone: 'zone',
         name: 'name',
         sectionName: 'section',
diff --git a/packages/kuma-gui/src/app/kuma/kri.ts b/packages/kuma-gui/src/app/kuma/kri.ts
@@ -8,35 +8,40 @@ export class Kri {
   static fromString(kri: string) {
     if(!Kri.isKriString(kri)) {
       return {
-        id: '',
-        kind: '',
+        shortName: '',
         mesh: '',
         zone: '',
         namespace: '',
         name: '',
         sectionName: '',
       }
     }
-    const [_kriProtocol, kind, mesh, zone, namespace, name, sectionName] = kri.split('_')
+
+    const [
+      shortName = '',
+      mesh = '',
+      zone = '',
+      namespace = '',
+      name = '',
+      sectionName = '',
+    ] = kri.split('_').slice(1)
 
     return {
-      id: `${name}${namespace !== '' ? `.${namespace}`: '' }`,
-      kind,
+      shortName,
       mesh,
       zone,
       namespace,
       name,
       sectionName,
     }
-
   }
 
   static isKriString(kri: string): kri is KriString {
     return kri.startsWith('kri_') && kri.split('_').length === 7
   }
 
   static toString(kri: Partial<ReturnType<typeof Kri.fromString>>) {
-    const { kind = '', mesh = '', zone = '', namespace = '', name = '', sectionName = '' } = kri
-    return `kri_${kind}_${mesh}_${zone}_${namespace}_${name}_${sectionName}` satisfies KriString
+    const { shortName = '', mesh = '', zone = '', namespace = '', name = '', sectionName = '' } = kri
+    return `kri_${shortName}_${mesh}_${zone}_${namespace}_${name}_${sectionName}` satisfies KriString
   }
 }
diff --git a/packages/kuma-gui/src/app/resources/data/MeshIdentity.ts b/packages/kuma-gui/src/app/resources/data/MeshIdentity.ts
@@ -7,7 +7,7 @@ type PartialMeshIdentity = components['schemas']['MeshIdentityItem']
 export const MeshIdentity = {
   fromObject: (item: PartialMeshIdentity) => {
     return {
-      kri: Kri.toString({ kind: 'mid', mesh: item.mesh, name: item.name}),
+      kri: Kri.toString({ shortName: 'mid', mesh: item.mesh, name: item.name}),
       ...item,
       raw: item,
     }
diff --git a/packages/kuma-gui/src/app/resources/data/MeshTrust.ts b/packages/kuma-gui/src/app/resources/data/MeshTrust.ts
@@ -7,7 +7,7 @@ type PartialMeshTrust = components['schemas']['MeshTrustItem']
 export const MeshTrust = {
   fromObject: (item: PartialMeshTrust) => {
     return {
-      kri: Kri.toString({ kind: 'mtrust', mesh: item.mesh, name: item.name }),
+      kri: Kri.toString({ shortName: 'mtrust', mesh: item.mesh, name: item.name }),
       ...item,
       spec: {
         ...item.spec,
diff --git a/packages/kuma-gui/src/app/service-mesh/index.ts b/packages/kuma-gui/src/app/service-mesh/index.ts
@@ -53,39 +53,42 @@ const protocolHandler = (router: Router, doc = document) => {
     const kriProto = 'kri://'
     switch (true) {
       case href.startsWith(kriProto): {
-        const kri = Kri.fromString(href.substring(kriProto.length))
+        const { mesh, zone, name, namespace, shortName } = Kri.fromString(href.substring(kriProto.length))
+        const id = `${name}${namespace !== '' ? `.${namespace}`: '' }`
+        if(zone !== '') {
+          return ''
+        }
 
-        const to = ((kri) => {
+        const to = (() => {
           switch (true) {
-            case kri.kind === 'msvc':
+            case shortName === 'msvc':
               return {
                 name: 'mesh-service-detail-view',
                 params: {
-                  mesh: kri.mesh,
-                  service: kri.id,
+                  mesh,
+                  service: id,
                 },
               }
-            case kri.kind === 'mzsvc':
+            case shortName === 'mzsvc':
               return {
                 name: 'mesh-multi-zone-service-detail-view',
                 params: {
-                  mesh: kri.mesh,
-                  service: kri.id,
+                  mesh: mesh,
+                  service: id,
                 },
               }
-            case kri.kind === 'extsvc':
+            case shortName === 'extsvc':
               return {
                 name: 'mesh-external-service-detail-view',
                 params: {
-                  mesh: kri.mesh,
-                  service: kri.id,
+                  mesh: mesh,
+                  service: id,
                 },
               }
             default:
               return
           }
-        })(kri)
-
+        })()
         if (to) {
           const link = useLink({ to })
           return link.href.value
diff --git a/packages/kuma-gui/src/app/services/locales/en-us/index.yaml b/packages/kuma-gui/src/app/services/locales/en-us/index.yaml
@@ -1,8 +1,4 @@
 services:
-  kri:
-    msvc: MeshService
-    mzsvc: MeshMultiZoneService
-    extsvc: MeshExternalService
   x-empty-state:
     title: There are no services present
   routes:
diff --git a/packages/x/src/components/x-action/XAction.vue b/packages/x/src/components/x-action/XAction.vue
@@ -153,7 +153,7 @@
     </KButton>
 
     <button
-      v-else
+      v-else-if="typeof attrs.onClick === 'function'"
       :class="`x-action-appearance-${props.appearance}`"
       data-testid="x-action"
       v-bind="$attrs"
@@ -169,12 +169,20 @@
       </template>
       <span><slot name="default" /></span>
     </button>
+    <template
+      v-else
+    >
+      <slot
+        name="default"
+        :inactive="true"
+      />
+    </template>
   </template>
 </template>
 <script lang="ts" setup>
 import { KUI_ICON_SIZE_40 } from '@kong/design-tokens'
 import { KDropdownItem, KButton } from '@kong/kongponents'
-import { computed, watch, inject, provide } from 'vue'
+import { computed, watch, inject, provide, useAttrs } from 'vue'
 import { RouterLink, useRouter } from 'vue-router'
 
 import { useProtocolHandler } from '../../'
@@ -189,6 +197,12 @@ type RouteLocationRawWithBooleanQuery = Omit<RouteLocationNamedRaw, 'query'> & {
 const emit = defineEmits<{
   (event: 'click'): Event
 }>()
+
+defineSlots<{
+  default(props: {
+    inactive?: boolean
+  }): any
+}>()
 const props = withDefaults(defineProps<{
   action?: 'default' | 'docs' | 'create' | 'copy' | 'action' | 'expand' | 'refresh' | 'progress'
   appearance?: 'primary' | 'secondary' | 'tertiary' | 'danger' | 'anchor'
@@ -205,7 +219,8 @@ const props = withDefaults(defineProps<{
   for: '',
 })
 
-provide('x-action', {})
+const attrs = useAttrs()
+
 const group = inject<{
   expanded: boolean
 } | undefined>('x-action-group', undefined)
@@ -217,6 +232,10 @@ const href = computed(() => props.href.includes('://') ? protocolHandler(props.h
 const target = computed(() => props.href.length > 0 && props.href === href.value ? '_blank' : undefined)
 const rel = computed(() => target.value === '_blank' ? 'noopener noreferrer' : href.value.length > 0 && props.href === href.value ? undefined : 'x-internal')
 
+if(href.value.length > 0 || typeof attrs.onClick === 'function' || props.for) {
+  provide('x-action', {})
+}
+
 const query = computed(() => {
   return Object.entries(props.to.query ?? {}).reduce<Record<string, string | number | null | undefined>>((prev, [key, value]) => {
     switch (true) {

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@ describe('kri', () => {`
`8`	`8`	`[`
`9`	`9`	`Kri.fromString('kri_policy_mesh_zone_namespace_name_section'),`
`10`	`10`	`{`
`11`		`- id: 'name.namespace',`
`12`		`- kind: 'policy',`
	`11`	`+ shortName: 'policy',`
`13`	`12`	`mesh: 'mesh',`
`14`	`13`	`zone: 'zone',`
`15`	`14`	`namespace: 'namespace',`
`@@ -20,8 +19,7 @@ describe('kri', () => {`
`20`	`19`	`[`
`21`	`20`	`Kri.fromString('kri_policy__zone__name_section'),`
`22`	`21`	`{`
`23`		`- id: 'name',`
`24`		`- kind: 'policy',`
	`22`	`+ shortName: 'policy',`
`25`	`23`	`mesh: '',`
`26`	`24`	`zone: 'zone',`
`27`	`25`	`namespace: '',`
`@@ -32,8 +30,7 @@ describe('kri', () => {`
`32`	`30`	`[`
`33`	`31`	`Kri.fromString(''),`
`34`	`32`	`{`
`35`		`- id: '',`
`36`		`- kind: '',`
	`33`	`+ shortName: '',`
`37`	`34`	`mesh: '',`
`38`	`35`	`zone: '',`
`39`	`36`	`namespace: '',`
`@@ -44,8 +41,7 @@ describe('kri', () => {`
`44`	`41`	`[`
`45`	`42`	`Kri.fromString('not-kri_foo_bar_baz_qux_quux_corge'),`
`46`	`43`	`{`
`47`		`- id: '',`
`48`		`- kind: '',`
	`44`	`+ shortName: '',`
`49`	`45`	`mesh: '',`
`50`	`46`	`zone: '',`
`51`	`47`	`namespace: '',`
`@@ -55,7 +51,7 @@ describe('kri', () => {`
`55`	`51`	`],`
`56`	`52`	`[`
`57`	`53`	`Kri.toString({`
`58`		`- kind: 'policy',`
	`54`	`+ shortName: 'policy',`
`59`	`55`	`mesh: 'mesh',`
`60`	`56`	`zone: 'zone',`
`61`	`57`	`namespace: 'namespace',`
`@@ -66,7 +62,7 @@ describe('kri', () => {`
`66`	`62`	`],`
`67`	`63`	`[`
`68`	`64`	`Kri.toString({`
`69`		`- kind: 'policy',`
	`65`	`+ shortName: 'policy',`
`70`	`66`	`zone: 'zone',`
`71`	`67`	`name: 'name',`
`72`	`68`	`sectionName: 'section',`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ type PartialMeshIdentity = components['schemas']['MeshIdentityItem']`
`7`	`7`	`export const MeshIdentity = {`
`8`	`8`	`fromObject: (item: PartialMeshIdentity) => {`
`9`	`9`	`return {`
`10`		`- kri: Kri.toString({ kind: 'mid', mesh: item.mesh, name: item.name}),`
	`10`	`+ kri: Kri.toString({ shortName: 'mid', mesh: item.mesh, name: item.name}),`
`11`	`11`	`...item,`
`12`	`12`	`raw: item,`
`13`	`13`	`}`