From 57930c470116532e2e4c10ebb721af92e390ac9f Mon Sep 17 00:00:00 2001
From: Theo Sanderson <theo@sndrsn.co.uk>
Date: Sun, 17 Mar 2024 17:57:51 +0000
Subject: [PATCH 1/9] wip

---
 .../src/components/ReviewPage/ReviewPage.tsx  | 66 +++++++++++++++----
 1 file changed, 55 insertions(+), 11 deletions(-)

diff --git a/website/src/components/ReviewPage/ReviewPage.tsx b/website/src/components/ReviewPage/ReviewPage.tsx
index 5ecba016bd..86b878c2b5 100644
--- a/website/src/components/ReviewPage/ReviewPage.tsx
+++ b/website/src/components/ReviewPage/ReviewPage.tsx
@@ -15,6 +15,7 @@ import {
     awaitingApprovalForRevocationStatus,
     type PageQuery,
     type SequenceEntryStatus,
+    receivedStatus,
 } from '../../types/backend.ts';
 import { type ClientConfig } from '../../types/runtimeConfig.ts';
 import { displayConfirmationDialog } from '../ConfirmationDialog.tsx';
@@ -34,9 +35,30 @@ type ReviewPageProps = {
 
 const pageSizeOptions = [10, 20, 50, 100] as const;
 
+const NumberAndVisibility = ({ text, number, setVisibility, visibilityEnabled }) =>
+{
+    // checkbox number, text
+    return <div className='flex items-center gap-2 text-sm text-grat-500'>
+       <label> <input
+
+            type='checkbox'
+            checked={visibilityEnabled}
+            onChange={() => setVisibility(!visibilityEnabled)}
+            className='mr-2'
+        />
+        {number} {text}</label>
+    </div>
+
+
+
+
+}
+
 const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessToken }) => {
     const { errorMessage, isErrorOpen, openErrorFeedback, closeErrorFeedback } = useErrorFeedbackState();
     const [showErrors, setShowErrors] = useState(true);
+    const [showUnprocessed, setShowUnprocessed] = useState(true);
+    const [showValid, setShowValid] = useState(false);
     const [pageQuery, setPageQuery] = useState<PageQuery>({ page: 1, size: pageSizeOptions[2] });
 
     const hooks = useSubmissionOperations(organism, clientConfig, accessToken, openErrorFeedback, pageQuery);
@@ -66,8 +88,36 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
     const processedCount = hooks.getSequences.data.statusCounts[awaitingApprovalStatus];
     const errorCount = hooks.getSequences.data.statusCounts[hasErrorsStatus];
     const revocationCount = hooks.getSequences.data.statusCounts[awaitingApprovalForRevocationStatus];
+    const receivedCount = hooks.getSequences.data.statusCounts[receivedStatus];
+    
 
     const finishedCount = processedCount + errorCount + revocationCount;
+    const unfinishedCount = receivedCount + processingCount;
+    const validCount = processedCount + revocationCount;
+
+    const categoryInfo = [
+        {
+            text: "sequences still awaiting processing",
+            number: unfinishedCount,
+            setVisibility: setShowUnprocessed,
+            visibilityEnabled: showUnprocessed,
+        },
+        {
+            text: "valid sequences",
+            number: validCount,
+            setVisibility: setShowValid,
+            visibilityEnabled: showValid,
+        },
+        {
+            text: "sequences with errors",
+            number: errorCount,
+            setVisibility: setShowErrors,
+            visibilityEnabled: showErrors,
+        }
+        
+    ]
+
+
 
     const sequences: SequenceEntryStatus[] = hooks.getSequences.data.sequenceEntries;
 
@@ -78,14 +128,11 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
                 {processingCount > 0 && <span className='loading loading-spinner loading-sm ml-3'> </span>}
             </div>
             <div>
-                <input
-                    className='mr-3'
-                    type='checkbox'
-                    checked={showErrors}
-                    title='Show sequences with errors'
-                    onChange={(e) => setShowErrors(e.target.checked)}
-                />
-                Also show entries with errors
+               {
+                     categoryInfo.map((info) => {
+                          return <NumberAndVisibility {...info} />
+                     })
+               }
             </div>
         </div>
     );
