frontend all fixed?

loculus-project · Nov 6, 2024 · 690f9ed · 690f9ed
1 parent 6fface7
commit 690f9ed
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/website/src/components/ReviewPage/ReviewCard.tsx b/website/src/components/ReviewPage/ReviewCard.tsx
@@ -12,6 +12,8 @@ import {
     type SequenceEntryStatus,
     type SequenceEntryStatusNames,
     type SequenceEntryToEdit,
+    errorsProcessingResult,
+    warningsProcessingResult,
 } from '../../types/backend.ts';
 import type { ClientConfig } from '../../types/runtimeConfig.ts';
 import { createAuthorizationHeader } from '../../utils/createAuthorizationHeader.ts';
@@ -58,8 +60,8 @@ export const ReviewCard: FC<ReviewCardProps> = ({
                         status={sequenceEntryStatus.status}
                         dataUseTerms={sequenceEntryStatus.dataUseTerms}
                         accession={sequenceEntryStatus.accession}
-                        hasWarnings={sequenceEntryStatus.hasWarnings}
-                        hasErrors={sequenceEntryStatus.hasErrors}
+                        hasWarnings={sequenceEntryStatus.processingResult === warningsProcessingResult}
+                        hasErrors={sequenceEntryStatus.processingResult === errorsProcessingResult}
                     />
                     <KeyValueComponent
                         accessionVersion={getAccessionVersionString(sequenceEntryStatus)}
@@ -111,7 +113,9 @@ const ButtonBar: FC<ButtonBarProps> = ({
         `${
             disabled ? 'text-gray-300' : 'text-gray-500 hover:text-gray-900 hover:cursor-pointer'
         } pl-3 inline-block mr-2 mb-2 text-xl`;
-    const approvable = sequenceEntryStatus.status === processedStatus && !sequenceEntryStatus.hasErrors;
+    const approvable =
+        sequenceEntryStatus.status === processedStatus &&
+        !(sequenceEntryStatus.processingResult === errorsProcessingResult);
     const notProcessed = sequenceEntryStatus.status !== processedStatus;
 
     return (
@@ -130,7 +134,7 @@ const ButtonBar: FC<ButtonBarProps> = ({
                 content={
                     approvable
                         ? 'Release this sequence entry'
-                        : sequenceEntryStatus.hasErrors
+                        : sequenceEntryStatus.processingResult === errorsProcessingResult
                           ? 'You need to fix the errors before releasing this sequence entry'
                           : 'Still awaiting preprocessing'
                 }

diff --git a/website/src/components/ReviewPage/ReviewPage.spec.tsx b/website/src/components/ReviewPage/ReviewPage.spec.tsx
@@ -34,8 +34,7 @@ function renderReviewPage() {
 const receivedTestData: SequenceEntryStatus = {
     submissionId: 'custom1',
     status: receivedStatus,
-    hasErrors: false,
-    hasWarnings: false,
+    processingResult: null,
     accession: 'accession1',
     version: 1,
     isRevocation: false,
@@ -47,8 +46,7 @@ const receivedTestData: SequenceEntryStatus = {
 const processingTestData: SequenceEntryStatus = {
     submissionId: 'custom4',
     status: inProcessingStatus,
-    hasErrors: false,
-    hasWarnings: false,
+    processingResult: null,
     accession: 'accession4',
     version: 1,
     isRevocation: false,
@@ -60,8 +58,7 @@ const processingTestData: SequenceEntryStatus = {
 const erroneousTestData: SequenceEntryStatus = {
     submissionId: 'custom2',
     status: processedStatus,
-    hasErrors: true,
-    hasWarnings: false,
+    processingResult: errorsProcessingResult,
     accession: 'accession2',
     version: 1,
     isRevocation: false,
@@ -73,8 +70,7 @@ const erroneousTestData: SequenceEntryStatus = {
 const awaitingApprovalTestData: SequenceEntryStatus = {
     submissionId: 'custom3',
     status: processedStatus,
-    hasErrors: false,
-    hasWarnings: false,
+    processingResult: noIssuesProcessingResult,
     accession: 'accession3',
     version: 1,
     isRevocation: false,
@@ -106,11 +102,11 @@ const generateGetSequencesResponse = (sequenceEntries: SequenceEntryStatus[]): G
     );
     const processingResultCounts = sequenceEntries.reduce(
         (acc, sequence) => {
-            if (sequence.hasErrors) {
+            if (sequence.processingResult === errorsProcessingResult) {
                 acc[errorsProcessingResult] = acc[errorsProcessingResult] + 1;
-            } else if (sequence.hasWarnings) {
+            } else if (sequence.processingResult === warningsProcessingResult) {
                 acc[warningsProcessingResult] = acc[warningsProcessingResult] + 1;
-            } else {
+            } else if (sequence.processingResult === noIssuesProcessingResult) {
                 acc[noIssuesProcessingResult] = acc[noIssuesProcessingResult] + 1;
             }
             return acc;

diff --git a/website/src/types/backend.ts b/website/src/types/backend.ts
@@ -6,8 +6,8 @@ export const processedStatus = 'PROCESSED';
 export const approvedForReleaseStatus = 'APPROVED_FOR_RELEASE';
 
 export const noIssuesProcessingResult = 'NO_ISSUES';
-export const warningsProcessingResult = 'WARNINGS';
-export const errorsProcessingResult = 'ERRORS';
+export const warningsProcessingResult = 'HAS_WARNINGS';
+export const errorsProcessingResult = 'HAS_ERRORS';
 
 export const sequenceEntryStatusNames = z.union([
     z.literal(receivedStatus),
@@ -127,8 +127,7 @@ export type DataUseTermsHistoryEntry = z.infer<typeof dataUseTermsHistoryEntry>;
 export const sequenceEntryStatus = accessionVersion.merge(
     z.object({
         status: sequenceEntryStatusNames,
-        hasErrors: z.boolean(),
-        hasWarnings: z.boolean(),
+        processingResult: sequenceEntryProcessingResultNames.nullable(),
         submissionId: z.string(),
         isRevocation: z.boolean(),
         dataUseTerms,