Skip to content
Open
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3912108
feat: add route search form with 9 filter fields
DSingh0304 Oct 7, 2025
fab7806
feat(tests): add end-to-end tests for routes search functionality
DSingh0304 Oct 12, 2025
75a8903
Merge branch 'master' into master
DSingh0304 Oct 17, 2025
b95810a
Change import from 'clsx' to 'classNames'
DSingh0304 Oct 17, 2025
62850cd
refactor(SearchForm): remove placeholder text from input fields
DSingh0304 Oct 23, 2025
15329fe
Merge branch 'master' into master
Baoyuantop Nov 17, 2025
ed84e0b
fix: fetch all data for client-side filtering
DSingh0304 Nov 17, 2025
892983b
test: add e2e test for creating routes with version labels via UI
DSingh0304 Nov 17, 2025
3e34815
feat: add versionOptions to route SearchForm and update e2e test
DSingh0304 Nov 17, 2025
2facdec
feat: enhance pagination tests to filter routes across all pages
DSingh0304 Nov 18, 2025
e1489cc
fix: update type casting for pagination parameters in RouteList
DSingh0304 Nov 19, 2025
5c46c2f
fix: improve type casting for search parameters in RouteList
DSingh0304 Nov 19, 2025
15b45b1
feat: add deleteAllConsumers function to handle bulk deletion of cons…
DSingh0304 Nov 19, 2025
ae762d9
fix: routes search reset functionality
DSingh0304 Nov 21, 2025
4998fa1
Merge branch 'master' into master
DSingh0304 Nov 21, 2025
c8183f2
Merge branch 'apache:master' into master
DSingh0304 Nov 24, 2025
6d3b7c0
feat: Add search limit alert to tables and refactor clsx import.
DSingh0304 Dec 16, 2025
8e7bdf1
Merge branch 'master' into master
DSingh0304 Dec 17, 2025
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
146 changes: 146 additions & 0 deletions e2e/tests/routes.filter-version.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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 { routesPom } from '@e2e/pom/routes';
import { e2eReq } from '@e2e/utils/req';
import { test } from '@e2e/utils/test';
import { uiHasToastMsg } from '@e2e/utils/ui';
import { uiFillUpstreamRequiredFields } from '@e2e/utils/ui/upstreams';
import { expect } from '@playwright/test';

import { deleteAllRoutes } from '@/apis/routes';
import type { APISIXType } from '@/types/schema/apisix';

/**
* Test for version filtering across multiple pages.
* This verifies that client-side filtering works across all routes,
* not just the current page.
*/
test.describe('Routes version filter', () => {
test.describe.configure({ mode: 'serial' });

const nodes: APISIXType['UpstreamNode'][] = [
{ host: 'test.com', port: 80, weight: 100 },
{ host: 'test2.com', port: 80, weight: 100 },
];

test.beforeAll(async () => {
// Clean up any existing routes
await deleteAllRoutes(e2eReq);
});

test.afterAll(async () => {
// Clean up test routes
await deleteAllRoutes(e2eReq);
});

test('should filter routes by version across all pages', async ({ page }) => {
test.slow(); // This test creates multiple routes via UI

await test.step('create routes with different versions via UI', async () => {
await routesPom.toIndex(page);
await routesPom.isIndexPage(page);

// Create 3 routes with version v1
for (let i = 1; i <= 3; i++) {
await routesPom.getAddRouteBtn(page).click();
await routesPom.isAddPage(page);

await page.getByLabel('Name', { exact: true }).first().fill(`route_v1_${i}`);
await page.getByLabel('URI', { exact: true }).fill(`/v1/test${i}`);

// Select HTTP method
await page.getByRole('textbox', { name: 'HTTP Methods' }).click();
await page.getByRole('option', { name: 'GET' }).click();

// Add label for version (in the route section, not upstream)
const routeLabelsField = page.getByRole('textbox', { name: 'Labels' }).first();
await routeLabelsField.click();
await routeLabelsField.fill('version:v1');
await routeLabelsField.press('Enter');

// Add upstream
const upstreamSection = page.getByRole('group', {
name: 'Upstream',
exact: true,
});
await uiFillUpstreamRequiredFields(upstreamSection, {
nodes,
name: `upstream_v1_${i}`,
desc: 'test',
});

await routesPom.getAddBtn(page).click();
await uiHasToastMsg(page, {
hasText: 'Add Route Successfully',
});

// Go back to list
await routesPom.getRouteNavBtn(page).click();
await routesPom.isIndexPage(page);
}

// Create 3 routes with version v2
for (let i = 1; i <= 3; i++) {
await routesPom.getAddRouteBtn(page).click();
await routesPom.isAddPage(page);

await page.getByLabel('Name', { exact: true }).first().fill(`route_v2_${i}`);
await page.getByLabel('URI', { exact: true }).fill(`/v2/test${i}`);

// Select HTTP method
await page.getByRole('textbox', { name: 'HTTP Methods' }).click();
await page.getByRole('option', { name: 'GET' }).click();

// Add label for version (in the route section, not upstream)
const routeLabelsField = page.getByRole('textbox', { name: 'Labels' }).first();
await routeLabelsField.click();
await routeLabelsField.fill('version:v2');
await routeLabelsField.press('Enter');

// Add upstream
const upstreamSection = page.getByRole('group', {
name: 'Upstream',
exact: true,
});
await uiFillUpstreamRequiredFields(upstreamSection, {
nodes,
name: `upstream_v2_${i}`,
desc: 'test',
});

await routesPom.getAddBtn(page).click();
await uiHasToastMsg(page, {
hasText: 'Add Route Successfully',
});

// Go back to list
await routesPom.getRouteNavBtn(page).click();
await routesPom.isIndexPage(page);
}
});

await test.step('verify all routes are created with labels', async () => {
// Verify routes are visible in list
await expect(page.getByText('route_v1_1')).toBeVisible();
await expect(page.getByText('route_v2_1')).toBeVisible();

// Verify version filter field exists
await expect(page.locator('#version')).toBeAttached();
});
});
});
27 changes: 26 additions & 1 deletion e2e/tests/routes.list.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,32 @@ test.describe('page and page_size should work correctly', () => {
pom: routesPom,
items: routes,
filterItemsNotInPage,
// Make locator unique by matching both name and URI
getCell: (page, item) =>
page.getByRole('cell', { name: item.name }).first(),
page.getByRole('row').filter({ hasText: item.name }).getByRole('cell', { name: item.name }).first(),
});

