From 0dd67a89eb7c92d801cdef71f614db962baaea6d Mon Sep 17 00:00:00 2001 From: Erwin Dondorp Date: Fri, 13 Dec 2024 01:15:41 +0100 Subject: [PATCH] ARTEMIS-5213 allow internal addresses to be shown separatelly --- .../artemis/brokers/BrokerDiagram.tsx | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/brokers/BrokerDiagram.tsx b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/brokers/BrokerDiagram.tsx index 873dc2a..6252ca3 100644 --- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/brokers/BrokerDiagram.tsx +++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/brokers/BrokerDiagram.tsx @@ -500,20 +500,16 @@ export const BrokerDiagram: React.FunctionComponent = () => { for (const address of brokerTopology.addresses) { var internalAddress: boolean = isInternalName(address.name); - if (viewOptions.showAddresses) { - if(internalAddress && viewOptions.showInternalAddresses) { - addInternalAddress(address.name, newBrokerNodes, brokerTopology.broker, newBrokerEdges, controller, model, viewOptions.showConnectors, selectNode); - } else if (!internalAddress && viewOptions.showAddresses) { - addAddress(address.name, newBrokerNodes, brokerTopology.broker, newBrokerEdges, controller, model, viewOptions.showConnectors, selectNode); - } + if(internalAddress && viewOptions.showInternalAddresses) { + addInternalAddress(address.name, newBrokerNodes, brokerTopology.broker, newBrokerEdges, controller, model, viewOptions.showConnectors, selectNode); + } else if (!internalAddress && viewOptions.showAddresses) { + addAddress(address.name, newBrokerNodes, brokerTopology.broker, newBrokerEdges, controller, model, viewOptions.showConnectors, selectNode); } - if (viewOptions.showQueues) { - for (const queue of address.queues) { - if (internalAddress && viewOptions.showInternalQueues) { - addInternalQueue(address.name, queue.name, queue.routingType, newBrokerNodes, brokerTopology.broker, newBrokerEdges, controller, model, viewOptions.showInternalAddresses, viewOptions.showConnectors, selectNode); - } else if (!internalAddress &&viewOptions.showQueues) { - addQueue(address.name, queue.name, queue.routingType, newBrokerNodes, brokerTopology.broker, newBrokerEdges, controller, model, viewOptions.showAddresses, viewOptions.showConnectors, selectNode); - } + for (const queue of address.queues) { + if (internalAddress && viewOptions.showInternalQueues) { + addInternalQueue(address.name, queue.name, queue.routingType, newBrokerNodes, brokerTopology.broker, newBrokerEdges, controller, model, viewOptions.showInternalAddresses, viewOptions.showConnectors, selectNode); + } else if (!internalAddress &&viewOptions.showQueues) { + addQueue(address.name, queue.name, queue.routingType, newBrokerNodes, brokerTopology.broker, newBrokerEdges, controller, model, viewOptions.showAddresses, viewOptions.showConnectors, selectNode); } } }