Skip to content

fix(hosting): use backup counts from backend #8191

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
mergify merged 1 commit into from
Nov 2, 2026
Merged

fix(hosting): use backup counts from backend #8191

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
4 changes: 4 additions & 0 deletions packages/api-client/src/modules/archon/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,10 @@ export namespace Archon {
export type BackupsQueueWithOptionsResponse = BackupsQueueResponse & {
options: WorldBackupOptions
next_auto_backup_at: string | null
/** How many backups occupy the manual backup pool. Manual backups can't be created once this reaches `split_manual`. */
manual_count: number
/** How many backups occupy the automatic backup pool. The oldest ones rotate out once this exceeds `split_automatic`. */
auto_count: number
}

export type PatchWorldBackupOptions = {
Expand Down
9 changes: 3 additions & 6 deletions packages/ui/src/layouts/wrapped/hosting/manage/backups/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,6 @@ const messages = defineMessages({
},
})

const LIVE_STATUSES: Backup['status'][] = ['pending', 'in_progress', 'done']

const { formatMessage } = useVIntl()
const formatRelativeTime = useRelativeTime()
const { formatFrequency } = useBackupIntervalFormat()
Expand All @@ -335,6 +333,7 @@ const { canManageBackups, permissionDeniedMessage } = useServerPermissions()

const {
query,
data,
backups,
deletedBackups,
options,
Expand Down Expand Up @@ -378,10 +377,8 @@ const { highlightedBackupId } = useFocusedBackup(
)

const autoEnabled = computed(() => (options.value?.split_automatic ?? 0) > 0)
const autoUsed = computed(() => backups.value.filter((b) => b.rotates_at).length)
const manualUsed = computed(
() => backups.value.filter((b) => !b.automated && LIVE_STATUSES.includes(b.status)).length,
)
const autoUsed = computed(() => data.value?.auto_count ?? 0)
const manualUsed = computed(() => data.value?.manual_count ?? 0)

const nextAutoBackupLabel = computed(() => {
const next = nextAutoBackupAt.value
Expand Down
Loading