Merge pull request #755 from marklogic-community/trace-ui-fix

fixes for trace-ui
Marklogic-retired · Feb 21, 2018 · c0e0c76 · c0e0c76
2 parents 2430b3d + 7eacefc
commit c0e0c76
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/marklogic-data-hub/src/server-side/impl/trace-lib.xqy b/marklogic-data-hub/src/server-side/impl/trace-lib.xqy
@@ -538,7 +538,9 @@ declare function trace:trace-to-json-legacy($trace)
 
 declare function trace:trace-to-json($trace)
 {
-  if (fn:exists($trace/steps)) then
+  if (fn:exists($trace/steps) or
+      xdmp:node-kind($trace) = "object" and
+      fn:exists($trace/trace/steps)) then
     let $o := json:object()
     let $walk-me :=
       let $n := $trace/node()

diff --git a/marklogic-data-hub/src/trace-ui/proxy.config.json b/marklogic-data-hub/src/trace-ui/proxy.config.json
@@ -2,5 +2,9 @@
   "/v1/*": {
     "target": "http://localhost:8012",
     "secure": false
+  },
+  "/hub/*": {
+    "target": "http://localhost:8012",
+    "secure": false
   }
 }
diff --git a/marklogic-data-hub/src/trace-ui/src/app/traces/trace.service.ts b/marklogic-data-hub/src/trace-ui/src/app/traces/trace.service.ts
@@ -44,7 +44,7 @@ export class TraceService {
   }
 
   getTrace(traceId: string) {
-    return this.get(`/v1/documents?transform=ml:traceUISearchResults&uri=/${traceId}`);
+    return this.get(`/hub/traces/${traceId}`);
   }
 
   private extractData = (res: Response) => {