From b1ac894ccf6ea3dae7cdf3873cdeeb9dadc27008 Mon Sep 17 00:00:00 2001
From: Evgeniy Alekseev <i@arcanis.me>
Date: Fri, 15 Jul 2022 14:15:10 +0300
Subject: [PATCH] add action button to suggest table

Also replace functions with lambdas
---
 src/main/resources/html/bis.html   | 32 ++++++++---------
 src/main/resources/html/loot.html  | 55 ++++++++++++++++++------------
 src/main/resources/html/party.html | 18 +++++-----
 src/main/resources/html/users.html | 18 +++++-----
 4 files changed, 67 insertions(+), 56 deletions(-)

diff --git a/src/main/resources/html/bis.html b/src/main/resources/html/bis.html
index 976f414..836740b 100644
--- a/src/main/resources/html/bis.html
+++ b/src/main/resources/html/bis.html
@@ -207,8 +207,8 @@
                 }),
                 type: "POST",
                 contentType: "application/json",
-                success: function (_) { reload(); },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                success: _ => { reload(); },
+                error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
             });
             updateBisDialog.modal("hide");
             return true; // action expects boolean result
@@ -247,9 +247,9 @@
                 url: `/api/v1/party/${partyId}`,
                 type: "GET",
                 dataType: "json",
