diff --git a/frontend/src/routes/(root)/(logged)/workers/+page.svelte b/frontend/src/routes/(root)/(logged)/workers/+page.svelte index d83d43634e..43823b52c6 100644 --- a/frontend/src/routes/(root)/(logged)/workers/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/workers/+page.svelte @@ -163,7 +163,16 @@ } let queueMetricsDrawer: Drawer - let selectedTab: string = groupedWorkers?.[0]?.[0] ?? 'default' + let selectedTab: string = 'default' + + $: workerGroups && selectedTab == 'default' && updateSelectedTabIfDefaultDoesNotExist() + + function updateSelectedTabIfDefaultDoesNotExist() { + if (selectedTab == 'default' && !workerGroups?.hasOwnProperty('default')) { + selectedTab = Object.keys(workerGroups ?? {})[0] ?? 'default' + } + } + let search: string = '' $: worker_group = filterWorkerGroupByNames( @@ -361,7 +370,7 @@ search = '' }} > - {#each Object.keys(workerGroups ?? {}) as name (name)} + {#each Object.keys(workerGroups ?? {}).sort((a, b) => (groupedWorkers.find((x) => x[0] == b)?.[1]?.length ?? 0) - (groupedWorkers.find((x) => x[0] == a)?.[1]?.length ?? 0)) as name (name)}