From 88c8c929dc0d445cd06adbecbb76b12c0a95fa3a Mon Sep 17 00:00:00 2001
From: Evgeniy Alekseev <i@arcanis.me>
Date: Sat, 11 Sep 2021 23:05:51 +0300
Subject: [PATCH] add error description to modals

---
 .../package-actions-modals.jinja2             |  2 +
 .../package-actions-script.jinja2             | 41 ++++++++++++-------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/package/share/ahriman/build-status/package-actions-modals.jinja2 b/package/share/ahriman/build-status/package-actions-modals.jinja2
index 7faa73f1..fb72034d 100644
--- a/package/share/ahriman/build-status/package-actions-modals.jinja2
+++ b/package/share/ahriman/build-status/package-actions-modals.jinja2
@@ -31,6 +31,7 @@
             </div>
             <div class="modal-body">
                 <p>Packages update has failed.</p>
+                <p id="errorDetails"></p>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
@@ -48,6 +49,7 @@
             </div>
             <div class="modal-body">
                 <p>Packages update has been run.</p>
+                <ul id="successDetails"></ul>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
diff --git a/package/share/ahriman/build-status/package-actions-script.jinja2 b/package/share/ahriman/build-status/package-actions-script.jinja2
index 3b77b5e1..a0377183 100644
--- a/package/share/ahriman/build-status/package-actions-script.jinja2
+++ b/package/share/ahriman/build-status/package-actions-script.jinja2
@@ -1,22 +1,24 @@
 <script>
-    const $remove = $("#remove")
-    const $update = $("#update")
+    const $remove = $("#remove");
+    const $update = $("#update");
 
-    const $table = $("#packages")
+    const $table = $("#packages");
     $table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table",
         function () {
-            $remove.prop("disabled", !$table.bootstrapTable("getSelections").length)
-            $update.prop("disabled", !$table.bootstrapTable("getSelections").length)
+            $remove.prop("disabled", !$table.bootstrapTable("getSelections").length);
+            $update.prop("disabled", !$table.bootstrapTable("getSelections").length);
         })
 
-    const $successForm = $("#successForm")
-    $successForm.on("hidden.bs.modal", function() { window.location.reload(); })
+    const $successForm = $("#successForm");
+    const $successDetails = $("#successDetails");
+    $successForm.on("hidden.bs.modal", function() { window.location.reload(); });
 
-    const $failedForm = $("#failedForm")
-    $failedForm.on("hidden.bs.modal", function() { window.location.reload(); })
+    const $failedForm = $("#failedForm");
+    const $errorDetails = $("#errorDetails");
+    $failedForm.on("hidden.bs.modal", function() { window.location.reload(); });
 
-    const $package = $("#package")
-    const $knownPackages = $("#knownPackages")
+    const $package = $("#package");
+    const $knownPackages = $("#knownPackages");
     $package.keyup(function () {
         const $this = $(this);
         clearTimeout($this.data("timeout"));
@@ -36,7 +38,7 @@
                         return $option;
                     });
                     $knownPackages.empty().append($options);
-                    $this.focus()
+                    $this.focus();
                 },
             })
         }, this), 500));
@@ -50,8 +52,19 @@
             data: JSON.stringify({packages: $packages}),
             type: "POST",
             contentType: "application/json",
-            success: function (_) { $successForm.modal("show"); },
-            error: function (_) { $failedForm.modal("show"); },
+            success: function (_) {
+                const $details = $packages.map(function (pkg) {
+                    const $li = document.createElement("li");
+                    $li.innerText = pkg;
+                    return $li;
+                });
+                $successDetails.empty().append($details);
+                $successForm.modal("show");
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                $errorDetails.text(errorThrown);
+                $failedForm.modal("show");
+            },
         })
     }