fix tests and format

loculus-project · Jan 22, 2025 · c128424 · c128424
1 parent a6bdac8
commit c128424
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/backend/src/main/kotlin/org/loculus/backend/config/Config.kt b/backend/src/main/kotlin/org/loculus/backend/config/Config.kt
@@ -26,9 +26,7 @@ data class Schema(
     val submissionDataTypes: SubmissionDataTypes = SubmissionDataTypes(),
 )
 
-data class SubmissionDataTypes(
-    val consensusSequences: Boolean = true,
-)
+data class SubmissionDataTypes(val consensusSequences: Boolean = true)
 
 // The Json property names need to be kept in sync with website config enum `metadataPossibleTypes` in `config.ts`
 // They also need to be in sync with SILO database config, as the Loculus config is a sort of superset of it

diff --git a/website/src/components/SearchPage/SearchFullUI.spec.tsx b/website/src/components/SearchPage/SearchFullUI.spec.tsx
@@ -3,11 +3,11 @@ import { render, screen, waitFor, waitForElementToBeRemoved } from '@testing-lib
 import userEvent from '@testing-library/user-event';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { SearchFullUI } from './SearchFullUI';
-import { testConfig, testOrganism, testSiteName } from '../../../vitest.setup.ts';
+import { type InnerSearchFullUIProps, SearchFullUI } from './SearchFullUI';
+import { testConfig, testOrganism } from '../../../vitest.setup.ts';
 import { lapisClientHooks } from '../../services/serviceHooks.ts';
 import type { MetadataFilter, Schema } from '../../types/config.ts';
-import type { ReferenceGenomesSequenceNames, ReferenceAccession } from '../../types/referencesGenomes.ts';
+import type { ReferenceAccession, ReferenceGenomesSequenceNames } from '../../types/referencesGenomes.ts';
 
 global.ResizeObserver = class FakeResizeObserver {
     observe() {}
@@ -89,18 +89,20 @@ function renderSearchFullUI({
         accessToken: 'dummyAccessToken',
         referenceGenomesSequenceNames,
         myGroups: [],
-        websiteName: testSiteName,
         organism: testOrganism,
         clientConfig,
         schema: {
             metadata: metadataSchema,
             tableColumns: ['field1', 'field3'],
             primaryKey: 'accession',
+            submissionDataTypes: {
+                consensusSequences: true,
+            },
         } as Schema,
         initialData: [],
         initialCount: 0,
         initialQueryDict: {},
-    };
+    } satisfies InnerSearchFullUIProps;
 
     render(
         <QueryClientProvider client={new QueryClient()}>

diff --git a/website/src/components/SearchPage/SearchFullUI.tsx b/website/src/components/SearchPage/SearchFullUI.tsx
@@ -34,7 +34,7 @@ import {
 import { EditDataUseTermsModal } from '../DataUseTerms/EditDataUseTermsModal.tsx';
 import ErrorBox from '../common/ErrorBox.tsx';
 
-interface InnerSearchFullUIProps {
+export interface InnerSearchFullUIProps {
     accessToken?: string;
     referenceGenomesSequenceNames: ReferenceGenomesSequenceNames;
     myGroups: Group[];

diff --git a/website/src/components/Submission/RevisionForm.tsx b/website/src/components/Submission/RevisionForm.tsx
@@ -5,9 +5,9 @@ import { DataUploadForm } from './DataUploadForm.tsx';
 import { routes } from '../../routes/routes.ts';
 import { type Group } from '../../types/backend.ts';
 import type { InputField } from '../../types/config.ts';
+import type { SubmissionDataTypes } from '../../types/config.ts';
 import type { ReferenceGenomesSequenceNames } from '../../types/referencesGenomes';
 import type { ClientConfig } from '../../types/runtimeConfig.ts';
-import type { SubmissionDataTypes } from '../../types/config.ts';
 
 type RevisionFormProps = {
     accessToken: string;

diff --git a/website/src/components/Submission/SubmissionForm.tsx b/website/src/components/Submission/SubmissionForm.tsx
@@ -5,9 +5,9 @@ import { DataUploadForm } from './DataUploadForm.tsx';
 import { routes } from '../../routes/routes.ts';
 import { type Group } from '../../types/backend.ts';
 import type { InputField } from '../../types/config.ts';
+import type { SubmissionDataTypes } from '../../types/config.ts';
 import type { ReferenceGenomesSequenceNames } from '../../types/referencesGenomes';
 import type { ClientConfig } from '../../types/runtimeConfig.ts';
-import type { SubmissionDataTypes } from '../../types/config.ts';
 
 type SubmissionFormProps = {
     accessToken: string;