airship/airshipui
Code Issues Proposed changes

Merge "Quick fix for the fqdn option not working for the dashboards"

Browse Source
This commit is contained in:
Zuul 2020-06-25 21:39:26 +00:00 committed by Gerrit Code Review
commit 819964eafd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/js/common.js
View File

@ -106,11 +106,11 @@ function addServiceDashboards(json) { // eslint-disable-line no-unused-vars
let namespace = cluster.namespaces[j];
for (let k = 0; k < namespace.dashboards.length; k++) {
let dash = namespace.dashboards[k];
let fqdn = "";
if (dash.fqdn === undefined) {
fqdn = `${dash.hostname}.${cluster.namespaces[j].name}.${cluster.baseFqdn}`
let fqdn = null;
if (dash.hasOwnProperty("fqdn")) {
fqdn = `${dash.fqdn}`;
} else {
({ fqdn } = dash.fqdn);
fqdn = `${dash.hostname}.${cluster.namespaces[j].name}.${cluster.baseFqdn}`;
}
let url = `${dash.protocol}://${fqdn}:${dash.port}/${dash.path || ""}`;
addDashboard("DashDropdown", dash.name, url)