Skip to content

[app] Fix pagination #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2022
Merged

[app] Fix pagination #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ NOTE: As semantic versioning states all 0.y.z releases can contain breaking chan
- [#352](https://github.com/kobsio/kobs/pull/#352): [app] Fix plugin filter and allow filtering by the name of a satellite.
- [#356](https://github.com/kobsio/kobs/pull/#356): [app] Fix tooltip in documents table of the klogs plugin. Fix filtering of services and operations in the Jaeger plugin. Add max height to all select boxes.
- [#358](https://github.com/kobsio/kobs/pull/#358): [app] Fix namespace handling, when multiple namespaces are selected.
- [#359](https://github.com/kobsio/kobs/pull/#359): [app] Fix pagination, when the number of items per page is changed.

### Changed

Expand Down
2 changes: 1 addition & 1 deletion plugins/app/src/components/applications/ApplicationsPagination.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const Applications: React.FunctionComponent<IApplicationsPagination> = ({
setOptions({ ...options, page: newPage })
}
onPerPageSelect={(event: React.MouseEvent | React.KeyboardEvent | MouseEvent, newPerPage: number): void =>
setOptions({ ...options, perPage: newPerPage })
setOptions({ ...options, page: 1, perPage: newPerPage })
}
onFirstClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setOptions({ ...options, page: newPage })
Expand Down
2 changes: 1 addition & 1 deletion plugins/app/src/components/applications/ApplicationsPanelList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const ApplicationsPanelList: React.FunctionComponent<IApplicationsPanelListProps
setOptions({ ...options, page: newPage })
}
onPerPageSelect={(event: React.MouseEvent | React.KeyboardEvent | MouseEvent, newPerPage: number): void =>
setOptions({ ...options, perPage: newPerPage })
setOptions({ ...options, page: 1, perPage: newPerPage })
}
onFirstClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setOptions({ ...options, page: newPage })
Expand Down
2 changes: 1 addition & 1 deletion plugins/app/src/components/plugins/PluginInstances.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const PluginInstances: React.FunctionComponent = () => {
setState({ ...state, page: newPage })
}
onPerPageSelect={(event: React.MouseEvent | React.KeyboardEvent | MouseEvent, newPerPage: number): void =>
setState({ ...state, perPage: newPerPage })
setState({ ...state, page: 1, perPage: newPerPage })
}
onFirstClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setState({ ...state, page: newPage })
Expand Down
2 changes: 1 addition & 1 deletion plugins/app/src/components/profile/UserApplicationsPagination.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const Applications: React.FunctionComponent<IApplicationsPagination> = ({
setOptions({ ...options, page: newPage })
}
onPerPageSelect={(event: React.MouseEvent | React.KeyboardEvent | MouseEvent, newPerPage: number): void =>
setOptions({ ...options, perPage: newPerPage })
setOptions({ ...options, page: 1, perPage: newPerPage })
}
onFirstClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setOptions({ ...options, page: newPage })
Expand Down
2 changes: 1 addition & 1 deletion plugins/app/src/components/teams/Teams.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const Teams: React.FunctionComponent = () => {
setState({ ...state, page: newPage })
}
onPerPageSelect={(event: React.MouseEvent | React.KeyboardEvent | MouseEvent, newPerPage: number): void =>
setState({ ...state, perPage: newPerPage })
setState({ ...state, page: 1, perPage: newPerPage })
}
onFirstClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setState({ ...state, page: newPage })
Expand Down
12 changes: 6 additions & 6 deletions plugins/plugin-elasticsearch/src/components/panel/LogsDocuments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,23 @@ const LogsDocuments: React.FunctionComponent<ILogsDocumentsProps> = ({
page={page.page}
variant={PaginationVariant.bottom}
onSetPage={(event: React.MouseEvent | React.KeyboardEvent | MouseEvent, newPage: number): void =>
setPage({ page: newPage, perPage: page.perPage })
setPage({ ...page, page: newPage })
}
onPerPageSelect={(
event: React.MouseEvent | React.KeyboardEvent | MouseEvent,
newPerPage: number,
): void => setPage({ page: page.page, perPage: newPerPage })}
): void => setPage({ page: 1, perPage: newPerPage })}
onFirstClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setPage({ page: newPage, perPage: page.perPage })
setPage({ ...page, page: newPage })
}
onLastClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setPage({ page: newPage, perPage: page.perPage })
setPage({ ...page, page: newPage })
}
onNextClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setPage({ page: newPage, perPage: page.perPage })
setPage({ ...page, page: newPage })
}
onPreviousClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setPage({ page: newPage, perPage: page.perPage })
setPage({ ...page, page: newPage })
}
/>
</Td>
Expand Down
2 changes: 1 addition & 1 deletion plugins/plugin-harbor/src/components/panel/Pagination.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const Pagination: React.FunctionComponent<IPaginationProps> = ({
setOptions({ ...options, page: newPage })
}
onPerPageSelect={(event: React.MouseEvent | React.KeyboardEvent | MouseEvent, newPerPage: number): void =>
setOptions({ ...options, perPage: newPerPage })
setOptions({ ...options, page: 1, perPage: newPerPage })
}
onFirstClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setOptions({ ...options, page: newPage })
Expand Down
12 changes: 6 additions & 6 deletions plugins/plugin-klogs/src/components/panel/LogsDocuments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,23 +128,23 @@ const LogsDocuments: React.FunctionComponent<ILogsDocumentsProps> = ({
page={page.page}
variant={PaginationVariant.bottom}
onSetPage={(event: React.MouseEvent | React.KeyboardEvent | MouseEvent, newPage: number): void =>
setPage({ page: newPage, perPage: page.perPage })
setPage({ ...page, page: newPage })
}
onPerPageSelect={(
event: React.MouseEvent | React.KeyboardEvent | MouseEvent,
newPerPage: number,
): void => setPage({ page: page.page, perPage: newPerPage })}
): void => setPage({ page: 1, perPage: newPerPage })}
onFirstClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setPage({ page: newPage, perPage: page.perPage })
setPage({ ...page, page: newPage })
}
onLastClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setPage({ page: newPage, perPage: page.perPage })
setPage({ ...page, page: newPage })
}
onNextClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setPage({ page: newPage, perPage: page.perPage })
setPage({ ...page, page: newPage })
}
onPreviousClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setPage({ page: newPage, perPage: page.perPage })
setPage({ ...page, page: newPage })
}
/>
</Td>
Expand Down
2 changes: 1 addition & 1 deletion plugins/plugin-sonarqube/src/components/page/Page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const Page: React.FunctionComponent<IPluginPageProps> = ({ instance }: IPluginPa
setOptions({ ...options, page: newPage })
}
onPerPageSelect={(event: React.MouseEvent | React.KeyboardEvent | MouseEvent, newPerPage: number): void =>
setOptions({ ...options, perPage: newPerPage })
setOptions({ ...options, page: 1, perPage: newPerPage })
}
onFirstClick={(event: React.SyntheticEvent<HTMLButtonElement>, newPage: number): void =>
setOptions({ ...options, page: newPage })
Expand Down