airship/airshipui
Code Issues Proposed changes

Quick fix for the fqdn option not working for the dashboards

Browse Source 
Change-Id: I36c7c85694fd3fb4ea6cd0b88cbb008dafb0f3b0
This commit is contained in:
Schiefelbein, Andrew 2020-06-25 14:24:53 -05:00
parent e9de7d1988
commit cc14fa4f99
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]; let namespace = cluster.namespaces[j];
for (let k = 0; k < namespace.dashboards.length; k++) { for (let k = 0; k < namespace.dashboards.length; k++) {
let dash = namespace.dashboards[k]; let dash = namespace.dashboards[k];
let fqdn = ""; let fqdn = null;
if (dash.fqdn === undefined) { if (dash.hasOwnProperty("fqdn")) {
fqdn = `${dash.hostname}.${cluster.namespaces[j].name}.${cluster.baseFqdn}` fqdn = `${dash.fqdn}`;
} else { } else {
({ fqdn } = dash.fqdn); fqdn = `${dash.hostname}.${cluster.namespaces[j].name}.${cluster.baseFqdn}`;
} }
let url = `${dash.protocol}://${fqdn}:${dash.port}/${dash.path || ""}`; let url = `${dash.protocol}://${fqdn}:${dash.port}/${dash.path || ""}`;
addDashboard("DashDropdown", dash.name, url) addDashboard("DashDropdown", dash.name, url)