From bd926de74085a415b61fe17bbc3d2191c6a6ecf4 Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Tue, 3 Sep 2024 18:31:05 +0300 Subject: [PATCH] review remains --- .../ahriman/templates/build-status.jinja2 | 10 +- .../templates/build-status/alerts.jinja2 | 2 +- .../build-status/key-import-modal.jinja2 | 4 +- .../templates/build-status/login-modal.jinja2 | 4 +- .../build-status/package-add-modal.jinja2 | 74 +++++---- .../build-status/package-info-modal.jinja2 | 152 +++++++++--------- .../build-status/package-rebuild-modal.jinja2 | 4 +- .../templates/build-status/table.jinja2 | 78 ++++----- .../share/ahriman/templates/repo-index.jinja2 | 12 +- .../templates/utils/bootstrap-scripts.jinja2 | 12 +- 10 files changed, 159 insertions(+), 193 deletions(-) diff --git a/package/share/ahriman/templates/build-status.jinja2 b/package/share/ahriman/templates/build-status.jinja2 index 732d55ae..9f5f271f 100644 --- a/package/share/ahriman/templates/build-status.jinja2 +++ b/package/share/ahriman/templates/build-status.jinja2 @@ -44,28 +44,28 @@ - {% endif %} diff --git a/package/share/ahriman/templates/build-status/alerts.jinja2 b/package/share/ahriman/templates/build-status/alerts.jinja2 index 6916a9e0..54f98567 100644 --- a/package/share/ahriman/templates/build-status/alerts.jinja2 +++ b/package/share/ahriman/templates/build-status/alerts.jinja2 @@ -35,7 +35,7 @@ function showFailure(title, description, jqXHR, errorThrown) { let details; try { - details = $.parseJSON(jqXHR.responseText).error; // execution handler json error response + details = JSON.parse(jqXHR.responseText).error; // execution handler json error response } catch (_) { details = errorThrown; } diff --git a/package/share/ahriman/templates/build-status/key-import-modal.jinja2 b/package/share/ahriman/templates/build-status/key-import-modal.jinja2 index 3a05d36b..4a9f9bb3 100644 --- a/package/share/ahriman/templates/build-status/key-import-modal.jinja2 +++ b/package/share/ahriman/templates/build-status/key-import-modal.jinja2 @@ -76,7 +76,7 @@ type: "POST", contentType: "application/json", success: _ => { - bootstrap.Modal.getInstance(keyImportModal).hide(); + bootstrap.Modal.getOrCreateInstance(keyImportModal).hide(); showSuccess("Success", `Key ${key} has been imported`); }, error: (jqXHR, _, errorThrown) => { @@ -87,7 +87,7 @@ } } - $(_ => { + document.addEventListener("DOMContentLoaded", _ => { keyImportModal.addEventListener("hidden.bs.modal", _ => { keyImportBodyInput.textContent = ""; keyImportForm.reset(); diff --git a/package/share/ahriman/templates/build-status/login-modal.jinja2 b/package/share/ahriman/templates/build-status/login-modal.jinja2 index 5292d4dc..a4412ced 100644 --- a/package/share/ahriman/templates/build-status/login-modal.jinja2 +++ b/package/share/ahriman/templates/build-status/login-modal.jinja2 @@ -52,7 +52,7 @@ type: "POST", contentType: "application/json", success: _ => { - bootstrap.Modal.getInstance(loginModal).hide(); + bootstrap.Modal.getOrCreateInstance(loginModal).hide(); showSuccess("Logged in", `Successfully logged in as ${username}`, _ => location.href = "/"); }, error: (jqXHR, _, errorThrown) => { @@ -78,7 +78,7 @@ } } - $(_ => { + document.addEventListener("DOMContentLoaded", _ => { loginModal.addEventListener("hidden.bs.modal", _ => { loginForm.reset(); }); diff --git a/package/share/ahriman/templates/build-status/package-add-modal.jinja2 b/package/share/ahriman/templates/build-status/package-add-modal.jinja2 index 78fb4cd9..5a7638fa 100644 --- a/package/share/ahriman/templates/build-status/package-add-modal.jinja2 +++ b/package/share/ahriman/templates/build-status/package-add-modal.jinja2 @@ -41,14 +41,14 @@ diff --git a/package/share/ahriman/templates/build-status/package-info-modal.jinja2 b/package/share/ahriman/templates/build-status/package-info-modal.jinja2 index ad3ac7a4..f92eedfc 100644 --- a/package/share/ahriman/templates/build-status/package-info-modal.jinja2 +++ b/package/share/ahriman/templates/build-status/package-info-modal.jinja2 @@ -58,7 +58,7 @@
- + @@ -87,33 +89,35 @@ diff --git a/package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2 b/package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2 index 07a96c70..4e6fa59f 100644 --- a/package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2 +++ b/package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2 @@ -43,14 +43,14 @@ const packages = packageRebuildDependencyInput.value; const repository = getRepositorySelector(packageRebuildRepositoryInput); if (packages) { - bootstrap.Modal.getInstance(packageRebuildModal).hide(); + bootstrap.Modal.getOrCreateInstance(packageRebuildModal).hide(); const onSuccess = update => `Repository rebuild has been run for packages which depend on ${update}`; const onFailure = error => `Repository rebuild failed: ${error}`; doPackageAction("/api/v1/service/rebuild", [packages], repository, onSuccess, onFailure); } } - $(_ => { + document.addEventListener("DOMContentLoaded", _ => { packageRebuildModal.addEventListener("shown.bs.modal", _ => { const option = packageRebuildRepositoryInput.querySelector(`option[value="${repository.architecture}-${repository.repository}"]`); if (option) option.selected = "selected"; diff --git a/package/share/ahriman/templates/build-status/table.jinja2 b/package/share/ahriman/templates/build-status/table.jinja2 index 81c0ed7a..b5f282b6 100644 --- a/package/share/ahriman/templates/build-status/table.jinja2 +++ b/package/share/ahriman/templates/build-status/table.jinja2 @@ -1,19 +1,14 @@ diff --git a/package/share/ahriman/templates/repo-index.jinja2 b/package/share/ahriman/templates/repo-index.jinja2 index 6f2add03..68b714e3 100644 --- a/package/share/ahriman/templates/repo-index.jinja2 +++ b/package/share/ahriman/templates/repo-index.jinja2 @@ -105,13 +105,13 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa