From cecebb3f6ec7b88e07086bd94601ee467364c9ac Mon Sep 17 00:00:00 2001
From: Clebert Suconic <clebertsuconic@apache.org>
Date: Tue, 17 Nov 2020 15:11:25 -0500
Subject: [PATCH] Revert "ARTEMIS-2983 Improving Browsing functionality on the
 web console"

This reverts commit 42e31e0494ebcf7e2005cfc28ffb680c8e56d4a3.

I am doing the revert just apply the correct JIRA, as I used the wrong JIRA ID by accident
---
 .../webapp/plugin/js/components/queues.js     | 43 ++++---------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/queues.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/queues.js
index 3389aa99ba..1df3af8b09 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/queues.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/queues.js
@@ -125,13 +125,10 @@ var Artemis;
         };
         ctrl.tableColumns = [
             { header: 'ID', itemField: 'id' },
-            { header: 'Name', itemField: 'name',
-              templateFn: function(value, item) { return '<a href="#" onclick="selectQueue(' + item.idx + ')">' + $sanitize(value) + '</a>' }
-            },
+            { header: 'Name', itemField: 'name' },
             { header: 'Routing Types', itemField: 'routingTypes' },
-            { header: 'Address', itemField: 'address',
-              templateFn: function(value, item) { return '<a href="#" onclick="selectAddress(' + item.idx + ')">' + $sanitize(value) + '</a>' }
-            },
+            { header: 'Queue Count', itemField: 'queueCount' },
+            { header: 'Address', itemField: 'address' , templateFn: function(value, item) { return '<a href="#" onclick="selectAddress(' + item.idx + ')">' + $sanitize(value) + '</a>' }},
             { header: 'Routing Type', itemField: 'routingType' },
             { header: 'Filter', itemField: 'filter' },
             { header: 'Durable', itemField: 'durable' },
@@ -139,9 +136,7 @@ var Artemis;
             { header: 'Purge On No Consumers', itemField: 'purgeOnNoConsumers' },
             { header: 'Consumer Count', itemField: 'consumerCount' },
             { header: 'Rate', itemField: 'rate' },
-            { header: 'Message Count', itemField: 'messageCount',
-              templateFn: function(value, item) { return '<a href="#" onclick="browseQueue(' + item.idx + ')" title="Browse Messages">' + value + '</a>' }
-            },
+            { header: 'Message Count', itemField: 'messageCount' },
             { header: 'Paused', itemField: 'paused' },
             { header: 'Temporary', itemField: 'temporary' },
             { header: 'Auto Created', itemField: 'autoCreated' },
@@ -179,7 +174,7 @@ var Artemis;
         }
 
         if (artemisAddress.address) {
-            Artemis.log.debug("navigating to address = " + artemisAddress.address.address);
+            Artemis.log.debug("navigating to queue = " + artemisAddress.address.address);
             ctrl.filter.values.field = ctrl.filter.fieldOptions[3].id;
             ctrl.filter.values.operation = ctrl.filter.operationOptions[0].id;
             ctrl.filter.values.value = artemisAddress.address.address;
@@ -192,24 +187,10 @@ var Artemis;
             $location.path("artemis/operations").search({"tab": "artemis", "nid": getQueuesNid(item, $location)});
         };
         selectAddress = function (idx) {
-            var item = ctrl.queues[idx]
-            Artemis.log.debug("navigating to address:" + item.address);
-            artemisAddress.address = { address: item.address };
-            $location.path("artemis/artemisAddresses").search({"tab": "artemis", "nid": getAddressesNid(item, $location)});
-        };
-        selectQueue = function (idx) {
-            var item = ctrl.queues[idx];
-            var nid = getQueuesNid(item, $location);
-            Artemis.log.debug("navigating to queue:" + nid);
-            artemisAddress.address = { address: item.address };
-            artemisQueue.queue = item;
-            $location.path("artemis/artemisQueues").search({"tab": "artemis", "nid": nid});
-        };
-        browseQueue = function (idx) {
-            var item = ctrl.queues[idx];
-            var nid = getQueuesNid(item, $location);
-            Artemis.log.debug("navigating to queue browser:" + nid);
-            $location.path("artemis/artemisBrowseQueue").search({"tab": "artemis", "nid": nid});
+            var address = ctrl.queues[idx].address;
+            Artemis.log.debug("navigating to address:" + address)
+            artemisAddress.address = { address: address };
+            $location.path("artemis/artemisAddresses");
         };
         function getQueuesNid(item, $location) {
             var rootNID = getRootNid($location);
@@ -217,12 +198,6 @@ var Artemis;
             Artemis.log.debug("targetNID=" + targetNID);
             return targetNID;
         }
-        function getAddressesNid(item, $location) {
-            var rootNID = getRootNid($location);
-            var targetNID = rootNID + "addresses-" + item.address;
-            Artemis.log.debug("targetNID=" + targetNID);
-            return targetNID;
-        }
         function getRootNid($location) {
             var currentNid = $location.search()['nid'];
             Artemis.log.debug("current nid=" + currentNid);