fix(ui): pagination limit for dashboards (#21466)

* fix: pagination limit for dashboards

* add e2e test

* refactor: address pr comments

(cherry picked from commit f4720e0cb7921e1c8b518d748dc84a7440d704d5)
This commit is contained in:
Pranita Fulsundar 2025-06-02 09:54:22 +05:30 committed by OpenMetadata Release Bot
parent 7327b9c5f4
commit c1fef32b15
4 changed files with 149 additions and 3 deletions

View File

@ -0,0 +1,82 @@
/*
* Copyright 2025 Collate.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import test, { expect } from '@playwright/test';
import { DashboardServiceClass } from '../../support/entity/service/DashboardServiceClass';
import { createNewPage, redirectToHomePage } from '../../utils/common';
import { generateEntityChildren } from '../../utils/entity';
// use the admin user to login
test.use({ storageState: 'playwright/.auth/admin.json' });
const dashboardEntity = new DashboardServiceClass();
test.slow(true);
test.describe('Dashboards', () => {
test.beforeAll('Setup pre-requests', async ({ browser }) => {
const { apiContext, afterAction } = await createNewPage(browser);
const dashboardChildren = generateEntityChildren('dashboard', 25);
await dashboardEntity.create(apiContext, dashboardChildren);
await afterAction();
});
test.afterAll('Clean up', async ({ browser }) => {
const { afterAction, apiContext } = await createNewPage(browser);
await dashboardEntity.delete(apiContext);
await afterAction();
});
test.beforeEach('Visit home page', async ({ page }) => {
await redirectToHomePage(page);
});
test(`should change the page size`, async ({ page }) => {
await dashboardEntity.visitEntityPage(page);
await page.getByRole('tab', { name: 'Dashboards' }).click();
await page.waitForSelector('.ant-spin', {
state: 'detached',
});
await expect(page.getByTestId('pagination')).toBeVisible();
await expect(page.getByTestId('previous')).toBeDisabled();
await expect(page.getByTestId('page-indicator')).toContainText(
'Page 1 of 2 '
);
// Check the page sizing change
const childrenResponse = page.waitForResponse(
(res) =>
res.url().includes('/api/v1/dashboards') &&
res.url().includes('limit=25')
);
await page.getByTestId('page-size-selection-dropdown').click();
await page.getByText('25 / Page').click();
await childrenResponse;
await page.waitForSelector('.ant-spin', {
state: 'detached',
});
await expect(page.getByTestId('next')).toBeDisabled();
await expect(page.getByTestId('previous')).toBeDisabled();
await expect(page.getByTestId('page-indicator')).toContainText(
'Page 1 of 1'
);
});
});

View File

@ -12,6 +12,7 @@
*/
import { APIRequestContext, Page } from '@playwright/test';
import { Operation } from 'fast-json-patch';
import { isUndefined } from 'lodash';
import { SERVICE_TYPE } from '../../../constant/service';
import { uuid } from '../../../utils/common';
import { visitServiceDetailsPage } from '../../../utils/service';
@ -35,8 +36,14 @@ export class DashboardServiceClass extends EntityClass {
},
},
};
childEntity = {
name: `pw-dashboard-${uuid()}`,
displayName: `pw-dashboard-${uuid()}`,
service: this.entity.name,
};
entityResponseData: ResponseDataType = {} as ResponseDataType;
childrenArrayResponseData: ResponseDataType[] = [];
constructor(name?: string) {
super(EntityTypeEndpoint.DashboardService);
@ -44,7 +51,21 @@ export class DashboardServiceClass extends EntityClass {
this.type = 'Dashboard Service';
}
async create(apiContext: APIRequestContext) {
private async createDashboardChild(
apiContext: APIRequestContext,
dashboardData: { name: string; displayName: string; service: string }
): Promise<ResponseDataType> {
const response = await apiContext.post('/api/v1/dashboards', {
data: dashboardData,
});
return await response.json();
}
async create(
apiContext: APIRequestContext,
customChildDashboards?: { name: string; displayName: string }[]
) {
const serviceResponse = await apiContext.post(
'/api/v1/services/dashboardServices',
{
@ -56,7 +77,38 @@ export class DashboardServiceClass extends EntityClass {
this.entityResponseData = service;
return service;
const childDashboardResponseData: ResponseDataType[] = [];
if (!isUndefined(customChildDashboards)) {
for (const child of customChildDashboards) {
const childDashboard = {
...child,
service: this.entity.name,
};
const responseData = await this.createDashboardChild(
apiContext,
childDashboard
);
childDashboardResponseData.push(responseData);
}
} else {
const childDashboard = {
...this.childEntity,
};
const responseData = await this.createDashboardChild(
apiContext,
childDashboard
);
childDashboardResponseData.push(responseData);
}
this.childrenArrayResponseData = childDashboardResponseData;
return {
service,
children: this.childrenArrayResponseData,
};
}
async patch(apiContext: APIRequestContext, payload: Operation[]) {

View File

@ -25,6 +25,7 @@ import {
descriptionBox,
redirectToHomePage,
toastNotification,
uuid,
} from './common';
import {
customFormatDateTime,
@ -1422,3 +1423,14 @@ export const getFirstRowColumnLink = (page: Page) => {
.locator('[data-testid="column-name"] a')
.first();
};
export const generateEntityChildren = (entityName: string, count = 25) => {
return Array.from({ length: count }, (_, i) => {
const id = uuid();
return {
name: `pw-${entityName}-${i + 1}-${id}`,
displayName: `pw-${entityName}-${i + 1}-${id}`,
};
});
};

View File

@ -69,9 +69,9 @@ export const getDashboards = async (
params: {
service,
fields,
limit,
...paging,
include,
limit,
},
});