fix: updated variable names and created constants (#4068)

Author: mrtopsyt

explorer/e2e/anvil/anvil-filters.spec.ts

@@ -8,10 +8,33 @@ import {
   testFilterPersistence,
   testFilterPresence,
 } from "../testFunctions";
-import { anvilFilters, anvilTabs, anvilTabTestOrder } from "./anvil-tabs";
+import {
+  anvilFilters,
+  anvilTabs,
+  anvilTabTestOrder,
+  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,
+  FILE_FORMAT_INDEX,
+  CONSENT_GROUP_INDEX,
+];
+const FILTER_INDEX_LIST_SHORT = [
+  BIOSAMPLE_TYPE_INDEX,
+  FILE_FORMAT_INDEX,
+  DIAGNOSIS_INDEX,
+];
 
-const filterIndexList = [3, 4, 5, 10, 6, 2];
-const filterIndexListShort = [1, 10, 3];
 test("Check that all filters exist on the Datasets tab and are clickable", async ({
   page,
 }) => {
@@ -77,7 +100,7 @@ test("Check that filter checkboxes are persistent across pages on an arbitrary f
 }) => {
   await testFilterPersistence(
     page,
-    anvilFilters[3],
+    anvilFilters[FILE_FORMAT_INDEX],
     anvilTabTestOrder.map((x) => anvilTabs[x])
   );
 });
@@ -88,8 +111,8 @@ test("Check that filter menu counts match actual counts on the Datasets tab", as
   const result = await testFilterCounts(
     page,
     anvilTabs.datasets,
-    filterIndexList.map((x) => anvilFilters[x]),
-    25
+    FILTER_INDEX_LIST.map((x) => anvilFilters[x]),
+    anvilTabs.datasets.maxPages ?? 0
   );
   if (!result) {
     test.fail();
@@ -102,8 +125,8 @@ test("Check that filter menu counts match actual counts on the Activities tab",
   await testFilterCounts(
     page,
     anvilTabs.activities,
-    filterIndexList.map((x) => anvilFilters[x]),
-    25
+    FILTER_INDEX_LIST.map((x) => anvilFilters[x]),
+    anvilTabs.activities.maxPages ?? 0
   );
 });
 
@@ -114,7 +137,7 @@ test("Check that the blue filter bubbles match the selected filter for an arbitr
   await testFilterBubbles(
     page,
     anvilTabs.files,
-    filterIndexListShort.map((x) => anvilFilters[x])
+    FILTER_INDEX_LIST_SHORT.map((x) => anvilFilters[x])
   );
 });
 
@@ -125,7 +148,7 @@ test("Check that the blue filter bubbles match the selected filter for an arbitr
   await testFilterBubbles(
     page,
     anvilTabs.biosamples,
-    filterIndexListShort.map((x) => anvilFilters[x])
+    FILTER_INDEX_LIST_SHORT.map((x) => anvilFilters[x])
   );
 });
 
@@ -136,6 +159,6 @@ test("Check that the clear all button functions on the files tab", async ({
   await testClearAll(
     page,
     anvilTabs.files,
-    filterIndexListShort.map((x) => anvilFilters[x])
+    FILTER_INDEX_LIST_SHORT.map((x) => anvilFilters[x])
   );
 });

explorer/e2e/anvil/anvil-tabs.ts

@@ -18,10 +18,22 @@ export const anvilFilters: string[] = [
   "Phenotypic Sex",
   "Reported Ethnicity",
 ];
+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 anvilTabs: AnvilCMGTabCollection = {
   activities: {
     emptyFirstColumn: false,
+    maxPages: 25,
     preselectedColumns: [
       { name: "Document Id", sortable: true },
       { name: "Activity Type", sortable: true },
@@ -40,6 +52,7 @@ export const anvilTabs: AnvilCMGTabCollection = {
   },
   biosamples: {
     emptyFirstColumn: false,
+    maxPages: 25,
     preselectedColumns: [
       { name: "BioSample Id", sortable: true },
       { name: "Anatomical Site", sortable: true },
@@ -57,6 +70,7 @@ export const anvilTabs: AnvilCMGTabCollection = {
   },
   datasets: {
     emptyFirstColumn: false,
+    maxPages: 25,
     preselectedColumns: [
       { name: "Dataset", sortable: true },
       { name: "Access", sortable: false },
@@ -75,6 +89,7 @@ export const anvilTabs: AnvilCMGTabCollection = {
   },
   donors: {
     emptyFirstColumn: false,
+    maxPages: 25,
     preselectedColumns: [
       { name: "Donor Id", sortable: true },
       { name: "Organism Type", sortable: true },
@@ -89,6 +104,7 @@ export const anvilTabs: AnvilCMGTabCollection = {
   },
   files: {
     emptyFirstColumn: true,
+    maxPages: 25,
     preselectedColumns: [
       { name: "Name", sortable: true },
       { name: "File Format", sortable: true },

explorer/e2e/testInterfaces.ts

@@ -1,5 +1,6 @@
 export interface TabDescription {
   emptyFirstColumn: boolean;
+  maxPages?: number;
   preselectedColumns: columnDescription[];
   selectableColumns: columnDescription[];
   tabName: string;