Move accession_ha and accession_na to metadata columns

Following up on @huddlej's comment <#138 (comment)> Instead of using the accessions as colorings to force their inclusion in the build, just include them as `metadata_columns`.
nextstrain · Sep 10, 2024 · 6ddfdba · 6ddfdba
1 parent d5e1e56
commit 6ddfdba
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 111 deletions.
diff --git a/config/h1n1pdm/auspice_config.json b/config/h1n1pdm/auspice_config.json
@@ -87,16 +87,6 @@
       "title": "Division",
       "type": "categorical"
     },
-    {
-      "key": "accession_ha",
-      "title": "Accession (HA)",
-      "type": "categorical"
-    },
-    {
-      "key": "accession_na",
-      "title": "Accession (NA)",
-      "type": "categorical"
-    },
     {
       "key": "submitting_lab",
       "title": "Submitting lab",
@@ -166,6 +156,8 @@
     "frequencies"
   ],
   "metadata_columns": [
-    "gisaid_epi_isl"
+    "gisaid_epi_isl",
+    "accession_ha",
+    "accession_na"
   ]
 }
diff --git a/config/h1n1pdm/ha/auspice_config.json b/config/h1n1pdm/ha/auspice_config.json
@@ -162,16 +162,6 @@
       "title": "Division",
       "type": "categorical"
     },
-    {
-      "key": "accession_ha",
-      "title": "Accession (HA)",
-      "type": "categorical"
-    },
-    {
-      "key": "accession_na",
-      "title": "Accession (NA)",
-      "type": "categorical"
-    },
     {
       "key": "submitting_lab",
       "title": "Submitting lab",
@@ -241,6 +231,8 @@
     "frequencies"
   ],
   "metadata_columns": [
-    "gisaid_epi_isl"
+    "gisaid_epi_isl",
+    "accession_ha",
+    "accession_na"
   ]
 }
diff --git a/config/h1n1pdm/na/auspice_config.json b/config/h1n1pdm/na/auspice_config.json
@@ -127,16 +127,6 @@
       "title": "Division",
       "type": "categorical"
     },
-    {
-      "key": "accession_ha",
-      "title": "Accession (HA)",
-      "type": "categorical"
-    },
-    {
-      "key": "accession_na",
-      "title": "Accession (NA)",
-      "type": "categorical"
-    },
     {
       "key": "submitting_lab",
       "title": "Submitting lab",
@@ -206,6 +196,8 @@
     "frequencies"
   ],
   "metadata_columns": [
-    "gisaid_epi_isl"
+    "gisaid_epi_isl",
+    "accession_ha",
+    "accession_na"
   ]
 }
diff --git a/config/h3n2/auspice_config.json b/config/h3n2/auspice_config.json
@@ -97,16 +97,6 @@
       "title": "Division",
       "type": "categorical"
     },
-    {
-      "key": "accession_ha",
-      "title": "Accession (HA)",
-      "type": "categorical"
-    },
-    {
-      "key": "accession_na",
-      "title": "Accession (NA)",
-      "type": "categorical"
-    },
     {
       "key": "submitting_lab",
       "title": "Submitting lab",
@@ -176,6 +166,8 @@
     "frequencies"
   ],
   "metadata_columns": [
-    "gisaid_epi_isl"
+    "gisaid_epi_isl",
+    "accession_ha",
+    "accession_na"
   ]
 }
diff --git a/config/h3n2/auspice_config_fitness.json b/config/h3n2/auspice_config_fitness.json
@@ -154,6 +154,8 @@
     "frequencies"
   ],
   "metadata_columns": [
-    "gisaid_epi_isl"
+    "gisaid_epi_isl",
+    "accession_ha",
+    "accession_na"
   ]
 }
diff --git a/config/h3n2/ha/auspice_config.json b/config/h3n2/ha/auspice_config.json
@@ -140,16 +140,6 @@
       "title": "Division",
       "type": "categorical"
     },
