This is an automated email from the ASF dual-hosted git repository. andytaylor pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis-console.git
commit f32ab2151ec2f58f3708f4d41ed5ce08b4858d73 Author: GChuf <[email protected]> AuthorDate: Mon Oct 27 09:37:01 2025 +0100 ARTEMIS-5720: Use const and let instead of var --- .../src/addresses/AddressesTable.tsx | 6 +- .../artemis-console-plugin/src/artemis-service.ts | 120 ++++++++++----------- .../src/brokers/BrokerDiagram.tsx | 24 ++--- .../src/connections/ConnectionsTable.tsx | 2 +- .../src/consumers/ConsumerTable.tsx | 6 +- .../packages/artemis-console-plugin/src/context.ts | 4 +- .../src/messages/MessageView.tsx | 21 ++-- .../src/messages/MessagesTable.tsx | 22 ++-- .../src/messages/QueueSelect.tsx | 10 +- .../src/producers/ProducerTable.tsx | 4 +- .../src/queues/CreateQueue.tsx | 2 +- .../src/queues/QueuesTable.tsx | 4 +- .../src/sessions/SessionsTable.tsx | 6 +- .../src/views/ArtemisJMXTabView.tsx | 2 +- 14 files changed, 116 insertions(+), 117 deletions(-) diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/AddressesTable.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/AddressesTable.tsx index b0c3025..f2af960 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/AddressesTable.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/AddressesTable.tsx @@ -32,7 +32,7 @@ import { columnStorage } from '../artemis-preferences-service'; export const AddressesTable: React.FunctionComponent<Navigate> = (navigate) => { const getQueueFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'address', operation: 'EQUALS', input: row.name @@ -95,7 +95,7 @@ export const AddressesTable: React.FunctionComponent<Navigate> = (navigate) => { } const getRowActions = (row: any): IAction[] => { - var actions: IAction[] = [ + const actions: IAction[] = [ { title: 'Show in Artemis JMX', onClick: async () => { @@ -140,7 +140,7 @@ export const AddressesTable: React.FunctionComponent<Navigate> = (navigate) => { ); } - var canSendMessage = artemisService.canSendMessageToAddress(brokerNode, row.name); + const canSendMessage = artemisService.canSendMessageToAddress(brokerNode, row.name); if (canSendMessage) { actions.push( { diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.ts b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.ts index 08c653f..b27307d 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.ts +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.ts @@ -47,7 +47,7 @@ export class BrokerNetworkTopology { } getBackupCount(): number { - var backups: number = 0; + let backups: number = 0; this.brokers.forEach((broker) => { if (broker.backup) { backups = backups + 1; @@ -171,36 +171,36 @@ class ArtemisService { private async initBrokerObjectName(): Promise<string> { const config = await configManager.getArtemisconfig(); - var search = await jolokiaService.search(config.jmx.domain + ":broker=*").catch(() => null); + const search = await jolokiaService.search(config.jmx.domain + ":broker=*").catch(() => null); return search && search[0] ? search[0] : ""; } async getBrokerInfo(): Promise<BrokerInfo | null> { return new Promise<BrokerInfo | null>(async (resolve, reject) => { - var brokerObjectName = await this.brokerObjectName; + const brokerObjectName = await this.brokerObjectName; if ("" === brokerObjectName) { resolve(null) return } - var response = await jolokiaService.readAttributes(brokerObjectName).catch(e => null); + const response = await jolokiaService.readAttributes(brokerObjectName).catch(e => null); if (response) { - var name = response.Name as string; - var nodeID = response.NodeID as string; - var version = response.Version as string; - var started = "" + response.Started as string; - var globalMaxSize = response.GlobalMaxSize as number; - var addressMemoryUsage = response.AddressMemoryUsage as number; - var uptime = response.Uptime as string; - var used = 0; - var haPolicy = response.HAPolicy as string; - var addressMemoryUsageMB = 0; - var globalMaxSizeMB = globalMaxSize / 1048576; + const name = response.Name as string; + const nodeID = response.NodeID as string; + const version = response.Version as string; + const started = "" + response.Started as string; + const globalMaxSize = response.GlobalMaxSize as number; + const addressMemoryUsage = response.AddressMemoryUsage as number; + const uptime = response.Uptime as string; + const haPolicy = response.HAPolicy as string; + const globalMaxSizeMB = globalMaxSize / 1048576; + let used = 0; + let addressMemoryUsageMB = 0; if (addressMemoryUsage > 0) { addressMemoryUsageMB = addressMemoryUsage / 1048576; used = addressMemoryUsageMB / globalMaxSizeMB * 100 } const topology = await jolokiaService.execute(brokerObjectName, LIST_NETWORK_TOPOLOGY_SIG) as string; - var brokerInfo: BrokerInfo = { + const brokerInfo: BrokerInfo = { name: name, objectName: brokerObjectName, nodeID: nodeID, version: version, @@ -222,20 +222,20 @@ class ArtemisService { async createBrokerTopology(maxAddresses: number, addressFilter: string): Promise<BrokerTopology> { return new Promise<BrokerTopology>(async (resolve, reject) => { try { - var brokerInfo = await this.getBrokerInfo(); - var brokerObjectName = await this.brokerObjectName; + const brokerInfo = await this.getBrokerInfo(); + const brokerObjectName = await this.brokerObjectName; const topology = await jolokiaService.execute(brokerObjectName, LIST_NETWORK_TOPOLOGY_SIG) as string; brokerInfo!.networkTopology = new BrokerNetworkTopology(JSON.parse(topology)); - var brokerTopology: BrokerTopology = { + const brokerTopology: BrokerTopology = { broker: brokerInfo!, addresses: [] } - var addresses: string[] = (await this.getAllAddresses(addressFilter)); - var max: number = maxAddresses < addresses.length ? maxAddresses: addresses.length; + let addresses: string[] = (await this.getAllAddresses(addressFilter)); + const max: number = maxAddresses < addresses.length ? maxAddresses: addresses.length; addresses = addresses.slice(0, max); for (const address of addresses) { - var queuesJson: string = await this.getQueuesForAddress(address); - var queues: Queue[] = JSON.parse(queuesJson).data; + const queuesJson: string = await this.getQueuesForAddress(address); + const queues: Queue[] = JSON.parse(queuesJson).data; brokerTopology.addresses.push({ name: address, queues: queues @@ -252,15 +252,15 @@ class ArtemisService { async createAcceptors(): Promise<Acceptors> { return new Promise<Acceptors>(async (resolve, reject) => { - var brokerObjectName = await this.brokerObjectName; + const brokerObjectName = await this.brokerObjectName; const acceptorSearch = brokerObjectName + ",component=acceptors,name=*"; - var search = await jolokiaService.search(acceptorSearch); + const search = await jolokiaService.search(acceptorSearch); if (search) { const acceptors: Acceptors = { acceptors: [] }; - for (var key in search) { + for (const key in search) { const acceptor: Acceptor = await jolokiaService.readAttributes(search[key]) as Acceptor; acceptors.acceptors.push(acceptor); } @@ -272,15 +272,15 @@ class ArtemisService { async createClusterConnections(): Promise<ClusterConnections> { return new Promise<ClusterConnections>(async (resolve, reject) => { - var brokerObjectName = await this.brokerObjectName; + const brokerObjectName = await this.brokerObjectName; const clusterConnectionSearch = brokerObjectName + ",component=cluster-connections,name=*"; - var search = await jolokiaService.search(clusterConnectionSearch); + const search = await jolokiaService.search(clusterConnectionSearch); if (search) { const clusterConnections: ClusterConnections = { clusterConnections: [] }; - for (var key in search) { + for (const key in search) { const clusterConnection: ClusterConnection = await jolokiaService.readAttributes(search[key]) as ClusterConnection; clusterConnections.clusterConnections.push(clusterConnection); } @@ -301,12 +301,12 @@ class ArtemisService { } async doSendMessage(mbean: string, body: string, theHeaders: { name: string; value: string }[], durable: boolean, createMessageId: boolean, useCurrentlogon: boolean, username: string, password: string) { - var type = 3; - var user = useCurrentlogon ? null : username; - var pwd = useCurrentlogon ? null : password; - var headers: { [id: string]: string; } = {}; + const type = 3; + const user = useCurrentlogon ? null : username; + const pwd = useCurrentlogon ? null : password; + const headers: { [id: string]: string; } = {}; theHeaders.forEach(function (object) { - var key = object.name; + const key = object.name; if (key) { headers[key] = object.value; } @@ -350,7 +350,7 @@ class ArtemisService { } async getMessages(mBean: string, page: number, perPage: number, filter: string) { - var count: number; + let count: number; if (filter && filter.length > 0) { count = await jolokiaService.execute(mBean, COUNT_MESSAGES_SIG2, [filter]) as number; } else { @@ -364,7 +364,7 @@ class ArtemisService { } async getProducers(page: number, perPage: number, activeSort: ActiveSort, filter: Filter): Promise<string> { - var producerFilter = { + const producerFilter = { field: filter.input !== '' ? filter.column : '', operation: filter.input !== '' ? filter.operation : '', value: filter.input, @@ -375,7 +375,7 @@ class ArtemisService { } async getConsumers(page: number, perPage: number, activeSort: ActiveSort, filter: Filter): Promise<string> { - var consumerFilter = { + const consumerFilter = { field: filter.input !== '' ? filter.column : '', operation: filter.input !== '' ? filter.operation : '', value: filter.input, @@ -386,7 +386,7 @@ class ArtemisService { } async getConnections(page: number, perPage: number, activeSort: ActiveSort, filter: Filter): Promise<string> { - var connectionsFilter = { + const connectionsFilter = { field: filter.input !== '' ? filter.column : '', operation: filter.input !== '' ? filter.operation : '', value: filter.input, @@ -397,7 +397,7 @@ class ArtemisService { } async getSessions(page: number, perPage: number, activeSort: ActiveSort, filter: Filter): Promise<string> { - var sessionsFilter = { + const sessionsFilter = { field: filter.input !== '' ? filter.column : '', operation: filter.input !== '' ? filter.operation : '', value: filter.input, @@ -408,7 +408,7 @@ class ArtemisService { } async getAddresses(page: number, perPage: number, activeSort: ActiveSort, filter: Filter): Promise<string> { - var addressesFilter = { + const addressesFilter = { field: filter.input !== '' ? filter.column : '', operation: filter.input !== '' ? filter.operation : '', value: filter.input, @@ -420,11 +420,11 @@ class ArtemisService { async getAllAddresses(addressFilter: string): Promise<string[]> { return new Promise<string[]>(async (resolve, reject) => { - var addressesString = await jolokiaService.execute(await this.getBrokerObjectName(), LIST_ALL_ADDRESSES_SIG, [',']) as string; + const addressesString = await jolokiaService.execute(await this.getBrokerObjectName(), LIST_ALL_ADDRESSES_SIG, [',']) as string; if (addressesString) { - var addressArray = addressesString.split(',') + const addressArray = addressesString.split(',') if (addressFilter && addressFilter.length > 0) { - var filtered = addressArray.filter(function (str) { return str.includes(addressFilter); }); + const filtered = addressArray.filter(function (str) { return str.includes(addressFilter); }); resolve(filtered); } else { resolve(addressArray); @@ -435,7 +435,7 @@ class ArtemisService { } async getQueues(page: number, perPage: number, activeSort: ActiveSort, filter: Filter): Promise<string> { - var queuesFilter = { + const queuesFilter = { field: filter.input !== '' ? filter.column : '', operation: filter.input !== '' ? filter.operation : '', value: filter.input, @@ -446,7 +446,7 @@ class ArtemisService { } async getQueuesForAddress(address: string): Promise<string> { - var queuesFilter = { + const queuesFilter = { field: 'address', operation: 'EQUALS', value: address @@ -459,7 +459,7 @@ class ArtemisService { } async purgeQueue(name: string, address: string, routingType: string) { - var queueMBean: string = createQueueObjectName(await this.getBrokerObjectName(), address, routingType, name); + const queueMBean: string = createQueueObjectName(await this.getBrokerObjectName(), address, routingType, name); return jolokiaService.execute(queueMBean, REMOVE_ALL_MESSAGES_SIG); } @@ -498,14 +498,14 @@ class ArtemisService { return this.formatPersistentSize(size); } if (columnID === "originalQueue" && message["StringProperties"]) { - var originalQueue = message["StringProperties"]._AMQ_ORIG_QUEUE != null ? message["StringProperties"]._AMQ_ORIG_QUEUE : message["StringProperties"]["extraProperties._AMQ_ORIG_QUEUE"] + const originalQueue = message["StringProperties"]._AMQ_ORIG_QUEUE != null ? message["StringProperties"]._AMQ_ORIG_QUEUE : message["StringProperties"]["extraProperties._AMQ_ORIG_QUEUE"] return originalQueue ? originalQueue : ""; } return message[columnID] ? "" + message[columnID] : ""; } formatType = (message: Message) => { - var typeLabels = ["default", "1", "object", "text", "bytes", "map", "stream", "embedded"]; + const typeLabels = ["default", "1", "object", "text", "bytes", "map", "stream", "embedded"]; return message.type + " (" + typeLabels[message.type] + ")"; } @@ -516,13 +516,13 @@ class ArtemisService { if (timestamp === 0) { return "never"; } - var expiresIn = timestamp - Date.now(); + const expiresIn = timestamp - Date.now(); if (Math.abs(expiresIn) < MS_PER_DAY) { - var duration = expiresIn < 0 ? -expiresIn : expiresIn; - var hours = this.pad2(Math.floor((duration / MS_PER_HOUR) % 24)); - var mins = this.pad2(Math.floor((duration / MS_PER_MIN) % 60)); - var secs = this.pad2(Math.floor((duration / MS_PER_SEC) % 60)); - var ret; + const duration = expiresIn < 0 ? -expiresIn : expiresIn; + const hours = this.pad2(Math.floor((duration / MS_PER_HOUR) % 24)); + const mins = this.pad2(Math.floor((duration / MS_PER_MIN) % 60)); + const secs = this.pad2(Math.floor((duration / MS_PER_SEC) % 60)); + let ret; if (expiresIn < 0) { // "HH:mm:ss ago" ret = hours + ":" + mins + ":" + secs + " ago"; @@ -555,7 +555,7 @@ class ArtemisService { if (timestamp === 0) { return "N/A"; } - var d = new Date(timestamp); + const d = new Date(timestamp); // "yyyy-MM-dd HH:mm:ss" //add 1 to month as getmonth returns the position not the actual month return d.getFullYear() + "-" + this.pad2(d.getMonth() + 1) + "-" + this.pad2(d.getDate()) + " " + this.pad2(d.getHours()) + ":" + this.pad2(d.getMinutes()) + ":" + this.pad2(d.getSeconds()); @@ -577,7 +577,7 @@ class ArtemisService { canSendMessageToAddress = (broker: MBeanNode | undefined, address: string): boolean => { if(broker) { - var addressMBean = broker.parent?.find(node => { + const addressMBean = broker.parent?.find(node => { return node.propertyList?.get('component') === 'addresses' && node.propertyList?.get('subcomponent') === undefined && node.name === address }) return this.checkCanSendMessageToAddress(addressMBean as MBeanNode); @@ -599,7 +599,7 @@ class ArtemisService { canPurgeQueue = (broker: MBeanNode | undefined, queue: string): boolean => { if(broker) { - var queueMBean = broker.parent?.find(node => { + const queueMBean = broker.parent?.find(node => { return node.propertyList?.get('subcomponent') === 'queues' && node.name === queue }) return (this.DEBUG_PRIVS && queueMBean?.hasInvokeRights(REMOVE_ALL_MESSAGES_SIG)) ?? false; @@ -609,7 +609,7 @@ class ArtemisService { canSendMessageToQueue = (broker: MBeanNode | undefined, queue: string): boolean => { if(broker) { - var queueMBean = broker.parent?.find(node => { + const queueMBean = broker.parent?.find(node => { return node.propertyList?.get('subcomponent') === 'queues' && node.name === queue }) return this.checkCanSendMessageToQueue(queueMBean as MBeanNode); @@ -623,7 +623,7 @@ class ArtemisService { canBrowseQueue = (broker: MBeanNode | undefined, queue: string): boolean => { if(broker) { - var queueMBean = broker.parent?.find(node => { + const queueMBean = broker.parent?.find(node => { return node.propertyList?.get('subcomponent') === 'queues' && node.name === queue }) return this.checkCanBrowseQueue(queueMBean as MBeanNode); @@ -668,7 +668,7 @@ class ArtemisService { doesMethodExist = (broker: MBeanNode | undefined, queue: string, method: string): boolean => { if(broker) { - var queueMBean = broker.parent?.find(node => { + const queueMBean = broker.parent?.find(node => { return node.propertyList?.get('subcomponent') === 'queues' && node.name === queue }) return queueMBean?queueMBean.hasOperations(method): false; diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/brokers/BrokerDiagram.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/brokers/BrokerDiagram.tsx index 8d49d8b..5e78e66 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/brokers/BrokerDiagram.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/brokers/BrokerDiagram.tsx @@ -386,7 +386,7 @@ export const BrokerDiagram: React.FunctionComponent = () => { return } if (topologyLoaded && brokerTopology) { - var brokerNode: NodeModel = { + const brokerNode: NodeModel = { id: brokerTopology.broker.nodeID, type: 'broker', label: brokerTopology.broker.name, @@ -405,8 +405,8 @@ export const BrokerDiagram: React.FunctionComponent = () => { selectNode: selectNode } } - var newBrokerNodes: NodeModel[] = []; - var newBrokerEdges: EdgeModel[] = []; + const newBrokerNodes: NodeModel[] = []; + const newBrokerEdges: EdgeModel[] = []; newBrokerNodes.push(brokerNode); const model: Model = { @@ -511,7 +511,7 @@ export const BrokerDiagram: React.FunctionComponent = () => { } for (const address of brokerTopology.addresses) { - var internalAddress: boolean = isInternalName(address.name); + const internalAddress: boolean = isInternalName(address.name); if(internalAddress && viewOptions.showInternalAddresses) { addInternalAddress(address.name, newBrokerNodes, brokerTopology.broker, newBrokerEdges, controller, model, viewOptions.showConnectors, selectNode); } else if (!internalAddress && viewOptions.showAddresses) { @@ -633,7 +633,7 @@ export const BrokerDiagram: React.FunctionComponent = () => { }; function addAddress(address: string, newBrokerNodes: NodeModel[], brokerInfo: BrokerInfo, newBrokerEdges: EdgeModel[], controller: Visualization, model: Model, showConnectors: boolean, selectNode: Function) { - var addressNode: NodeModel = { + const addressNode: NodeModel = { id: 'address-node-' + address, type: 'resource', label: address, @@ -651,7 +651,7 @@ function addAddress(address: string, newBrokerNodes: NodeModel[], brokerInfo: Br }; newBrokerNodes.push(addressNode); if (showConnectors) { - var addressEdge: EdgeModel = { + const addressEdge: EdgeModel = { id: 'address-edge-' + brokerInfo.nodeID + '-address-node-' + address, type: 'edge', source: brokerInfo.nodeID, @@ -663,7 +663,7 @@ function addAddress(address: string, newBrokerNodes: NodeModel[], brokerInfo: Br } function addInternalAddress(address: string, newBrokerNodes: NodeModel[], brokerInfo: BrokerInfo, newBrokerEdges: EdgeModel[], controller: Visualization, model: Model, showConnectors: boolean, selectNode: Function) { - var addressNode: NodeModel = { + const addressNode: NodeModel = { id: 'address-node-' + address, type: 'resource', label: address, @@ -681,7 +681,7 @@ function addInternalAddress(address: string, newBrokerNodes: NodeModel[], broker }; newBrokerNodes.push(addressNode); if (showConnectors) { - var addressEdge: EdgeModel = { + const addressEdge: EdgeModel = { id: 'address-edge-' + brokerInfo.nodeID + '-address-node-' + address, type: 'edge', source: brokerInfo.nodeID, @@ -693,7 +693,7 @@ function addInternalAddress(address: string, newBrokerNodes: NodeModel[], broker } function addQueue(address: string, queue: string, routingType: string, newBrokerNodes: NodeModel[], brokerInfo: BrokerInfo, newBrokerEdges: EdgeModel[], controller: Visualization, model: Model, showAddresses: boolean, showConnectors: boolean, selectNode: Function) { - var queueNode: NodeModel = { + const queueNode: NodeModel = { id: 'queue-node-' + queue, type: 'resource', label: queue, @@ -713,7 +713,7 @@ function addQueue(address: string, queue: string, routingType: string, newBroke }; newBrokerNodes.push(queueNode); if (showAddresses && showConnectors) { - var queueEdge: EdgeModel = { + const queueEdge: EdgeModel = { id: 'queue-edge-address-node' + address + '-queue-node-' + queue, type: 'edge', source: 'address-node-' + address, @@ -725,7 +725,7 @@ function addQueue(address: string, queue: string, routingType: string, newBroke } function addInternalQueue(address: string, queue: string, routingType: string, newBrokerNodes: NodeModel[], brokerInfo: BrokerInfo, newBrokerEdges: EdgeModel[], controller: Visualization, model: Model, showInternalAddresses: boolean, showConnectors: boolean, selectNode: Function) { - var queueNode: NodeModel = { + const queueNode: NodeModel = { id: 'queue-node-' + queue, type: 'resource', label: queue, @@ -745,7 +745,7 @@ function addInternalQueue(address: string, queue: string, routingType: string, n }; newBrokerNodes.push(queueNode); if (showInternalAddresses && showConnectors) { - var queueEdge: EdgeModel = { + const queueEdge: EdgeModel = { id: 'queue-edge-address-node' + address + '-queue-node-' + queue, type: 'edge', source: 'address-node-' + address, diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/connections/ConnectionsTable.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/connections/ConnectionsTable.tsx index d3d08d1..dc38872 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/connections/ConnectionsTable.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/connections/ConnectionsTable.tsx @@ -25,7 +25,7 @@ import { columnStorage } from '../artemis-preferences-service'; export const ConnectionsTable: React.FunctionComponent<Navigate> = (navigate) => { const getSessionFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'connectionID', operation: 'EQUALS', input: row.connectionID diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/consumers/ConsumerTable.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/consumers/ConsumerTable.tsx index 06681a2..b43beab 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/consumers/ConsumerTable.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/consumers/ConsumerTable.tsx @@ -25,7 +25,7 @@ import { columnStorage } from '../artemis-preferences-service'; export const ConsumerTable: React.FunctionComponent<Navigate> = navigate => { const getSessionFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'id', operation: 'EQUALS', input: row.session @@ -34,7 +34,7 @@ export const ConsumerTable: React.FunctionComponent<Navigate> = navigate => { } const getQueueFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'name', operation: 'EQUALS', input: row.queue @@ -43,7 +43,7 @@ export const ConsumerTable: React.FunctionComponent<Navigate> = navigate => { } const getAddressFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'name', operation: 'EQUALS', input: row.address diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/context.ts b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/context.ts index 30bde50..e8999b4 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/context.ts +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/context.ts @@ -53,7 +53,7 @@ export function useArtemisTree() { tvd.defaultExpanded = true }) } - var subTree: MBeanTree = MBeanTree.createFromNodes(artemisPluginName, [rootNode]) + const subTree: MBeanTree = MBeanTree.createFromNodes(artemisPluginName, [rootNode]) setTree(subTree) } else { @@ -91,7 +91,7 @@ export function useArtemisTree() { }, []) const findAndSelectNode = (objectName: string, name: string) => { - var node: MBeanNode | null = tree.find(node => { + let node: MBeanNode | null = tree.find(node => { return node.objectName === objectName }); if (!node) { diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/MessageView.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/MessageView.tsx index 66aea99..3ca27f0 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/MessageView.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/MessageView.tsx @@ -62,26 +62,27 @@ export const MessageView: React.FunctionComponent<MessageProps> = props => { const updateBodyText = (currentMessage: Message): void => { log.debug("loading message:" + currentMessage); - var body: string = ""; + let body: string = ""; + let lenTxt: string = ""; if (currentMessage.text) { body = currentMessage.text; - var lenTxt = "" + body.length; + lenTxt = "" + body.length; setMessageTextMode("text (" + lenTxt + " chars)"); setMessageBody(body); } else if (currentMessage.BodyPreview) { - var code = Number(localStorage["ArtemisBrowseBytesMessages"] || "1"); + const code = Number(localStorage["ArtemisBrowseBytesMessages"] || "1"); setMessageTextMode("bytes (turned off)"); - var len = 0; + let len = 0; if (code !== 99) { - var bytesArr: string[] = []; - var textArr: string[] = []; + const bytesArr: string[] = []; + const textArr: string[] = []; currentMessage.BodyPreview.forEach(function(b: number) { if (code === 1 || code === 2 || code === 16) { // text textArr.push(String.fromCharCode(b)); } if (code === 1 || code === 4) { - var unsignedByte = b & 0xff; + const unsignedByte = b & 0xff; if (unsignedByte < 16) { // hex and must be 2 digit so they space out evenly @@ -91,12 +92,12 @@ export const MessageView: React.FunctionComponent<MessageProps> = props => { } } else { // just show as is without spacing out, as that is usually more used for hex than decimal - var s = b.toString(10); + const s = b.toString(10); bytesArr.push(s); } }); - var bytesData = bytesArr.join(" "); - var textData = textArr.join(""); + const bytesData = bytesArr.join(" "); + const textData = textArr.join(""); if (code === 1 || code === 2) { // bytes and text len = currentMessage.BodyPreview.length; diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/MessagesTable.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/MessagesTable.tsx index 9d9896f..0c2b48a 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/MessagesTable.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/MessagesTable.tsx @@ -92,8 +92,6 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => { message: error, }) }) - var data = await listMessages(); - } const listMessages = async (): Promise<any> => { const brokerObjectname = await artemisService.getBrokerObjectName(); @@ -195,7 +193,7 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => { } const onSelectMessage = (id: number, inex: number, selected: boolean) => { - var updatedSelectedMessages: number[] = []; + let updatedSelectedMessages: number[] = []; if (selected) { selectedMessages.forEach((id) => updatedSelectedMessages.push(id)); updatedSelectedMessages.push(id); @@ -223,7 +221,7 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => { const selectAllMessages = (isSelecting: boolean) => { if(isSelecting) { - var updatedSelectedMessages: number[] = rows.map((row: any, index) => { + const updatedSelectedMessages: number[] = rows.map((row: any, index) => { return Number(row.messageID); }) setSelectedMessages(updatedSelectedMessages); @@ -237,9 +235,9 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => { const handleDeleteMessages = () => { const isRejected = <T,>(p: PromiseSettledResult<T>): p is PromiseRejectedResult => p.status === 'rejected'; - var results: Promise<unknown>[] = []; + const results: Promise<unknown>[] = []; for (let i = 0; i < selectedMessages.length; i++) { - var promise: Promise<unknown> = artemisService.deleteMessage(selectedMessages[i], props.address, props.routingType, props.queue); + const promise: Promise<unknown> = artemisService.deleteMessage(selectedMessages[i], props.address, props.routingType, props.queue); results.push(promise); }; Promise.allSettled(results) @@ -266,9 +264,9 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => { const handleMoveMessages = () => { const isRejected = <T,>(p: PromiseSettledResult<T>): p is PromiseRejectedResult => p.status === 'rejected'; - var results: Promise<unknown>[] = []; + const results: Promise<unknown>[] = []; for (let i = 0; i < selectedMessages.length; i++) { - var promise: Promise<unknown> = artemisService.moveMessage(selectedMessages[i], selectedTargetQueue, props.address, props.routingType, props.queue); + const promise: Promise<unknown> = artemisService.moveMessage(selectedMessages[i], selectedTargetQueue, props.address, props.routingType, props.queue); results.push(promise); }; Promise.allSettled(results) @@ -295,9 +293,9 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => { const handleCopyMessages = () => { const isRejected = <T,>(p: PromiseSettledResult<T>): p is PromiseRejectedResult => p.status === 'rejected'; - var results: Promise<unknown>[] = []; + const results: Promise<unknown>[] = []; for (let i = 0; i < selectedMessages.length; i++) { - var promise: Promise<unknown> = artemisService.copyMessage(selectedMessages[i], selectedTargetQueue, props.address, props.routingType, props.queue); + const promise: Promise<unknown> = artemisService.copyMessage(selectedMessages[i], selectedTargetQueue, props.address, props.routingType, props.queue); results.push(promise); }; Promise.allSettled(results) @@ -324,9 +322,9 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => { const handleRetryMessages = () => { const isRejected = <T,>(p: PromiseSettledResult<T>): p is PromiseRejectedResult => p.status === 'rejected'; - var results: Promise<unknown>[] = []; + const results: Promise<unknown>[] = []; for (let i = 0; i < selectedMessages.length; i++) { - var promise: Promise<unknown> = artemisService.retryMessage(selectedMessages[i], props.address, props.routingType, props.queue); + const promise: Promise<unknown> = artemisService.retryMessage(selectedMessages[i], props.address, props.routingType, props.queue); results.push(promise); }; Promise.allSettled(results) diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/QueueSelect.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/QueueSelect.tsx index 9d8162b..d6a10e9 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/QueueSelect.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/QueueSelect.tsx @@ -39,12 +39,12 @@ export const QueueSelectInput: React.FunctionComponent<QueueSelectProps> = (queu useEffect(() => { const listData = async () => { - var activeSort:ActiveSort = { + const activeSort:ActiveSort = { id: 'name', order: SortDirection.ASCENDING } - var data: any = await artemisService.getQueues(1, 10, activeSort, filter); - var queues = JSON.parse(data).data + const data: any = await artemisService.getQueues(1, 10, activeSort, filter); + const queues = JSON.parse(data).data if (queues.length > 0) { setQueues(queues); } else { @@ -69,7 +69,7 @@ export const QueueSelectInput: React.FunctionComponent<QueueSelectProps> = (queu const handleSelectQueueChange = (_event: React.MouseEvent<Element, MouseEvent> | undefined, value: string | number | undefined) => { setIsOpen(false); - var queueName: string = value as string; + const queueName: string = value as string; setSelected(queueName); setFilterText(queueName) queueSelectProps.selectQueue(queueName); @@ -99,7 +99,7 @@ export const QueueSelectInput: React.FunctionComponent<QueueSelectProps> = (queu const customFilter = (_event: FormEvent<HTMLInputElement>, value: string) => { setFilterText(value) - var newFilter: Filter = { + const newFilter: Filter = { column: 'name', operation: 'CONTAINS', input: value diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/producers/ProducerTable.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/producers/ProducerTable.tsx index ab12acf..245ea0a 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/producers/ProducerTable.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/producers/ProducerTable.tsx @@ -22,7 +22,7 @@ import { columnStorage } from '../artemis-preferences-service'; export const ProducerTable: React.FunctionComponent<Navigate> = navigate => { const getSessionFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'id', operation: 'EQUALS', input: row.session @@ -31,7 +31,7 @@ export const ProducerTable: React.FunctionComponent<Navigate> = navigate => { } const getAddressFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'name', operation: 'EQUALS', input: row.address diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/CreateQueue.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/CreateQueue.tsx index 225f722..1e522f7 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/CreateQueue.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/CreateQueue.tsx @@ -43,7 +43,7 @@ export const CreateQueue: React.FunctionComponent<CreateQueueProps> = (props: Cr }; const handleCreateQueue = () => { - var queueConfiguration: any = { + const queueConfiguration: any = { "name": queueName, "address": props.address, "filter-string": filter, diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/QueuesTable.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/QueuesTable.tsx index 2dcd445..ad81c66 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/QueuesTable.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/QueuesTable.tsx @@ -36,7 +36,7 @@ export type queuePermissions = { export const QueuesTable: React.FunctionComponent<QueueNavigate> = navigate => { const getAddressFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'name', operation: 'EQUALS', input: row.address @@ -45,7 +45,7 @@ export const QueuesTable: React.FunctionComponent<QueueNavigate> = navigate => { } const getConsumersFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'queue', operation: 'EQUALS', input: row.name diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/sessions/SessionsTable.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/sessions/SessionsTable.tsx index 2a58496..1943c1e 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/sessions/SessionsTable.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/sessions/SessionsTable.tsx @@ -25,7 +25,7 @@ import { columnStorage } from '../artemis-preferences-service'; export const SessionsTable: React.FunctionComponent<Navigate> = navigate => { const getConnectionFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'connectionID', operation: 'EQUALS', input: row.connectionID @@ -34,7 +34,7 @@ export const SessionsTable: React.FunctionComponent<Navigate> = navigate => { } const getConsumerFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'session', operation: 'EQUALS', input: row.id @@ -43,7 +43,7 @@ export const SessionsTable: React.FunctionComponent<Navigate> = navigate => { } const getProducerFilter = (row: any) => { - var filter: Filter = { + const filter: Filter = { column: 'session', operation: 'EQUALS', input: row.id diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/views/ArtemisJMXTabView.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/views/ArtemisJMXTabView.tsx index a331e7c..356f672 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/views/ArtemisJMXTabView.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/views/ArtemisJMXTabView.tsx @@ -57,7 +57,7 @@ export const ArtemisJMXTabs: React.FunctionComponent = () => { const isAddress = isAnAddress(selectedNode) const isAQueue = isQueue(selectedNode); - var prop = selectedNode.getProperty("routing-type"); + let prop = selectedNode.getProperty("routing-type"); const routingType: string = prop === undefined?'':prop; prop = selectedNode.getProperty("address"); const address: string | undefined = prop === undefined?'':prop; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
