WIP Made button load and send ajax request

Author: fabapp2

applications/rest-service/src/main/java/org/springframework/sbm/ReportController.java

@@ -7,14 +7,12 @@
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.context.ProjectContextHolder;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @Controller
+@CrossOrigin
 class ReportController{
 
     @Autowired
@@ -48,4 +46,21 @@ public String applyRecipes(@RequestParam("recipeNames[]") String[] recipeNames)
         }
         return reportHolder.getReport();
     }
+
+    @PostMapping(path = "/spring-boot-upgrade")
+    @ResponseBody
+    public void applyRecipes2(@RequestBody String recipeNames) {
+        /*
+        ProjectContext context = contextHolder.getProjectContext();
+        List.of(recipeNames).forEach(recipeName -> applyCommand.execute(context, recipeName));
+        applyCommand.execute(context, "boot-2.7-3.0-upgrade-report2");
+
+         */
+        try {
+            Thread.sleep(5000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
 }

applications/rest-service/src/main/java/org/springframework/sbm/SpringBootUpgradeReportApp.java

@@ -17,6 +17,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * @author Fabian Krüger
@@ -31,4 +34,14 @@ public static void main(String[] args) {
             exception.printStackTrace();
         }
     }
+
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+        return new WebMvcConfigurer() {
+            @Override
+            public void addCorsMappings(CorsRegistry registry) {
+                registry.addMapping("/**").allowedMethods("*");
+            }
+        };
+    }
 }

applications/rest-service/src/main/java/org/springframework/sbm/SpringBootUpgradeReportStringRenderer.java

