This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis-console.git
commit 39ede8153dd5943e59891be8fa3be814ce175c02 Author: Andy Taylor <[email protected]> AuthorDate: Fri May 10 10:05:30 2024 +0100 ARTEMIS-4680 - Upgrade the console to use HawtIO 4 Some general tidying up, adding ids and a few fixes --- .../src/artemis-extension/artemis/artemis-service.ts | 2 +- .../src/artemis-extension/artemis/messages/MessageView.tsx | 4 ++-- .../src/artemis-extension/artemis/messages/MessagesTable.tsx | 7 +++++-- .../src/artemis-extension/artemis/queues/QueuesTable.tsx | 2 +- .../src/artemis-extension/artemis/table/ArtemisTable.tsx | 6 +++--- .../src/artemis-extension/artemis/views/ArtemisTabView.tsx | 2 +- artemis-console-extension/pom.xml | 10 ++++++++-- pom.xml | 2 -- 8 files changed, 21 insertions(+), 14 deletions(-) diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/artemis-service.ts b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/artemis-service.ts index 5f4a4a7..21f37e5 100644 --- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/artemis-service.ts +++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/artemis-service.ts @@ -413,7 +413,7 @@ class ArtemisService { return this.formatPersistentSize(size); } if (columnID === "originalQueue" && message["StringProperties"]) { - const originalQueue = message["StringProperties"]._AMQ_ORIG_QUEUE; + var 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] : ""; diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessageView.tsx b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessageView.tsx index 59fe57b..29300ab 100644 --- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessageView.tsx +++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessageView.tsx @@ -225,8 +225,8 @@ export const MessageView: React.FunctionComponent<MessageProps> = props => { </Tbody> </TableComposable> {props.back && - <><Button onClick={() => { if (props.back) { props.back(0); } } }>Queues</Button> - <Button onClick={() => { if (props.back) { props.back(1); } }}>Browse</Button></> + <><Button id='message-view-queues-button' onClick={() => { if (props.back) { props.back(0); } } }>Queues</Button> + <Button id='message-view-browse-button' onClick={() => { if (props.back) { props.back(1); } }}>Browse</Button></> } </> ) diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx index d0d7d7b..f0cd6a7 100644 --- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx +++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx @@ -113,6 +113,7 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => { return [ { title: 'Delete', + id: 'message-dropdown-delete', onClick: () => { setSelectedMessages([row.messageID]); setShowDeleteMessagesModal(true); @@ -120,12 +121,14 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => { }, { title: 'View', + id: 'message-dropdown-view', onClick: () => { if (props.selectMessage) { props.selectMessage(row); } } }, { title: 'Resend', + id: 'message-dropdown-resend', onClick: () => { if (props.selectMessage) { setResendMessage(row); @@ -260,7 +263,7 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => { </ToolbarItem> </ToolbarContent> </Toolbar> - <TableComposable variant="compact" aria-label="Column Management Table"> + <TableComposable id='message-table' variant="compact" aria-label="Column Management Table"> <Thead> <Tr > <Th></Th> @@ -316,7 +319,7 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => { }} /> {props.back && - <Button onClick={() => { if (props.back) { props.back(0) } }}>Queues</Button> + <Button id='message-table-queues-button' onClick={() => { if (props.back) { props.back(0) } }}>Queues</Button> } <Modal aria-label='delete-message-modal' diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/queues/QueuesTable.tsx b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/queues/QueuesTable.tsx index b8c5656..14a25e7 100644 --- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/queues/QueuesTable.tsx +++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/queues/QueuesTable.tsx @@ -59,7 +59,7 @@ export const QueuesTable: React.FunctionComponent<QueueNavigate> = navigate => { { id: 'maxConsumers', name: 'Max Consumers', visible: true, sortable: true, filterable: true }, { id: 'purgeOnNoConsumers', name: 'Purge On No Consumers', visible: true, sortable: true, filterable: true }, { id: 'consumerCount', name: 'Consumer Count', visible: true, sortable: true, filterable: true, filter: getConsumersFilter, filterTab: 4}, - { id: 'messageCount', name: 'Message Count', visible: false, sortable: true, filterable: true, link: messageView}, + { id: 'messageCount', name: 'Message Count', visible: true, sortable: true, filterable: true, link: messageView}, { id: 'paused', name: 'Paused', visible: false, sortable: true, filterable: true }, { id: 'temporary', name: 'Temporary', visible: false, sortable: true, filterable: true }, { id: 'autoCreated', name: 'Auto Created', visible: false, sortable: true, filterable: true }, diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx index 18c34e9..fb5c3ba 100644 --- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx +++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx @@ -265,7 +265,7 @@ const operationOptions = [ } onClose={handleModalToggle} actions={[ - <Button key="save" variant="primary" onClick={onSave}> + <Button id='columns-save-button' key="save" variant="primary" onClick={onSave}> Save </Button>, <Button key="close" variant="secondary" onClick={handleModalToggle}> @@ -393,7 +393,7 @@ const operationOptions = [ /> </ToolbarItem> <ToolbarItem key="search-button"> - <Button onClick={applyFilter}>Search</Button> + <Button onClick={applyFilter} id="table-search-button">Search</Button> </ToolbarItem> <ToolbarItem key="column-select"> <Button variant='link' onClick={handleModalToggle}>Manage Columns</Button> @@ -412,7 +412,7 @@ const operationOptions = [ return ( <React.Fragment> {toolbarItems} - <TableComposable variant="compact" aria-label="Column Management Table"> + <TableComposable variant="compact" aria-label="Data Table" id='data-table'> <Thead> <Tr > {columns.map((column, id) => { diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/views/ArtemisTabView.tsx b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/views/ArtemisTabView.tsx index 0341df1..10f1838 100644 --- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/views/ArtemisTabView.tsx +++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/views/ArtemisTabView.tsx @@ -97,7 +97,7 @@ export const ArtemisTabs: React.FunctionComponent = () => { <AddressesTable search={handleSearch} filter={searchFilter}/> } </Tab> - <Tab eventKey={6} title={<TabTitleText>Queues</TabTitleText>} aria-label="consumers"> + <Tab eventKey={6} title={<TabTitleText>Queues</TabTitleText>} aria-label="queues"> {activeTabKey === 6 && <QueuesView search={handleSearch} filter={searchFilter}/> } diff --git a/artemis-console-extension/pom.xml b/artemis-console-extension/pom.xml index 9ba5a5c..27fe499 100644 --- a/artemis-console-extension/pom.xml +++ b/artemis-console-extension/pom.xml @@ -31,6 +31,11 @@ <name>ActiveMQ Artemis Console Extension</name> + <properties> + <!-- Path to the Hawtio TypeScript plugin --> + <extension.path>artemis-extension</extension.path> + <extension.install.dir>artemis-extension</extension.install.dir> + </properties> <build> <finalName>${project.artifactId}</finalName> @@ -41,7 +46,8 @@ <artifactId>frontend-maven-plugin</artifactId> <version>${frontend-maven-plugin-version}</version> <configuration> - <workingDirectory>${plugin.path}</workingDirectory> + <workingDirectory>${extension.path}</workingDirectory> + <installDirectory>${extension.install.dir}</installDirectory> </configuration> <executions> <execution> @@ -81,7 +87,7 @@ <configuration> <filesets> <fileset> - <directory>${basedir}/${plugin.path}/build</directory> + <directory>${basedir}/${extension.path}/build</directory> <includes> <include>**/*</include> </includes> diff --git a/pom.xml b/pom.xml index 1bfc805..1607567 100644 --- a/pom.xml +++ b/pom.xml @@ -52,8 +52,6 @@ <node-version>v20.9.0</node-version> <yarn-version>v1.22.21</yarn-version> <frontend-maven-plugin-version>1.15.0</frontend-maven-plugin-version> - <!-- Path to the Hawtio TypeScript plugin --> - <plugin.path>artemis-extension</plugin.path> <project.build.outputTimestamp>2024-03-27T00:00:01Z</project.build.outputTimestamp> </properties>
