Merge pull request #915 from loculus-project/876-exclude-revocation-s…

…equences-in-counts-that-display-in-search-filters

fix(website): apply hidden filters for SearchForm AND search results

website/src/components/SearchPage/SearchForm.tsx

@@ -65,7 +65,8 @@ export const SearchForm: FC<SearchFormProps> = ({
     const handleSearch: FormEventHandler<HTMLFormElement> = async (event) => {
         event.preventDefault();
         setIsLoading(true);
-        location.href = routes.searchPage(organism, fieldValues, mutationFilter);
+        const searchableFieldValues = fieldValues.filter((field) => !(field.notSearchable ?? false));
+        location.href = routes.searchPage(organism, searchableFieldValues, mutationFilter);
     };
 
     const resetSearch = async () => {

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

@@ -1,5 +1,12 @@
 ---
-import { getData, getReferenceGenomesSequenceNames, getMetadataFilters, getMutationFilter, getOrderBy } from './search';
+import {
+    getData,
+    getReferenceGenomesSequenceNames,
+    getMetadataFilters,
+    getMutationFilter,
+    getOrderBy,
+    addHiddenFilters,
+} from './search';
 import { cleanOrganism } from '../../../components/Navigation/cleanOrganism';
 import { DownloadDialog } from '../../../components/SearchPage/DownloadDialog/DownloadDialog';
 import { Pagination } from '../../../components/SearchPage/Pagination';
@@ -8,7 +15,7 @@ import { Table } from '../../../components/SearchPage/Table';
 import ErrorBox from '../../../components/common/ErrorBox.astro';
 import { getLapisUrl, getRuntimeConfig, getSchema } from '../../../config';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
-import { pageSize } from '../../../settings';
+import { hiddenDefaultSearchFilters, pageSize } from '../../../settings';
 
 const organism = Astro.params.organism!;
 const { organism: cleanedOrganism } = cleanOrganism(organism);
@@ -19,7 +26,7 @@ const getSearchParams = (field: string): string => {
     return Astro.url.searchParams.get(field) ?? '';
 };
 
-const metadataFilter = getMetadataFilters(getSearchParams, organism);
+const metadataFilter = addHiddenFilters(getMetadataFilters(getSearchParams, organism), hiddenDefaultSearchFilters);
 const mutationFilter = getMutationFilter(Astro.url.searchParams);
 
 const pageParam = Astro.url.searchParams.get('page');

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

@@ -3,9 +3,8 @@ import { ok, Result } from 'neverthrow';
 import type { TableSequenceData } from '../../../components/SearchPage/Table.tsx';
 import { getReferenceGenomes, getSchema } from '../../../config.ts';
 import { LapisClient } from '../../../services/lapisClient.ts';
-import { hiddenDefaultSearchFilters } from '../../../settings.ts';
 import type { ProblemDetail } from '../../../types/backend.ts';
-import type { FilterValue, MetadataFilter, MutationFilter } from '../../../types/config.ts';
+import type { MetadataFilter, MutationFilter } from '../../../types/config.ts';
 import { type LapisBaseRequest, type OrderBy, type OrderByType, orderByType } from '../../../types/lapis.ts';
 import type { ReferenceGenomesSequenceNames } from '../../../types/referencesGenomes.ts';
 
@@ -14,24 +13,21 @@ export type SearchResponse = {
     totalCount: number;
 };
 
-function addHiddenFilters(searchFormFilter: FilterValue[], hiddenFilters: FilterValue[]) {
+export function addHiddenFilters(searchFormFilter: MetadataFilter[], hiddenFilters: MetadataFilter[]) {
     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: FilterValue[],
+    metadataFilter: MetadataFilter[],
     mutationFilter: MutationFilter,
     offset: number,
     limit: number,
     orderBy?: OrderBy,
-    hiddenDefaultFilters: FilterValue[] = hiddenDefaultSearchFilters,
 ): Promise<Result<SearchResponse, ProblemDetail>> => {
-    const filters = addHiddenFilters(metadataFilter, hiddenDefaultFilters);
-
-    const metadataSearchFilters = filters
+    const metadataSearchFilters = metadataFilter
         .filter((metadata) => metadata.filterValue !== '')
         .reduce((acc: Record<string, string>, metadata) => {
             acc[metadata.name] = metadata.filterValue;

website/src/settings.ts

@@ -14,8 +14,13 @@ export const GROUP_FIELD = 'group';
 export const DATA_USE_TERMS_FIELD = 'dataUseTerms';
 
 export const hiddenDefaultSearchFilters = [
-    { name: VERSION_STATUS_FIELD, filterValue: siloVersionStatuses.latestVersion, type: 'string' as const },
-    { name: IS_REVOCATION_FIELD, filterValue: 'false', type: 'string' as const },
+    {
+        name: VERSION_STATUS_FIELD,
+        filterValue: siloVersionStatuses.latestVersion,
+        type: 'string' as const,
+        notSearchable: true,
+    },
+    { name: IS_REVOCATION_FIELD, filterValue: 'false', type: 'string' as const, notSearchable: true },
 ];
 
 export const metadataDefaultDownloadDataFormat = 'tsv';