Skip to content

[7.x] add loading state to nodes table (#114709) #114740

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
kibanamachine merged 1 commit into from
Oct 13, 2021
Merged

[7.x] add loading state to nodes table (#114709) #114740

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
4 changes: 4 additions & 0 deletions x-pack/plugins/monitoring/public/application/pages/elasticsearch/nodes_page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export const ElasticsearchNodesPage: React.FC<ComponentProps> = ({ clusters }) =
const globalState = useContext(GlobalStateContext);
const { showCgroupMetricsElasticsearch } = useContext(ExternalConfigContext);
const { services } = useKibana<{ data: any }>();
const [isLoading, setIsLoading] = React.useState(false);
const { generate: generateBreadcrumbs } = useContext(BreadcrumbContainer.Context);
const { getPaginationRouteOptions, updateTotalItemCount, getPaginationTableProps } =
useTable('elasticsearch.nodes');
Expand Down Expand Up @@ -69,6 +70,7 @@ export const ElasticsearchNodesPage: React.FC<ComponentProps> = ({ clusters }) =
const bounds = services.data?.query.timefilter.timefilter.getBounds();
const url = `../api/monitoring/v1/clusters/${clusterUuid}/elasticsearch/nodes`;
if (services.http?.fetch && clusterUuid) {
setIsLoading(true);
const response = await services.http?.fetch(url, {
method: 'POST',
body: JSON.stringify({
Expand All @@ -81,6 +83,7 @@ export const ElasticsearchNodesPage: React.FC<ComponentProps> = ({ clusters }) =
}),
});

setIsLoading(false);
setData(response);
updateTotalItemCount(response.totalNodeCount);
const alertsResponse = await fetchAlerts({
Expand Down Expand Up @@ -129,6 +132,7 @@ export const ElasticsearchNodesPage: React.FC<ComponentProps> = ({ clusters }) =
setupMode={setupMode}
nodes={data.nodes}
alerts={alerts}
isLoading={isLoading}
showCgroupMetricsElasticsearch={showCgroupMetricsElasticsearch}
{...getPaginationTableProps()}
/>
Expand Down
6 changes: 6 additions & 0 deletions x-pack/plugins/monitoring/public/components/table/eui_table_ssp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export function EuiMonitoringSSPTable({
...props
}) {
const [queryText, setQueryText] = React.useState('');
const [isLoading, setIsLoading] = React.useState(false);
const [page, setPage] = React.useState({
index: pagination.pageIndex,
size: pagination.pageSize,
Expand Down Expand Up @@ -72,7 +73,9 @@ export function EuiMonitoringSSPTable({
setSort({ sort });
// angular version
if (props.fetchMoreData) {
setIsLoading(true);
await props.fetchMoreData({ page, sort: { sort }, queryText });
setIsLoading(false);
onTableChange({ page, sort });
}
// react version
Expand All @@ -87,7 +90,9 @@ export function EuiMonitoringSSPTable({
setQueryText(queryText);
// angular version
if (props.fetchMoreData) {
setIsLoading(true);
await props.fetchMoreData({ page: newPage, sort, queryText });
setIsLoading(false);
} else {
// react version
onTableChange({ page, sort: sort.sort, queryText });
Expand All @@ -105,6 +110,7 @@ export function EuiMonitoringSSPTable({
pagination={pagination}
onChange={onChange}
columns={columns}
loading={props.isLoading || isLoading}
/>
{footerContent}
</div>
Expand Down
1 change: 1 addition & 0 deletions x-pack/test/functional/services/monitoring/elasticsearch_nodes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export function MonitoringElasticsearchNodesProvider({ getService, getPageObject

async clickNameCol() {
await find.clickByCssSelector(`[data-test-subj="${SUBJ_TABLE_SORT_NAME_COL}"] > button`);
await find.byCssSelector('.euiBasicTable-loading');
await this.waitForTableToFinishLoading();
}

Expand Down