From dc8b7dbe7ebcaad98b1bbf5707ec80ab8e2e5303 Mon Sep 17 00:00:00 2001
From: BlasenhauerJ <blasenhauer.jordan.dev@gmail.com>
Date: Tue, 28 Mar 2023 13:28:48 +0200
Subject: [PATCH] fix form input

*exclude form input from being overwrite by setting input logic to keep csrf token and right form input values
*add message on loading screen
*when creating a new service, server_name is empty by default
*when opening modal, show the first setting
---
 src/ui/static/css/dashboard.css |  4 ----
 src/ui/static/js/services.js    | 38 +++++++++++++++++++++++++++++++++
 src/ui/templates/loading.html   | 11 +++++++---
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/ui/static/css/dashboard.css b/src/ui/static/css/dashboard.css
index 263a37118..9d74ec91c 100644
--- a/src/ui/static/css/dashboard.css
+++ b/src/ui/static/css/dashboard.css
@@ -3459,10 +3459,6 @@ h6 {
     right: 1.5rem;
   }
 
-  .xl\:col-span-4 {
-    grid-column: span 4 / span 4;
-  }
-
   .xl\:ml-68 {
     margin-left: 17rem;
   }
diff --git a/src/ui/static/js/services.js b/src/ui/static/js/services.js
index a476dcfe4..4d44ad878 100644
--- a/src/ui/static/js/services.js
+++ b/src/ui/static/js/services.js
@@ -74,6 +74,9 @@ class ServiceModal {
           this.setForm(action, serviceName, this.formNewEdit);
           //set default value with method default
           this.setSettingsDefault();
+          //server name is unset
+          const inpServName = document.querySelector("input#SERVER_NAME");
+          inpServName.value = "";
           //show modal
           this.openModal();
         }
@@ -96,6 +99,17 @@ class ServiceModal {
   setSettingsDefault() {
     const inps = this.modal.querySelectorAll("input");
     inps.forEach((inp) => {
+      //form related values are excludes
+      const inpName = inp.getAttribute("name");
+      if (
+        inpName === "csrf_token" ||
+        inpName === "SERVER_NAME" ||
+        inpName === "OLD_SERVER_NAME" ||
+        inpName === "operation"
+      )
+        return;
+
+      //for all other settings values
       const defaultMethod = "default";
       const defaultVal = inp.getAttribute("default-value") || "";
 
@@ -226,6 +240,16 @@ class ServiceModal {
         const inps = this.modal.querySelectorAll(`[name='${key}']`);
 
         inps.forEach((inp) => {
+          //form related values are excludes
+          const inpName = inp.getAttribute("name");
+          if (
+            inpName === "csrf_token" ||
+            inpName === "SERVER_NAME" ||
+            inpName === "OLD_SERVER_NAME" ||
+            inpName === "operation"
+          )
+            return;
+
           //SET DISABLED / ENABLED
           //for regular input
           if (
@@ -282,6 +306,9 @@ class ServiceModal {
   }
 
   openModal() {
+    //switch to first setting
+    document.querySelector("button[tab-handler]").click();
+    //show modal el
     this.modal.classList.add("flex");
     this.modal.classList.remove("hidden");
   }
@@ -595,6 +622,17 @@ class Multiple {
     try {
       const inps = settingContainer.querySelectorAll("input");
       inps.forEach((inp) => {
+        //form related values are excludes
+        const inpName = inp.getAttribute("name");
+        if (
+          inpName === "csrf_token" ||
+          inpName === "SERVER_NAME" ||
+          inpName === "OLD_SERVER_NAME" ||
+          inpName === "operation"
+        )
+          return;
+
+        //for settings input
         if (inp.getAttribute("type") === "checkbox") {
           inp.checked = value === "yes" ? true : false;
           if (inp.hasAttribute("disabled")) {
diff --git a/src/ui/templates/loading.html b/src/ui/templates/loading.html
index eb90945aa..47d9ec511 100644
--- a/src/ui/templates/loading.html
+++ b/src/ui/templates/loading.html
@@ -22,9 +22,14 @@
           alt="main logo"
         />
         {%if message %}
-        <h1 class="text-center absolute mt-6 font-bold text-white text-2xl">
-          {%endif%}
-        </h1>
+        <div class="w-full flex justify-center">
+          <h1
+            class="text-center absolute mt-6 font-bold text-white text-2xl tracking-wide"
+          >
+            {{ message }}
+          </h1>
+        </div>
+        {%endif%}
       </div>
     </div>
   </body>