From 479e8e708aaf01c5359506b711e6e772e6999af2 Mon Sep 17 00:00:00 2001 From: GChuf Date: Fri, 5 Sep 2025 09:04:20 +0200 Subject: [PATCH 1/3] ARTEMIS-5999 - Rewrite ArtemisTable menu and remove deprecated imports --- .../src/table/ArtemisFilters.tsx | 4 +- .../src/table/ArtemisTable.tsx | 116 +++++++++--------- 2 files changed, 61 insertions(+), 59 deletions(-) diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisFilters.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisFilters.tsx index 98f150b0..64306f73 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisFilters.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisFilters.tsx @@ -38,8 +38,6 @@ export const ArtemisFilters: React.FC = ({ columns, operati const [columnOpen, setColumnOpen] = useState(false); const [operationOpen, setOperationOpen] = useState(false); - const visibleColumns = columns.filter(c => c.visible); - const applyFilter = () => { const filterValue = searchRef.current?.value ?? ""; if (filterOperation && filterColumn) { @@ -66,7 +64,7 @@ export const ArtemisFilters: React.FC = ({ columns, operati selected={filterColumn?.name} > - {visibleColumns.map(column => ( + {columns.map(column => ( {column.name} ))} diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisTable.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisTable.tsx index 08e8433d..1ecd8c95 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisTable.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisTable.tsx @@ -37,12 +37,12 @@ import { SortAmountDownIcon } from '@patternfly/react-icons/dist/esm/icons/sort- import { Thead, Tr, Th, Tbody, Td, IAction, ActionsColumn, Table, InnerScrollContainer } from '@patternfly/react-table'; import { artemisPreferencesService } from '../artemis-preferences-service'; import { - OptionsMenu, - OptionsMenuItem, - OptionsMenuItemGroup, - OptionsMenuSeparator, - OptionsMenuToggle -} from '@patternfly/react-core/deprecated' + MenuItem, + Divider, + MenuToggle, + MenuList, + Select +} from '@patternfly/react-core' import { ArtemisFilters } from './ArtemisFilters'; import {Simulate} from "react-dom/test-utils"; @@ -114,10 +114,10 @@ const operationOptions = [ const [rows, setRows] = useState([]) const [resultsSize, setresultsSize] = useState(0) const [columnsLoaded, setColumnsLoaded] = useState(false); - + const [operationOpen, setOperationOpen] = useState(false); + const onToggle = () => setOperationOpen(prev => !prev); const [columns, setColumns] = useState(broker.allColumns); const [activeSort, setActiveSort] = useState(initialActiveSort); - const [isSortDropdownOpen, setIsSortDropdownOpen] = useState(false); const [isModalOpen, setIsModalOpen] = useState(false); const [page, setPage] = useState(1); const [isCompact, setIsCompact] = useState(false); @@ -334,63 +334,67 @@ const operationOptions = [ ); }; + + return ( - - {Object.values(broker.allColumns).filter((element) => element.visible).map((column, columnIndex) => ( - { - updateActiveSort(column.id, activeSort.order) - }} - > - {column.name} - - ))} - , - , - - updateActiveSort(activeSort.id, SortDirection.ASCENDING)} - isSelected={activeSort.order === SortDirection.ASCENDING} - id="ascending" - key="ascending" - > - Ascending - - updateActiveSort(activeSort.id, SortDirection.DESCENDING)} - isSelected={activeSort.order === SortDirection.DESCENDING} - id="descending" - key="descending" - > - Descending - - - ]} - isOpen={isSortDropdownOpen} - toggle={ - setIsSortDropdownOpen(!isSortDropdownOpen)} - toggleTemplate={} - /> - } - isPlain - isGrouped - /> + { From 7bae20ecc25e9c732063c1d1021684f48cb5dc91 Mon Sep 17 00:00:00 2001 From: gchuf Date: Mon, 13 Apr 2026 09:09:30 +0200 Subject: [PATCH 2/3] ARTEMIS-5999 - Switch to ESM build --- .../artemis-extension/app/package.json | 5 ++++- .../artemis-extension/app/webpack.config.cjs | 9 ++++++++- .../packages/artemis-console-plugin/package.json | 6 +++--- .../artemis-console-plugin/src/ArtemisJMXContent.tsx | 2 +- .../artemis-console-plugin/src/ArtemisPreferences.tsx | 2 +- .../src/addresses/AddressesTable.tsx | 2 +- .../src/addresses/CreateAddress.tsx | 2 +- .../src/addresses/DeleteAddress.tsx | 4 ++-- .../artemis-console-plugin/src/brokers/BrokerDiagram.tsx | 2 +- .../src/messages/MessagesTable.tsx | 2 +- .../artemis-console-plugin/src/messages/QueueSelect.tsx | 2 +- .../artemis-console-plugin/src/messages/SendMessage.tsx | 6 +++--- .../artemis-console-plugin/src/queues/CreateQueue.tsx | 6 +++--- .../artemis-console-plugin/src/queues/DeleteQueue.tsx | 2 +- .../artemis-console-plugin/src/queues/QueuesView.tsx | 2 +- .../artemis-console-plugin/src/status/Status.tsx | 6 +++--- .../artemis-console-plugin/src/table/ArtemisTable.tsx | 2 +- .../packages/artemis-console-plugin/tsup.config.ts | 2 +- 18 files changed, 37 insertions(+), 27 deletions(-) diff --git a/artemis-console-extension/artemis-extension/app/package.json b/artemis-console-extension/artemis-extension/app/package.json index e7e98be6..a0f37cc8 100644 --- a/artemis-console-extension/artemis-extension/app/package.json +++ b/artemis-console-extension/artemis-extension/app/package.json @@ -4,8 +4,11 @@ "description": "Artemis Console", "license": "Apache-2.0", "private": true, + "type": "module", + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", "scripts": { - "start": "webpack serve --mode development", + "start": "webpack serve --mode development --hot --open", "build": "webpack --mode production && yarn replace-version && yarn replace-doc-version", "replace-version": "replace __PACKAGE_VERSION_PLACEHOLDER__ $npm_package_version ./build/static/js -r --include=\"*.js\"", "replace-doc-version": "replace __PACKAGE_VERSION_PLACEHOLDER__ $npm_package_version ./build/hawtconfig.json" diff --git a/artemis-console-extension/artemis-extension/app/webpack.config.cjs b/artemis-console-extension/artemis-extension/app/webpack.config.cjs index 3ceba7ef..ce4c6dd7 100644 --- a/artemis-console-extension/artemis-extension/app/webpack.config.cjs +++ b/artemis-console-extension/artemis-extension/app/webpack.config.cjs @@ -242,9 +242,16 @@ module.exports = (webpackEnv, args) => { minimizer: [ // This is only used in production mode new TerserPlugin({ + parallel: true, terserOptions: { ecma: 2023, - compress: true, + module: true, + compress: { + passes: 2, + pure_getters: true, + drop_console: true, + drop_debugger: true + }, mangle: true, output: { ecma: 2023, diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/package.json b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/package.json index 97a25568..0adbde42 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/package.json +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/package.json @@ -9,8 +9,8 @@ "exports": { ".": { "types": "./dist/index.d.ts", - "require": "./dist/index.js", - "default": "./dist/index.js" + "require": "./dist/index.mjs", + "default": "./dist/index.mjs" }, "./styles": "./dist/index.css", "./dist/index.css": "./dist/index.css" @@ -18,7 +18,7 @@ "scripts": { "build": "tsup --clean && yarn replace-version", "test": "jest", - "replace-version": "replace __PACKAGE_VERSION_PLACEHOLDER__ $npm_package_version ./dist/index.js" + "replace-version": "replace __PACKAGE_VERSION_PLACEHOLDER__ $npm_package_version ./dist/index.mjs" }, "dependencies": { "react-split": "^2.0.14", diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/ArtemisJMXContent.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/ArtemisJMXContent.tsx index 244dd264..add0ba29 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/ArtemisJMXContent.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/ArtemisJMXContent.tsx @@ -17,7 +17,7 @@ import { PageGroup, PageSection, PageSectionVariants, Title, Divider, Text, EmptyState, EmptyStateIcon, EmptyStateVariant } from "@patternfly/react-core" import { useContext } from "react"; import { ArtemisContext } from "./context"; -import { CubesIcon } from "@patternfly/react-icons/dist/esm/icons/cubes-icon"; +import { CubesIcon } from "@patternfly/react-icons/dist/esm/icons/cubes-icon.js"; import './ArtemisJMXContent.css' import { ArtemisJMXTabs } from "./views/ArtemisJMXTabView"; diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/ArtemisPreferences.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/ArtemisPreferences.tsx index eb400304..964786ce 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/ArtemisPreferences.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/ArtemisPreferences.tsx @@ -17,7 +17,7 @@ import { CardBody, Flex, FlexItem, Form, FormGroup, FormSection, Icon, MenuToggle, MenuToggleElement, Select, SelectList, SelectOption, TextInput, Tooltip } from '@patternfly/react-core' import React, { FormEvent, useState } from 'react' import { artemisPreferencesService, ArtemisOptions } from './artemis-preferences-service' -import { HelpIcon } from '@patternfly/react-icons/dist/esm/icons/help-icon' +import { HelpIcon } from '@patternfly/react-icons/dist/esm/icons/help-icon.js' export const ArtemisPreferences: React.FunctionComponent = () => ( 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 726092b6..70641b9b 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 @@ -19,7 +19,7 @@ import { ActiveSort, ArtemisTable, Column, Filter, ToolbarAction } from '../tabl import { Navigate } from '../views/ArtemisTabView.js'; import { artemisService } from '../artemis-service'; import { IAction } from '@patternfly/react-table'; -import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon'; +import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon.js'; import { Button, Icon, Modal, ModalVariant, TextContent, Text } from '@patternfly/react-core'; import { CreateQueue } from '../queues/CreateQueue'; import { Attributes, eventService, jolokiaService, Operations, workspace } from '@hawtio/react'; diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/CreateAddress.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/CreateAddress.tsx index 91694a1a..614b75e7 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/CreateAddress.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/CreateAddress.tsx @@ -29,7 +29,7 @@ import { import React, {useState} from 'react' import {artemisService} from '../artemis-service'; import { eventService, jolokiaService } from '@hawtio/react'; -import {OutlinedQuestionCircleIcon} from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon'; +import {OutlinedQuestionCircleIcon} from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon.js'; interface CreateAddressProps { reload: Function diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/DeleteAddress.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/DeleteAddress.tsx index b556e54f..c5cd9f51 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/DeleteAddress.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/addresses/DeleteAddress.tsx @@ -16,10 +16,10 @@ */ import { ActionGroup, Text, Button, Form, Icon, Modal, ModalVariant, TextContent, Title, Popover } from '@patternfly/react-core'; import React, { useState } from 'react' -import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon'; +import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon.js'; import { eventService, jolokiaService, workspace } from '@hawtio/react'; import { artemisService } from '../artemis-service'; -import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon'; +import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon.js'; type DeleteAddressProps = { address: string 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 e086c899..a99116fb 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 @@ -15,7 +15,7 @@ * limitations under the License. */ import * as React from 'react'; -import { ClusterIcon } from '@patternfly/react-icons/dist/esm/icons/cluster-icon'; +import { ClusterIcon } from '@patternfly/react-icons/dist/esm/icons/cluster-icon.js'; import { ColaLayout, 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 caf438b9..e32030c7 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 @@ -19,7 +19,7 @@ import { Column } from '../table/ArtemisTable'; import { artemisService } from '../artemis-service'; import { Toolbar, ToolbarContent, ToolbarItem, Text, SearchInput, Button, PaginationVariant, Pagination, DataList, DataListCell, DataListCheck, DataListItem, DataListItemCells, DataListItemRow, Modal, TextContent, Icon, ModalVariant } from '@patternfly/react-core'; import { Thead, Tr, Th, Tbody, Td, ActionsColumn, IAction, Table, InnerScrollContainer } from '@patternfly/react-table'; -import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon'; +import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon.js'; import { createQueueObjectName } from '../util/jmx'; import { Link } from 'react-router-dom'; import { eventService, jolokiaService } from '@hawtio/react'; 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 c8edc123..29200c3f 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 @@ -18,7 +18,7 @@ import React, { FormEvent, useEffect, useState } from 'react'; import { Button, MenuToggle, MenuToggleElement, Select, SelectList, SelectOption, TextInputGroup, TextInputGroupMain, TextInputGroupUtilities } from '@patternfly/react-core'; import { artemisService } from '../artemis-service'; import { ActiveSort, Filter, SortDirection } from '../table/ArtemisTable'; -import { TimesIcon } from '@patternfly/react-icons/dist/esm/icons/times-icon' +import { TimesIcon } from '@patternfly/react-icons/dist/esm/icons/times-icon.js' import { eventService, jolokiaService } from '@hawtio/react' export type QueueSelectProps = { diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/SendMessage.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/SendMessage.tsx index d72b715b..ff0b27df 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/SendMessage.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/messages/SendMessage.tsx @@ -37,9 +37,9 @@ import { Popover, TextContent } from '@patternfly/react-core' -import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon' -import { InfoCircleIcon } from '@patternfly/react-icons/dist/esm/icons/info-circle-icon' -import { TrashIcon } from '@patternfly/react-icons/dist/esm/icons/trash-icon' +import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon.js' +import { InfoCircleIcon } from '@patternfly/react-icons/dist/esm/icons/info-circle-icon.js' +import { TrashIcon } from '@patternfly/react-icons/dist/esm/icons/trash-icon.js' import { CodeEditor, Language } from '@patternfly/react-code-editor' import { eventService, jolokiaService } from '@hawtio/react' import { artemisService } from '../artemis-service' 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 e9d0e2a7..727a6d50 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 @@ -16,9 +16,9 @@ */ import { ActionGroup, Button, Checkbox, Flex, FlexItem, Form, FormGroup, NumberInput, Radio, TextInput, Title, Text, TextContent, Popover, Tooltip } from '@patternfly/react-core'; import React, { FormEvent, useState } from 'react' -import { TrashIcon } from '@patternfly/react-icons/dist/esm/icons/trash-icon' -import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon' -import { InfoCircleIcon } from '@patternfly/react-icons/dist/esm/icons/info-circle-icon' +import { TrashIcon } from '@patternfly/react-icons/dist/esm/icons/trash-icon.js' +import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon.js' +import { InfoCircleIcon } from '@patternfly/react-icons/dist/esm/icons/info-circle-icon.js' import { artemisService } from '../artemis-service'; import { eventService, jolokiaService, workspace } from '@hawtio/react'; diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/DeleteQueue.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/DeleteQueue.tsx index 5282b9bc..9a43518b 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/DeleteQueue.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/DeleteQueue.tsx @@ -18,7 +18,7 @@ import { ActionGroup, Button, Form, Modal, ModalVariant, Popover, TextContent, T import React, { useState } from 'react' import { eventService, jolokiaService, workspace } from '@hawtio/react'; import { artemisService } from '../artemis-service'; -import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon'; +import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon.js'; type DeleteQueueProps = { queue: string diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/QueuesView.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/QueuesView.tsx index 7923705b..46ba0cba 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/QueuesView.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/queues/QueuesView.tsx @@ -21,7 +21,7 @@ import { MessagesTable } from '../messages/MessagesTable'; import { Filter } from '../table/ArtemisTable'; import { Button, Modal, ModalVariant, TextContent, Title, Text, Icon, TextVariants, TextList, TextListItem, TextListItemVariants, TextListVariants } from '@patternfly/react-core'; import { Message, MessageView } from '../messages/MessageView'; -import { HelpIcon } from '@patternfly/react-icons/dist/esm/icons/help-icon'; +import { HelpIcon } from '@patternfly/react-icons/dist/esm/icons/help-icon.js'; import { Link } from 'react-router-dom'; export type QueueNavigate = { diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/status/Status.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/status/Status.tsx index f4d89652..193cbe23 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/status/Status.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/status/Status.tsx @@ -41,9 +41,9 @@ import { Spinner, Tooltip } from "@patternfly/react-core" -import { EllipsisVIcon } from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon' -import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon' -import { OkIcon } from '@patternfly/react-icons/dist/esm/icons/ok-icon' +import { EllipsisVIcon } from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon.js' +import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon.js' +import { OkIcon } from '@patternfly/react-icons/dist/esm/icons/ok-icon.js' import { Attributes, eventService, jolokiaService, Operations } from '@hawtio/react'; import React, { ReactNode, useContext, useEffect, useState } from "react"; import { Acceptors, artemisService, BrokerInfo, BrokerState, ClusterConnections } from "../artemis-service"; diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisTable.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisTable.tsx index 1ecd8c95..818ff4c4 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisTable.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/table/ArtemisTable.tsx @@ -33,7 +33,7 @@ import { Text, TextContent } from '@patternfly/react-core'; -import { SortAmountDownIcon } from '@patternfly/react-icons/dist/esm/icons/sort-amount-down-icon'; +import { SortAmountDownIcon } from '@patternfly/react-icons/dist/esm/icons/sort-amount-down-icon.js'; import { Thead, Tr, Th, Tbody, Td, IAction, ActionsColumn, Table, InnerScrollContainer } from '@patternfly/react-table'; import { artemisPreferencesService } from '../artemis-preferences-service'; import { diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/tsup.config.ts b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/tsup.config.ts index ed4a5475..2e8285f2 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/tsup.config.ts +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/tsup.config.ts @@ -21,7 +21,7 @@ import { defineConfig } from 'tsup' export default defineConfig({ entry: ["src/index.ts"], - format: "cjs", + format: "esm", target: "esnext", sourcemap: true, dts: true, From cc6bdd20e79c83bf7ff689b8b8a118c21dd1ea33 Mon Sep 17 00:00:00 2001 From: GChuf Date: Mon, 8 Sep 2025 13:59:12 +0200 Subject: [PATCH 3/3] ARTEMIS-5999 - Cleanup imports --- .../packages/artemis-console-plugin/src/Artemis.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/Artemis.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/Artemis.tsx index ab59597e..b8b6d919 100644 --- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/Artemis.tsx +++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/Artemis.tsx @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import React from 'react' + import { ArtemisTabs } from './views/ArtemisTabView'; import { PageSection, Page } from '@patternfly/react-core'; - export const Artemis: React.FunctionComponent = () => { return (