-    {
-      "key": "accession_ha",
-      "title": "Accession (HA)",
-      "type": "categorical"
-    },
-    {
-      "key": "accession_na",
-      "title": "Accession (NA)",
-      "type": "categorical"
-    },
     {
       "key": "submitting_lab",
       "title": "Submitting lab",
@@ -219,6 +209,8 @@
     "frequencies"
   ],
   "metadata_columns": [
-    "gisaid_epi_isl"
+    "gisaid_epi_isl",
+    "accession_ha",
+    "accession_na"
   ]
 }
diff --git a/config/h3n2/na/auspice_config.json b/config/h3n2/na/auspice_config.json
@@ -112,16 +112,6 @@
       "title": "Division",
       "type": "categorical"
     },
-    {
-      "key": "accession_ha",
-      "title": "Accession (HA)",
-      "type": "categorical"
-    },
-    {
-      "key": "accession_na",
-      "title": "Accession (NA)",
-      "type": "categorical"
-    },
     {
       "key": "submitting_lab",
       "title": "Submitting lab",
@@ -191,6 +181,8 @@
     "frequencies"
   ],
   "metadata_columns": [
-    "gisaid_epi_isl"
+    "gisaid_epi_isl",
+    "accession_ha",
+    "accession_na"
   ]
 }
diff --git a/config/vic/auspice_config.json b/config/vic/auspice_config.json
@@ -72,16 +72,6 @@
       "title": "Division",
       "type": "categorical"
     },
-    {
-      "key": "accession_ha",
-      "title": "Accession (HA)",
-      "type": "categorical"
-    },
-    {
-      "key": "accession_na",
-      "title": "Accession (NA)",
-      "type": "categorical"
-    },
     {
       "key": "submitting_lab",
       "title": "Submitting lab",
@@ -151,6 +141,8 @@
     "frequencies"
   ],
   "metadata_columns": [
-    "gisaid_epi_isl"
+    "gisaid_epi_isl",
+    "accession_ha",
+    "accession_na"
   ]
 }
diff --git a/config/vic/ha/auspice_config.json b/config/vic/ha/auspice_config.json
@@ -119,16 +119,6 @@
       "title": "Division",
       "type": "categorical"
     },
-    {
-      "key": "accession_ha",
-      "title": "Accession (HA)",
-      "type": "categorical"
-    },
-    {
-      "key": "accession_na",
-      "title": "Accession (NA)",
-      "type": "categorical"
-    },
     {
       "key": "submitting_lab",
       "title": "Submitting lab",
@@ -198,6 +188,8 @@
     "frequencies"
   ],
   "metadata_columns": [
-    "gisaid_epi_isl"
+    "gisaid_epi_isl",
+    "accession_ha",
+    "accession_na"
   ]
 }
diff --git a/config/vic/na/auspice_config.json b/config/vic/na/auspice_config.json
@@ -112,16 +112,6 @@
       "title": "Division",
       "type": "categorical"
     },
-    {
-      "key": "accession_ha",
-      "title": "Accession (HA)",
-      "type": "categorical"
-    },
-    {
-      "key": "accession_na",
-      "title": "Accession (NA)",
-      "type": "categorical"
-    },
     {
       "key": "submitting_lab",
       "title": "Submitting lab",
@@ -191,6 +181,8 @@
     "frequencies"
   ],
   "metadata_columns": [
-    "gisaid_epi_isl"
+    "gisaid_epi_isl",
+    "accession_ha",
+    "accession_na"
   ]
 }
diff --git a/config/yam/auspice_config.json b/config/yam/auspice_config.json
@@ -67,16 +67,6 @@
       "title": "Division",
       "type": "categorical"
     },
-    {
-      "key": "accession_ha",
-      "title": "Accession (HA)",
-      "type": "categorical"
-    },
-    {
-      "key": "accession_na",
-      "title": "Accession (NA)",
-      "type": "categorical"
-    },
     {
       "key": "submitting_lab",
       "title": "Submitting lab",
@@ -129,6 +119,8 @@
     "frequencies"
   ],
   "metadata_columns": [
-    "gisaid_epi_isl"
+    "gisaid_epi_isl",
+    "accession_ha",
+    "accession_na"
   ]
 }