From a780fbd9fb2549bd95e5069d8248947369c16cab Mon Sep 17 00:00:00 2001 From: gchuf Date: Thu, 2 Jul 2026 11:15:57 +0200 Subject: [PATCH] ARTEMIS-6139 Avoid fetching messages twice --- .../src/messages/MessagesTable.tsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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..e4272acb 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 @@ -39,10 +39,8 @@ export type MessageProps = { } - export const MessagesTable: React.FunctionComponent = props => { - const messageView = (row: any) => { if (props.selectMessage) { props.selectMessage(row); } } @@ -61,11 +59,22 @@ export const MessagesTable: React.FunctionComponent = props => { { id: 'validatedUser', name: 'Validated User', visible: false, sortable: true, filterable: false }, { id: 'originalQueue', name: 'Original Queue', visible: false, sortable: true, filterable: false }, ]; + + const initialPerPage = () => { + if (columnStorage.messages) { + const savedPerPage = artemisPreferencesService.loadTablePageSize( + columnStorage.messages + ); + return savedPerPage ?? 10; + } + return 10; + } + const [filter, setFilter] = useState(""); const [inputValue, setInputValue] = useState(''); const [page, setPage] = useState(1); const [rows, setRows] = useState([]) - const [perPage, setPerPage] = useState(10); + const [perPage, setPerPage] = useState(initialPerPage); const [columns, setColumns] = useState(allColumns); const [columnsLoaded, setColumnsLoaded] = useState(false); const [columnsModalOpen, setColumnsModalOpen] = useState(false);