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/artemis-console.git
commit 3a5e2c60d7889c39d4fc06039e474b7824d63e6e Author: gchuf <[email protected]> AuthorDate: Sat Apr 11 17:34:59 2026 +0200 ARTEMIS-5963 - Initialize isCompact and columnPreferences correctly --- .../src/table/ArtemisTable.tsx | 34 +++++++++++++--------- 1 file changed, 20 insertions(+), 14 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 143aa23..c8d94e6 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 @@ -121,17 +121,34 @@ const operationOptions = [ return 10; } + const initialIsCompact = () => { + if (perPage == -1) { + return true; + } else { + return false; + } + } + + const initialColumns = () => { + if (broker.storageColumnLocation) { + const savedColumns = artemisPreferencesService.loadColumnPreferences( + broker.storageColumnLocation, broker.allColumns + ); + return savedColumns ?? broker.allColumns; + } + return broker.allColumns; + } + const [rows, setRows] = useState([]) const [resultsSize, setresultsSize] = useState(0) - const [columnsLoaded, setColumnsLoaded] = useState(false); - const [columns, setColumns] = useState(broker.allColumns); + const [columns, setColumns] = useState(initialColumns); const [activeSort, setActiveSort] = useState(initialActiveSort); const [isSortDropdownOpen, setIsSortDropdownOpen] = useState(false); const [isModalOpen, setIsModalOpen] = useState(false); const [page, setPage] = useState(1); const [perPage, setPerPage] = useState(initialPerPage); - const [isCompact, setIsCompact] = useState(false); + const [isCompact, setIsCompact] = useState(initialIsCompact); const rootElement = document.getElementById('root') as HTMLElement; const popperProps = { position: 'right' as const, @@ -163,17 +180,6 @@ const operationOptions = [ setresultsSize(data.count); }; - useEffect(() => { - if (!columnsLoaded && broker.storageColumnLocation) { - const updatedColumns: Column[] = artemisPreferencesService.loadColumnPreferences(broker.storageColumnLocation, broker.allColumns); - if (perPage == -1) { - setIsCompact(true); - } - setColumns(updatedColumns); - setColumnsLoaded(true); - } - }, [columnsLoaded]); - useEffect(() => { listData(); }, [page, perPage, activeSort, filter, broker.loadData]); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
