Use github permalinks for redirects and links

Author: Mark Robinson

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

@@ -82,36 +82,30 @@ public ModelAndView newWorkflowFromGithubURL(@Valid WorkflowForm workflowForm, B
             // Go back to index if there are validation errors
             return new ModelAndView("index");
         } else {
-            // The ID of the workflow to be redirected to
-            String workflowID;
-
             // Check database for existing workflow
-            Workflow existingWorkflow = workflowRepository.findByRetrievedFrom(githubInfo);
-            if (existingWorkflow != null) {
+            Workflow workflow = workflowRepository.findByRetrievedFrom(githubInfo);
+            if (workflow != null) {
                 logger.info("Fetching existing workflow from DB");
-
-                // Get the ID from the existing workflow
-                workflowID = existingWorkflow.getID();
             } else {
                 // New workflow from Github URL
-                Workflow newWorkflow = workflowFactory.workflowFromGithub(githubInfo);
+                workflow = workflowFactory.workflowFromGithub(githubInfo);
 
                 // Runtime error
-                if (newWorkflow == null) {
+                if (workflow == null) {
                     bindingResult.rejectValue("githubURL", "githubURL.parsingError");
                     return new ModelAndView("index");
                 }
 
                 // Save to the MongoDB database
                 logger.info("Adding new workflow to DB");
-                workflowRepository.save(newWorkflow);
-
-                // Get the ID from the new workflow
-                workflowID = newWorkflow.getID();
+                workflowRepository.save(workflow);
             }
 
             // Redirect to the workflow
-            return new ModelAndView("redirect:/workflows/" + workflowID);
+            GithubDetails githubDetails = workflow.getRetrievedFrom();
+            return new ModelAndView("redirect:/workflows/github.com/" + githubDetails.getOwner()
+                    + "/" + githubDetails.getRepoName() + "/tree/" + githubDetails.getBranch()
+                    + "/" + githubDetails.getPath());
         }
     }
 

src/main/resources/templates/workflow.html

@@ -98,14 +98,14 @@ <h4 class="modal-title" id="dotGraphLabel">Workflow DOT Graph</h4>
 
 <div class="container">
     <div class="row">
-        <div class="col-md-12" role="main" id="main">
+        <div class="col-md-12" role="main" id="main" th:with="workflowURL=@{'github.com/' + ${workflow.retrievedFrom.owner} + '/' + ${workflow.retrievedFrom.repoName} + '/tree/' + ${workflow.retrievedFrom.branch} + '/' + ${workflow.retrievedFrom.path}}">
             <h2>Workflow: <span th:text="${workflow.label}">Workflow Name</span></h2>
             <p>
-                <a th:href="@{'https://github.com/' + ${workflow.retrievedFrom.owner} + '/' + ${workflow.retrievedFrom.repoName} + '/tree/' + ${workflow.retrievedFrom.branch} + '/' + ${workflow.retrievedFrom.path}}" href="#" rel="noopener" target="_blank">
+                <a th:href="@{'https://' + ${workflowURL}}" href="#" rel="noopener" target="_blank">
                     <img id="githubLogo" src="../static/img/GitHub-Mark-32px.png" th:src="@{/img/GitHub-Mark-32px.png}" width="24" height="24" />
                 </a>
                 <i>Fetched <span th:text="${{workflow.retrievedOn}}">01/12/16 at 21:00</span></i>
-                <span th:if="${workflow.roBundle == null}"> - Generating download link&hellip; [<a th:href="@{'/workflows/' + ${workflow.id}}" href="#">Refresh</a>]</span>
+                <span th:if="${workflow.roBundle == null}"> - Generating download link&hellip; [<a th:href="@{'/workflows/' + ${workflowURL}}" href="#">Refresh</a>]</span>
                 <span th:if="${workflow.roBundle != null}">
                     - <a th:href="@{'/workflows/' + ${workflow.id} + '/download'}" href="#" download="bundle.zip">Download as Research Object Bundle</a>
                     <a href="http://www.researchobject.org/" rel="noopener" target="_blank">[?]</a>