diff --git a/packages/kuma-gui/cypress/support/step_definitions/index.ts b/packages/kuma-gui/cypress/support/step_definitions/index.ts
index 51ebbf9c0..654fcddf4 100644
--- a/packages/kuma-gui/cypress/support/step_definitions/index.ts
+++ b/packages/kuma-gui/cypress/support/step_definitions/index.ts
@@ -248,10 +248,12 @@ Then(/^the "(.*)" element(s)? contain[s]?$/, (selector: string, multiple = '', t
})
}
})
-Then(/^the "(.*)" element contains "(.*)"$/, (selector: string, value: string) => {
+Then(/^the "(.*)" element( doesn't | )contain[s]? "(.*)"$/, (selector: string, assertion: string, value: string) => {
$(selector).then(($el) => {
+ const negative = assertion !== ' '
+ const prefix = negative ? 'not.' : ''
const chainer = $el[0].tagName === 'INPUT' ? 'have.value' : 'contain'
- $(selector).should(chainer, value)
+ $(selector).should(`${prefix}${chainer}`, value)
})
})
diff --git a/packages/kuma-gui/src/app/connections/views/ConnectionInboundSummaryClustersView.vue b/packages/kuma-gui/src/app/connections/views/ConnectionInboundSummaryClustersView.vue
index 4d81d3c5a..344cc4a26 100644
--- a/packages/kuma-gui/src/app/connections/views/ConnectionInboundSummaryClustersView.vue
+++ b/packages/kuma-gui/src/app/connections/views/ConnectionInboundSummaryClustersView.vue
@@ -9,7 +9,7 @@
connection: '',
}"
name="connection-inbound-summary-clusters-view"
- v-slot="{ route }"
+ v-slot="{ route, uri }"
>
-
-
-
-
- Refresh
-
-
-
-
+
+
+
+ Refresh
+
+
+
+
+
diff --git a/packages/kuma-gui/src/app/connections/views/ConnectionOutboundSummaryClustersView.vue b/packages/kuma-gui/src/app/connections/views/ConnectionOutboundSummaryClustersView.vue
index 373d8b944..e651f790e 100644
--- a/packages/kuma-gui/src/app/connections/views/ConnectionOutboundSummaryClustersView.vue
+++ b/packages/kuma-gui/src/app/connections/views/ConnectionOutboundSummaryClustersView.vue
@@ -9,7 +9,7 @@
connection: '',
}"
name="connection-outbound-summary-clusters-view"
- v-slot="{ route }"
+ v-slot="{ route, uri }"
>
-
-
-
-
- Refresh
-
-
-
-
+
+
+
+ Refresh
+
+
+
+
+
diff --git a/packages/kuma-gui/src/app/data-planes/sources.ts b/packages/kuma-gui/src/app/data-planes/sources.ts
index dacbf7db5..46bdd3e36 100644
--- a/packages/kuma-gui/src/app/data-planes/sources.ts
+++ b/packages/kuma-gui/src/app/data-planes/sources.ts
@@ -76,7 +76,7 @@ export const sources = (source: Source, api: KumaApi, can: Can) => {
'/meshes/:mesh/dataplanes/:name/as/kubernetes': async (params) => {
return api.getDataplaneFromMesh(params, { format: 'kubernetes' })
},
-
+ // @deprecated please use either /xds, /clusters or /stats endpoints (ie. without /data-path)
'/meshes/:mesh/dataplanes/:name/data-path/:dataPath': async (params) => {
const { mesh, name } = params
const dataPath = includes(['xds', 'clusters', 'stats'] as const, params.dataPath) ? params.dataPath : 'xds'
@@ -87,6 +87,14 @@ export const sources = (source: Source, api: KumaApi, can: Can) => {
dataPath,
})
},
+ '/meshes/:mesh/dataplanes/:name/clusters': async (params) => {
+ const { mesh, name } = params
+ return api.getDataplaneData({
+ mesh,
+ dppName: name,
+ dataPath: 'clusters',
+ })
+ },
'/meshes/:mesh/dataplanes/:name/xds/:endpoints': async (params) => {
const { mesh, name, endpoints } = params