Redirect to index with form filled if workflow not yet generated for URL

Author: Mark Robinson

src/main/java/org/commonwl/viewer/domain/WorkflowForm.java

@@ -25,6 +25,12 @@
  */
 public class WorkflowForm {
 
+    public WorkflowForm() {}
+
+    public WorkflowForm(String githubURL) {
+        this.githubURL = githubURL;
+    }
+
     private String githubURL;
 
     public String getGithubURL() {

src/main/java/org/commonwl/viewer/web/PageController.java

@@ -23,6 +23,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 public class PageController {
@@ -33,8 +34,8 @@ public class PageController {
      * @return The view for this page
      */
     @GetMapping("/")
-    public String homePage(Model model) {
-        model.addAttribute("workflowForm", new WorkflowForm());
+    public String homePage(Model model, @RequestParam(value = "url", required = false) String defaultURL) {
+        model.addAttribute("workflowForm", new WorkflowForm(defaultURL));
         return "index";
     }
 

src/main/java/org/commonwl/viewer/web/WorkflowController.java

@@ -154,9 +154,10 @@ public ModelAndView getWorkflowByGithubDetails(@PathVariable("owner") String own
         // Get workflow from database
         Workflow workflowModel = workflowRepository.findByRetrievedFrom(githubDetails);
 
-        // 404 error if workflow does not exist
+        // Redirect to index with form autofilled if workflow does not already exist
         if (workflowModel == null) {
-            throw new WorkflowNotFoundException();
+            return new ModelAndView("redirect:/?url=https://github.com/" +
+                    owner + "/" + repoName + "/tree/" + branch + "/" + path);
         }
 
         // Display this model along with the view

src/main/resources/templates/index.html

@@ -50,7 +50,7 @@ <h2>Workflow from Github URL</h2>
                             <strong>Error:</strong> <span th:errors="*{githubURL}">Error message here</span>
                         </div>
                         <div class="input-group">
-                            <input type="text" class="form-control" placeholder="Github URL" id="githubURL" name="githubURL" th:field="*{githubURL}" />
+                            <input type="text" class="form-control" placeholder="Github URL" id="githubURL" name="githubURL" th:field="*{githubURL}" th:value="${formURL}" />
                             <span class="input-group-btn">
                                 <button class="btn btn-primary" type="submit">Parse Workflow</button>
                             </span>