Fix behaviour with single workflow in a packed file

Author: MarkRobbo

src/main/java/org/commonwl/view/workflow/WorkflowController.java

@@ -467,7 +467,9 @@ private ModelAndView getWorkflow(GitDetails gitDetails, RedirectAttributes redir
             queued = workflowService.getQueuedWorkflow(gitDetails);
             if (queued == null) {
                 // Validation
-                WorkflowForm workflowForm = new WorkflowForm(gitDetails.getUrl(), gitDetails.getBranch(), gitDetails.getPath());
+                String packedPart = (gitDetails.getPackedId() == null) ? "" : "#" + gitDetails.getPackedId();
+                WorkflowForm workflowForm = new WorkflowForm(gitDetails.getUrl(), gitDetails.getBranch(),
+                        gitDetails.getPath() + packedPart);
                 BeanPropertyBindingResult errors = new BeanPropertyBindingResult(workflowForm, "errors");
                 workflowFormValidator.validateAndParse(workflowForm, errors);
                 if (!errors.hasErrors()) {
@@ -476,6 +478,10 @@ private ModelAndView getWorkflow(GitDetails gitDetails, RedirectAttributes redir
                             queued = workflowService.createQueuedWorkflow(gitDetails);
                             if (queued.getWorkflowList() != null) {
                                 // Packed workflow listing
+                                if (queued.getWorkflowList().size() == 1) {
+                                    gitDetails.setPackedId(queued.getWorkflowList().get(0).getFileName());
+                                    return new ModelAndView("redirect:" + gitDetails.getInternalUrl());
+                                }
                                 return new ModelAndView("selectworkflow", "workflowOverviews", queued.getWorkflowList())
                                         .addObject("gitDetails", gitDetails);
                             }

src/main/java/org/commonwl/view/workflow/WorkflowService.java

@@ -309,17 +309,25 @@ public QueuedWorkflow createQueuedWorkflow(GitDetails gitInfo)
             File workflowFile = new File(pathToWorkflowFile.toString());
 
             // Handling of packed workflows
-            String packedWorkflowId = null;
-            if (cwlService.isPacked(workflowFile)) {
-                List<WorkflowOverview> overviews = cwlService.getWorkflowOverviewsFromPacked(workflowFile);
-                if (overviews.size() == 0) {
-                    throw new IOException("No workflow was found within the packed CWL file");
-                } else {
-                    // Dummy queued workflow object to return the list
-                    QueuedWorkflow overviewList = new QueuedWorkflow();
-                    overviewList.setWorkflowList(overviews);
-                    return overviewList;
+            String packedWorkflowId = gitInfo.getPackedId();
+            if (packedWorkflowId == null) {
+                if (cwlService.isPacked(workflowFile)) {
+                    List<WorkflowOverview> overviews = cwlService.getWorkflowOverviewsFromPacked(workflowFile);
+                    if (overviews.size() == 0) {
+                        throw new IOException("No workflow was found within the packed CWL file");
+                    } else {
+                        // Dummy queued workflow object to return the list
+                        QueuedWorkflow overviewList = new QueuedWorkflow();
+                        overviewList.setWorkflowList(overviews);
+                        return overviewList;
+                    }
                 }
+            } else {
+                // Packed ID specified but was not found
+                if (!cwlService.isPacked(workflowFile)) {
+                    throw new WorkflowNotFoundException();
+                }
+
             }
 
             Workflow basicModel = cwlService.parseWorkflowNative(workflowFile, packedWorkflowId);