diff --git a/ui-v2/app/components/templated-anchor.js b/ui-v2/app/components/templated-anchor.js
index 9336ebf50d..3e4dadc853 100644
--- a/ui-v2/app/components/templated-anchor.js
+++ b/ui-v2/app/components/templated-anchor.js
@@ -60,7 +60,7 @@ export default Component.extend({
if (typeof vars !== 'undefined' && typeof value !== 'undefined') {
value = value.replace(templateRe, function(match, group) {
try {
- return get(vars, group) || '';
+ return encodeURIComponent(get(vars, group) || '');
} catch (e) {
return '';
}
diff --git a/ui-v2/app/routes/dc/services/show.js b/ui-v2/app/routes/dc/services/show.js
index 361b0e15df..3b8083fbdf 100644
--- a/ui-v2/app/routes/dc/services/show.js
+++ b/ui-v2/app/routes/dc/services/show.js
@@ -15,9 +15,11 @@ export default Route.extend({
model: function(params) {
const repo = get(this, 'repo');
const settings = get(this, 'settings');
+ const dc = this.modelFor('dc').dc.Name;
return hash({
- item: repo.findBySlug(params.name, this.modelFor('dc').dc.Name),
+ item: repo.findBySlug(params.name, dc),
urls: settings.findBySlug('urls'),
+ dc: dc,
});
},
setupController: function(controller, model) {
diff --git a/ui-v2/app/templates/dc/services/show.hbs b/ui-v2/app/templates/dc/services/show.hbs
index 452017b2a5..53860f601a 100644
--- a/ui-v2/app/templates/dc/services/show.hbs
+++ b/ui-v2/app/templates/dc/services/show.hbs
@@ -34,7 +34,7 @@
{{/block-slot}}
{{#block-slot 'actions'}}
{{#if urls.service}}
- {{#templated-anchor href=urls.service vars=(hash Service=(hash Name=item.Service.Service)) rel="external"}}Open Dashboard{{/templated-anchor}}
+ {{#templated-anchor data-test-dashboard-anchor href=urls.service vars=(hash Datacenter=dc Service=(hash Name=item.Service.Service)) rel="external"}}Open Dashboard{{/templated-anchor}}
{{/if}}
{{/block-slot}}
{{#block-slot 'content'}}
diff --git a/ui-v2/app/templates/settings.hbs b/ui-v2/app/templates/settings.hbs
index 4a4874cc21..7215c9f96c 100644
--- a/ui-v2/app/templates/settings.hbs
+++ b/ui-v2/app/templates/settings.hbs
@@ -16,12 +16,12 @@