diff --git a/apps/frontend/src/components/ui/moderation/ModerateByIdsModal.stories.ts b/apps/frontend/src/components/ui/moderation/ModerateByIdsModal.stories.ts new file mode 100644 index 00000000000..cdaaf7c41b2 --- /dev/null +++ b/apps/frontend/src/components/ui/moderation/ModerateByIdsModal.stories.ts @@ -0,0 +1,30 @@ +import { Button } from '@modrinth/ui' +import type { Meta, StoryObj } from '@storybook/vue3-vite' +import { ref } from 'vue' + +import ModerateByIdsModal from '~/components/ui/moderation/ModerateByIdsModal.vue' + +const meta = { + title: 'Website/Moderation/ModerateByIdsModal', + component: ModerateByIdsModal, +} satisfies Meta + +export default meta +type Story = StoryObj + +export const Default: Story = { + render: () => ({ + components: { ModerateByIdsModal, Button }, + setup() { + const modalRef = ref | null>(null) + const openModal = () => modalRef.value?.show() + return { modalRef, openModal } + }, + template: ` +
+ + +
+ `, + }), +} diff --git a/apps/frontend/src/components/ui/moderation/ModerateByIdsModal.vue b/apps/frontend/src/components/ui/moderation/ModerateByIdsModal.vue index 5f5d7bae268..16c884446fc 100644 --- a/apps/frontend/src/components/ui/moderation/ModerateByIdsModal.vue +++ b/apps/frontend/src/components/ui/moderation/ModerateByIdsModal.vue @@ -1,94 +1,124 @@ diff --git a/apps/frontend/src/pages/moderation/index.vue b/apps/frontend/src/pages/moderation/index.vue index 40b67224bec..1f4f0e3acac 100644 --- a/apps/frontend/src/pages/moderation/index.vue +++ b/apps/frontend/src/pages/moderation/index.vue @@ -115,7 +115,13 @@ :skipped-ids="moderationQueue.currentQueue.skipped" @review-skipped="reviewSkippedQueue" /> - + import type { Labrinth } from '@modrinth/api-client' import { ListFilterIcon, ScaleIcon, SortAscIcon, SortDescIcon } from '@modrinth/assets' +import { moderationSettings } from '@modrinth/moderation' import { Button } from '@modrinth/ui' import { Combobox, @@ -184,6 +191,7 @@ const notificationManager = injectNotificationManager() const { addNotification } = notificationManager const formatNumber = useFormatNumber() const moderationQueue = useModerationQueue() +const modSettings = useModerationSettings() const route = useRoute() const router = useRouter() const client = injectModrinthClient() @@ -550,10 +558,10 @@ async function navigateToModerationProject(projectId: string) { }) } -async function startModeratingByIds(projectIds: string[]) { +async function startModeratingByIds(projectIds: string[], skipProcessedIds: boolean) { const token = loadingState.begin() try { - await moderationQueue.setQueue(projectIds) + await moderationQueue.setQueue(projectIds, skipProcessedIds) const targetProjectId = await findFirstEligibleProject() diff --git a/apps/frontend/src/providers/project-review/queue.ts b/apps/frontend/src/providers/project-review/queue.ts index 69a797a60a0..7ad187d7aa3 100644 --- a/apps/frontend/src/providers/project-review/queue.ts +++ b/apps/frontend/src/providers/project-review/queue.ts @@ -41,13 +41,11 @@ export function useReviewQueue( const preloadTechReview = computed(() => settings.value.get(moderationSettings.General.TechReviewMode), ) + const skipProcessedIds = + queue.currentQueue.skipProcessedIds ?? + !settings.value.get(moderationSettings.General.IncludeNonProcessingProjects) const prefetchKey = computed(() => - JSON.stringify([ - projectId.value, - remaining.value, - settings.value.get(moderationSettings.General.IncludeNonProcessingProjects), - preloadTechReview.value, - ]), + JSON.stringify([projectId.value, remaining.value, !skipProcessedIds, preloadTechReview.value]), ) let lastPrefetchKey = '' let disposed = false @@ -69,13 +67,7 @@ export function useReviewQueue( return lastPrefetchKey = key const isCurrent = () => !disposed && prefetchKey.value === key - void findNextEligibleQueueProject( - client, - queue, - [...remaining.value], - true, - settings.value.get(moderationSettings.General.IncludeNonProcessingProjects), - ) + void findNextEligibleQueueProject(client, queue, [...remaining.value], true) .then(async (next) => { if (next && isCurrent()) { await prefetchReviewProject( @@ -122,13 +114,7 @@ export function useReviewQueue( if (!id || !inQueue.value || (completedProjectId && completedProjectId !== id)) return if (completedProjectId && !completed.value) await queue.completeProject(id) const candidates = remaining.value - const next = await findNextEligibleQueueProject( - client, - queue, - candidates, - true, - settings.value.get(moderationSettings.General.IncludeNonProcessingProjects), - ) + const next = await findNextEligibleQueueProject(client, queue, candidates, true) if (next) await queryClient.fetchQuery(projectQueryOptions.v3(next.project, client)) if (!completed.value) await queue.deferProject(id) for (const excluded of next?.excluded ?? candidates) await queue.excludeProject(excluded) diff --git a/apps/frontend/src/services/moderation/queue-eligibility.ts b/apps/frontend/src/services/moderation/queue-eligibility.ts index ab33591c3f8..88db01e036c 100644 --- a/apps/frontend/src/services/moderation/queue-eligibility.ts +++ b/apps/frontend/src/services/moderation/queue-eligibility.ts @@ -60,9 +60,8 @@ export async function findNextEligibleQueueProject( moderationQueue: ModerationQueueService, candidateIds: string[], strict = false, - includeNonProcessing = useModerationSettings().value.get( - moderationSettings.General.IncludeNonProcessingProjects, - ), + skipProcessed = moderationQueue.currentQueue.skipProcessedIds ?? + !useModerationSettings().value.get(moderationSettings.General.IncludeNonProcessingProjects), ): Promise { const excluded: string[] = [] let checkedCount = 0 @@ -77,7 +76,7 @@ export async function findNextEligibleQueueProject( for (const id of batch) { const result = results.get(id) - if (isEligibleQueueCandidate(result, includeNonProcessing)) { + if (isEligibleQueueCandidate(result, !skipProcessed)) { return { project: id, excluded: [...excluded] } } excluded.push(id) diff --git a/apps/frontend/src/services/moderation/queue-storage.ts b/apps/frontend/src/services/moderation/queue-storage.ts index 0dadabfa7cb..63339a2204e 100644 --- a/apps/frontend/src/services/moderation/queue-storage.ts +++ b/apps/frontend/src/services/moderation/queue-storage.ts @@ -12,6 +12,7 @@ export interface PersistedModerationQueueState { history?: string[] activeProjectId?: string | null lastUpdated: string + skipProcessedIds?: boolean } isQueueMode: boolean } @@ -41,6 +42,8 @@ function isPersistedStateCandidate(value: unknown): value is PersistedModeration if (queue.history !== undefined && !isStringArray(queue.history)) return false if (queue.activeProjectId != null && typeof queue.activeProjectId !== 'string') return false if (typeof queue.lastUpdated !== 'string') return false + if (queue.skipProcessedIds !== undefined && typeof queue.skipProcessedIds !== 'boolean') + return false return true } diff --git a/apps/frontend/src/services/moderation/queue.ts b/apps/frontend/src/services/moderation/queue.ts index 002e3456fbd..22e835b59bf 100644 --- a/apps/frontend/src/services/moderation/queue.ts +++ b/apps/frontend/src/services/moderation/queue.ts @@ -17,6 +17,7 @@ export interface ModerationQueue { history: string[] activeProjectId: string | null lastUpdated: Date + skipProcessedIds?: boolean } export type LockStatusResponse = Labrinth.Moderation.Internal.LockStatusResponse @@ -33,7 +34,7 @@ export interface ModerationQueueService { hasSkipped: boolean progress: number - setQueue(projectIds: string[]): Promise + setQueue(projectIds: string[], skipProcessedIds?: boolean): Promise completeProject(projectId: string): Promise deferProject(projectId: string): Promise excludeProject(projectId: string): Promise @@ -55,6 +56,7 @@ const EMPTY_QUEUE: ModerationQueue = { history: [], activeProjectId: null, lastUpdated: new Date(), + skipProcessedIds: false, } function createEmptyQueue(): ModerationQueue { @@ -96,6 +98,7 @@ function sanitizeQueue(raw: PersistedModerationQueueState['currentQueue']): Mode history: (raw.history ?? []).filter((id): id is string => typeof id === 'string'), activeProjectId: typeof raw.activeProjectId === 'string' ? raw.activeProjectId : null, lastUpdated: Number.isNaN(lastUpdated.getTime()) ? new Date() : lastUpdated, + skipProcessedIds: raw.skipProcessedIds, } } @@ -115,6 +118,7 @@ function persistedPayload( history: [...queue.history], activeProjectId: queue.activeProjectId, lastUpdated: queue.lastUpdated.toISOString(), + skipProcessedIds: queue.skipProcessedIds, }, isQueueMode, } @@ -175,7 +179,7 @@ function createModerationQueueState(client: AbstractModrinthClient = injectModri return result } - function setQueueState(items: string[]) { + function setQueueState(items: string[], skipProcessedIds?: boolean = null) { isQueueMode.value = true currentQueue.value = { projectOrder: [...items], @@ -186,12 +190,13 @@ function createModerationQueueState(client: AbstractModrinthClient = injectModri history: [], activeProjectId: null, lastUpdated: new Date(), + skipProcessedIds: skipProcessedIds, } } - async function setQueue(projectIds: string[]): Promise { + async function setQueue(projectIds: string[], skipProcessedIds?: boolean = null): Promise { await withMutation(() => { - setQueueState(projectIds) + setQueueState(projectIds, skipProcessedIds) }) } @@ -259,7 +264,10 @@ function createModerationQueueState(client: AbstractModrinthClient = injectModri async function startSkippedReview(): Promise { await withMutation(() => { const skipped = new Set(currentQueue.value.skipped) - setQueueState(currentQueue.value.projectOrder.filter((id) => skipped.has(id))) + setQueueState( + currentQueue.value.projectOrder.filter((id) => skipped.has(id)), + currentQueue.value.skipProcessedIds, + ) }) } diff --git a/packages/ui/src/components/base/FileInput.vue b/packages/ui/src/components/base/FileInput.vue index 9323b1e3098..e6db6202c31 100644 --- a/packages/ui/src/components/base/FileInput.vue +++ b/packages/ui/src/components/base/FileInput.vue @@ -29,6 +29,7 @@ const props = withDefaults( maxSize?: number | null showIcon?: boolean shouldAlwaysReset?: boolean + clearOnChange?: boolean longStyle?: boolean disabled?: boolean }>(), @@ -37,6 +38,7 @@ const props = withDefaults( multiple: false, showIcon: true, shouldAlwaysReset: false, + clearOnChange: false, longStyle: false, disabled: false, }, @@ -56,6 +58,9 @@ function addFiles(incoming: FileList, shouldNotReset = false) { files.value = files.value.filter((file) => fileIsValid(file, validationOptions, formatBytes)) if (files.value.length > 0) { emit('change', files.value) + if (props.clearOnChange) { + files.value = [] + } } }