Revize 1e4fafce

Minor changes

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/controller/AppController.java

@@ -349 +349 @@
      * @throws Exception If image is not in the folder
      */
     @GetMapping("/operationalizations/images/{imageName}")
-    public @ResponseBody byte[] imageTestGet(@PathVariable String imageName) throws Exception {
+    public @ResponseBody byte[] imageGet(@PathVariable String imageName) throws Exception {
         File f = new File(new FileSystemResource("").getFile().getAbsolutePath() + "\\src\\main\\webapp\\operationalizations\\images\\" + imageName);
         return Files.readAllBytes(f.toPath());
     }

src/main/webapp/WEB-INF/templates/configuration.html

@@ -34 +34 @@
     <h1>Configuration</h1>
 
         <!-- Form for configuration values -->
-        <form action="#" th:action="@{/configuration}" th:object="${antiPatterns}" method="post">
+        <form action="#" th:action="@{/configuration}" th:object="${antiPatterns}" method="post" id="configuration-form">
             <div th:each="antiPattern : ${antiPatterns}">
                 <h3 th:text="${antiPattern.printName}"></h3>
                 <div th:each="threshold : ${antiPattern.thresholds}">
@@ -88 +88 @@
 
             <!-- Submit button to save configuration -->
             <div class="text-center save-configuration-button-container">
-                <button type="submit" class="btn btn-primary btn-lg custom-button" id="configuration-save-button" name="configuration-save-button" hidden>Save</button>
+                <button type="submit" class="btn btn-primary btn-lg custom-button" id="configuration-save-button" name="configuration-save-button" disabled hidden>Save</button>
                 <div class="input-group w-25 mx-auto" style="margin: 15px">
-                    <input type="text" class="form-control" placeholder="New configuration name" id="configuration-save-as-input" name="configuration-save-as-input">
+                    <input type="text" class="form-control" placeholder="New configuration name" id="configuration-save-as-input" name="configuration-save-as-input" required>
                     <div class="input-group-append">
-                        <button type="submit" class="btn btn-outline-primary" id="configuration-save-as-button" name="configuration-save-as-button" hidden>Save as</button>
+                        <button type="submit" class="btn btn-outline-primary" id="configuration-save-as-button" name="configuration-save-as-button" disabled hidden>Save as</button>
                     </div>
                 </div>
             </div>

src/main/webapp/WEB-INF/templates/fragments/navbar.html

@@ -7 +7 @@
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav mr-auto">
                 <li class="nav-item active">
-                    <a class="nav-link" th:href="@{/}">Home</a>
+                    <a class="nav-link" th:href="@{/}">Analyze</a>
                 </li>
                 <li class="nav-item active">
                     <a class="nav-link" th:href="@{/configuration}">Configuration</a>
@@ -22 +22 @@
                 </li>
                 <li class="nav-item active" id="current-configuration-box">
                     <form id="configuration-form" th:action="@{/setSelectedConfiguration}" method="post">
-                        <select class="form-control" id="current-configuration-select" name="current-configuration-select" onchange="this.form.submit()">
+                        <select class="form-control" id="current-configuration-select" name="current-configuration-select" onchange="this.form.submit()" disabled>
                             <option th:each="configuration : ${configurationList}" th:value = ${configuration} th:text = ${configuration} th:selected="${#strings.equals(configuration, selectedConfiguration)}"></option>
                         </select>
                     </form>

src/main/webapp/resources/js/config-edit.js

@@ -31 +31 @@
  * Show only 'Save as' button
  */
 function showSaveAsButton(){
-    if(document.getElementById("configuration-save-button") != null)
+    if(document.getElementById("configuration-save-button") != null) {
         document.getElementById("configuration-save-button").hidden = true;
-
-    if(document.getElementById("configuration-save-button-individual") != null)
+        document.getElementById("configuration-save-button").disabled = true;
+    }
+    if(document.getElementById("configuration-save-button-individual") != null) {
         document.getElementById("configuration-save-button-individual").hidden = true;
-
-    if(document.getElementById("configuration-save-as-button") != null)
+        document.getElementById("configuration-save-button-individual").disabled = true;
+    }
+    if(document.getElementById("configuration-save-as-button") != null) {
         document.getElementById("configuration-save-as-button").hidden = false;
-
-    if(document.getElementById("configuration-save-as-input") != null)
+        document.getElementById("configuration-save-as-button").disabled = false;
+    }
+    if(document.getElementById("configuration-save-as-input") != null) {
         document.getElementById("configuration-save-as-input").hidden = false;
+        document.getElementById("configuration-save-as-input").disabled = false;
+    }
 }
 
 /**
  * Show both save buttons
  */
 function showBothSaveButtons(){
-    if(document.getElementById("configuration-save-button") != null)
-    document.getElementById("configuration-save-button").hidden = false;
-
-    if(document.getElementById("configuration-save-button-individual") != null)
+    if(document.getElementById("configuration-save-button") != null) {
+        document.getElementById("configuration-save-button").hidden = false;
+        document.getElementById("configuration-save-button").disabled = false;
+    }
+    if(document.getElementById("configuration-save-button-individual") != null) {
         document.getElementById("configuration-save-button-individual").hidden = false;
-
-    if(document.getElementById("configuration-save-as-button") != null)
+        document.getElementById("configuration-save-button-individual").disabled = false;
+    }
+    if(document.getElementById("configuration-save-as-button") != null) {
         document.getElementById("configuration-save-as-button").hidden = false;
-
-    if(document.getElementById("configuration-save-as-input") != null)
+        document.getElementById("configuration-save-as-button").disabled = false;
+    }
+    if(document.getElementById("configuration-save-as-input") != null) {
         document.getElementById("configuration-save-as-input").hidden = false;
+        document.getElementById("configuration-save-as-input").disabled = false;
+    }
 }
 
 /**
  * Hide both save buttons
  */
 function hideBothSaveButtons(){
-    if(document.getElementById("configuration-save-button") != null)
+    if(document.getElementById("configuration-save-button") != null) {
         document.getElementById("configuration-save-button").hidden = true;
-
-    if(document.getElementById("configuration-save-button-individual") != null)
+        document.getElementById("configuration-save-button").disabled = true;
+    }
+    if(document.getElementById("configuration-save-button-individual") != null) {
         document.getElementById("configuration-save-button-individual").hidden = true;
-
-    if(document.getElementById("configuration-save-as-button") != null)
+        document.getElementById("configuration-save-button-individual").disabled = true;
+    }
+    if(document.getElementById("configuration-save-as-button") != null) {
         document.getElementById("configuration-save-as-button").hidden = true;
-
-    if(document.getElementById("configuration-save-as-input") != null)
+        document.getElementById("configuration-save-as-button").disabled = true;
+    }
+    if(document.getElementById("configuration-save-as-input") != null) {
         document.getElementById("configuration-save-as-input").hidden = true;
+        document.getElementById("configuration-save-as-input").disabled = true;
+    }
 }

src/main/webapp/resources/js/editor.js

@@ -122 +122 @@
         return;
     }
     else{
-        alert("Image upload error.");
+        alert("Upload error. Max size of image is 1048576 bytes.");
         document.getElementById('imageInput').files[0] = null;
         return;
     }

src/main/webapp/resources/js/login.js

@@ -26 +26 @@
 function applyUnloggedStyle(){
     document.getElementById("login-button").hidden = false;
     document.getElementById("logout-button").hidden = true;
+    document.getElementById("current-configuration-select").disabled = true;
 }
 
 /**
@@ -36 +37 @@
     document.getElementById("logout-button").hidden = false;
     document.getElementById("user-name-container").innerText = user;
     document.getElementById("user-name-container").hidden = false;
+    document.getElementById("current-configuration-select").disabled = false;
 }