diff --git a/src/app/services/data/MeshService.ts b/src/app/services/data/MeshService.ts index cb5ef50c5..4f92b0199 100644 --- a/src/app/services/data/MeshService.ts +++ b/src/app/services/data/MeshService.ts @@ -30,6 +30,11 @@ export const MeshService = { ...item, tls: typeof item.tls !== 'undefined' ? item.tls : { status: 'NotReady' }, vips: Array.isArray(item.vips) ? item.vips : [], + dataplaneProxies: ((item = {}) => ({ + connected: item.connected ?? 0, + total: item.total ?? 0, + healthy: item.healthy ?? 0, + }))(item.dataplaneProxies), addresses: Array.isArray(item.addresses) ? item.addresses.map(item => { return { diff --git a/src/app/services/routes.ts b/src/app/services/routes.ts index 05fe296a5..1a2868606 100644 --- a/src/app/services/routes.ts +++ b/src/app/services/routes.ts @@ -65,30 +65,34 @@ export const routes = (can: Can) => { }, ], }, - { - path: 'mesh-multi-zone-services/:service', - name: 'mesh-multi-zone-service-detail-tabs-view', - component: () => import('@/app/services/views/MeshMultiZoneServiceDetailTabsView.vue'), - children: [ + ...(can('use zones') + ? [ { - path: 'overview', - name: 'mesh-multi-zone-service-detail-view', - component: () => import('@/app/services/views/MeshMultiZoneServiceDetailView.vue'), + path: 'mesh-multi-zone-services/:service', + name: 'mesh-multi-zone-service-detail-tabs-view', + component: () => import('@/app/services/views/MeshMultiZoneServiceDetailTabsView.vue'), children: [ { - path: ':dataPlane', - name: 'mesh-multi-zone-service-data-plane-summary-view', - component: () => import('@/app/data-planes/views/DataPlaneSummaryView.vue'), + path: 'overview', + name: 'mesh-multi-zone-service-detail-view', + component: () => import('@/app/services/views/MeshMultiZoneServiceDetailView.vue'), + children: [ + { + path: ':dataPlane', + name: 'mesh-multi-zone-service-data-plane-summary-view', + component: () => import('@/app/data-planes/views/DataPlaneSummaryView.vue'), + }, + ], + }, + { + path: 'config', + name: 'mesh-multi-zone-service-config-view', + component: () => import('@/app/services/views/MeshMultiZoneServiceConfigView.vue'), }, ], }, - { - path: 'config', - name: 'mesh-multi-zone-service-config-view', - component: () => import('@/app/services/views/MeshMultiZoneServiceConfigView.vue'), - }, - ], - }, + ] + : []), { path: 'mesh-external-services/:service', name: 'mesh-external-service-detail-tabs-view', @@ -99,11 +103,6 @@ export const routes = (can: Can) => { name: 'mesh-external-service-detail-view', component: () => import('@/app/services/views/MeshExternalServiceDetailView.vue'), }, - { - path: 'config', - name: 'mesh-external-service-config-view', - component: () => import('@/app/services/views/MeshExternalServiceConfigView.vue'), - }, ], }, ] @@ -147,18 +146,22 @@ export const routes = (can: Can) => { }, ], }, - { - path: 'mesh-multi-zone-services', - name: 'mesh-multi-zone-service-list-view', - component: () => import('@/app/services/views/MeshMultiZoneServiceListView.vue'), - children: [ + ...(can('use zones') + ? [ { - path: ':service', - name: 'mesh-multi-zone-service-summary-view', - component: () => import('@/app/services/views/MeshMultiZoneServiceSummaryView.vue'), + path: 'mesh-multi-zone-services', + name: 'mesh-multi-zone-service-list-view', + component: () => import('@/app/services/views/MeshMultiZoneServiceListView.vue'), + children: [ + { + path: ':service', + name: 'mesh-multi-zone-service-summary-view', + component: () => import('@/app/services/views/MeshMultiZoneServiceSummaryView.vue'), + }, + ], }, - ], - }, + ] + : []), { path: 'mesh-external-services', name: 'mesh-external-service-list-view', diff --git a/src/app/services/views/MeshExternalServiceConfigView.vue b/src/app/services/views/MeshExternalServiceConfigView.vue deleted file mode 100644 index cb0fa32a4..000000000 --- a/src/app/services/views/MeshExternalServiceConfigView.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - diff --git a/src/app/services/views/MeshExternalServiceDetailView.vue b/src/app/services/views/MeshExternalServiceDetailView.vue index 2a43804dc..137b2a43d 100644 --- a/src/app/services/views/MeshExternalServiceDetailView.vue +++ b/src/app/services/views/MeshExternalServiceDetailView.vue @@ -1,7 +1,12 @@ - - - - - - - - + + + @@ -128,8 +119,8 @@