feat(tree-view): use perma links on nodes

bee-queue · Jun 11, 2021 · 07b6f3d · 07b6f3d
1 parent 56f2748
commit 07b6f3d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/example/bullmq_with_flows.js b/example/bullmq_with_flows.js
@@ -80,7 +80,7 @@ async function main() {
           name: queueName,
 
           // User-readable display name for the host. Required.
-          hostId: 'Queue Server 1',
+          hostId: 'Server 1',
 
           // Queue type (Bull or Bullmq or Bee - default Bull).
           type: 'bullmq',
@@ -95,7 +95,7 @@ async function main() {
           name: parentQueueName,
 
           // User-readable display name for the host. Required.
-          hostId: 'Queue Server 1',
+          hostId: 'Server 1',
 
           // Queue type (Bull or Bullmq or Bee - default Bull).
           type: 'bullmq',
@@ -110,7 +110,7 @@ async function main() {
       flows: [
         {
           // User-readable display name for the host. Required.
-          hostId: 'Flow server 1',
+          hostId: 'Server 1',
 
           // Required for each flow definition.
           name: 'Connection name 1',
@@ -125,7 +125,7 @@ async function main() {
         },
         {
           // User-readable display name for the host. Required.
-          hostId: 'Flow server 2',
+          hostId: 'Server 1',
 
           // Required for each flow definition.
           name: 'Connection name 2',

diff --git a/example/package.json b/example/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "bee-queue": "^1.4.0",
     "bull": "^3.22.6",
-    "bullmq": "^1.33.1",
+    "bullmq": "^1.34.0",
     "express": "^4.17.1",
     "redis-server": "^1.2.2"
   }

diff --git a/public/dashboard.js b/public/dashboard.js
@@ -5,9 +5,20 @@ $(document).ready(() => {
     return string.charAt(0).toUpperCase() + string.slice(1);
   }
 
-  function formatToTreeView(flow) {
+  function encodeURI(url) {
+    if (typeof url !== 'string') {
+      return '';
+    }
+    return encodeURIComponent(url);
+  }
+
+  function formatToTreeView(flow, basePath, flowHost) {
     const {job, children} = flow;
-    const text = `${job.name} <span class="label label-default">${job.id}</span>`;
+    const text = `${job.name} <a href="${basePath}/${encodeURI(
+      flowHost
+    )}/${encodeURI(job.queueName)}/${
+      job.id
+    }"><span class="label label-default">${job.id}</span></a>`;
 
     if (children && children.length > 0) {
       return {
@@ -282,7 +293,7 @@ $(document).ready(() => {
       contentType: 'application/json',
     })
       .done((res) => {
-        const flowTree = formatToTreeView(res);
+        const flowTree = formatToTreeView(res, basePath, flowHost);
         alert('Flow successfully added!');
         localStorage.removeItem('arena:savedFlow');
         $('#tree').treeview({data: [flowTree]});