fix: always show latest version on search page

website/src/components/SearchPage/SearchForm.spec.tsx

@@ -16,19 +16,19 @@ vi.mock('../../config', () => ({
 
 const queryClient = new QueryClient();
 
-const defaultMetadataSettings = [
+const defaultSearchFormFilters = [
     { name: 'field1', type: 'string' as const, label: 'Field 1', autocomplete: false, filterValue: '' },
     { name: 'field2', type: 'date' as const, autocomplete: false, filterValue: '' },
     { name: 'field3', type: 'pango_lineage' as const, label: 'Field 3', autocomplete: true, filterValue: '' },
 ];
 
 function renderSearchForm(
-    metadataSettings: Filter[] = [...defaultMetadataSettings],
+    searchFormFilters: Filter[] = [...defaultSearchFormFilters],
     clientConfig: ClientConfig = testConfig.public,
 ) {
     render(
         <QueryClientProvider client={queryClient}>
-            <SearchForm organism={testOrganism} metadataSettings={metadataSettings} clientConfig={clientConfig} />
+            <SearchForm organism={testOrganism} filters={searchFormFilters} clientConfig={clientConfig} />
         </QueryClientProvider>,
     );
 }
@@ -60,13 +60,13 @@ describe('SearchForm', () => {
         await userEvent.click(searchButton);
 
         expect(window.location.href).toBe(
-            routes.searchPage(testOrganism, [{ ...defaultMetadataSettings[0], filterValue }]),
+            routes.searchPage(testOrganism, [{ ...defaultSearchFormFilters[0], filterValue }]),
         );
     });
 
     test('should not render the form with fields with flag notSearchable', async () => {
         renderSearchForm([
-            ...defaultMetadataSettings,
+            ...defaultSearchFormFilters,
             {
                 name: 'NotSearchable',
                 type: 'string' as const,
@@ -79,24 +79,4 @@ describe('SearchForm', () => {
         expect(screen.getByPlaceholderText('Field 1')).toBeDefined();
         expect(screen.queryByPlaceholderText('NotSearchable')).not.toBeInTheDocument();
     });
-
-    test('should add default values for isLatestVersion fields to search', async () => {
-        renderSearchForm([
-            ...defaultMetadataSettings,
-            {
-                name: 'isLatestVersion',
-                type: 'string' as const,
-                autocomplete: false,
-                filterValue: '',
-                notSearchable: true,
-            },
-        ]);
-
-        await userEvent.type(screen.getByPlaceholderText('Field 1'), 'test');
-
-        const searchButton = screen.getByRole('button', { name: 'Search' });
-        await userEvent.click(searchButton);
-
-        expect(window.location.href).toContain(`isLatestVersion=true`);
-    });
 });

website/src/components/SearchPage/SearchForm.tsx

@@ -22,24 +22,17 @@ const queryClient = new QueryClient();
 
 interface SearchFormProps {
     organism: string;
-    metadataSettings: Filter[];
+    filters: Filter[];
     clientConfig: ClientConfig;
 }
 
 const clientLogger = getClientLogger('SearchForm');
 
-const defaultFilters = [
-    { name: 'isLatestVersion', value: 'true' },
-    { name: 'isRevocation', value: 'false' },
-];
-
-export const SearchForm: FC<SearchFormProps> = ({ organism, metadataSettings, clientConfig }) => {
+export const SearchForm: FC<SearchFormProps> = ({ organism, filters, clientConfig }) => {
     const [fieldValues, setFieldValues] = useState<(Filter & { label: string })[]>(
-        metadataSettings.map((filter) => ({
+        filters.map((filter) => ({
             ...filter,
-            filterValue:
-                defaultFilters.find((defaultFilter) => filter.name === defaultFilter.name && filter.notSearchable)
-                    ?.value ?? '',
+            filterValue: '',
             label: filter.label ?? sentenceCase(filter.name),
         })),
     );

website/src/pages/[organism]/search/index.astro

@@ -1,5 +1,5 @@
 ---
-import { getData, getMetadataSettings } from './search';
+import { getData, getSearchFormFilters } from './search';
 import { Pagination } from '../../../components/SearchPage/Pagination';
 import { SearchForm } from '../../../components/SearchPage/SearchForm';
 import { Table } from '../../../components/SearchPage/Table';
@@ -16,13 +16,13 @@ const getSearchParams = (field: string): string => {
     return Astro.url.searchParams.get(field) ?? '';
 };
 
-const metadataSettings = await getMetadataSettings(getSearchParams, organism);
+const searchFormFilter = getSearchFormFilters(getSearchParams, organism);
 
 const pageParam = Astro.url.searchParams.get('page');
 const page = pageParam !== null ? Number.parseInt(pageParam, 10) : 1;
 const offset = (page - 1) * pageSize;
 
-const data = await getData(organism, metadataSettings, offset, pageSize);
+const data = await getData(organism, searchFormFilter, offset, pageSize);
 ---
 
 <BaseLayout title='Search'>
@@ -31,7 +31,7 @@ const data = await getData(organism, metadataSettings, offset, pageSize);
         <div class='md:w-72'>
             <SearchForm
                 organism={organism}
-                metadataSettings={metadataSettings}
+                filters={searchFormFilter}
                 clientConfig={clientConfig}
                 client:only='react'
             />

website/src/pages/[organism]/search/search.ts

@@ -3,20 +3,31 @@ import { Result } from 'neverthrow';
 import type { TableSequenceData } from '../../../components/SearchPage/Table.tsx';
 import { getSchema } from '../../../config.ts';
 import { LapisClient } from '../../../services/lapisClient.ts';
+import { hiddenDefaultSearchFilters } from '../../../settings.ts';
 import type { ProblemDetail } from '../../../types/backend.ts';
 import type { Filter } from '../../../types/config.ts';
 
 export type SearchResponse = {
     data: TableSequenceData[];
     totalCount: number;
 };
+
+function addHiddenFilters(searchFormFilter: Filter[], hiddenFilters: Filter[]) {
+    const searchFormFilterNames = searchFormFilter.map((filter) => filter.name);
+    const hiddenFiltersToAdd = hiddenFilters.filter((filter) => !searchFormFilterNames.includes(filter.name));
+    return [...searchFormFilter, ...hiddenFiltersToAdd];
+}
+
 export const getData = async (
     organism: string,
-    metadataFilter: Filter[],
+    searchFormFilter: Filter[],
     offset: number,
     limit: number,
+    hiddenDefaultFilters: Filter[] = hiddenDefaultSearchFilters,
 ): Promise<Result<SearchResponse, ProblemDetail>> => {
-    const searchFilters = metadataFilter
+    const filters = addHiddenFilters(searchFormFilter, hiddenDefaultFilters);
+
+    const searchFilters = filters
         .filter((metadata) => metadata.filterValue !== '')
         .reduce((acc: Record<string, string>, metadata) => {
             acc[metadata.name] = metadata.filterValue;
@@ -43,12 +54,12 @@ export const getData = async (
     });
 };
 
-export const getMetadataSettings = async (
-    getSearchParams: (param: string) => string,
-    organism: string,
-): Promise<Filter[]> => {
+export const getSearchFormFilters = (getSearchParams: (param: string) => string, organism: string): Filter[] => {
     const schema = getSchema(organism);
     return schema.metadata.flatMap((metadata) => {
+        if (metadata.notSearchable === true) {
+            return [];
+        }
         if (metadata.type === 'date') {
             const metadataFrom = {
                 ...metadata,

website/src/settings.ts

@@ -1 +1,6 @@
 export const pageSize = 100;
+
+export const hiddenDefaultSearchFilters = [
+    { name: 'versionStatus', filterValue: 'LATEST_VERSION', type: 'string' as const },
+    { name: 'isRevocation', filterValue: 'false', type: 'string' as const },
+];

website/tests/pages/search/index.spec.ts

@@ -28,7 +28,6 @@ test.describe('The search page', () => {
         await searchPage.page.waitForURL(
             `${baseUrl}${routes.searchPage(dummyOrganism.key, [
                 { name: 'accessionVersion', type: 'string', filterValue: testSequence.name },
-                { name: 'isRevocation', type: 'string', filterValue: 'false' },
             ])}`,
         );
         await expect(searchPage.page.getByText(testSequence.name, { exact: true })).toBeVisible();