@@ -193,9 +240,6 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
     const reviewCards = (
         <div className='flex flex-col gap-2 py-4'>
             {sequences.map((sequence) => {
-                if (!showErrors && sequence.status === hasErrorsStatus) {
-                    return null;
-                }
                 return (
                     <div key={sequence.accession}>
                         <ReviewCard

From 075d3a791f58d170cbe53864828721b04463439a Mon Sep 17 00:00:00 2001
From: Theo Sanderson <theo@sndrsn.co.uk>
Date: Sun, 17 Mar 2024 20:25:19 +0000
Subject: [PATCH 2/9] Many improvements

---
 .../submission/SubmissionDatabaseService.kt   |  21 +-
 .../components/ReviewPage/ReviewPage.spec.tsx |   4 +-
 .../src/components/ReviewPage/ReviewPage.tsx  | 184 ++++++++++++------
 website/src/hooks/useSubmissionOperations.ts  |  10 +-
 website/tests/pages/review/review.page.ts     |   6 +-
 5 files changed, 145 insertions(+), 80 deletions(-)

diff --git a/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt b/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
index 7cf96a78e6..aef7f8cb5d 100644
--- a/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
+++ b/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
@@ -433,7 +433,7 @@ class SubmissionDatabaseService(
         val listOfStatuses = statusesFilter ?: Status.entries
 
         sequenceEntriesTableProvider.get(organism).let { table ->
-            val query = table
+            val baseQuery = table
                 .join(
                     DataUseTermsTable,
                     JoinType.LEFT,
@@ -456,30 +456,33 @@ class SubmissionDatabaseService(
                 )
                 .select(
                     where = {
-                        table.statusIsOneOf(listOfStatuses) and
-                            table.groupNameIsOneOf(validatedGroupNames)
+                        table.groupNameIsOneOf(validatedGroupNames)
                     },
                 )
                 .orderBy(table.accessionColumn)
 
             if (organism != null) {
-                query.andWhere { table.organismIs(organism) }
+                baseQuery.andWhere { table.organismIs(organism) }
             }
 
-            val statusCounts: Map<Status, Int> = listOfStatuses.associateWith { status ->
-                query.count { it[table.statusColumn] == status.name }
+            val statusCounts: Map<Status, Int> = Status.entries.associateWith { status ->
+                baseQuery.count { it[table.statusColumn] == status.name }
+            }
+
+            val filteredQuery = baseQuery.andWhere {
+                table.statusIsOneOf(listOfStatuses)
             }
 
             if (warningsFilter == WarningsFilter.EXCLUDE_WARNINGS) {
-                query.andWhere {
+                filteredQuery.andWhere {
                     not(table.entriesWithWarnings)
                 }
             }
 
             val pagedQuery = if (page != null && size != null) {
-                query.limit(size, (page * size).toLong())
+                filteredQuery.limit(size, (page * size).toLong())
             } else {
-                query
+                filteredQuery
             }
 
             return GetSequenceResponse(
diff --git a/website/src/components/ReviewPage/ReviewPage.spec.tsx b/website/src/components/ReviewPage/ReviewPage.spec.tsx
index f86b31ae50..c792bc41e9 100644
--- a/website/src/components/ReviewPage/ReviewPage.spec.tsx
+++ b/website/src/components/ReviewPage/ReviewPage.spec.tsx
@@ -83,7 +83,7 @@ describe('ReviewPage', () => {
         const { getByText } = renderReviewPage();
 
         await waitFor(() => {
-            expect(getByText('No sequences to review')).toBeDefined();
+            expect(getByText('You do not currently have any unreleased sequences')).toBeDefined();
         });
     });
 
@@ -132,7 +132,7 @@ describe('ReviewPage', () => {
         getByText((text) => text.includes('Confirm')).click();
 
         await waitFor(() => {
-            expect(getByText('No sequences to review')).toBeDefined();
+            expect(getByText('You do not currently have any unreleased sequences')).toBeDefined();
         });
     });
 
diff --git a/website/src/components/ReviewPage/ReviewPage.tsx b/website/src/components/ReviewPage/ReviewPage.tsx
index 86b878c2b5..e4df8617f8 100644
--- a/website/src/components/ReviewPage/ReviewPage.tsx
+++ b/website/src/components/ReviewPage/ReviewPage.tsx
@@ -15,6 +15,7 @@ import {
     awaitingApprovalForRevocationStatus,
     type PageQuery,
     type SequenceEntryStatus,
+    type GetSequencesResponse,
     receivedStatus,
 } from '../../types/backend.ts';
 import { type ClientConfig } from '../../types/runtimeConfig.ts';
@@ -23,9 +24,12 @@ import { ManagedErrorFeedback, useErrorFeedbackState } from '../common/ManagedEr
 import { withQueryProvider } from '../common/withQueryProvider.tsx';
 import BiTrash from '~icons/bi/trash';
 import IwwaArrowDown from '~icons/iwwa/arrow-down';
+import MdiEye from '~icons/mdi/eye';
 import WpfPaperPlane from '~icons/wpf/paper-plane';
 const menuItemClassName = `group flex rounded-md items-center w-full px-2 py-2 text-sm
-hover:bg-gray-400 bg-gray-500 text-white text-left mb-1`;
+hover:bg-primary-500 bg-primary-600 text-white text-left mb-1`;
+
+let oldSequenceData: GetSequencesResponse | null = null;
 
 type ReviewPageProps = {
     clientConfig: ClientConfig;
@@ -35,104 +39,152 @@ type ReviewPageProps = {
 
 const pageSizeOptions = [10, 20, 50, 100] as const;
 
-const NumberAndVisibility = ({ text, number, setVisibility, visibilityEnabled }) =>
-{
+const NumberAndVisibility = ({
+    text,
+    countNumber,
+    setVisibility,
+    visibilityEnabled,
+}: {
+    text: string;
+    countNumber: number;
+    setVisibility: (value: boolean) => void;
+    visibilityEnabled: boolean;
+}) => {
     // checkbox number, text
-    return <div className='flex items-center gap-2 text-sm text-grat-500'>
-       <label> <input
+    return (
+        <div className='flex items-center gap-3 text-sm text-gray-600'>
+            <label>
+                <input
+                    type='checkbox'
+                    checked={visibilityEnabled}
+                    onChange={() => setVisibility(visibilityEnabled === false)}
+                    className='mr-2 text-gray-400'
+                />
+                <span className=' inline-block font-semibold '>{countNumber} </span>&nbsp;
+                {text}
+            </label>
+        </div>
+    );
+};
 
-            type='checkbox'
-            checked={visibilityEnabled}
-            onChange={() => setVisibility(!visibilityEnabled)}
-            className='mr-2'
-        />
-        {number} {text}</label>
-    </div>
+const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessToken }) => {
+    const { errorMessage, isErrorOpen, openErrorFeedback, closeErrorFeedback } = useErrorFeedbackState();
 
+    const [pageQuery, setPageQuery] = useState<PageQuery>({ page: 1, size: pageSizeOptions[2] });
 
+    const hooks = useSubmissionOperations(organism, clientConfig, accessToken, openErrorFeedback, pageQuery);
 
+    const showErrors = hooks.includedStatuses.includes(hasErrorsStatus);
+    const showUnprocessed =
+        hooks.includedStatuses.includes(inProcessingStatus) && hooks.includedStatuses.includes(receivedStatus);
+    const showValid =
+        hooks.includedStatuses.includes(awaitingApprovalStatus) &&
+        hooks.includedStatuses.includes(awaitingApprovalForRevocationStatus);
 
-}
+    const setAStatus = (status: string, value: boolean) => {
+        hooks.setIncludedStatuses((prev) => {
+            if (value) {
+                return [...prev, status];
+            }
+            return prev.filter((s) => s !== status);
+        });
+    };
 
-const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessToken }) => {
-    const { errorMessage, isErrorOpen, openErrorFeedback, closeErrorFeedback } = useErrorFeedbackState();
-    const [showErrors, setShowErrors] = useState(true);
-    const [showUnprocessed, setShowUnprocessed] = useState(true);
-    const [showValid, setShowValid] = useState(false);
-    const [pageQuery, setPageQuery] = useState<PageQuery>({ page: 1, size: pageSizeOptions[2] });
+    const setShowErrors = (value: boolean) => setAStatus(hasErrorsStatus, value);
+    const setShowUnprocessed = (value: boolean) => {
+        setAStatus(inProcessingStatus, value);
+        setAStatus(receivedStatus, value);
+    };
 
-    const hooks = useSubmissionOperations(organism, clientConfig, accessToken, openErrorFeedback, pageQuery);
+    const setShowValid = (value: boolean) => {
+        setAStatus(awaitingApprovalStatus, value);
+        setAStatus(awaitingApprovalForRevocationStatus, value);
+    };
 
     const handleSizeChange = (event: ChangeEvent<HTMLSelectElement>) => {
         const newSize = parseInt(event.target.value, 10);
         setPageQuery({ page: 1, size: newSize });
     };
 
+    let sequencesData = hooks.getSequences.data;
+
+    if (!hooks.getSequences.isLoading && !hooks.getSequences.isError) {
+        oldSequenceData = hooks.getSequences.data;
+    }
+
     if (hooks.getSequences.isLoading) {
-        return <div>Loading...</div>;
+        // Type checking doesn't seem to understand how to handle the ref, so we need to..
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition, @typescript-eslint/strict-boolean-expressions
+        if (oldSequenceData) {
+            sequencesData = oldSequenceData;
+        } else {
+            return <div>Loading...</div>;
+        }
     }
 
     if (hooks.getSequences.isError) {
         return <div>Error: {hooks.getSequences.error.message}</div>;
     }
-
-    if (hooks.getSequences.data.sequenceEntries.length === 0) {
-        return <div>No sequences to review</div>;
+    if (sequencesData === undefined) {
+        return <div>Loading..</div>;
+        // this is not expected to happen, but it's here to satisfy the type checker
     }
 
-    const total = Object.values(hooks.getSequences.data.statusCounts).reduce(
-        (acc: number, count: number) => acc + count,
-        0,
-    );
-    const processingCount = hooks.getSequences.data.statusCounts[inProcessingStatus];
-    const processedCount = hooks.getSequences.data.statusCounts[awaitingApprovalStatus];
-    const errorCount = hooks.getSequences.data.statusCounts[hasErrorsStatus];
-    const revocationCount = hooks.getSequences.data.statusCounts[awaitingApprovalForRevocationStatus];
-    const receivedCount = hooks.getSequences.data.statusCounts[receivedStatus];
-    
+    const total = Object.values(sequencesData.statusCounts).reduce((acc: number, count: number) => acc + count, 0);
+    const processingCount = sequencesData.statusCounts[inProcessingStatus];
+    const processedCount = sequencesData.statusCounts[awaitingApprovalStatus];
+    const errorCount = sequencesData.statusCounts[hasErrorsStatus];
+    const revocationCount = sequencesData.statusCounts[awaitingApprovalForRevocationStatus];
+    const receivedCount = sequencesData.statusCounts[receivedStatus];
 
     const finishedCount = processedCount + errorCount + revocationCount;
     const unfinishedCount = receivedCount + processingCount;
     const validCount = processedCount + revocationCount;
 
+    if (total === 0) {
+        return (
+            <div className='pt-1 text-gray-600'>
+                You do not currently have any unreleased sequences awaiting review.
+            </div>
+        );
+    }
+
     const categoryInfo = [
         {
-            text: "sequences still awaiting processing",
-            number: unfinishedCount,
+            text: 'sequences still awaiting processing',
+            countNumber: unfinishedCount,
             setVisibility: setShowUnprocessed,
             visibilityEnabled: showUnprocessed,
         },
         {
-            text: "valid sequences",
-            number: validCount,
+            text: 'valid sequences',
+            countNumber: validCount,
             setVisibility: setShowValid,
             visibilityEnabled: showValid,
         },
         {
-            text: "sequences with errors",
-            number: errorCount,
+            text: 'sequences with errors',
+            countNumber: errorCount,
             setVisibility: setShowErrors,
             visibilityEnabled: showErrors,
-        }
-        
-    ]
-
-
+        },
+    ];
 
-    const sequences: SequenceEntryStatus[] = hooks.getSequences.data.sequenceEntries;
+    const sequences: SequenceEntryStatus[] = sequencesData.sequenceEntries;
 
     const controlPanel = (
-        <div className='flex flex-col py-2'>
-            <div>
-                {finishedCount} of {total} sequences processed.
-                {processingCount > 0 && <span className='loading loading-spinner loading-sm ml-3'> </span>}
+        <div className='flex flex-col'>
+            <div className='text-gray-600 mr-3'>
+                {unfinishedCount > 0 && (
+                    <span className='loading loading-spinner loading-sm mr-2 relative top-1'> </span>
+                )}
+                {finishedCount} of {total} sequences processed
             </div>
-            <div>
-               {
-                     categoryInfo.map((info) => {
-                          return <NumberAndVisibility {...info} />
-                     })
-               }
+            <div className='border border-gray-200 rounded-md p-3 mt-3 flex gap-3'>
+                <MdiEye className='w-4 h-4 mr-1.5 inline-block text-gray-500 mt-0.5' />
+                {categoryInfo.map((info) => {
+                    return <NumberAndVisibility {...info} />;
+                })}
             </div>
         </div>
     );
@@ -163,10 +215,10 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
     );
 
     const bulkActionButtons = (
-        <div className='flex justify-end items-center gap-3'>
+        <div className='flex justify-end items-center gap-3 mt-auto '>
             {finishedCount > 0 && (
-                <Menu as='div' className='relative inline-block text-left'>
-                    <Menu.Button className='border rounded-md p-1 bg-gray-500 text-white px-2'>
+                <Menu as='div' className=' inline-block text-left'>
+                    <Menu.Button className='border rounded-md p-1 bg-primary-600 text-white px-2'>
                         <BiTrash className='inline-block w-4 h-4 -mt-0.5 mr-1.5' />
                         Discard sequences
                         <IwwaArrowDown className='inline-block ml-1 w-3 h-3 -mt-0.5' />
@@ -218,7 +270,7 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
             )}
             {processedCount + revocationCount > 0 && (
                 <button
-                    className='border rounded-md p-1 bg-gray-500 text-white px-2'
+                    className='border rounded-md p-1 bg-primary-600 text-white px-2'
                     onClick={() =>
                         displayConfirmationDialog({
                             dialogText: 'Are you sure you want to release all valid sequences?',
@@ -272,10 +324,14 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
     return (
         <>
             <ManagedErrorFeedback message={errorMessage} open={isErrorOpen} onClose={closeErrorFeedback} />
-            {controlPanel}
-            {bulkActionButtons}
-            {reviewCards}
-            {pagination}
+            <div className={hooks.getSequences.isLoading ? 'opacity-50 pointer-events-none' : ''}>
+                <div className='flex sm:justify-between items-bottom flex-col md:flex-row gap-5'>
+                    {controlPanel}
+                    {bulkActionButtons}
+                </div>
+                {reviewCards}
+                {pagination}
+            </div>
         </>
     );
 };
diff --git a/website/src/hooks/useSubmissionOperations.ts b/website/src/hooks/useSubmissionOperations.ts
index cd8a0ac731..095f94f3f4 100644
--- a/website/src/hooks/useSubmissionOperations.ts
+++ b/website/src/hooks/useSubmissionOperations.ts
@@ -1,6 +1,6 @@
 import { isErrorFromAlias } from '@zodios/core';
 import type { AxiosError } from 'axios';
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
 
 import { backendApi } from '../services/backendApi.ts';
 import { backendClientHooks } from '../services/serviceHooks.ts';
@@ -24,13 +24,13 @@ export function useSubmissionOperations(
     pageQuery: PageQuery,
 ) {
     const hooks = useMemo(() => backendClientHooks(clientConfig), [clientConfig]);
-    const includedStatuses = [
+    const [includedStatuses, setIncludedStatuses] = useState<string[]>([
         receivedStatus,
         inProcessingStatus,
-        awaitingApprovalStatus,
         hasErrorsStatus,
+        awaitingApprovalStatus,
         awaitingApprovalForRevocationStatus,
-    ];
+    ]);
     const useGetSequences = hooks.useGetSequences(
         {
             headers: createAuthorizationHeader(accessToken),
@@ -72,6 +72,8 @@ export function useSubmissionOperations(
         deleteSequenceEntries: useDeleteSequenceEntries.mutate,
         approveProcessedData: useApproveProcessedData.mutate,
         getSequences: useGetSequences,
+        includedStatuses,
+        setIncludedStatuses,
     };
 }
 
diff --git a/website/tests/pages/review/review.page.ts b/website/tests/pages/review/review.page.ts
index e561d7baac..3670337553 100644
--- a/website/tests/pages/review/review.page.ts
+++ b/website/tests/pages/review/review.page.ts
@@ -31,7 +31,11 @@ export class ReviewPage {
     }
 
     public async getReviewPageOverview(): Promise<ReviewPageOverview> {
-        if (await this.page.getByText('No sequences to review', { exact: false }).isVisible()) {
+        if (
+            await this.page
+                .getByText('You do not currently have any unreleased sequences', { exact: false })
+                .isVisible()
+        ) {
             return { processed: 0, total: 0 };
         }
 

From e6a73f3569fb6b941afa2d8dc00126dc48d6f7ea Mon Sep 17 00:00:00 2001
From: Theo Sanderson <theo@sndrsn.co.uk>
Date: Sun, 17 Mar 2024 20:31:52 +0000
Subject: [PATCH 3/9] fix some tests

---
 website/src/components/ReviewPage/ReviewPage.spec.tsx | 6 +++---
 website/tests/pages/review/review.page.ts             | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/website/src/components/ReviewPage/ReviewPage.spec.tsx b/website/src/components/ReviewPage/ReviewPage.spec.tsx
index c792bc41e9..3556170520 100644
--- a/website/src/components/ReviewPage/ReviewPage.spec.tsx
+++ b/website/src/components/ReviewPage/ReviewPage.spec.tsx
@@ -83,7 +83,7 @@ describe('ReviewPage', () => {
         const { getByText } = renderReviewPage();
 
         await waitFor(() => {
-            expect(getByText('You do not currently have any unreleased sequences')).toBeDefined();
+            expect(getByText('You do not currently have any unreleased sequences awaiting review.')).toBeDefined();
         });
     });
 
@@ -132,7 +132,7 @@ describe('ReviewPage', () => {
         getByText((text) => text.includes('Confirm')).click();
 
         await waitFor(() => {
-            expect(getByText('You do not currently have any unreleased sequences')).toBeDefined();
+            expect(getByText('You do not currently have any unreleased sequences awaiting review.')).toBeDefined();
         });
     });
 
@@ -151,7 +151,7 @@ describe('ReviewPage', () => {
         const { getByText } = renderReviewPage();
 
         await waitFor(() => {
-            expect(getByText((text) => text.includes('2 of 4 sequences processed.'))).toBeDefined();
+            expect(getByText((text) => text.includes('2 of 4 sequences processed'))).toBeDefined();
         });
     });
 });
diff --git a/website/tests/pages/review/review.page.ts b/website/tests/pages/review/review.page.ts
index 3670337553..76f5df228b 100644
--- a/website/tests/pages/review/review.page.ts
+++ b/website/tests/pages/review/review.page.ts
@@ -33,15 +33,15 @@ export class ReviewPage {
     public async getReviewPageOverview(): Promise<ReviewPageOverview> {
         if (
             await this.page
-                .getByText('You do not currently have any unreleased sequences', { exact: false })
+                .getByText('You do not currently have any unreleased sequences awaiting review.', { exact: false })
                 .isVisible()
         ) {
             return { processed: 0, total: 0 };
         }
 
-        await this.page.waitForSelector(':text("sequences processed.")');
+        await this.page.waitForSelector(':text("sequences processed")');
 
-        const infoText = await this.page.$eval(':text("sequences processed.")', (element) => element.textContent);
+        const infoText = await this.page.$eval(':text("sequences processed")', (element) => element.textContent);
 
         const matchResult = infoText?.match(/(\d+) of (\d+) sequences processed/) ?? null;
 

From 5676bc522e1d5ec8c07f4eb86acdc6e568617231 Mon Sep 17 00:00:00 2001
From: Theo Sanderson <theo@sndrsn.co.uk>
Date: Sun, 17 Mar 2024 20:41:22 +0000
Subject: [PATCH 4/9] fix backend test

---
 .../backend/controller/submission/GetSequencesEndpointTest.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/test/kotlin/org/loculus/backend/controller/submission/GetSequencesEndpointTest.kt b/backend/src/test/kotlin/org/loculus/backend/controller/submission/GetSequencesEndpointTest.kt
index 238a779043..4667f8a9f6 100644
--- a/backend/src/test/kotlin/org/loculus/backend/controller/submission/GetSequencesEndpointTest.kt
+++ b/backend/src/test/kotlin/org/loculus/backend/controller/submission/GetSequencesEndpointTest.kt
@@ -4,6 +4,7 @@ import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.containsInAnyOrder
 import org.hamcrest.Matchers.containsString
 import org.hamcrest.Matchers.empty
+import org.hamcrest.Matchers.hasEntry
 import org.hamcrest.Matchers.hasSize
 import org.hamcrest.Matchers.`is`
 import org.junit.jupiter.api.Test
@@ -169,7 +170,7 @@ class GetSequencesEndpointTest(
         )
 
         assertThat(resultForInAwaitingApprovalPageOne.sequenceEntries, hasSize(5))
-        assertThat(resultForInAwaitingApprovalPageOne.statusCounts, `is`(mapOf(AWAITING_APPROVAL to 10)))
+        assertThat(resultForInAwaitingApprovalPageOne.statusCounts, hasEntry(AWAITING_APPROVAL, 10))
 
         val resultForInAwaitingApprovalPageTwo = convenienceClient.getSequenceEntries(
             statusesFilter = listOf(AWAITING_APPROVAL),

From 0e68d987144341fb7b086d75cdaf1de31828cd44 Mon Sep 17 00:00:00 2001
From: Theo Sanderson <theo@sndrsn.co.uk>
Date: Sun, 17 Mar 2024 20:46:40 +0000
Subject: [PATCH 5/9] cleanup

---
 website/src/components/ReviewPage/ReviewPage.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/website/src/components/ReviewPage/ReviewPage.tsx b/website/src/components/ReviewPage/ReviewPage.tsx
index e4df8617f8..56471a6749 100644
--- a/website/src/components/ReviewPage/ReviewPage.tsx
+++ b/website/src/components/ReviewPage/ReviewPage.tsx
@@ -50,7 +50,6 @@ const NumberAndVisibility = ({
     setVisibility: (value: boolean) => void;
     visibilityEnabled: boolean;
 }) => {
-    // checkbox number, text
     return (
         <div className='flex items-center gap-3 text-sm text-gray-600'>
             <label>
@@ -113,8 +112,6 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
     }
 
     if (hooks.getSequences.isLoading) {
-        // Type checking doesn't seem to understand how to handle the ref, so we need to..
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition, @typescript-eslint/strict-boolean-expressions
         if (oldSequenceData) {
             sequencesData = oldSequenceData;
         } else {

From b1639c2c3671acc96222e5f526a86c0b8a6dbf70 Mon Sep 17 00:00:00 2001
From: Theo Sanderson <theo@sndrsn.co.uk>
Date: Sun, 17 Mar 2024 23:42:36 +0000
Subject: [PATCH 6/9] Reviewpage redesign (#1373)

---
 .../controller/DatasetCitationsController.kt     |  2 +-
 .../backend/controller/SubmissionController.kt   |  3 +++
 .../submission/SubmissionDatabaseService.kt      |  5 ++++-
 .../datasetcitations/CitationEndpointsTest.kt    |  4 ++--
 .../submission/SubmissionControllerClient.kt     |  2 ++
 .../submission/SubmissionConvenienceClient.kt    |  2 ++
 website/src/components/ReviewPage/ReviewCard.tsx |  2 +-
 website/src/components/ReviewPage/ReviewPage.tsx | 16 ++++++++++++----
 website/src/hooks/useSubmissionOperations.ts     |  6 ++++--
 9 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/kotlin/org/loculus/backend/controller/DatasetCitationsController.kt b/backend/src/main/kotlin/org/loculus/backend/controller/DatasetCitationsController.kt
index 90700848ae..993168efd4 100644
--- a/backend/src/main/kotlin/org/loculus/backend/controller/DatasetCitationsController.kt
+++ b/backend/src/main/kotlin/org/loculus/backend/controller/DatasetCitationsController.kt
@@ -97,7 +97,7 @@ class DatasetCitationsController(
     @GetMapping("/get-user-cited-by-dataset")
     fun getUserCitedByDataset(@UsernameFromJwt username: String): CitedBy {
         val statusFilter = listOf(APPROVED_FOR_RELEASE)
-        val userSequences = submissionDatabaseService.getSequences(username, null, null, statusFilter)
+        val userSequences = submissionDatabaseService.getSequences(username, null, null, statusFilter, statusFilter)
         return datasetCitationsService.getUserCitedByDataset(userSequences.sequenceEntries)
     }
 
diff --git a/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt b/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt
index cb34e1c11e..370ff293a9 100644
--- a/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt
+++ b/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt
@@ -255,6 +255,8 @@ class SubmissionController(
         )
         @RequestParam(required = false)
         statusesFilter: List<Status>?,
+        @RequestParam(required = false)
+        initialStatusesFilter: List<Status>?,
         @UsernameFromJwt username: String,
         @RequestParam(required = false, defaultValue = "INCLUDE_WARNINGS")
         warningsFilter: WarningsFilter,
@@ -275,6 +277,7 @@ class SubmissionController(
         organism,
         groupsFilter,
         statusesFilter,
+        initialStatusesFilter,
         warningsFilter,
         page,
         size,
diff --git a/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt b/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
index aef7f8cb5d..5740dd15ec 100644
--- a/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
+++ b/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
@@ -414,6 +414,7 @@ class SubmissionDatabaseService(
         organism: Organism?,
         groupsFilter: List<String>?,
         statusesFilter: List<Status>?,
+        statusesInitialFilter: List<Status>?,
         warningsFilter: WarningsFilter? = null,
         page: Int? = null,
         size: Int? = null,
@@ -431,6 +432,7 @@ class SubmissionDatabaseService(
         }
 
         val listOfStatuses = statusesFilter ?: Status.entries
+        val listOfInitialStatuses = statusesInitialFilter ?: Status.entries
 
         sequenceEntriesTableProvider.get(organism).let { table ->
             val baseQuery = table
@@ -456,7 +458,8 @@ class SubmissionDatabaseService(
                 )
                 .select(
                     where = {
-                        table.groupNameIsOneOf(validatedGroupNames)
+                        table.statusIsOneOf(listOfInitialStatuses) and
+                            table.groupNameIsOneOf(validatedGroupNames)
                     },
                 )
                 .orderBy(table.accessionColumn)
diff --git a/backend/src/test/kotlin/org/loculus/backend/controller/datasetcitations/CitationEndpointsTest.kt b/backend/src/test/kotlin/org/loculus/backend/controller/datasetcitations/CitationEndpointsTest.kt
index c878301bce..05fef51474 100644
--- a/backend/src/test/kotlin/org/loculus/backend/controller/datasetcitations/CitationEndpointsTest.kt
+++ b/backend/src/test/kotlin/org/loculus/backend/controller/datasetcitations/CitationEndpointsTest.kt
@@ -62,7 +62,7 @@ class CitationEndpointsTest(
     @Test
     fun `WHEN calling get user cited by dataset of non-existing user THEN returns empty results`() {
         every {
-            submissionDatabaseService.getSequences(any(), any(), any(), any())
+            submissionDatabaseService.getSequences(any(), any(), any(), any(), any())
         } returns GetSequenceResponse(sequenceEntries = emptyList(), statusCounts = emptyMap())
 
         client.getUserCitedByDataset()
@@ -88,7 +88,7 @@ class CitationEndpointsTest(
     @Test
     fun `WHEN calling get dataset cited by publication of existing dataset THEN returns results`() {
         every {
-            submissionDatabaseService.getSequences(any(), any(), any(), any())
+            submissionDatabaseService.getSequences(any(), any(), any(), any(), any())
         } returns GetSequenceResponse(
             sequenceEntries = listOf(
                 SequenceEntryStatus(
diff --git a/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionControllerClient.kt b/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionControllerClient.kt
index fafa456011..9e5cb2cd75 100644
--- a/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionControllerClient.kt
+++ b/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionControllerClient.kt
@@ -86,6 +86,7 @@ class SubmissionControllerClient(private val mockMvc: MockMvc, private val objec
         organism: String = DEFAULT_ORGANISM,
         groupsFilter: List<String>? = null,
         statusesFilter: List<Status>? = null,
+        initialStatusesFilter: List<Status>? = null,
         warningsFilter: WarningsFilter? = null,
         jwt: String? = jwtForDefaultUser,
         page: Int? = null,
@@ -96,6 +97,7 @@ class SubmissionControllerClient(private val mockMvc: MockMvc, private val objec
                 .withAuth(jwt)
                 .param("groupsFilter", groupsFilter?.joinToString { it })
                 .param("statusesFilter", statusesFilter?.joinToString { it.name })
+                .param("initialStatusesFilter", initialStatusesFilter?.joinToString { it.name })
                 .param("warningsFilter", warningsFilter?.name)
                 .param("page", page?.toString())
                 .param("size", size?.toString()),
diff --git a/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionConvenienceClient.kt b/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionConvenienceClient.kt
index 0a4ecb218d..237352a52f 100644
--- a/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionConvenienceClient.kt
+++ b/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionConvenienceClient.kt
@@ -161,6 +161,7 @@ class SubmissionConvenienceClient(
         username: String = DEFAULT_USER_NAME,
         groupsFilter: List<String>? = null,
         statusesFilter: List<Status>? = null,
+        initialStatusesFilter: List<Status>? = null,
         organism: String = DEFAULT_ORGANISM,
         warningsFilter: WarningsFilter = WarningsFilter.INCLUDE_WARNINGS,
         page: Int? = null,
@@ -170,6 +171,7 @@ class SubmissionConvenienceClient(
             organism = organism,
             groupsFilter = groupsFilter,
             statusesFilter = statusesFilter,
+            initialStatusesFilter = initialStatusesFilter,
             warningsFilter = warningsFilter,
             jwt = generateJwtFor(username),
             page = page,
diff --git a/website/src/components/ReviewPage/ReviewCard.tsx b/website/src/components/ReviewPage/ReviewCard.tsx
index ee0e1ceec4..f48ba64f9d 100644
--- a/website/src/components/ReviewPage/ReviewCard.tsx
+++ b/website/src/components/ReviewPage/ReviewCard.tsx
@@ -51,7 +51,7 @@ export const ReviewCard: FC<ReviewCardProps> = ({
     const { isLoading, data } = useGetMetadataAndAnnotations(organism, clientConfig, accessToken, sequenceEntryStatus);
 
     return (
-        <div className='p-3 border rounded-md shadow-lg relative transition-all duration-500'>
+        <div className='px-3 py-2   relative transition-all duration-500'>
             <div className='flex'>
                 <div className='flex flex-grow flex-wrap '>
                     <StatusIcon
diff --git a/website/src/components/ReviewPage/ReviewPage.tsx b/website/src/components/ReviewPage/ReviewPage.tsx
index 56471a6749..7d0d98404c 100644
--- a/website/src/components/ReviewPage/ReviewPage.tsx
+++ b/website/src/components/ReviewPage/ReviewPage.tsx
@@ -287,7 +287,7 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
     );
 
     const reviewCards = (
-        <div className='flex flex-col gap-2 py-4'>
+        <div className='flex flex-col gap-2 py-4 divide-y divide-gray-200'>
             {sequences.map((sequence) => {
                 return (
                     <div key={sequence.accession}>
@@ -322,9 +322,17 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
         <>
             <ManagedErrorFeedback message={errorMessage} open={isErrorOpen} onClose={closeErrorFeedback} />
             <div className={hooks.getSequences.isLoading ? 'opacity-50 pointer-events-none' : ''}>
-                <div className='flex sm:justify-between items-bottom flex-col md:flex-row gap-5'>
-                    {controlPanel}
-                    {bulkActionButtons}
+                <div className='sticky top-0 z-10'>
+                    <div className='flex sm:justify-between items-bottom flex-col md:flex-row gap-5 bg-white pb-1'>
+                        {controlPanel}
+                        {bulkActionButtons}
+                    </div>
+                    <div
+                        className='h-2 w-full'
+                        style={{
+                            background: 'linear-gradient(0deg, rgba(255, 255, 255, 0) 0%,rgba(100, 100, 100, .2) 80%)',
+                        }}
+                    ></div>
                 </div>
                 {reviewCards}
                 {pagination}
diff --git a/website/src/hooks/useSubmissionOperations.ts b/website/src/hooks/useSubmissionOperations.ts
index 095f94f3f4..2bed5c4240 100644
--- a/website/src/hooks/useSubmissionOperations.ts
+++ b/website/src/hooks/useSubmissionOperations.ts
@@ -24,13 +24,14 @@ export function useSubmissionOperations(
     pageQuery: PageQuery,
 ) {
     const hooks = useMemo(() => backendClientHooks(clientConfig), [clientConfig]);
-    const [includedStatuses, setIncludedStatuses] = useState<string[]>([
+    const allRelevantStatuses = [
         receivedStatus,
         inProcessingStatus,
         hasErrorsStatus,
         awaitingApprovalStatus,
         awaitingApprovalForRevocationStatus,
-    ]);
+    ];
+    const [includedStatuses, setIncludedStatuses] = useState<string[]>(allRelevantStatuses);
     const useGetSequences = hooks.useGetSequences(
         {
             headers: createAuthorizationHeader(accessToken),
@@ -38,6 +39,7 @@ export function useSubmissionOperations(
                 organism,
             },
             queries: {
+                initialStatusesFilter: allRelevantStatuses.join(','),
                 statusesFilter: includedStatuses.join(','),
                 page: pageQuery.page - 1,
                 size: pageQuery.size,

From 3d5717808c3465c0e63bb532de67ff960b08a5af Mon Sep 17 00:00:00 2001
From: Theo Sanderson <theo@sndrsn.co.uk>
Date: Fri, 22 Mar 2024 14:28:39 +0000
Subject: [PATCH 7/9] address code review

---
 .../backend/controller/DatasetCitationsController.kt       | 2 +-
 .../org/loculus/backend/controller/SubmissionController.kt | 3 ---
 .../service/submission/SubmissionDatabaseService.kt        | 4 +---
 .../controller/datasetcitations/CitationEndpointsTest.kt   | 4 ++--
 .../controller/submission/SubmissionControllerClient.kt    | 2 --
 .../controller/submission/SubmissionConvenienceClient.kt   | 2 --
 website/src/components/ReviewPage/ReviewPage.tsx           | 7 ++++---
 7 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/kotlin/org/loculus/backend/controller/DatasetCitationsController.kt b/backend/src/main/kotlin/org/loculus/backend/controller/DatasetCitationsController.kt
index 993168efd4..90700848ae 100644
--- a/backend/src/main/kotlin/org/loculus/backend/controller/DatasetCitationsController.kt
+++ b/backend/src/main/kotlin/org/loculus/backend/controller/DatasetCitationsController.kt
@@ -97,7 +97,7 @@ class DatasetCitationsController(
     @GetMapping("/get-user-cited-by-dataset")
     fun getUserCitedByDataset(@UsernameFromJwt username: String): CitedBy {
         val statusFilter = listOf(APPROVED_FOR_RELEASE)
-        val userSequences = submissionDatabaseService.getSequences(username, null, null, statusFilter, statusFilter)
+        val userSequences = submissionDatabaseService.getSequences(username, null, null, statusFilter)
         return datasetCitationsService.getUserCitedByDataset(userSequences.sequenceEntries)
     }
 
diff --git a/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt b/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt
index 370ff293a9..cb34e1c11e 100644
--- a/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt
+++ b/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt
@@ -255,8 +255,6 @@ class SubmissionController(
         )
         @RequestParam(required = false)
         statusesFilter: List<Status>?,
-        @RequestParam(required = false)
-        initialStatusesFilter: List<Status>?,
         @UsernameFromJwt username: String,
         @RequestParam(required = false, defaultValue = "INCLUDE_WARNINGS")
         warningsFilter: WarningsFilter,
@@ -277,7 +275,6 @@ class SubmissionController(
         organism,
         groupsFilter,
         statusesFilter,
-        initialStatusesFilter,
         warningsFilter,
         page,
         size,
diff --git a/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt b/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
index 5740dd15ec..97cd919907 100644
--- a/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
+++ b/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
@@ -432,7 +432,6 @@ class SubmissionDatabaseService(
         }
 
         val listOfStatuses = statusesFilter ?: Status.entries
-        val listOfInitialStatuses = statusesInitialFilter ?: Status.entries
 
         sequenceEntriesTableProvider.get(organism).let { table ->
             val baseQuery = table
@@ -458,8 +457,7 @@ class SubmissionDatabaseService(
                 )
                 .select(
                     where = {
-                        table.statusIsOneOf(listOfInitialStatuses) and
-                            table.groupNameIsOneOf(validatedGroupNames)
+                        table.groupNameIsOneOf(validatedGroupNames)
                     },
                 )
                 .orderBy(table.accessionColumn)
diff --git a/backend/src/test/kotlin/org/loculus/backend/controller/datasetcitations/CitationEndpointsTest.kt b/backend/src/test/kotlin/org/loculus/backend/controller/datasetcitations/CitationEndpointsTest.kt
index 05fef51474..c878301bce 100644
--- a/backend/src/test/kotlin/org/loculus/backend/controller/datasetcitations/CitationEndpointsTest.kt
+++ b/backend/src/test/kotlin/org/loculus/backend/controller/datasetcitations/CitationEndpointsTest.kt
@@ -62,7 +62,7 @@ class CitationEndpointsTest(
     @Test
     fun `WHEN calling get user cited by dataset of non-existing user THEN returns empty results`() {
         every {
-            submissionDatabaseService.getSequences(any(), any(), any(), any(), any())
+            submissionDatabaseService.getSequences(any(), any(), any(), any())
         } returns GetSequenceResponse(sequenceEntries = emptyList(), statusCounts = emptyMap())
 
         client.getUserCitedByDataset()
@@ -88,7 +88,7 @@ class CitationEndpointsTest(
     @Test
     fun `WHEN calling get dataset cited by publication of existing dataset THEN returns results`() {
         every {
-            submissionDatabaseService.getSequences(any(), any(), any(), any(), any())
+            submissionDatabaseService.getSequences(any(), any(), any(), any())
         } returns GetSequenceResponse(
             sequenceEntries = listOf(
                 SequenceEntryStatus(
diff --git a/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionControllerClient.kt b/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionControllerClient.kt
index 9e5cb2cd75..fafa456011 100644
--- a/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionControllerClient.kt
+++ b/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionControllerClient.kt
@@ -86,7 +86,6 @@ class SubmissionControllerClient(private val mockMvc: MockMvc, private val objec
         organism: String = DEFAULT_ORGANISM,
         groupsFilter: List<String>? = null,
         statusesFilter: List<Status>? = null,
-        initialStatusesFilter: List<Status>? = null,
         warningsFilter: WarningsFilter? = null,
         jwt: String? = jwtForDefaultUser,
         page: Int? = null,
@@ -97,7 +96,6 @@ class SubmissionControllerClient(private val mockMvc: MockMvc, private val objec
                 .withAuth(jwt)
                 .param("groupsFilter", groupsFilter?.joinToString { it })
                 .param("statusesFilter", statusesFilter?.joinToString { it.name })
-                .param("initialStatusesFilter", initialStatusesFilter?.joinToString { it.name })
                 .param("warningsFilter", warningsFilter?.name)
                 .param("page", page?.toString())
                 .param("size", size?.toString()),
diff --git a/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionConvenienceClient.kt b/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionConvenienceClient.kt
index 237352a52f..0a4ecb218d 100644
--- a/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionConvenienceClient.kt
+++ b/backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionConvenienceClient.kt
@@ -161,7 +161,6 @@ class SubmissionConvenienceClient(
         username: String = DEFAULT_USER_NAME,
         groupsFilter: List<String>? = null,
         statusesFilter: List<Status>? = null,
-        initialStatusesFilter: List<Status>? = null,
         organism: String = DEFAULT_ORGANISM,
         warningsFilter: WarningsFilter = WarningsFilter.INCLUDE_WARNINGS,
         page: Int? = null,
@@ -171,7 +170,6 @@ class SubmissionConvenienceClient(
             organism = organism,
             groupsFilter = groupsFilter,
             statusesFilter = statusesFilter,
-            initialStatusesFilter = initialStatusesFilter,
             warningsFilter = warningsFilter,
             jwt = generateJwtFor(username),
             page = page,
diff --git a/website/src/components/ReviewPage/ReviewPage.tsx b/website/src/components/ReviewPage/ReviewPage.tsx
index 7d0d98404c..2daf3e92ce 100644
--- a/website/src/components/ReviewPage/ReviewPage.tsx
+++ b/website/src/components/ReviewPage/ReviewPage.tsx
@@ -24,7 +24,7 @@ import { ManagedErrorFeedback, useErrorFeedbackState } from '../common/ManagedEr
 import { withQueryProvider } from '../common/withQueryProvider.tsx';
 import BiTrash from '~icons/bi/trash';
 import IwwaArrowDown from '~icons/iwwa/arrow-down';
-import MdiEye from '~icons/mdi/eye';
+import LucideFilter from '~icons/lucide/filter';
 import WpfPaperPlane from '~icons/wpf/paper-plane';
 const menuItemClassName = `group flex rounded-md items-center w-full px-2 py-2 text-sm
 hover:bg-primary-500 bg-primary-600 text-white text-left mb-1`;
@@ -127,7 +127,6 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
         // this is not expected to happen, but it's here to satisfy the type checker
     }
 
-    const total = Object.values(sequencesData.statusCounts).reduce((acc: number, count: number) => acc + count, 0);
     const processingCount = sequencesData.statusCounts[inProcessingStatus];
     const processedCount = sequencesData.statusCounts[awaitingApprovalStatus];
     const errorCount = sequencesData.statusCounts[hasErrorsStatus];
@@ -136,6 +135,8 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
 
     const finishedCount = processedCount + errorCount + revocationCount;
     const unfinishedCount = receivedCount + processingCount;
+
+    const total = finishedCount + unfinishedCount;
     const validCount = processedCount + revocationCount;
 
     if (total === 0) {
@@ -178,7 +179,7 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, accessTo
                 {finishedCount} of {total} sequences processed
             </div>
             <div className='border border-gray-200 rounded-md p-3 mt-3 flex gap-3'>
-                <MdiEye className='w-4 h-4 mr-1.5 inline-block text-gray-500 mt-0.5' />
+                <LucideFilter className='w-4 h-4 mr-1.5 inline-block text-gray-500 mt-0.5' />
                 {categoryInfo.map((info) => {
                     return <NumberAndVisibility {...info} />;
                 })}

From 6ef08d751a94e0924ba079886756faadaf47f962 Mon Sep 17 00:00:00 2001
From: Theo Sanderson <theo@sndrsn.co.uk>
Date: Fri, 22 Mar 2024 14:30:22 +0000
Subject: [PATCH 8/9] missed something

---
 .../backend/service/submission/SubmissionDatabaseService.kt      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt b/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
index 97cd919907..aef7f8cb5d 100644
--- a/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
+++ b/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
@@ -414,7 +414,6 @@ class SubmissionDatabaseService(
         organism: Organism?,
         groupsFilter: List<String>?,
         statusesFilter: List<Status>?,
-        statusesInitialFilter: List<Status>?,
         warningsFilter: WarningsFilter? = null,
         page: Int? = null,
         size: Int? = null,

From b99dd7ec9e98e40951712952f09399a064570918 Mon Sep 17 00:00:00 2001
From: Theo Sanderson <theo@sndrsn.co.uk>
Date: Fri, 22 Mar 2024 14:40:38 +0000
Subject: [PATCH 9/9] add group reference to unreleased submissions

---
 website/src/pages/[organism]/submission/index.astro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/src/pages/[organism]/submission/index.astro b/website/src/pages/[organism]/submission/index.astro
index a27191443a..b3047b841e 100644
--- a/website/src/pages/[organism]/submission/index.astro
+++ b/website/src/pages/[organism]/submission/index.astro
@@ -18,7 +18,7 @@ const options = [
     },
     {
         title: 'Review',
-        description: 'Review your unreleased submissions.',
+        description: "Review your group's unreleased submissions.",
         route: routes.userSequenceReviewPage(organism!.key),
     },
     {