Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -381,13 +381,10 @@ test.describe('Pagination Tests', PLAYWRIGHT_BASIC_TEST_TAG_OBJ, () => {
page,
}) => {
await page.goto('/settings/notifications/alerts');
// Skip row count validation because ActivityFeedAlert system alert is added on page 1
await testPaginationNavigation(
page,
'/api/v1/events/subscriptions',
'table',
true,
false
'table'
);
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ export interface NotificationBoxProp {
onMarkTaskNotificationRead: () => void;
onTabChange: (key: string) => void;
}

Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,17 @@ const NotificationListPage = () => {
async (params?: Partial<Paging>) => {
setLoadingCount((count) => count + 1);
try {
const isFirstPage =
isUndefined(params?.after) && isUndefined(params?.before);
const { data, paging } = await getAllAlerts({
after: params?.after,
before: params?.before,
limit: pageSize,
limit: isFirstPage ? pageSize - 1 : pageSize,
alertType: AlertType.Notification,
});

if (isUndefined(params?.after)) {
// Fetch and show the system created activity feed alert when fetching results fro page 1
if (isFirstPage) {
// Fetch and show the system created activity feed alert on page 1
const activityFeedAlert = await getAlertsFromName(
'ActivityFeedAlert'
);
Expand Down
Loading