test('should filter across all pages, not just current page', async ({ page }) => {
// Find a route that is NOT on the first page (assuming pagination works)
const pageSize = 10;
const targetRoute = routes[pageSize]; // 11th route

// Go to routes page
await routesPom.toIndex(page);
await routesPom.isIndexPage(page);

// Use the search/filter form to search for the target route
const nameInput = page.getByLabel('Name');
await expect(nameInput).toBeVisible();
await nameInput.fill(targetRoute.name);
const searchButton = page.getByRole('button', { name: 'Search' });
await searchButton.click();

// The target route should now be visible (filtering works across all data)
await expect(page.getByRole('cell', { name: targetRoute.name })).toBeVisible();

// Reset the search
const resetButton = page.getByRole('button', { name: 'Reset' });
await resetButton.click();
});
});
128 changes: 128 additions & 0 deletions e2e/tests/routes.search.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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 { routesPom } from '@e2e/pom/routes';
import { e2eReq } from '@e2e/utils/req';
import { test } from '@e2e/utils/test';
import { expect} from '@playwright/test';

import { deleteAllRoutes, putRouteReq } from '@/apis/routes';
import { API_ROUTES } from '@/config/constant';
import type { APISIXType } from '@/types/schema/apisix';

// Sample routes for testing search functionality
const testRoutes: APISIXType['Route'][] = [
{
id: 'search_route_1',
name: 'alpha_route',
uri: '/alpha',
desc: 'First test route',
methods: ['GET'],
upstream: {
nodes: [{ host: '127.0.0.1', port: 80, weight: 100 }],
},
},
{
id: 'search_route_2',
name: 'beta_route',
uri: '/beta',
desc: 'Second test route',
methods: ['POST'],
upstream: {
nodes: [{ host: '127.0.0.1', port: 80, weight: 100 }],
},
},
{
id: 'search_route_3',
name: 'gamma_route',
uri: '/gamma',
desc: 'Third test route',
methods: ['GET'],
upstream: {
nodes: [{ host: '127.0.0.1', port: 80, weight: 100 }],
},
},
];

test.describe('Routes search functionality', () => {
test.describe.configure({ mode: 'serial' });

test.beforeAll(async () => {
await deleteAllRoutes(e2eReq);
await Promise.all(testRoutes.map((route) => putRouteReq(e2eReq, route)));
});

test.afterAll(async () => {
await Promise.all(
testRoutes.map((route) => e2eReq.delete(`${API_ROUTES}/${route.id}`))
);
});

test('should filter routes by name', async ({ page }) => {
await test.step('navigate to routes page', async () => {
await routesPom.getRouteNavBtn(page).click();
await routesPom.isIndexPage(page);
});

await test.step('search for routes with "alpha" in name', async () => {
const nameInput = page.getByLabel('Name'); // Matches the label from SearchForm
await nameInput.fill('alpha');
const searchButton = page.getByRole('button', { name: 'Search' });
await searchButton.click();

// Wait for table to update
await expect(page.getByText('alpha_route')).toBeVisible();

// Verify only matching route is shown
const tableRows = page.getByRole('row');
await expect(tableRows).toHaveCount(2); // Header + 1 data row
await expect(page.getByText('beta_route')).toBeHidden();
await expect(page.getByText('gamma_route')).toBeHidden();
});

await test.step('reset search and verify all routes are shown', async () => {
const resetButton = page.getByRole('button', { name: 'Reset' });
await resetButton.click();

// Wait for table to update
await expect(page.getByText('beta_route')).toBeVisible();

// Verify all routes are back
const tableRows = page.getByRole('row');
await expect(tableRows).toHaveCount(4); // Header + 3 data rows
await expect(page.getByText('alpha_route')).toBeVisible();
await expect(page.getByText('gamma_route')).toBeVisible();
});
});

test('should show no results for non-matching search', async ({ page }) => {
await test.step('navigate to routes page', async () => {
await routesPom.getRouteNavBtn(page).click();
await routesPom.isIndexPage(page);
});

await test.step('search for non-existent name', async () => {
const nameInput = page.getByLabel('Name');
await nameInput.fill('nonexistent');
const searchButton = page.getByRole('button', { name: 'Search' });
await searchButton.click();

// Wait for table to update
await expect(page.getByText('No Data')).toBeVisible(); // Assuming Antd's empty state
});
});
});
4 changes: 2 additions & 2 deletions src/components/form/Editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
import { InputWrapper, type InputWrapperProps, Skeleton } from '@mantine/core';
import { Editor } from '@monaco-editor/react';
import { clsx } from 'clsx';
import classNames from 'clsx';
import { useEffect, useMemo, useRef, useState } from 'react';
import {
type FieldValues,
Expand Down Expand Up @@ -132,7 +132,7 @@ export const FormItemEditor = <T extends FieldValues>(
)}
<Editor
wrapperProps={{
className: clsx(
className: classNames(
'editor-wrapper',
restField.disabled && 'editor-wrapper--disabled'
),
Expand Down
Loading
Loading