fix: updated anvil tests #4444

Author: MillenniumFalconMechanic

e2e/anvil/anvil-filters.spec.ts

@@ -15,14 +15,12 @@ import {
   BIOSAMPLE_TYPE_INDEX,
   CONSENT_GROUP_INDEX,
   DATASET_INDEX,
-  DATA_MODALITY_INDEX,
   DIAGNOSIS_INDEX,
   FILE_FORMAT_INDEX,
   REPORTED_ETHNICITY_INDEX,
 } from "./anvil-tabs";
 
 const FILTER_INDEX_LIST = [
-  DATA_MODALITY_INDEX,
   DATASET_INDEX,
   DIAGNOSIS_INDEX,
   REPORTED_ETHNICITY_INDEX,

e2e/anvil/anvil-tabs.ts

@@ -23,7 +23,6 @@ export const ANVIL_FILTER_NAMES: string[] = [
   "Anatomical Site",
   "BioSample Type",
   "Consent Group",
-  "Data Modality",
   "Dataset",
   "Diagnosis",
   "File Format",
@@ -35,14 +34,13 @@ export const ANVIL_FILTER_NAMES: string[] = [
 export const ANATOMICAL_SITE_INDEX = 0;
 export const BIOSAMPLE_TYPE_INDEX = 1;
 export const CONSENT_GROUP_INDEX = 2;
-export const DATA_MODALITY_INDEX = 3;
-export const DATASET_INDEX = 4;
-export const DIAGNOSIS_INDEX = 5;
-export const FILE_FORMAT_INDEX = 6;
-export const IDENTIFIER_INDEX = 7;
-export const ORGANISM_TYPE_INDEX = 8;
-export const PHENOTYPIC_SEX_INDEX = 9;
-export const REPORTED_ETHNICITY_INDEX = 10;
+export const DATASET_INDEX = 3;
+export const DIAGNOSIS_INDEX = 4;
+export const FILE_FORMAT_INDEX = 5;
+export const IDENTIFIER_INDEX = 6;
+export const ORGANISM_TYPE_INDEX = 7;
+export const PHENOTYPIC_SEX_INDEX = 8;
+export const REPORTED_ETHNICITY_INDEX = 9;
 
 const ANVIL_CMG_SEARCH_FILTERS_PLACEHOLDER_TEXT = "Search all filters...";
 
@@ -125,13 +123,6 @@ export const ANVIL_TABS: AnvilCMGTabCollection = {
           ],
         name: ANVIL_DATASETS_BACKPAGE_HEADER_NAMES.DIAGNOSIS,
       },
-      {
-        correspondingColumn:
-          ANVIL_DATASETS_PRESELECTED_COLUMNS_BY_NAME[
-            ANVIL_COLUMN_NAMES.DATA_MODALITY
-          ],
-        name: ANVIL_DATASETS_BACKPAGE_HEADER_NAMES.DATA_MODALITY,
-      },
       {
         correspondingColumn:
           ANVIL_DATASETS_SELECTABLE_COLUMNS_BY_NAME[

e2e/anvil/constants.ts

@@ -3,7 +3,6 @@ import { ColumnDescription } from "e2e/testInterfaces";
 export const ANVIL_DATASETS_BACKPAGE_HEADER_NAMES = {
   CONSENT_GROUP: "Consent group",
   DATASET_ID: "Dataset Id",
-  DATA_MODALITY: "Data modality",
   DIAGNOSIS: "Diagnosis",
   ORGANISM_TYPE: "Organism type",
   PHENOTYPIC_SEX: "Phenotypic sex",
@@ -18,7 +17,6 @@ export const ANVIL_COLUMN_NAMES = {
   BIOSAMPLE_TYPE: "BioSample Type",
   CONSENT_GROUP: "Consent Group",
   DATASET: "Dataset",
-  DATA_MODALITY: "Data Modality",
   DIAGNOSIS: "Diagnosis",
   DOCUMENT_ID: "Document Id",
   DONOR_ID: "Donor Id",
@@ -34,7 +32,6 @@ export const ANVIL_COLUMN_NAMES = {
 
 export const PLURALIZED_METADATA_LABEL = {
   [ANVIL_COLUMN_NAMES.DIAGNOSIS]: "diagnoses",
-  [ANVIL_COLUMN_NAMES.DATA_MODALITY]: "data modalities",
   [ANVIL_COLUMN_NAMES.DATASET]: "dataset names",
   [ANVIL_COLUMN_NAMES.CONSENT_GROUP]: "consent codes",
   [ANVIL_COLUMN_NAMES.ORGANISM_TYPE]: "organism types",
@@ -52,12 +49,6 @@ export const ANVIL_DATASETS_PRESELECTED_COLUMNS_BY_NAME = {
     pluralizedLabel: PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.DIAGNOSIS],
     sortable: true,
   },
-  [ANVIL_COLUMN_NAMES.DATA_MODALITY]: {
-    name: ANVIL_COLUMN_NAMES.DATA_MODALITY,
-    pluralizedLabel:
-      PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.DATA_MODALITY],
-    sortable: true,
-  },
   [ANVIL_COLUMN_NAMES.DATASET]: {
     name: ANVIL_COLUMN_NAMES.DATASET,
     pluralizedLabel: PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.DATASET],
@@ -113,12 +104,6 @@ export const ANVIL_ACTIVITIES_PRESELECTED_COLUMNS_BY_NAME = {
       PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.ACTIVITY_TYPE],
     sortable: true,
   },
-  [ANVIL_COLUMN_NAMES.DATA_MODALITY]: {
-    name: ANVIL_COLUMN_NAMES.DATA_MODALITY,
-    pluralizedLabel:
-      PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.DATA_MODALITY],
-    sortable: true,
-  },
   [ANVIL_COLUMN_NAMES.BIOSAMPLE_TYPE]: {
     name: ANVIL_COLUMN_NAMES.BIOSAMPLE_TYPE,
     pluralizedLabel:
@@ -263,12 +248,6 @@ export const ANVIL_FILES_PRESELECTED_COLUMNS_BY_NAME = {
     name: ANVIL_COLUMN_NAMES.DRS_URI,
     sortable: false,
   },
-  [ANVIL_COLUMN_NAMES.DATA_MODALITY]: {
-    name: ANVIL_COLUMN_NAMES.DATA_MODALITY,
-    pluralizedLabel:
-      PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.DATA_MODALITY],
-    sortable: true,
-  },
   [ANVIL_COLUMN_NAMES.ORGANISM_TYPE]: {
     name: ANVIL_COLUMN_NAMES.ORGANISM_TYPE,
     pluralizedLabel: