Skip to content

Modern Docker Management, Designed for Everyone

fix: sort environments by name with current selection first

Kyle Mendell4e0f1dcfc074
diff --git a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
index bac069df5..0e235d679 100644
--- a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
+++ b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
@@ -56,7 +56,6 @@
formatVolumeOverviewLabel,
getCpuMetric,
getDiskMetric,
- getEnvironmentCardSortRank,
getMemoryMetric,
shouldLoadEnvironment
} from './dashboard-overview';
@@ -224,23 +223,16 @@
}
const environmentCards = $derived.by((): DashboardEnvironmentCardState[] => {
- const refreshNonce = reloadVersion;
- void refreshNonce;
-
- return availableEnvironments
- .map((environment, index) => ({
- environment,
- index,
- sortRank: getEnvironmentCardSortRank(environment)
- }))
+ return [...availableEnvironments]
.sort((a, b) => {
- if (a.sortRank !== b.sortRank) {
- return a.sortRank - b.sortRank;
+ const currentOrder = Number(b.id === currentEnvironmentId) - Number(a.id === currentEnvironmentId);
+ if (currentOrder !== 0) {
+ return currentOrder;
}
- return a.index - b.index;
+ return a.name.localeCompare(b.name, undefined, { sensitivity: 'base' }) || a.id.localeCompare(b.id);
})
- .map(({ environment }) => ({ environment }));
+ .map((environment) => ({ environment }));
});
const loadableEnvironmentCards = $derived(environmentCards.filter(({ environment }) => shouldLoadEnvironment(environment)));
const loadableEnvironmentIds = $derived.by(() => new Set(loadableEnvironmentCards.map(({ environment }) => environment.id)));
diff --git a/frontend/src/routes/(app)/dashboard/dashboard-overview.ts b/frontend/src/routes/(app)/dashboard/dashboard-overview.ts
index 5701551aa..f99239aa9 100644
--- a/frontend/src/routes/(app)/dashboard/dashboard-overview.ts
+++ b/frontend/src/routes/(app)/dashboard/dashboard-overview.ts
@@ -20,11 +20,6 @@ export function createBaseEnvironmentOverview(environment: Environment): Dashboa
};
}
-export function getEnvironmentCardSortRank(environment: Environment): number {
- if (shouldLoadEnvironment(environment)) return 0;
- return environment.enabled ? 1 : 2;
-}
-
export function buildOverviewSummary(items: DashboardEnvironmentOverview[]): DashboardOverviewSummary {
return {
totalEnvironments: items.length,