From 4c56cebb13afc646ba83817bf3119e9f6c034e59 Mon Sep 17 00:00:00 2001 From: zyoshoka <107108195+zyoshoka@users.noreply.github.com> Date: Thu, 29 Aug 2024 15:28:41 +0900 Subject: [PATCH] refactor(frontend): consolidate `'deliver' | 'queue'` type def into `queue.vue` --- .../frontend/src/pages/admin/overview.queue.vue | 11 ++++++----- packages/frontend/src/pages/admin/queue.chart.vue | 13 +++++++------ packages/frontend/src/pages/admin/queue.vue | 6 ++++-- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/packages/frontend/src/pages/admin/overview.queue.vue b/packages/frontend/src/pages/admin/overview.queue.vue index 760b64f057..fb190f5325 100644 --- a/packages/frontend/src/pages/admin/overview.queue.vue +++ b/packages/frontend/src/pages/admin/overview.queue.vue @@ -38,6 +38,7 @@ SPDX-License-Identifier: AGPL-3.0-only import { markRaw, onMounted, onUnmounted, ref, shallowRef } from 'vue'; import * as Misskey from 'misskey-js'; import XChart from './overview.queue.chart.vue'; +import type { ApQueueDomain } from '@/pages/admin/queue.vue'; import number from '@/filters/number.js'; import { useStream } from '@/stream.js'; @@ -53,7 +54,7 @@ const chartDelayed = shallowRef>(); const chartWaiting = shallowRef>(); const props = defineProps<{ - domain: 'deliver' | 'inbox'; + domain: ApQueueDomain; }>(); function onStats(stats: Misskey.entities.QueueStats) { @@ -69,10 +70,10 @@ function onStats(stats: Misskey.entities.QueueStats) { } function onStatsLog(statsLog: Misskey.entities.QueueStatsLog) { - const dataProcess: Misskey.entities.QueueStats['deliver' | 'inbox']['activeSincePrevTick'][] = []; - const dataActive: Misskey.entities.QueueStats['deliver' | 'inbox']['active'][] = []; - const dataDelayed: Misskey.entities.QueueStats['deliver' | 'inbox']['delayed'][] = []; - const dataWaiting: Misskey.entities.QueueStats['deliver' | 'inbox']['waiting'][] = []; + const dataProcess: Misskey.entities.QueueStats[ApQueueDomain]['activeSincePrevTick'][] = []; + const dataActive: Misskey.entities.QueueStats[ApQueueDomain]['active'][] = []; + const dataDelayed: Misskey.entities.QueueStats[ApQueueDomain]['delayed'][] = []; + const dataWaiting: Misskey.entities.QueueStats[ApQueueDomain]['waiting'][] = []; for (const stats of [...statsLog].reverse()) { dataProcess.push(stats[props.domain].activeSincePrevTick); diff --git a/packages/frontend/src/pages/admin/queue.chart.vue b/packages/frontend/src/pages/admin/queue.chart.vue index 61e0b7a89e..960a263a86 100644 --- a/packages/frontend/src/pages/admin/queue.chart.vue +++ b/packages/frontend/src/pages/admin/queue.chart.vue @@ -51,6 +51,7 @@ SPDX-License-Identifier: AGPL-3.0-only import { markRaw, onMounted, onUnmounted, ref, shallowRef } from 'vue'; import * as Misskey from 'misskey-js'; import XChart from './queue.chart.chart.vue'; +import type { ApQueueDomain } from '@/pages/admin/queue.vue'; import number from '@/filters/number.js'; import { misskeyApi } from '@/scripts/misskey-api.js'; import { useStream } from '@/stream.js'; @@ -63,14 +64,14 @@ const activeSincePrevTick = ref(0); const active = ref(0); const delayed = ref(0); const waiting = ref(0); -const jobs = ref([]); +const jobs = ref([]); const chartProcess = shallowRef>(); const chartActive = shallowRef>(); const chartDelayed = shallowRef>(); const chartWaiting = shallowRef>(); const props = defineProps<{ - domain: 'deliver' | 'inbox'; + domain: ApQueueDomain; }>(); function onStats(stats: Misskey.entities.QueueStats) { @@ -86,10 +87,10 @@ function onStats(stats: Misskey.entities.QueueStats) { } function onStatsLog(statsLog: Misskey.entities.QueueStatsLog) { - const dataProcess: Misskey.entities.QueueStats['deliver' | 'inbox']['activeSincePrevTick'][] = []; - const dataActive: Misskey.entities.QueueStats['deliver' | 'inbox']['active'][] = []; - const dataDelayed: Misskey.entities.QueueStats['deliver' | 'inbox']['delayed'][] = []; - const dataWaiting: Misskey.entities.QueueStats['deliver' | 'inbox']['waiting'][] = []; + const dataProcess: Misskey.entities.QueueStats[ApQueueDomain]['activeSincePrevTick'][] = []; + const dataActive: Misskey.entities.QueueStats[ApQueueDomain]['active'][] = []; + const dataDelayed: Misskey.entities.QueueStats[ApQueueDomain]['delayed'][] = []; + const dataWaiting: Misskey.entities.QueueStats[ApQueueDomain]['waiting'][] = []; for (const stats of [...statsLog].reverse()) { dataProcess.push(stats[props.domain].activeSincePrevTick); diff --git a/packages/frontend/src/pages/admin/queue.vue b/packages/frontend/src/pages/admin/queue.vue index 8d77d927d7..284db894b8 100644 --- a/packages/frontend/src/pages/admin/queue.vue +++ b/packages/frontend/src/pages/admin/queue.vue @@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only