From e2bed58811d26fc3706be24a323d5177c049ecb1 Mon Sep 17 00:00:00 2001 From: Chlod Alejandro Date: Tue, 28 May 2024 09:42:02 +0800 Subject: [PATCH] csr: split status to enum file --- src/DeputyCommunications.ts | 2 +- src/DeputyStorage.ts | 2 +- src/models/ContributionSurveyRow.ts | 16 +--------------- src/models/ContributionSurveyRowStatus.ts | 14 ++++++++++++++ src/ui/root/DeputyContributionSurveyRow.tsx | 5 ++--- src/ui/shared/DeputyCCIStatusDropdown.tsx | 2 +- .../browser/ContributionSurveyRowUnitTests.ts | 2 +- 7 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 src/models/ContributionSurveyRowStatus.ts diff --git a/src/DeputyCommunications.ts b/src/DeputyCommunications.ts index 31e45a2ea..55445ee3f 100644 --- a/src/DeputyCommunications.ts +++ b/src/DeputyCommunications.ts @@ -1,8 +1,8 @@ import 'broadcastchannel-polyfill'; -import { ContributionSurveyRowStatus } from './models/ContributionSurveyRow'; import generateId from './util/generateId'; import { WikiPageConfiguration } from './config/WikiConfiguration'; import log from './util/log'; +import { ContributionSurveyRowStatus } from './models/ContributionSurveyRowStatus'; /** * Generic message used to acknowledge an action. This is usually required by diff --git a/src/DeputyStorage.ts b/src/DeputyStorage.ts index ecc06f701..1da161890 100644 --- a/src/DeputyStorage.ts +++ b/src/DeputyStorage.ts @@ -1,8 +1,8 @@ import { openDB, DBSchema, IDBPDatabase } from 'idb'; import { ExpandedRevisionData } from './api/ExpandedRevisionData'; -import { ContributionSurveyRowStatus } from './models/ContributionSurveyRow'; import MwApi from './MwApi'; import log from './util/log'; +import { ContributionSurveyRowStatus } from './models/ContributionSurveyRowStatus'; /** * General key-value store. Used for storing single-variable data diff --git a/src/models/ContributionSurveyRow.ts b/src/models/ContributionSurveyRow.ts index b6a2b628e..05f719f16 100644 --- a/src/models/ContributionSurveyRow.ts +++ b/src/models/ContributionSurveyRow.ts @@ -7,21 +7,7 @@ import ContributionSurveyRowParser, { } from './ContributionSurveyRowParser'; import { ContributionSurveyRowSort } from './ContributionSurveyRowSort'; import DispatchRevisions from '../api/DispatchRevisions'; - -export enum ContributionSurveyRowStatus { - // The row has not been processed yet. - Unfinished = 0, - // The row has a comment but cannot be parsed - Unknown = 1, - // The row has been processed and violations were found ({{y}}) - WithViolations = 2, - // The row has been processed and violations were not found ({{n}}) - WithoutViolations = 3, - // The row has been found but the added text is no longer in the existing revision - Missing = 4, - // The row has been processed and text was presumptively removed ({{x}}), - PresumptiveRemoval = 5 -} +import { ContributionSurveyRowStatus } from './ContributionSurveyRowStatus'; /** * Represents a contribution survey row. This is an abstraction of the row that can diff --git a/src/models/ContributionSurveyRowStatus.ts b/src/models/ContributionSurveyRowStatus.ts new file mode 100644 index 000000000..552a88357 --- /dev/null +++ b/src/models/ContributionSurveyRowStatus.ts @@ -0,0 +1,14 @@ +export enum ContributionSurveyRowStatus { + // The row has not been processed yet. + Unfinished = 0, + // The row has a comment but cannot be parsed + Unknown = 1, + // The row has been processed and violations were found ({{y}}) + WithViolations = 2, + // The row has been processed and violations were not found ({{n}}) + WithoutViolations = 3, + // The row has been found but the added text is no longer in the existing revision + Missing = 4, + // The row has been processed and text was presumptively removed ({{x}}), + PresumptiveRemoval = 5 +} diff --git a/src/ui/root/DeputyContributionSurveyRow.tsx b/src/ui/root/DeputyContributionSurveyRow.tsx index 264e4e5a4..2905d3f17 100644 --- a/src/ui/root/DeputyContributionSurveyRow.tsx +++ b/src/ui/root/DeputyContributionSurveyRow.tsx @@ -1,9 +1,7 @@ import { ComponentChild, h } from 'tsx-dom'; import DeputyContributionSurveySection from './DeputyContributionSurveySection'; import { DeputyUIElement } from '../DeputyUIElement'; -import ContributionSurveyRow, { - ContributionSurveyRowStatus -} from '../../models/ContributionSurveyRow'; +import ContributionSurveyRow from '../../models/ContributionSurveyRow'; import swapElements from '../../util/swapElements'; import unwrapWidget from '../../util/unwrapWidget'; import DeputyLoadingDots from './DeputyLoadingDots'; @@ -22,6 +20,7 @@ import { ContributionSurveyRowSort } from '../../models/ContributionSurveyRowSor import last from '../../util/last'; import warn from '../../util/warn'; import error from '../../util/error'; +import { ContributionSurveyRowStatus } from '../../models/ContributionSurveyRowStatus'; import dangerModeConfirm from '../../util/dangerModeConfirm'; export enum DeputyContributionSurveyRowState { diff --git a/src/ui/shared/DeputyCCIStatusDropdown.tsx b/src/ui/shared/DeputyCCIStatusDropdown.tsx index 02218c212..974d0f6ee 100644 --- a/src/ui/shared/DeputyCCIStatusDropdown.tsx +++ b/src/ui/shared/DeputyCCIStatusDropdown.tsx @@ -1,8 +1,8 @@ import '../../types'; -import { ContributionSurveyRowStatus } from '../../models/ContributionSurveyRow'; import unwrapWidget from '../../util/unwrapWidget'; import { DeputyMessageEvent, DeputyPageStatusUpdateMessage } from '../../DeputyCommunications'; import DeputyCase from '../../wiki/DeputyCase'; +import { ContributionSurveyRowStatus } from '../../models/ContributionSurveyRowStatus'; export interface DeputyCCIStatusDropdownProps { /** diff --git a/tests/unit/browser/ContributionSurveyRowUnitTests.ts b/tests/unit/browser/ContributionSurveyRowUnitTests.ts index 3c12bb31a..85e74929f 100644 --- a/tests/unit/browser/ContributionSurveyRowUnitTests.ts +++ b/tests/unit/browser/ContributionSurveyRowUnitTests.ts @@ -1,7 +1,7 @@ import '../../../src/types'; import 'types-mediawiki'; -import { ContributionSurveyRowStatus } from '../../../src/models/ContributionSurveyRow'; import BrowserHelper from '../../util/BrowserHelper'; +import { ContributionSurveyRowStatus } from '../../../src/models/ContributionSurveyRowStatus'; describe( 'ContributionSurveyRow static unit tests', () => {