Skip to content

[grid] Add "URI" to the list of sort-by choices on Overview UI #16004

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 2 commits into from
Jul 7, 2025
Merged

[grid] Add "URI" to the list of sort-by choices on Overview UI #16004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92b4ebc
[grid] Add "URI" to the list of sort-by choices on Overview UI
VietND96 Jul 7, 2025
00ce165
Fix review comments
VietND96 Jul 7, 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
4 changes: 3 additions & 1 deletion javascript/grid-ui/src/screens/Overview/Overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ function Overview (): JSX.Element {

const sortProperties = {
'platformName': (a, b) => compareSlotStereotypes(a, b, 'platformName'),
'status': (a, b) => a.status.localeCompare(b.status),
'status': (a, b) => (a.status ?? '').localeCompare(b.status ?? ''),
'uri': (a, b) => (a.uri ?? '').localeCompare(b.uri ?? ''),
'browserName': (a, b) => compareSlotStereotypes(a, b, 'browserName'),
'browserVersion': (a, b) => compareSlotStereotypes(a, b, 'browserVersion'),
'slotCount': (a, b) => {
Expand All @@ -80,6 +81,7 @@ function Overview (): JSX.Element {
const sortPropertiesLabel = {
'platformName': 'Platform Name',
'status': 'Status',
'uri': 'URI',
'browserName': 'Browser Name',
'browserVersion': 'Browser Version',
'slotCount': 'Slot Count',
Expand Down
48 changes: 48 additions & 0 deletions javascript/grid-ui/src/tests/components/Overview.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,54 @@ describe('Overview component', () => {
}
})

it('sorts nodes by URI when selected', async () => {
render(
<MockedProvider mocks={mocks} addTypename={false}>
<Overview />
</MockedProvider>
)

await screen.findByText('http://192.168.1.10:4444')

const user = userEvent.setup()
const selectElement = screen.getByRole('combobox')
await user.click(selectElement)
await user.click(screen.getByText('URI'))

// After sorting by URI, node1 should appear before node2
const nodeUris = screen.getAllByText(/http:\/\/192\.168\.1\.\d+:4444/)
expect(nodeUris[0]).toHaveTextContent('http://192.168.1.10:4444')
expect(nodeUris[1]).toHaveTextContent('http://192.168.1.11:4444')
})

it('sorts nodes by URI in descending order when selected', async () => {
render(
<MockedProvider mocks={mocks} addTypename={false}>
<Overview />
</MockedProvider>
)

await screen.findByText('http://192.168.1.10:4444')

const user = userEvent.setup()
const selectElement = screen.getByRole('combobox')
await user.click(selectElement)
await user.click(screen.getByText('URI'))

const descendingLabel = screen.getByText('Descending')
const checkbox = descendingLabel.closest('label')?.querySelector('input[type="checkbox"]')
expect(checkbox).not.toBeNull()
if (checkbox) {
await user.click(checkbox)
expect(checkbox).toBeChecked()
}

// After sorting by URI descending, node2 should appear before node1
const nodeUris = screen.getAllByText(/http:\/\/192\.168\.1\.\d+:4444/)
expect(nodeUris[0]).toHaveTextContent('http://192.168.1.11:4444')
expect(nodeUris[1]).toHaveTextContent('http://192.168.1.10:4444')
})

it('renders live view icon for node with VNC session', async () => {
render(
<MockedProvider mocks={mocks} addTypename={false}>
Expand Down