Merge branch 'master' into 75-SwaggerUIForHubAPIs

* master:
  fixed #158 fixed #159

Author: maeisabelle08

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.hub/lib/flow-lib.xqy

@@ -486,9 +486,16 @@ declare function flow:run-flow(
  :)
 declare function flow:make-envelope($map as map:map, $data-format as xs:string)
 {
-  xdmp:log(("map:", $map)),
   if ($data-format eq "application/json") then
-    xdmp:to-json($map)/node()
+    let $headers := fn:head((map:get($map, "headers"), json:array()))
+    let $triples := fn:head((map:get($map, "triples"), json:array()))
+    let $content := fn:head((map:get($map, "content"), json:object()))
+    return
+      xdmp:to-json(map:new((
+        map:entry("headers", $headers),
+        map:entry("triples", $triples),
+        map:entry("content", $content)
+      )))/node()
   else
     <envelope xmlns="http://marklogic.com/data-hub/envelope">
       <headers>{map:get($map, "headers")}</headers>

marklogic-data-hub/src/main/resources/scaffolding/conformance/sjs/content.sjs

@@ -10,7 +10,16 @@
  * @return - your content
  */
 function createContent(id, content, headers, triples, options) {
-  return cts.doc(id).xpath('/*:envelope/*:content/node()');
+  var root = cts.doc(id).root;
+
+  // for xml we need to use xpath
+  if (xdmp.nodeKind(root) === 'element') {
+    return root.xpath('/*:envelope/*:content/node()');
+  }
+  // for json we need to return the content
+  else {
+    return root.content;
+  }
 }
 
 module.exports = {

marklogic-data-hub/src/main/resources/scaffolding/conformance/sjs/headers.sjs

@@ -10,7 +10,7 @@
  * @return - an array of header objects
  */
 function createHeaders(id, content, headers, triples, options) {
-  return null;
+  return [];
 }
 
 module.exports = {

marklogic-data-hub/src/main/resources/scaffolding/conformance/sjs/triples.sjs

@@ -10,7 +10,7 @@
  * @return - an array of triples
  */
 function createTriples(id, content, headers, triples, options) {
-  return null;
+  return [];
 }
 
 module.exports = {

marklogic-data-hub/src/main/resources/scaffolding/conformance/xqy/content.xqy

@@ -24,5 +24,10 @@ declare function plugin:create-content(
   $triples as sem:triple*,
   $options as map:map) as node()?
 {
-  fn:doc($id)/envelope:envelope/envelope:content/node()
+  let $doc := fn:doc($id)
+  return
+    if ($doc/envelope:envelope) then
+      $doc/envelope:envelope/envelope:content/node()
+    else
+      $doc/content
 };

quick-start/src/main/resources/static/app/services/dataHubService.js

@@ -39,7 +39,7 @@
           self.status = data;
           if (!self.status.installed) {
             self.action.type = 'Install';
-            self.action.message = 'Install is in progress...';
+            self.action.message = 'Installing the Data Hub into MarkLogic...';
             self.action.progressType = 'success';
           }
         })