Skip to content

fix: add paused account filter #1403

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

Open
LvyuanW wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add paused account filter #1403

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
2 changes: 2 additions & 0 deletions backend/internal/repository/account_repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,8 @@ func (r *accountRepository) ListWithFilters(ctx context.Context, params paginati
}
if status != "" {
switch status {
case "paused":
q = q.Where(dbaccount.SchedulableEQ(false))
case "rate_limited":
q = q.Where(dbaccount.RateLimitResetAtGT(time.Now()))
case "temp_unschedulable":
Expand Down
17 changes: 17 additions & 0 deletions backend/internal/repository/account_repo_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,23 @@ func (s *AccountRepoSuite) TestListWithFilters() {
s.Require().Equal(service.StatusDisabled, accounts[0].Status)
},
},
{
name: "filter_by_paused",
setup: func(client *dbent.Client) {
active := mustCreateAccount(s.T(), client, &service.Account{Name: "active-schedulable"})
paused := mustCreateAccount(s.T(), client, &service.Account{Name: "paused-account"})
err := client.Account.UpdateOneID(paused.ID).SetSchedulable(false).Exec(context.Background())
s.Require().NoError(err)
err = client.Account.UpdateOneID(active.ID).SetSchedulable(true).Exec(context.Background())
s.Require().NoError(err)
},
status: "paused",
wantCount: 1,
validate: func(accounts []service.Account) {
s.Require().Equal("paused-account", accounts[0].Name)
s.Require().False(accounts[0].Schedulable)
},
},
{
name: "filter_by_search",
setup: func(client *dbent.Client) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/admin/account/AccountTableFilters.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const updatePrivacyMode = (value: string | number | boolean | null) => { emit('u
const updateGroup = (value: string | number | boolean | null) => { emit('update:filters', { ...props.filters, group: value }) }
const pOpts = computed(() => [{ value: '', label: t('admin.accounts.allPlatforms') }, { value: 'anthropic', label: 'Anthropic' }, { value: 'openai', label: 'OpenAI' }, { value: 'gemini', label: 'Gemini' }, { value: 'antigravity', label: 'Antigravity' }, { value: 'sora', label: 'Sora' }])
const tOpts = computed(() => [{ value: '', label: t('admin.accounts.allTypes') }, { value: 'oauth', label: t('admin.accounts.oauthType') }, { value: 'setup-token', label: t('admin.accounts.setupToken') }, { value: 'apikey', label: t('admin.accounts.apiKey') }, { value: 'bedrock', label: 'AWS Bedrock' }])
const sOpts = computed(() => [{ value: '', label: t('admin.accounts.allStatus') }, { value: 'active', label: t('admin.accounts.status.active') }, { value: 'inactive', label: t('admin.accounts.status.inactive') }, { value: 'error', label: t('admin.accounts.status.error') }, { value: 'rate_limited', label: t('admin.accounts.status.rateLimited') }, { value: 'temp_unschedulable', label: t('admin.accounts.status.tempUnschedulable') }])
const sOpts = computed(() => [{ value: '', label: t('admin.accounts.allStatus') }, { value: 'active', label: t('admin.accounts.status.active') }, { value: 'inactive', label: t('admin.accounts.status.inactive') }, { value: 'paused', label: t('admin.accounts.status.paused') }, { value: 'error', label: t('admin.accounts.status.error') }, { value: 'rate_limited', label: t('admin.accounts.status.rateLimited') }, { value: 'temp_unschedulable', label: t('admin.accounts.status.tempUnschedulable') }])
const privacyOpts = computed(() => [
{ value: '', label: t('admin.accounts.allPrivacyModes') },
{ value: '__unset__', label: t('admin.accounts.privacyUnset') },
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/admin/account/__tests__/AccountTableFilters.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ describe('AccountTableFilters', () => {
const selects = wrapper.findAll('.select-stub')
expect(selects).toHaveLength(5)

const statusOptions = JSON.parse(selects[2].attributes('data-options'))
expect(statusOptions).toContainEqual({ value: 'paused', label: 'admin.accounts.status.paused' })

const privacyOptions = JSON.parse(selects[3].attributes('data-options'))
expect(privacyOptions).toEqual([
{ value: '', label: 'admin.accounts.allPrivacyModes' },
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/views/admin/AccountsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,9 @@ const accountMatchesCurrentFilters = (account: Account) => {
if (params.platform && account.platform !== params.platform) return false
if (params.type && account.type !== params.type) return false
if (params.status) {
if (params.status === 'rate_limited') {
if (params.status === 'paused') {
if (account.schedulable) return false
} else if (params.status === 'rate_limited') {
if (!account.rate_limit_reset_at) return false
const resetAt = new Date(account.rate_limit_reset_at).getTime()
if (!Number.isFinite(resetAt) || resetAt <= Date.now()) return false
Expand Down
Loading