Skip to content

Commit

Permalink
Add topology default null to services show route
Browse files Browse the repository at this point in the history
  • Loading branch information
kaxcode committed Oct 5, 2020
1 parent 866246a commit a6aa865
Showing 1 changed file with 16 additions and 13 deletions.
29 changes: 16 additions & 13 deletions ui-v2/app/routes/dc/services/show.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,22 @@ export default Route.extend({
urls: this.settings.findBySlug('urls'),
chain: null,
proxies: [],
}).then(model => {
return ['connect-proxy', 'mesh-gateway', 'ingress-gateway', 'terminating-gateway'].includes(
get(model, 'items.firstObject.Service.Kind')
)
? model
: hash({
...model,
chain: this.data.source(uri => uri`/${nspace}/${dc}/discovery-chain/${params.name}`),
proxies: this.data.source(
uri => uri`/${nspace}/${dc}/proxies/for-service/${params.name}`
),
});
}).then(model => {
topology: null,
})
.then(model => {
return ['connect-proxy', 'mesh-gateway', 'ingress-gateway', 'terminating-gateway'].includes(
get(model, 'items.firstObject.Service.Kind')
)
? model
: hash({
...model,
chain: this.data.source(uri => uri`/${nspace}/${dc}/discovery-chain/${params.name}`),
proxies: this.data.source(
uri => uri`/${nspace}/${dc}/proxies/for-service/${params.name}`
),
});
})
.then(model => {
return ['mesh-gateway', 'terminating-gateway'].includes(
get(model, 'items.firstObject.Service.Kind')
)
Expand Down

0 comments on commit a6aa865

Please sign in to comment.