Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3130 - fixing broken filter fields in console 

https://issues.apache.org/jira/browse/ARTEMIS-3130
This commit is contained in:
Andy Taylor 2021-02-20 08:48:35 +00:00 committed by Domenico Francesco Bruscino
parent 9e72460565
commit 46858bcfc3
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/addresses.js
View File

@ -100,8 +100,8 @@ var Artemis;
fieldOptions: [
{id: 'id', name: 'ID'},
{id: 'name', name: 'Name'},
{id: 'routingTypes', name: 'Routing Types'},
{id: 'queueCount', name: 'Queue Count'}
{id: 'routing_Types', name: 'Routing Types'},
{id: 'queue_Count', name: 'Queue Count'}
],
operationOptions: [
{id: 'EQUALS', name: 'Equals'},

14
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/queues.js
View File

@ -127,18 +127,18 @@ var Artemis;
fieldOptions: [
{id: 'id', name: 'ID'},
{id: 'name', name: 'Name'},
{id: 'consumerId', name: 'Consumer ID'},
{id: 'consumer_Id', name: 'Consumer ID'},
{id: 'address', name: 'Address'},
{id: 'filter', name: 'Filter'},
{id: 'maxConsumers', name: 'Max Consumers'},
{id: 'routingType', name: 'Routing Type'},
{id: 'purgeOnNoConsumers', name: 'Purge On No Consumers'},
{id: 'max_Consumers', name: 'Max Consumers'},
{id: 'routing_Type', name: 'Routing Type'},
{id: 'purge_On_No_Consumers', name: 'Purge On No Consumers'},
{id: 'user', name: 'User'},
{id: 'messageCount', name: 'Message Count'},
{id: 'deliveringCount', name: 'Delivering Count'},
{id: 'message_Count', name: 'Message Count'},
{id: 'delivering_Count', name: 'Delivering Count'},
{id: 'paused', name: 'Paused'},
{id: 'temporary', name: 'Temporary'},
{id: 'autoCreated', name: 'Auto Created'},
{id: 'auto_Created', name: 'Auto Created'},
{id: 'rate', name: 'Rate'}
],
operationOptions: [

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/QueueFilterPredicate.java
View File

@ -95,6 +95,8 @@ public class QueueFilterPredicate extends ActiveMQFilterPredicate<QueueControl>
return matches(queue.isLastValue());
case SCHEDULED_COUNT:
return matches(queue.getScheduledCount());
case USER:
return matches(queue.getUser());
default:
return true;
}