Revize 99139959

#27 Configuration menu item not shown if AP list is empty

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

@@ -78 +78 @@
      */
     @GetMapping("/projects/{id}")
     public String getProjectById(@PathVariable Long id, Model model) {
+        model.addAttribute("query", new Query(projectService.getAllProjects(), antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns())));
         model.addAttribute("project", projectService.getProjectById(id));
         return "project";
     }
@@ -87 +88 @@
      * @return list of AP
      */
     @GetMapping("/anti-patterns")
-    public @ResponseBody List<AntiPattern> getAllAntiPatterns() {
+    public @ResponseBody List<AntiPattern> getAllAntiPatterns(Model model) {
+        model.addAttribute("query", new Query(projectService.getAllProjects(), antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns())));
         return antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns());
     }
 
@@ -101 +103 @@
     @GetMapping("/anti-patterns/{id}")
     public String getAntiPatternById(@PathVariable Long id, Model model, HttpSession session) {
         String currentConfigurationName = configurationGetFromSession(session);
+        model.addAttribute("query", new Query(projectService.getAllProjects(), antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns())));
         model.addAttribute("antiPattern", antiPatternService.getAntiPatternById(id).getAntiPatternModel());
         model.addAttribute("description", antiPatternService.getDescriptionFromCatalogue(id));
         model.addAttribute("operationalizationText", antiPatternService.getOperationalizationText(antiPatternService.getAntiPatternById(id).getAntiPatternModel().getName()));
@@ -164 +167 @@
         }
         antiPatternService.setConfigurationChanged(false);
 
+        model.addAttribute("query", new Query(projectService.getAllProjects(), antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns())));
         model.addAttribute("queryResults", antiPatternService.getResults());
         model.addAttribute("recalculationTime", DateTimeFormatter.ofPattern("HH:mm:ss").format(LocalTime.now()));
 
@@ -176 +180 @@
      * @return html file name for thymeleaf template
      */
     @GetMapping("/about")
-    public String about() {return "about";}
+    public String about(Model model) {
+        model.addAttribute("query", new Query(projectService.getAllProjects(), antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns())));
+        return "about";
+    }
 
     /**
      * Method for getting all configuration from app and set it to the model class.
@@ -186 +193 @@
      */
     @GetMapping("/configuration")
     public String configuration(Model model, HttpSession session) {
+        model.addAttribute("query", new Query(projectService.getAllProjects(), antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns())));
         model.addAttribute("antiPatterns", antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns()));
 
         String currentConfigurationName = configurationGetFromSession(session);
@@ -381 +389 @@
      * @return html file name for thymeleaf template
      */
     @GetMapping("/login")
-    public String login(){
+    public String login(Model model){
+        model.addAttribute("query", new Query(projectService.getAllProjects(), antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns())));
         return "login";
     }
 

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

@@ -9 +9 @@
                 <li class="nav-item active">
                     <a class="nav-link" th:href="@{/}">Detect</a>
                 </li>
-                <li class="nav-item active">
+                <li th:if="${not #lists.isEmpty(query.antiPatterns)}" class="nav-item active">
                     <a class="nav-link" th:href="@{/configuration}">Configuration</a>
                 </li>
                 <li class="nav-item active">