Revize cc904d05

#14 Saving configurations to new files

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

@@ -232 +232 @@
      * @return html file name for thymeleaf template
      */
     @PostMapping(value = "/configuration", params = "configuration-save-button")
-    public String configurationPost(Model model,
+    public String configurationSavePost(Model model,
                                     @RequestParam(value = "thresholdValues", required = false) String[] thresholdValues,
                                     @RequestParam(value = "thresholdNames", required = false) String[] thresholdNames,
                                     @RequestParam(value = "antiPatternNames", required = false) String[] antiPatternNames,
-                                    HttpSession session) {
+                                    HttpSession session, RedirectAttributes redirectAttributes) {
 
         String currentConfigurationName = configurationGetFromSession(session);
 
@@ -245 +245 @@
         List<String> wrongParameters = configurationService.saveNewConfiguration(antiPatterns, currentConfigurationName, antiPatternNames, thresholdNames, thresholdValues);
 
         if (wrongParameters.isEmpty()) {
-            model.addAttribute("successMessage", "All configuration values has been successfully saved.");
+            model.addAttribute("successMessage", "All configuration values have been successfully saved.");
         } else {
             model.addAttribute("errorMessage", "One or more configuration values are not in correct format, see messages below.");
             antiPatternService.setErrorMessages(antiPatterns, wrongParameters);
@@ -256 +256 @@
         return "configuration";
     }
 
+    /**
+     * Method of storing new configurations for individual AP.
+     *
+     * @param model object for passing data to the UI
+     * @param thresholdValues changed configuration values
+     * @param thresholdNames changed configuration names
+     * @return html file name for thymeleaf template
+     */
+    @PostMapping(value = "/configuration", params = "configuration-save-as-button")
+    public String configurationSaveAsPost(Model model,
+                                    @RequestParam(value = "thresholdValues", required = false) String[] thresholdValues,
+                                    @RequestParam(value = "thresholdNames", required = false) String[] thresholdNames,
+                                    @RequestParam(value = "antiPatternNames", required = false) String[] antiPatternNames,
+                                    @RequestParam(value = "configuration-save-as-input", required = false) String newConfigName,
+                                    HttpSession session, RedirectAttributes redirectAttributes) {
+
+        List<AntiPattern> antiPatterns = antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns());
+
+        List<String> allConfigurationNames = configurationService.getAllConfigurationNames();
+        if (newConfigName == null || newConfigName.length() == 0 ||  allConfigurationNames.contains(newConfigName)) {
+            model.addAttribute("antiPatterns", antiPatterns);
+            model.addAttribute("errorMessage", "Configuration name is not possible.");
+            return "configuration";
+        }
+
+        List<String> wrongParameters = configurationService.saveNewConfiguration(antiPatterns, newConfigName, antiPatternNames, thresholdNames, thresholdValues);
+
+        if (wrongParameters.isEmpty()) {
+            model.addAttribute("successMessage", "New configuration has been successfully saved.");
+        } else {
+            model.addAttribute("errorMessage", "One or more configuration values are not in correct format, see messages below.");
+            antiPatternService.setErrorMessages(antiPatterns, wrongParameters);
+        }
+
+        model.addAttribute("antiPatterns", antiPatterns);
+        session.setAttribute("configuration", newConfigName);
+        model.addAttribute("configurations", configurationService.getConfigurationByName(newConfigName));
+
+        model.addAttribute("configurationList", configurationsGetList(session));
+        model.addAttribute("selectedConfiguration", session.getAttribute("configuration"));
+
+        return "configuration";
+    }
+
     /**
      * Method for storing configuration values ​​for the respective AP.
      *

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/repository/ConfigurationRepository.java

@@ -13 +13 @@
 import java.io.*;
 import java.net.URL;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Component
@@ -140 +138 @@
         root.set("configuration", array);
 
         try {
-            URL url = servletContext.getResource(CONFIGURATION_DIR + configurationName + ".json");
-            JsonParser.getObjectWriter().writeValue(Paths.get(url.toURI()).toFile(), root);
+            String uri = servletContext.getResource(CONFIGURATION_DIR).toURI() + configurationName + ".json";
+
+            JsonParser.getObjectWriter().writeValue(Paths.get(new URL(uri).toURI()).toFile(), root);
         } catch (Exception e) {
             LOGGER.error("Cannot write configuration to the file");
         }

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

@@ -87 +87 @@
             </div>
 
             <!-- Submit button to save configuration -->
-            <div class="save-configuration-button-container">
+            <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-outline-primary btn-lg custom-button" id="configuration-save-as-button" name="configuration-save-as-button" hidden>Save as</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">
+                    <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>
+                    </div>
+                </div>
             </div>
             <!-- ./Submit button to save configuration -->
         </form>

src/main/webapp/resources/css/style.css

@@ -142 +142 @@
 }
 
 .save-configuration-button-container {
-    width: 30%;
-    margin: 60px auto;
-    display: flex;
-    justify-content: space-between;
+    margin: 40px auto;
 }
 
 /* ==========================================================================

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

@@ -33 +33 @@
 function showSaveAsButton(){
     document.getElementById("configuration-save-button").hidden = true;
     document.getElementById("configuration-save-as-button").hidden = false;
+    document.getElementById("configuration-save-as-input").hidden = false;
 }
 
 /**
@@ -41 +42 @@
 function showBothSaveButtons(){
     document.getElementById("configuration-save-button").hidden = false;
     document.getElementById("configuration-save-as-button").hidden = false;
+    document.getElementById("configuration-save-as-input").hidden = false;
 }
 
 /**
@@ -49 +51 @@
 function hideBothSaveButtons(){
     document.getElementById("configuration-save-button").hidden = true;
     document.getElementById("configuration-save-as-button").hidden = true;
+    document.getElementById("configuration-save-as-input").hidden = true;
 }