Merge branch 'master' into permalinks

Author: MarkRobbo

README.md

@@ -2,7 +2,7 @@
 
 This is a work-in-progress [Spring Boot](http://projects.spring.io/spring-boot/) MVC application which fetches [Common Workflow Language](http://www.commonwl.org/) files from a Github repository and creates a page for it detailing the main workflow and its inputs, outputs and steps.
 
-[![Build Status](https://travis-ci.org/common-workflow-language/cwlviewer.svg?branch=master)](https://travis-ci.org/common-workflow-language/cwlviewer) [![Gitter](https://img.shields.io/gitter/room/gitterHQ/gitter.svg)](https://gitter.im/common-workflow-language/common-workflow-language?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.org/common-workflow-language/cwlviewer.svg?branch=master)](https://travis-ci.org/common-workflow-language/cwlviewer) [![Gitter](https://img.shields.io/gitter/room/gitterHQ/gitter.svg)](https://gitter.im/common-workflow-language/common-workflow-language?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![](https://images.microbadger.com/badges/image/commonworkflowlanguage/cwlviewer.svg)](https://microbadger.com/images/commonworkflowlanguage/cwlviewer "Get your own image badge on microbadger.com") [![Docker image commonworkflowlanguage/cwlviewer](https://images.microbadger.com/badges/version/commonworkflowlanguage/cwlviewer.svg)](https://hub.docker.com/r/commonworkflowlanguage/cwlviewer/ "Get your own version badge on microbadger.com")
 
 
 
@@ -36,13 +36,18 @@ If you change the source code, re-build with `docker-compose build`.
 
 See the [docker-compose.yml](docker-compose.yml) file for details.
 
-If you don't want to use Docker Compose, you can do the equivalent manually with `docker`:
+If you don't want to use Docker Compose, you can do the equivalent manually with `docker`
+and the [commonworkflowlanguage/cwlviewer](https://hub.docker.com/r/commonworkflowlanguage/cwlviewer/builds/) docker image.
 
-    docker build -t cwlviewer .
     docker run --name cwlviewer-mongo -p 27017:27017 -d mongo
-    docker run --name cwlviewer -p 8080:8080 --link cwlviewer-mongo:mongo -d cwlviewer
+    docker run --name cwlviewer -p 8080:8080 --link cwlviewer-mongo:mongo -d commonworkflowlanguage/cwlviewer
     docker logs -f cwlviewer
 
+If you have modified the source code, then you may want to build the docker image locally first:
+
+    docker build -t commonworkflowlanguage/cwlviewer .
+
+
 ## Requirement: MongoDB
 
 You will need to have [MongoDB](https://www.mongodb.com/) running,

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

@@ -48,7 +48,7 @@ public class Workflow {
     // Metadata
     @Indexed(unique = true)
     private GithubDetails retrievedFrom;
-    @DateTimeFormat(pattern="MMM d yyyy 'at' hh:mm z")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss z")
     private Date retrievedOn;
 
     // A String which represents the path to a RO bundle

src/main/resources/static/css/main.css

@@ -21,6 +21,10 @@ body {
     padding-top: 61px;
 }
 
+.hide {
+    display: none;
+}
+
 :target {
     padding-top: 61px;
     margin-top: -61px;

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

@@ -110,4 +110,36 @@ require(['jquery', 'bootstrap.modal', 'renderer'],
             // Stop default button action
             event.preventDefault();
         });
-    });
+    });
+
+/**
+ * Code for including the link to the Research Object Bundle download
+ * without refresh once generated
+ */
+require(['jquery'],
+    function ($) {
+        // AJAX function to add download link to page if generated
+        function getDownloadLink() {
+            $.ajax({
+                type: 'HEAD',
+                url: $('#download').attr('href'),
+                dataType: "json",
+                success: function (data) {
+                    $("#generating").addClass("hide");
+                    $("#generated").removeClass("hide");
+                },
+                error: function () {
+                    // Retry in 5 seconds if still not generated
+                    setTimeout(function () {
+                        getDownloadLink();
+                    }, 5000)
+                }
+            });
+        }
+
+        // If ajaxRequired exists on the page the RO bundle link is not generated
+        // at time of page load
+        if ($("#ajaxRequired").length) {
+            getDownloadLink();
+        }
+    });

src/main/resources/templates/workflow.html

@@ -105,9 +105,10 @@ <h2>Workflow: <span th:text="${workflow.label}">Workflow Name</span></h2>
                     <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/' + ${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>
+                <span th:if="${workflow.roBundle == null}" id="ajaxRequired"></span>
+                <span th:class="${workflow.roBundle != null} ? hide : ''" id="generating"> - Generating download link <img alt="loading" src="/img/loading.svg" width="20" height="20" /></span>
+                <span th:class="${workflow.roBundle == null} ? hide : ''" id="generated">
+                    - <a th:href="@{'/workflows/' + ${workflow.id} + '/download'}" id="download" href="#" download="bundle.zip">Download as Research Object Bundle</a>
                     <a href="http://www.researchobject.org/" rel="noopener" target="_blank">[?]</a>
                 </span>
             </p>
@@ -173,6 +174,6 @@ <h2>Outputs</h2>
 
 <div th:replace="fragments/footer :: copy"></div>
 
-<script src="/bower_components/requirejs/require.js" data-main="/js/workflow.js"></script>
+<script src="/bower_components/requirejs/require.js" data-main="/js/main.js"></script>
 </body>
 </html>