diff --git a/ui/packages/consul-ui/app/routes/dc/routing-config.js b/ui/packages/consul-ui/app/routes/dc/routing-config.js index d8203c6620ea..bf1e3f065ccf 100644 --- a/ui/packages/consul-ui/app/routes/dc/routing-config.js +++ b/ui/packages/consul-ui/app/routes/dc/routing-config.js @@ -13,7 +13,12 @@ export default class RoutingConfigRoute extends Route { dc: dc, nspace: nspace, slug: name, - chain: await this.data.source(uri => uri`/${nspace}/${dc}/discovery-chain/${params.name}`), + chain: await this.data.source(uri => uri`/${nspace}/${dc}/discovery-chain/${name}`), }; } + + setupController(controller, model) { + super.setupController(...arguments); + controller.setProperties(model); + } } diff --git a/ui/packages/consul-ui/app/styles/layout.scss b/ui/packages/consul-ui/app/styles/layout.scss index 31942ed8c202..8bae6cddf790 100644 --- a/ui/packages/consul-ui/app/styles/layout.scss +++ b/ui/packages/consul-ui/app/styles/layout.scss @@ -46,11 +46,11 @@ html[data-route$='edit'] .app-view > header + div > *:first-child { } /* most tabs have margin after the tab bar, unless the tab has a filter bar */ /* if it is a filter bar and the thing after the filter bar is a p then it also */ -/* needs a top margun :S */ +/* needs a top margin :S */ %app-view-content .tab-section > *:first-child:not(.filter-bar):not(table), %app-view-content .tab-section > .search-bar + p, %app-view-content .tab-section .consul-health-check-list, -%app-view-content .container { +html[data-route$='dc.routing-config'] .discovery-chain { margin-top: 1.25em; } .consul-upstream-instance-list, diff --git a/ui/packages/consul-ui/app/templates/dc/routing-config.hbs b/ui/packages/consul-ui/app/templates/dc/routing-config.hbs index 5a147723cc08..d353e774c1b9 100644 --- a/ui/packages/consul-ui/app/templates/dc/routing-config.hbs +++ b/ui/packages/consul-ui/app/templates/dc/routing-config.hbs @@ -1,22 +1,27 @@ -{{page-title @model.slug}} + - - -
    -
  1. All Services
  2. -
-
- -

- {{@model.slug}} -

- -
- -
+ + + + +
    +
  1. All Services
  2. +
+
+ +

+ {{slug}} +

+ +
+ -
-
-
+ + + +