Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

fix(ui/datatables): sync page count with filtering [EE-5890] (#10010)

Browse source
This commit is contained in:
Chaim Lev-Ari 2023-08-22 09:36:31 +03:00 • committed by GitHub
parent bb646162d1
commit 5586910e9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 78 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/EnvironmentsDatatable.tsx
View file

@ -40,7 +40,7 @@ export function EnvironmentsDatatable() {
(value) => (value ? parseInt(value, 10) : undefined)
);
const tableState = useTableStateWithoutStorage('name');
const endpointsQuery = useEnvironmentList({
const environmentsQuery = useEnvironmentList({
pageLimit: tableState.pageSize,
page: page + 1,
search: tableState.search,
@ -56,7 +56,7 @@ export function EnvironmentsDatatable() {
const gitConfigCommitHash = edgeStackQuery.data?.GitConfig?.ConfigHash || '';
const environments: Array<EdgeStackEnvironment> = useMemo(
() =>
endpointsQuery.environments.map(
environmentsQuery.environments.map(
(env) =>
({
...env,
@ -72,7 +72,7 @@ export function EnvironmentsDatatable() {
[
currentFileVersion,
edgeStackQuery.data?.Status,
endpointsQuery.environments,
environmentsQuery.environments,
gitConfigCommitHash,
gitConfigURL,
]
@ -81,13 +81,15 @@ export function EnvironmentsDatatable() {
return (
<Datatable
columns={columns}
isLoading={endpointsQuery.isLoading}
isLoading={environmentsQuery.isLoading}
dataset={environments}
settingsManager={tableState}
title="Environments Status"
titleIcon={HardDrive}
isServerSidePagination
page={page}
onPageChange={setPage}
totalCount={endpointsQuery.totalCount}
totalCount={environmentsQuery.totalCount}
emptyContentLabel="No environment available."
disableSelect
description={