@@ -35,17 +35,18 @@ public void processReport(String renderedReport) {
         String closingHeadTag = "</head>";
 
         String additionalHeader =
-                "<link rel=\"stylesheet\" href=\"css/button.css\">\n" +
-                "<script src=\"js/setup2.js\"></script>\n" +
-                "<script src=\"js/site2.js\"></script>\n" +
-                "<script src=\"js/java.min.js\"></script>\n";
-        htmlReport = htmlReport.replace(closingHeadTag, additionalHeader + closingHeadTag);
+//                "<link rel=\"stylesheet\" href=\"css/button.css\">\n" +
+//                "<script src=\"js/setup2.js\"></script>\n" +
+//                "<script src=\"js/site2.js\"></script>\n" +
+
+//                "<script src=\"js/java.min.js\"></script>\n";
+//        htmlReport = htmlReport.replace(closingHeadTag, additionalHeader + closingHeadTag);
 
         htmlReport = htmlReport.replace("</body>", """
                 <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-Zenh87qX5JnK2Jl0vWa8Ck2rdkQ2Bzep5IDxbcnCeuOxjzrPF/et3URy9Bv1WTRi" crossorigin="anonymous">
                 <script src="https://code.jquery.com/jquery-3.6.1.min.js" integrity="sha256-o88AwQnZB+VDvE9tvIXrMQaPlFFSUTR+nldQm1LuPXQ=" crossorigin="anonymous"></script>
                 <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-OERcA2EqjJCMA+/3y+gxIOqMEjwtxJY7qPCqsdltbNJuaOe923+mo//f6V8Qbsw3" crossorigin="anonymous"></script>
-                <script src="/js/recipe.js"></script>
+                <script src="js/recipe.js"></script>
                 </body>
                 """);
         reportHolder.setReport(htmlReport);

applications/rest-service/src/main/resources/static/js/recipe.js

@@ -12,6 +12,8 @@ class State {
 
     startedRunningRecipe() {
         this.runningARecipe = true;
+        // disable all other buttons
+        console.log($("button"))
         this.notifyListeners();
     }
 
@@ -42,7 +44,7 @@ function runRecipe(element) {
 
     $.ajax({
         type: "POST",
-        url: "http://localhost:8080/apply-recipe",
+        url: "http://localhost:8080/spring-boot-upgrade",
         data: JSON.stringify({
             recipe: $(element).attr('recipe')
         }),
@@ -55,21 +57,48 @@ function runRecipe(element) {
         });
 }
 
-function runAllRecipe() {
+/**
+ *
+ */
+function applyRecipes(btn) {
 
+    console.log("applying recipes: " + $(btn).attr('recipe'));
     if (state.isRunningARecipe()) {
         return;
     }
-    state.startedRunningRecipe();
+
+    console.log(this)
 
     $.ajax({
         type: "POST",
-        url: "http://localhost:8080/apply-all-recipe",
+        url: "http://localhost:8080/spring-boot-upgrade",
+        dataType: "json",
+        contentType: 'application/json',
+        data: JSON.stringify({
+            recipes: $(btn).attr('recipe')
+        }),
+        beforeSend: function() {
+            console.log("before")
+            state.startedRunningRecipe();
+        },
+        success: function() {
+            // remove this section from the report
+            jQuery(this).closest('h3').next().remove();
+
+        },
+        error: function() {
+            // mark red flashlights / play alarm sound
+        }
     }).always(function () {
+        console.log("finished recipes")
         state.completedRunningRecipe();
     });
 }
 
+$( document ).ajaxStart(function() {
+    $( ".log" ).text( "Triggered ajaxStart handler." );
+});
+
 
 state.registerListeners(function () {
 
@@ -92,17 +121,18 @@ function changeAllRecipesButtonState() {
 
 const runAllRecipeInLoadingState = '<button type="button" class="btn btn-primary" id="recipeButton" ' +
     'name="apply-all-recipes-button" action="apply-all-recipes" ' +
-    'onclick="runAllRecipe()" disabled>' +
+    'onclick="applyRecipes()" disabled>' +
     'Run All Recipes' +
     '  <span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>\n' +
     '  <span class="visually-hidden">Loading...</span>' +
     '</button>';
 
 const runAllRecipeInNormalState = '<button type="button" class="btn btn-primary" id="recipeButton" ' +
     'name="apply-all-recipes-button" action="apply-all-recipes" ' +
-    'onclick="runAllRecipe()">' +
+    'onclick="applyRecipes()">' +
     'Run All Recipes' +
     '</button>';
+
 $(document).ready(function () {
     $(".run-all-recipe").html(runAllRecipeInNormalState);
 
@@ -114,7 +144,7 @@ const runRecipeNormalState = function () {
         const div = $(this);
         div.html('<button type="button" class="btn btn-primary" id="recipeButton" ' +
             'name="apply-recipe-button" recipe="' + div.attr('recipe') + '" ' +
-            'onclick="runRecipe(this)">' +
+            'onclick="applyRecipes(this)">' +
             'Run Recipe' +
             '</button>');
     });

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/report/SpringBootUpgradeReportSection.java

@@ -254,12 +254,25 @@ private void renderRemediationPossibility(StringBuilder sb, RemediationPossibili
 
         if(p.getRecipe() != null) {
             sb.append(ls).append(ls);
-            String buttonCode = """
-                    ++++
+            /*
+            <!--
                     <form name="apply-<RECIPE>-form" action="http://localhost:8080/spring-boot-upgrade" method="post">
-                    <input type="hidden" name="recipeNames[0]" value="<RECIPE>" />	
+                    <input type="hidden" name="recipeNames[0]" value="<RECIPE>" />
                     <button name="<RECIPE>" type="submit"  class="recipeButton">Run Recipe</button>
+
                     </form>
+                    -->
+
+                    <button type="button" class="btn btn-primary recipeButton" onclick="applyRecipes('<RECIPE>')">
+                        Run All Recipes
+                        <span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
+                        <span class="visually-hidden">Loading...</span>
+                    </button>
+            */
+            String buttonCode = """
+                    ++++
+                    <div class="run-a-recipe" recipe="<RECIPE>">
+                    </div>                
                     ++++
                     """;
             buttonCode = buttonCode.replace("<RECIPE>", p.getRecipe());