Skip to content

Add sorting for clusters and query history page columns #752

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
Sep 15, 2025
Merged

Add sorting for clusters and query history page columns #752

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
83de83d
Add sorting for clusters and query history page columns
maswin Jul 14, 2025
79f4f1e
Add tsx to .editorconfig
ebyhr Sep 15, 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
3 changes: 3 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ ij_java_doc_align_param_comments = false

[*.yml]
indent_size = 2

[*.tsx]
indent_size = 2
14 changes: 11 additions & 3 deletions webapp/src/components/cluster.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,16 @@ export function Cluster() {
<>
<Card bordered={false} className={styles.card} bodyStyle={{ padding: '10px' }}>
<Table dataSource={backendData} pagination={false} rowKey={"name"}>
<Column title="Name" dataIndex="name" key="name" />
<Column title="Name" dataIndex="name" key="name"
sorter={(a, b) => {
if (!a || !b) return 0;
return a.name.localeCompare(b.name)
}} />
<Column title="RoutingGroup" dataIndex="routingGroup" key="routingGroup"
sorter={(a, b) => {
if (!a || !b) return 0;
return a.routingGroup.localeCompare(b.routingGroup)
}}
filters={
[...new Set(backendData?.map(b => b.routingGroup))]
.map(routingGroup => {
Expand All @@ -108,8 +116,8 @@ export function Cluster() {
}} />
<Column title="ProxyToUrl" dataIndex="proxyTo" key="proxyTo" render={linkRender} />
<Column title="ExternalUrl" dataIndex="externalUrl" key="externalUrl" render={linkRender} />
<Column title="Queued" dataIndex="queued" key="queued" />
<Column title="Running" dataIndex="running" key="running" />
<Column title="Queued" dataIndex="queued" key="queued" sorter={(a, b) => (!a || !b) ? 0 : a.queued - b.queued} />
<Column title="Running" dataIndex="running" key="running" sorter={(a, b) => (!a || !b) ? 0 : a.running - b.running} />
<Column title="Active" dataIndex="active" key="active" render={switchRender} />
<Column title="Status" dataIndex="status" key="status" render={statusRender}/>
{access.hasRole(Role.ADMIN) && (
Expand Down
24 changes: 22 additions & 2 deletions webapp/src/components/history.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,33 @@ export function History() {
onPageChange: list,
}}>
<Column title="QueryId" dataIndex="queryId" key="queryId" render={linkQueryRender} />
<Column title="RoutingGroup" dataIndex="routingGroup" key="routingGroup" render={routingGroupRender} />
<Column title="RoutingGroup" dataIndex="routingGroup" key="routingGroup"
sorter={(a, b) => {
if (!a || !b) return 0;
return a.routingGroup.localeCompare(b.routingGroup);
}}
filters={
[...new Set(backendData?.map(b => b.routingGroup))]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if backendData is undefined this may become new Set([undefined]), perhaps default to empty array

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if backendData is undefined, it will be new Set(undefined) which will give an empty set. So filters array will be simply empty array so i think it is ok like this.

.map(routingGroup => {
return {
text: routingGroup,
value: routingGroup
}
})}
onFilter={(value, record) => {
if (!record) return false;
return value === record.routingGroup
}}
render={routingGroupRender} />
<Column title="Name" dataIndex="backendUrl" key="backendUrlName" render={(text: string) => <Text>{backendMapping[text]}</Text>} />
<Column title="RoutedTo" dataIndex="externalUrl" key="externalUrl" render={linkRender} />
<Column title="User" dataIndex="user" key="user" />
<Column title="Source" dataIndex="source" key="source" />
<Column title="QueryText" dataIndex="queryText" key="queryText" width={300} render={queryTextRender} />
<Column title="SubmissionTime" dataIndex="captureTime" key="captureTime" render={timeRender} />
<Column title="SubmissionTime" dataIndex="captureTime" key="captureTime" render={timeRender} sorter={(a, b) => {
if (!a || !b) return 0;
return a.captureTime - b.captureTime;
}} />
</Table>
</Card>
<Modal
Expand Down