Skip to content

Commit 8106acb

Browse files
authored
fix(resources/summary): structured causes empty default select option (#5007)
Switches from using `format` query param to `environment` in the summary view, as long as there is no `structured` view option. Closes #4979 --------- Signed-off-by: schogges <moritz.fleck@konghq.com>
1 parent 877e64d commit 8106acb

4 files changed

Lines changed: 18 additions & 13 deletions

File tree

packages/kuma-gui/src/app/policies/sources.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ export const sources = (api: KumaApi) => {
8585
mesh,
8686
name,
8787
},
88+
// @ts-expect-error - query parameter not listed in OAS
89+
query: {
90+
format: 'kubernetes',
91+
},
8892
},
8993
})
9094
return YAML.stringify(res.data)

packages/kuma-gui/src/app/resources/sources.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,10 @@ export const sources = (api: KumaApi) => {
8383
path: {
8484
kri: params.kri,
8585
},
86-
},
87-
query: {
88-
format: 'kubernetes',
86+
// @ts-expect-error - query parameter not listed in OAS
87+
query: {
88+
format: 'kubernetes',
89+
},
8990
},
9091
})
9192

packages/kuma-gui/src/app/resources/views/ResourceDetailView.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
mesh: '',
66
kri: '',
77
resourcePath: '',
8-
format: String,
8+
environment: String,
99
codeSearch: '',
1010
codeFilter: false,
1111
codeRegExp: false,
@@ -143,11 +143,11 @@
143143
>
144144
<XSelect
145145
:label="t('resources.routes.item.format')"
146-
:selected="route.params.format"
146+
:selected="route.params.environment"
147147
@change="(value) => {
148-
route.update({ format: value })
148+
route.update({ environment: value })
149149
}"
150-
@vue:before-mount="$event?.props?.selected && options.includes($event.props.selected) && $event.props.selected !== route.params.format && route.update({ format: $event.props.selected })"
150+
@vue:before-mount="$event?.props?.selected && options.includes($event.props.selected) && $event.props.selected !== route.params.environment && route.update({ environment: $event.props.selected })"
151151
>
152152
<template
153153
v-for="value in options"
@@ -163,7 +163,7 @@
163163
:data="[sourceData]"
164164
v-slot="{ data: [data] }"
165165
>
166-
<template v-if="route.params.format !== 'k8s'">
166+
<template v-if="route.params.environment !== 'k8s'">
167167
<XCodeBlock
168168
data-testid="codeblock-yaml-universal"
169169
language="yaml"

packages/kuma-gui/src/app/resources/views/ResourceSummaryView.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
codeSearch: '',
77
codeFilter: false,
88
codeRegExp: false,
9-
format: String,
9+
environment: String,
1010
}"
1111
v-slot="{ route, t, uri }"
1212
>
@@ -73,11 +73,11 @@
7373
>
7474
<XSelect
7575
:label="t('resources.routes.item.format')"
76-
:selected="route.params.format"
76+
:selected="route.params.environment"
7777
@change="(value) => {
78-
route.update({ format: value })
78+
route.update({ environment: value })
7979
}"
80-
@vue:before-mount="$event?.props?.selected && options.includes($event.props.selected) && $event.props.selected !== route.params.format && route.update({ format: $event.props.selected })"
80+
@vue:before-mount="$event?.props?.selected && options.includes($event.props.selected) && $event.props.selected !== route.params.environment && route.update({ environment: $event.props.selected })"
8181
>
8282
<template
8383
v-for="value in options"
@@ -92,7 +92,7 @@
9292
</header>
9393
</XLayout>
9494

95-
<template v-if="route.params.format !== 'k8s'">
95+
<template v-if="route.params.environment !== 'k8s'">
9696
<XCodeBlock
9797
data-testid="codeblock-yaml-universal"
9898
language="yaml"

0 commit comments

Comments
 (0)