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 0a0d346f9969639d9692d4f86c4d561c5258ade8 Author: GChuf <[email protected]> AuthorDate: Fri May 30 14:06:52 2025 +0200 ARTEMIS-5511 - Improve rendering logic --- .../src/table/ArtemisTable.tsx | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) 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 2e9e622..972c48d 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 @@ -133,7 +133,7 @@ const operationOptions = [ } } - const [filter, setFilter] = useState(broker.filter !== undefined? broker.filter:initialFilter); + const [filter, setFilter] = useState(() => broker.filter !== undefined ? broker.filter : initialFilter()); const [filterColumnStatusSelected, setFilterColumnStatusSelected] = useState(columns.find(column => filter.column === column.id)?.name); const [filterColumnOperationSelected, setFilterColumnOperationSelected] = useState(operationOptions.find(operation => operation.id === filter.operation)?.name); @@ -141,24 +141,23 @@ const operationOptions = [ const [filterColumnStatusIsExpanded, setFilterColumnStatusIsExpanded] = useState(false); const [filterColumnOperationIsExpanded, setFilterColumnOperationIsExpanded] = useState(false); + const listData = async () => { + const data = await broker.getData(page, perPage, activeSort, filter); + setRows(data.data); + setresultsSize(data.count); + }; useEffect(() => { - const listData = async () => { - var data = await broker.getData(page, perPage, activeSort, filter); - setRows(data.data); - setresultsSize(data.count); - } if (!columnsLoaded && broker.storageColumnLocation) { const updatedColumns: Column[] = artemisPreferencesService.loadColumnPreferences(broker.storageColumnLocation, broker.allColumns); setColumns(updatedColumns); setColumnsLoaded(true); } - if(broker.storageColumnLocation) { - setPerPage(artemisPreferencesService.loadTablePageSize(broker.storageColumnLocation)); - } - listData(); + }, [columns, columnsLoaded]); - }, [columns, page, activeSort, filter, perPage, columnsLoaded, broker]) + useEffect(() => { + listData(); + }, [page, perPage, activeSort, filter]); const handleModalToggle = () => { setIsModalOpen(!isModalOpen); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
