Merge pull request #77 from common-workflow-language/hotfix-missing-robundle

Regeneration of deleted RO bundles

Author: MarkRobbo

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

@@ -30,6 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -188,8 +189,8 @@ private void addFiles(List<RepositoryContents> repoContents, Path path) throws I
      * @throws IOException Any errors in saving
      */
     public Path saveToFile(Path directory) throws IOException {
-        // Save the Research Object Bundle
-        Path bundleLocation = Files.createTempFile(directory, "bundle", ".zip");
+        String fileName = "bundle-" + java.util.UUID.randomUUID() + ".zip";
+        Path bundleLocation = Files.createFile(directory.resolve(fileName));
         Bundles.closeAndSaveBundle(bundle, bundleLocation);
         return bundleLocation;
     }

src/main/java/org/commonwl/viewer/services/WorkflowService.java

@@ -29,6 +29,7 @@
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -78,9 +79,9 @@ public Workflow newWorkflowFromGithub(GithubDetails githubInfo) {
                 workflowModel.setRetrievedFrom(githubInfo);
                 workflowModel.setLastCommit(latestCommit);
 
-                // Create a new research object bundle from Github details
+                // Create a new research object bundle for the workflow
                 // This is Async so cannot just call constructor, needs intermediate as per Spring framework
-                ROBundleFactory.workflowROFromGithub(githubService, githubInfo, latestCommit);
+                generateROBundle(workflowModel);
 
                 // Return this model to be displayed
                 return workflowModel;
@@ -89,12 +90,24 @@ public Workflow newWorkflowFromGithub(GithubDetails githubInfo) {
                 logger.error("No workflow could be found");
             }
         } catch (Exception ex) {
-            logger.error("Error creating workflow: " + ex.getMessage());
+            logger.error("Error creating workflow", ex);
         }
 
         return null;
     }
 
+    /**
+     * Generates the RO bundle for a Workflow and adds it to the model
+     * @param workflow The workflow model to create a Research Object for
+     */
+    public void generateROBundle(Workflow workflow) {
+        try {
+            ROBundleFactory.workflowROFromGithub(githubService, workflow.getRetrievedFrom(), workflow.getLastCommit());
+        } catch (Exception ex) {
+            logger.error("Error creating RO Bundle", ex);
+        }
+    }
+
     /**
      * Removes a workflow and its research object bundle
      * @param workflow The workflow to be deleted

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

@@ -205,12 +205,18 @@ public FileSystemResource downloadROBundle(@PathVariable("workflowID") String wo
             throw new WorkflowNotFoundException();
         }
 
-        // Set a sensible default file name for the browser
-        response.setHeader("Content-Disposition", "attachment; filename=bundle.zip;");
-
-        // Serve the file from the local filesystem
+        // 404 error with retry if the file on disk does not exist
         File bundleDownload = new File(workflowModel.getRoBundle());
+        if (!bundleDownload.exists()) {
+            // Clear current RO bundle link and create a new one (async)
+            workflowModel.setRoBundle(null);
+            workflowRepository.save(workflowModel);
+            workflowService.generateROBundle(workflowModel);
+            throw new WorkflowNotFoundException();
+        }
+
         logger.info("Serving download for workflow " + workflowID + " [" + bundleDownload.toString() + "]");
+        response.setHeader("Content-Disposition", "attachment; filename=bundle.zip;");
         return new FileSystemResource(bundleDownload);
     }
 

src/main/resources/static/js/workflow.js

@@ -198,11 +198,16 @@ require(['jquery'],
                 type: 'HEAD',
                 url: $('#download').attr('href'),
                 dataType: "json",
-                success: function (data) {
+                success: function () {
+                    // Hide generating, show link
                     $("#generating").addClass("hide");
                     $("#generated").removeClass("hide");
                 },
                 error: function () {
+                    // Show generating, hide link
+                    $("#generated").addClass("hide");
+                    $("#generating").removeClass("hide");
+
                     // Retry in 5 seconds if still not generated
                     setTimeout(function () {
                         getDownloadLink();
@@ -211,9 +216,5 @@ require(['jquery'],
             });
         }
 
-        // If ajaxRequired exists on the page the RO bundle link is not generated
-        // at time of page load
-        if ($("#ajaxRequired").length) {
-            getDownloadLink();
-        }
+        getDownloadLink();
     });