From ff05652956161dd94aa109e2c5d40bd82d4cfd5d Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Wed, 24 Nov 2021 10:27:36 -0800 Subject: Move credential rendering to server --- templates/assets/site.js | 18 +++++++++--------- templates/index.tpl | 27 ++++----------------------- 2 files changed, 13 insertions(+), 32 deletions(-) (limited to 'templates') diff --git a/templates/assets/site.js b/templates/assets/site.js index 485a4cd..ebf9f5f 100644 --- a/templates/assets/site.js +++ b/templates/assets/site.js @@ -29,9 +29,7 @@ function accountTableLinkClick(event) { event.preventDefault(); var thisRow = event.target.parentElement.parentElement; - var template = event.target.getAttribute("data-template"); - var account = thisRow.getAttribute("data-account-name"); - var credentialEndpoint = thisRow.getAttribute("data-global-credential-endpoint"); + var account = thisRow.dataset["accountName"]; var oldText = event.target.text; var existingTr = document.getElementById("credentials-for-" + account); @@ -41,12 +39,14 @@ function accountTableLinkClick(event) { event.target.text = "Loading..."; - fetch(credentialEndpoint).then(getJSON).then(function(vals) { - vals["ShortName"] = account; - + fetch(thisRow.dataset["globalCredentialEndpoint"], { + "headers": { + "Accept": event.target.dataset["contentType"] + } + }).then(r => r.text()).then(function(text) { var newTr = fillTemplate("credential_row_template", { "Account": account, - "Content": fillTemplate(template, vals) + "Content": text, }); event.target.text = oldText; @@ -69,8 +69,8 @@ function populateAccountRow(row) { var out = fillTemplate("account_row_template", row); document.querySelector("#account-table tr").insertAdjacentHTML("afterend", out); - document.querySelectorAll("#account-row-" + row["short_name"] + " a[data-template]").forEach(function(element) { - element.addEventListener("click", accountTableLinkClick); + document.querySelectorAll(".account-row a[data-content-type]").forEach(function(e) { + e.addEventListener("click", accountTableLinkClick); }); } diff --git a/templates/index.tpl b/templates/index.tpl index da0b59e..c8c95d4 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -4,25 +4,6 @@ Select Account - - -