diff --git a/frontend/src/views/admin/AccountsView.vue b/frontend/src/views/admin/AccountsView.vue
index 16d474bbc2fd..98ecc2ee19d3 100644
--- a/frontend/src/views/admin/AccountsView.vue
+++ b/frontend/src/views/admin/AccountsView.vue
@@ -304,9 +304,6 @@
@@ -2100,12 +2097,12 @@ const allColumns = computed(() => {
{ key: 'id', label: t('admin.accounts.columns.id'), sortable: true },
{ key: 'platform_type', label: t('admin.accounts.columns.platformType'), sortable: false },
{ key: 'usage', label: t('admin.accounts.columns.usage'), sortable: false },
- { key: 'status', label: t('admin.accounts.columns.status'), sortable: true }
+ { key: 'status', label: t('admin.accounts.columns.status'), sortable: true },
+ { key: 'schedulable', label: t('admin.accounts.columns.schedulable'), sortable: true }
]
c.push(
{ key: 'taxonomy_route', label: t('admin.accounts.columns.classificationRoute'), sortable: false },
{ key: 'capacity', label: t('admin.accounts.columns.capacity'), sortable: false },
- { key: 'schedulable', label: t('admin.accounts.columns.schedulable'), sortable: true },
{ key: 'today_stats', label: t('admin.accounts.columns.todayStats'), sortable: false }
)
if (!authStore.isSimpleMode) {
diff --git a/frontend/src/views/admin/__tests__/AccountsView.console.spec.ts b/frontend/src/views/admin/__tests__/AccountsView.console.spec.ts
index 321aa41734fe..217802b0a0af 100644
--- a/frontend/src/views/admin/__tests__/AccountsView.console.spec.ts
+++ b/frontend/src/views/admin/__tests__/AccountsView.console.spec.ts
@@ -314,9 +314,10 @@ describe('admin AccountsView Cockpit console', () => {
it('shows usage in the default table order', async () => {
const wrapper = mountView()
await flushPromises()
- // upstream v0.2.8 defaults: only today_stats, proxy, notes, scheduler_score and rate_multiplier are hidden
+ // upstream defaults: only today_stats, proxy, notes, scheduler_score and rate_multiplier are hidden;
+ // the scheduling switch sits right after the status column, as upstream orders them
expect(wrapper.get('[data-test="view-table"]').attributes('data-columns')).toBe(
- 'select,name,id,platform_type,usage,status,taxonomy_route,capacity,schedulable,groups,priority,' +
+ 'select,name,id,platform_type,usage,status,schedulable,taxonomy_route,capacity,groups,priority,' +
'upstream_billing_rate,last_used_at,created_at,expires_at,actions'
)
})