Skip to content

Fix vai sort order, and sort all State columns by pseudo type and then name #17824

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

Draft
richard-cox wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Draft

Fix vai sort order, and sort all State columns by pseudo type and then name #17824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions shell/config/pagination-table-headers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ export const STEVE_ID_COL = {
};

export const STEVE_STATE_COL = {
...STATE,
// Note, we're show the 'state' as per model, not the 'metadata.state.name' that's available in the model to remotely sort/filter
// Need to investigate whether we should 'dumb down' the state we show to the native one (tracked via https://github.com/rancher/dashboard/issues/8527)
// This means we'll show something different to what we sort and filter on.
sort: ['metadata.state.name'],
...STATE,
// non vai sort works on colour --> name. the best we can do here is error --> transitioning --> name
sort: ['metadata.state.error:desc', 'metadata.state.transitioning:desc', 'metadata.state.name'],
search: 'metadata.state.name',
};

Expand Down
2 changes: 2 additions & 0 deletions shell/plugins/steve/steve-pagination-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ class StevePaginationUtils extends NamespaceProjectFilters {
{ field: 'metadata.namespace' },
{ field: 'id' },
{ field: 'metadata.state.name' },
{ field: 'metadata.state.error' },
{ field: 'metadata.state.transitioning' },
{ field: 'metadata.creationTimestamp' },
{ field: 'metadata.labels', startsWith: true },
],
Expand Down
Loading