Merge branch 'master' into chore/va-portal

uc-cdis · Feb 5, 2024 · 41a9d93 · 41a9d93
2 parents a673475 + 2208a6e
commit 41a9d93
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/data.midrc.org/etlMapping.yaml b/data.midrc.org/etlMapping.yaml
@@ -205,6 +205,15 @@ mappings:
           - name: data_category
             src: data_category
             fn: set
+          - name: data_file_source_node
+            src: source_node
+            fn: set
+          - name: data_file_annotation_name
+            src: annotation_name
+            fn: set
+          - name: data_file_annotation_method
+            src: annotation_method
+            fn: set
   - name: midrc_data_file
     doc_type: data_file
     type: collector

diff --git a/data.midrc.org/portal/gitops.json b/data.midrc.org/portal/gitops.json
@@ -1009,11 +1009,10 @@
           {
             "title": "Annotations",
             "fields": [
-              "imaging_study_annotations.airspace_disease_grading",
-              "imaging_study_annotations.class_covid19_pneumonia",
               "imaging_study_annotations.midrc_mRALE_score",
               "imaging_study_annotations.annotation_method",
-              "imaging_study_annotations.annotator_id"
+              "imaging_study_annotations.annotator_id",
+              "data_file_annotation_name"
             ]
           }
         ]
@@ -1044,12 +1043,11 @@
           "race",
           "ethnicity",
           "zip",
-          "imaging_study_annotations.airspace_disease_grading",
-          "imaging_study_annotations.class_covid19_pneumonia",
           "imaging_study_annotations.midrc_mRALE_score",
           "imaging_study_annotations.annotation_method",
           "imaging_study_annotations.annotator_id",
           "imaging_study_annotations.instance_uids",
+          "data_file_annotation_name",
           "_ct_series_file_count",
           "_dx_series_file_count",
           "_cr_series_file_count",
@@ -1753,4 +1751,4 @@
     ]
   },
   "ddUrl": "ddog-gov.com"
-}
+}