-                success: function (data) {
-                    const items = data.map(function (player) {
-                        return player.bis.map(function (loot) {
+                success: response => {
+                    const items = response.map(player => {
+                        return player.bis.map(loot => {
                             return {
                                 nick: player.nick,
                                 job: player.job,
@@ -258,12 +258,12 @@
                             };
                         });
                     });
-                    const payload = items.reduce(function (left, right) { return left.concat(right); }, []);
+                    const payload = items.reduce((left, right) => { return left.concat(right); }, []);
                     table.bootstrapTable("load", payload);
                     table.bootstrapTable("uncheckAll");
                     table.bootstrapTable("hideLoading");
 
-                    const options = data.map(function (player) {
+                    const options = response.map(player => {
                         const option = document.createElement("option");
                         option.innerText = formatPlayerId(player);
                         option.dataset.nick = player.nick;
@@ -272,13 +272,13 @@
                     });
                     playerInput.empty().append(options);
                 },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
             });
         }
 
         function removePiece() {
             const pieces = table.bootstrapTable("getSelections");
-            pieces.map(function (loot) {
+            pieces.map(loot => {
                 $.ajax({
                     url: `/api/v1/party/${partyId}/bis`,
                     data: JSON.stringify({
@@ -296,8 +296,8 @@
                     }),
                     type: "POST",
                     contentType: "application/json",
-                    success: function (_) { reload(); },
-                    error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                    success: _ => { reload(); },
+                    error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
                 });
             });
         }
@@ -325,8 +325,8 @@
                 }),
                 type: "PUT",
                 contentType: "application/json",
-                success: function (_) { reload(); },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                success: _ => { reload(); },
+                error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
             });
             updateBisDialog.modal("hide");
             return true; // action expects boolean result
@@ -342,7 +342,7 @@
             return false; // should not happen
         }
 
-        $(function () {
+        $(() => {
             setupFormClear(updateBisDialog, reset);
             setupRemoveButton(table, removeButton);
 
@@ -353,8 +353,8 @@
 
             hideControls();
 
-            updateBisButton.click(function () { reset(); });
-            addPieceButton.click(function () { reset(); });
+            updateBisButton.click(() => { reset(); });
+            addPieceButton.click(() => { reset(); });
 
             table.bootstrapTable({});
             reload();
diff --git a/src/main/resources/html/loot.html b/src/main/resources/html/loot.html
index b84ea0b..cbe0fd7 100644
--- a/src/main/resources/html/loot.html
+++ b/src/main/resources/html/loot.html
@@ -88,7 +88,7 @@
 
     <div id="add-loot-dialog" tabindex="-1" role="dialog" class="modal fade">
         <div class="modal-dialog modal-lg" role="document">
-            <form class="modal-content" action="javascript:" onsubmit="addLoot()">
+            <form class="modal-content" action="javascript:" onsubmit="addLootModal()">
                 <div class="modal-header">
                     <h4 class="modal-title">add looted piece</h4>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
@@ -132,6 +132,7 @@
                     <table id="stats" class="table table-striped table-hover">
                         <thead class="table-primary">
                         <tr>
+                            <th data-formatter="addLootFormatter"></th>
                             <th data-field="nick">nick</th>
                             <th data-field="job">job</th>
                             <th data-field="isRequired">required</th>
@@ -198,30 +199,40 @@
         const pieceTypeInput = $("#piece-type");
         const playerInput = $("#player");
 
-        function addLoot() {
-            const player = getCurrentOption(playerInput);
+        function addLoot(nick, job) {
             $.ajax({
                 url: `/api/v1/party/${partyId}/loot`,
                 data: JSON.stringify({
                     action: "add",
                     piece: {
                         pieceType: pieceTypeInput.val(),
-                        job: player.dataset.job,
+                        job: job,
                         piece: pieceInput.val(),
                     },
                     playerId: {
                         partyId: partyId,
-                        nick: player.dataset.nick,
-                        job: player.dataset.job,
+                        nick: nick,
+                        job: job,
                     },
                     isFreeLoot: freeLootInput.is(":checked"),
                 }),
                 type: "POST",
                 contentType: "application/json",
-                success: function (_) { reload(); },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                success: _ => {
+                    addLootDialog.modal("hide");
+                    reload();
+                },
+                error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
             });
-            addLootDialog.modal("hide");
+        }
+
+        function addLootFormatter(value, row, index) {
+            return `<button type="button" class="btn btn-primary" onclick="addLoot('${row.nick}', '${row.job}')"><i class="bi bi-plus"></i></button>`;
+        }
+
+        function addLootModal() {
+            const player = getCurrentOption(playerInput);
+            addLoot(player.dataset.nick, player.dataset.job);
             return true; // action expects boolean result
         }
 
@@ -236,9 +247,9 @@
                 url: `/api/v1/party/${partyId}`,
                 type: "GET",
                 dataType: "json",
-                success: function (data) {
-                    const items = data.map(function (player) {
-                        return player.loot.map(function (loot) {
+                success: response => {
+                    const items = response.map(player => {
+                        return player.loot.map(loot => {
                             return {
                                 nick: player.nick,
                                 job: player.job,
@@ -249,12 +260,12 @@
                             };
                         });
                     });
-                    const payload = items.reduce(function (left, right) { return left.concat(right); }, []);
+                    const payload = items.reduce((left, right) => { return left.concat(right); }, []);
                     table.bootstrapTable("load", payload);
                     table.bootstrapTable("uncheckAll");
                     table.bootstrapTable("hideLoading");
 
-                    const options = data.map(function (player) {
+                    const options = response.map(player => {
                         const option = document.createElement("option");
                         option.innerText = formatPlayerId(player);
                         option.dataset.nick = player.nick;
@@ -263,13 +274,13 @@
                     });
                     playerInput.empty().append(options);
                 },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
             });
         }
 
         function removeLoot() {
             const pieces = table.bootstrapTable("getSelections");
-            pieces.map(function (loot) {
+            pieces.map(loot => {
                 $.ajax({
                     url: `/api/v1/party/${partyId}/loot`,
                     data: JSON.stringify({
@@ -288,8 +299,8 @@
                     }),
                     type: "POST",
                     contentType: "application/json",
-                    success: function (_) { reload(); },
-                    error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                    success: _ => { reload(); },
+                    error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
                 });
             });
         }
@@ -306,8 +317,8 @@
                 type: "PUT",
                 contentType: "application/json",
                 dataType: "json",
-                success: function (data) {
-                    const payload = data.map(function (stat) {
+                success: response => {
+                    const payload = response.map(stat => {
                         return {
                             nick: stat.nick,
                             job: stat.job,
@@ -321,11 +332,11 @@
                     stats.bootstrapTable("uncheckAll");
                     stats.bootstrapTable("hideLoading");
                 },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
             });
         }
 
-        $(function () {
+        $(() => {
             setupFormClear(addLootDialog);
             setupRemoveButton(table, removeButton);
 
diff --git a/src/main/resources/html/party.html b/src/main/resources/html/party.html
index 0c5719f..baf396a 100644
--- a/src/main/resources/html/party.html
+++ b/src/main/resources/html/party.html
@@ -184,8 +184,8 @@
                 }),
                 type: "POST",
                 contentType: "application/json",
-                success: function (_) { reload(); },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                success: _ => { reload(); },
+                error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
             });
             addPlayerDialog.modal("hide");
             return true; // action expects boolean result
@@ -210,18 +210,18 @@
                 url: `/api/v1/party/${partyId}`,
                 type: "GET",
                 dataType: "json",
-                success: function (data) {
-                    table.bootstrapTable("load", data);
+                success: response => {
+                    table.bootstrapTable("load", response);
                     table.bootstrapTable("uncheckAll");
                     table.bootstrapTable("hideLoading");
                 },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
             });
         }
 
         function removePlayers() {
             const players = table.bootstrapTable("getSelections");
-            players.map(function (player) {
+            players.map(player => {
                 $.ajax({
                     url: `/api/v1/party/${partyId}`,
                     data: JSON.stringify({
@@ -234,13 +234,13 @@
                     }),
                     type: "POST",
                     contentType: "application/json",
-                    success: function (_) { reload(); },
-                    error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                    success: _ => { reload(); },
+                    error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
                 });
             });
         }
 
-        $(function () {
+        $(() => {
             setupFormClear(addPlayerDialog);
             setupRemoveButton(table, removeButton);
 
diff --git a/src/main/resources/html/users.html b/src/main/resources/html/users.html
index 2f2c33c..23dc8ff 100644
--- a/src/main/resources/html/users.html
+++ b/src/main/resources/html/users.html
@@ -173,8 +173,8 @@
                 }),
                 type: "POST",
                 contentType: "application/json",
-                success: function (_) { reload(); },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                success: _ => { reload(); },
+                error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
             });
             addUserDialog.modal("hide");
             return true; // action expects boolean result
@@ -191,28 +191,28 @@
                 url: `/api/v1/party/${partyId}/users`,
                 type: "GET",
                 dataType: "json",
-                success: function (data) {
-                    table.bootstrapTable("load", data);
+                success: response => {
+                    table.bootstrapTable("load", response);
                     table.bootstrapTable("uncheckAll");
                     table.bootstrapTable("hideLoading");
                 },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
             });
         }
 
         function removeUsers() {
             const users = table.bootstrapTable("getSelections");
-            users.map(function (user) {
+            users.map(user => {
                 $.ajax({
                     url: `/api/v1/party/${partyId}/users/${user.username}`,
                     type: "DELETE",
-                    success: function (_) { reload(); },
-                    error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
+                    success: _ => { reload(); },
+                    error: (jqXHR, _, errorThrown) => { requestAlert(jqXHR, errorThrown); },
                 });
             });
         }
 
-        $(function () {
+        $(() => {
             setupFormClear(addUserDialog);
             setupRemoveButton(table, removeButton);