Skip to content

feat(ui): Added Sort by age in Pod-view #20783

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 6 commits into from
May 7, 2025
Merged

feat(ui): Added Sort by age in Pod-view #20783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb5c0e7
resource-sort-added
surajyadav1108 Nov 13, 2024
d90622d
lints
surajyadav1108 Nov 13, 2024
7009de7
Merge branch 'master' into pod-sort
surajyadav1108 Jan 15, 2025
48f0af5
Merge branch 'master' into pod-sort
surajyadav1108 Jan 23, 2025
ad30d9d
Merge branch 'master' into pod-sort
surajyadav1108 Feb 21, 2025
c7572d0
Merge branch 'master' into pod-sort
surajyadav1108 Mar 21, 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
53 changes: 53 additions & 0 deletions ui/src/app/applications/components/application-pod-view/pod-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,15 @@ interface PodViewProps {
}

export type PodGroupType = 'topLevelResource' | 'parentResource' | 'node';
export type SortOrder = 'asc' | 'desc';

const labelForSortOrder: Record<SortOrder, string> = {
asc: 'Oldest First',
desc: 'Newest First'
};

export interface PodGroup extends Partial<ResourceNode> {
timestamp?: number;
type: PodGroupType;
pods: Pod[];
info?: InfoItem[];
Expand All @@ -53,6 +60,18 @@ export class PodView extends React.Component<PodViewProps> {
const podPrefs = prefs.appDetails.podView || ({} as PodViewPreferences);
const groups = this.processTree(podPrefs.sortMode, this.props.tree.hosts || []) || [];

if (podPrefs.sortMode !== 'node' && podPrefs.sortOrder) {
// Sort the groups in place based on precomputed timestamps
groups.sort((a, b) => {
const timeA = Date.parse(a.createdAt || '0');
const timeB = Date.parse(b.createdAt || '0');
a.timestamp = timeA;
b.timestamp = timeB;

return podPrefs.sortOrder === 'asc' ? timeA - timeB : timeB - timeA;
});
}

return (
<React.Fragment>
<div className='pod-view__settings'>
Expand All @@ -68,6 +87,20 @@ export class PodView extends React.Component<PodViewProps> {
items={this.menuItemsFor(['node', 'parentResource', 'topLevelResource'], prefs)}
/>
</div>
{podPrefs.sortMode !== 'node' && (
<div className='pod-view__settings__section'>
SORT BY AGE:&nbsp;
<DropDownMenu
anchor={() => (
<button className='argo-button argo-button--base-o'>
{labelForSortOrder[podPrefs.sortOrder || 'desc']}&nbsp;&nbsp;
<i className='fa fa-chevron-circle-down' />
</button>
)}
items={this.sortOrderItemsFor(['asc', 'desc'], prefs)}
/>
</div>
)}
{podPrefs.sortMode === 'node' && (
<div className='pod-view__settings__section'>
<button
Expand Down Expand Up @@ -218,6 +251,26 @@ export class PodView extends React.Component<PodViewProps> {
);
}

private sortOrderItemsFor(orders: SortOrder[], prefs: ViewPreferences): MenuItem[] {
const podPrefs = prefs.appDetails.podView || ({} as PodViewPreferences);
return orders.map(order => ({
title: (
<React.Fragment>
{podPrefs.sortOrder === order && <i className='fa fa-check' />} {labelForSortOrder[order]}{' '}
</React.Fragment>
),
action: () => {
this.appContext.apis.navigation.goto('.', {podSortOrder: order});
services.viewPreferences.updatePreferences({
appDetails: {
...prefs.appDetails,
podView: {...podPrefs, sortOrder: order}
}
});
}
}));
}

private menuItemsFor(modes: PodGroupType[], prefs: ViewPreferences): MenuItem[] {
const podPrefs = prefs.appDetails.podView || ({} as PodViewPreferences);
return modes.map(mode => ({
Expand Down
1 change: 1 addition & 0 deletions ui/src/app/shared/services/view-preferences-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export interface AppDetailsPreferences {
export interface PodViewPreferences {
sortMode: PodGroupType;
hideUnschedulable: boolean;
sortOrder?: 'asc' | 'desc';
}

export interface HealthStatusBarPreferences {
Expand Down