fix some displays

Author: anna-parker

integration-tests/tests/specs/features/search/active-filters.dependent.spec.ts

@@ -37,6 +37,7 @@ test.describe('Search', () => {
     });
 
     test('multi-segment mutation filter can be added and removed', async ({ page }) => {
+        //TODO: expand segment level
         const mutation = 'S:G100A';
         await searchPage.cchf();
         await searchPage.enterMutation(mutation);

website/src/components/SearchPage/DownloadDialog/DownloadDialog.tsx

@@ -69,7 +69,7 @@ export const DownloadDialog: FC<DownloadDialogProps> = ({
         return new Map(
             schema.metadata.map((field) => [
                 field.name,
-                new MetadataVisibility(selectedFields.has(field.name), field.onlyForReference),
+                new MetadataVisibility(selectedFields.has(field.name), field.onlyForReference, field.sequenceMetadataScope),
             ]),
         );
     }, [selectedFields, schema]);

website/src/components/SearchPage/DownloadDialog/FieldSelector/FieldSelectorModal.spec.tsx

@@ -222,7 +222,11 @@ describe('FieldSelectorModal', () => {
                     new Map(
                         metadata.map((field) => [
                             field.name,
-                            new MetadataVisibility(result.current[0].has(field.name), field.onlyForReference),
+                            new MetadataVisibility(
+                                result.current[0].has(field.name),
+                                field.onlyForReference,
+                                field.sequenceMetadataScope,
+                            ),
                         ]),
                     )
                 }

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

@@ -57,8 +57,8 @@ const defaultSearchFormFilters: MetadataFilter[] = [
 ];
 
 const defaultSearchVisibilities = new Map<string, MetadataVisibility>([
-    ['field1', new MetadataVisibility(true, undefined)],
-    ['field3', new MetadataVisibility(true, undefined)],
+    ['field1', new MetadataVisibility(true, undefined, undefined)],
+    ['field3', new MetadataVisibility(true, undefined, undefined)],
 ]);
 
 const setSomeFieldValues = vi.fn();
@@ -212,8 +212,8 @@ describe('SearchForm', () => {
             },
         ]);
         const searchVisibilities = new Map<string, MetadataVisibility>([
-            ['field1', new MetadataVisibility(true, 'suborganism1')],
-            ['field2', new MetadataVisibility(true, 'suborganism2')],
+            ['field1', new MetadataVisibility(true, 'suborganism1', 'main')],
+            ['field2', new MetadataVisibility(true, 'suborganism2', 'main')],
         ]);
 
         const field1 = () => screen.queryByLabelText('Field 1');

website/src/components/common/FieldSelectorModal.tsx

@@ -7,7 +7,7 @@ import type { Metadata } from '../../types/config.ts';
 import type { ReferenceGenomesInfo } from '../../types/referencesGenomes.ts';
 import { CustomTooltip } from '../../utils/CustomTooltip.tsx';
 import {
-    stillRequiresReferenceNameSelection,
+    segmentReferenceSelected,
     type SegmentReferenceSelections,
 } from '../../utils/sequenceTypeHelpers.ts';
 
@@ -265,10 +265,9 @@ export function getDisplayState(
         return undefined;
     }
 
-    //TODO: fix this to be at segment level
     if (
         field.onlyForReference !== undefined &&
-        stillRequiresReferenceNameSelection(referenceGenomesInfo, selectedReferenceNames)
+        !segmentReferenceSelected(field.sequenceMetadataScope!, referenceGenomesInfo, selectedReferenceNames)
     ) {
         if (greyOutIfStillRequiresReferenceSelection) {
             return {

website/src/utils/search.spec.ts

@@ -38,7 +38,7 @@ describe('MetadataFilterSchema', () => {
 
 describe('MetadataVisibility', () => {
     it('should return false when isChecked is false', () => {
-        const visibility = new MetadataVisibility(false, undefined);
+        const visibility = new MetadataVisibility(false, undefined, undefined);
 
         // Single segment single references
         expect(visibility.isVisible(SINGLE_SEG_SINGLE_REF_REFERENCEGENOMES, { [singleSegmentName]: null })).toBe(false);
@@ -65,7 +65,7 @@ describe('MetadataVisibility', () => {
     });
 
     it('should return true when isChecked is true and onlyForReference is undefined', () => {
-        const visibility = new MetadataVisibility(true, undefined);
+        const visibility = new MetadataVisibility(true, undefined, undefined);
 
         // Single segment single references
         expect(visibility.isVisible(SINGLE_SEG_SINGLE_REF_REFERENCEGENOMES, { [singleSegmentName]: null })).toBe(true);
@@ -90,15 +90,15 @@ describe('MetadataVisibility', () => {
     });
 
     it('should return true when isChecked is true and selectedReference matches or is not set', () => {
-        let visibility = new MetadataVisibility(true, 'singleReference');
+        let visibility = new MetadataVisibility(true, 'singleReference', 'main');
 
         // Single segment single references
         expect(visibility.isVisible(SINGLE_SEG_SINGLE_REF_REFERENCEGENOMES, { [singleSegmentName]: null })).toBe(false);
         expect(
             visibility.isVisible(SINGLE_SEG_SINGLE_REF_REFERENCEGENOMES, { [singleSegmentName]: 'singleReference' }),
         ).toBe(true);
 
-        visibility = new MetadataVisibility(true, 'ref1');
+        visibility = new MetadataVisibility(true, 'ref1', 'main');
 
         // Single segment multiple references
         expect(visibility.isVisible(SINGLE_SEG_MULTI_REF_REFERENCEGENOMES, { [singleSegmentName]: null })).toBe(false);

website/src/utils/search.ts

@@ -1,7 +1,7 @@
 import { sentenceCase } from 'change-case';
 
 import { validateSingleValue } from './extractFieldValue';
-import { stillRequiresReferenceNameSelection, type SegmentReferenceSelections } from './sequenceTypeHelpers.ts';
+import { segmentReferenceSelected, type SegmentReferenceSelections } from './sequenceTypeHelpers.ts';
 import type { TableSequenceData } from '../components/SearchPage/Table';
 import type { QueryState } from '../components/SearchPage/useStateSyncedWithUrlQueryParams.ts';
 import type {
@@ -40,10 +40,12 @@ type VisiblitySelectableAccessor = (field: MetadataFilter) => boolean;
 export class MetadataVisibility {
     public readonly isChecked: boolean;
     private readonly onlyForReference: string | undefined;
+    private readonly segmentName: string | undefined;
 
-    constructor(isChecked: boolean, onlyForReference: string | undefined) {
+    constructor(isChecked: boolean, onlyForReference: string | undefined, segmentName: string | undefined) {
         this.isChecked = isChecked;
         this.onlyForReference = onlyForReference;
+        this.segmentName = segmentName;
     }
 
     public isVisible(
@@ -60,10 +62,9 @@ export class MetadataVisibility {
         if (selectedReferenceNames === undefined) {
             return false;
         }
-        //TODO: fix this to be at segment level
         if (
             !hideIfStillRequiresReferenceSelection &&
-            stillRequiresReferenceNameSelection(referenceGenomesInfo, selectedReferenceNames)
+            segmentReferenceSelected(this.segmentName!, referenceGenomesInfo, selectedReferenceNames)
         ) {
             return true;
         }
@@ -104,6 +105,7 @@ const getFieldOrColumnVisibilitiesFromQuery = (
         const visibility = new MetadataVisibility(
             explicitVisibilitiesInUrlByFieldName.get(fieldName) ?? initiallyVisibleAccessor(field),
             field.onlyForReference,
+            field.sequenceMetadataScope,
         );
 
         visibilities.set(fieldName, visibility);