From 2e6b9da72406d85b52051ca2dfabef1f9c2ecf34 Mon Sep 17 00:00:00 2001 From: Jonah Paten Date: Fri, 5 Jul 2024 15:56:57 -0700 Subject: [PATCH 1/2] feat: added filter categories to anvil-cmg (#4046) --- explorer/site-config/anvil-cmg/dev/config.ts | 60 +++++++++++++------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/explorer/site-config/anvil-cmg/dev/config.ts b/explorer/site-config/anvil-cmg/dev/config.ts index 6228607c9..6e055ccf4 100644 --- a/explorer/site-config/anvil-cmg/dev/config.ts +++ b/explorer/site-config/anvil-cmg/dev/config.ts @@ -51,54 +51,70 @@ export function makeConfig( key: ANVIL_CMG_CATEGORY_KEY.DATASET_REGISTERED_ID, label: ANVIL_CMG_CATEGORY_LABEL.DATASET_REGISTERED_ID, }, + { + key: ANVIL_CMG_CATEGORY_KEY.DATASET_CONSENT_GROUP, + label: ANVIL_CMG_CATEGORY_LABEL.DATASET_CONSENT_GROUP, + }, ], + label: "Dataset", }, { categoryConfigs: [ { - key: ANVIL_CMG_CATEGORY_KEY.BIOSAMPLE_ANATOMICAL_SITE, - label: ANVIL_CMG_CATEGORY_LABEL.BIOSAMPLE_ANATOMICAL_SITE, + key: ANVIL_CMG_CATEGORY_KEY.DIAGNOSE_PHENOTYPE, + label: ANVIL_CMG_CATEGORY_LABEL.DIAGNOSE_PHENOTYPE, }, { - key: ANVIL_CMG_CATEGORY_KEY.BIOSAMPLE_BIOSAMPLE_TYPE, - label: ANVIL_CMG_CATEGORY_LABEL.BIOSAMPLE_BIOSAMPLE_TYPE, + key: ANVIL_CMG_CATEGORY_KEY.DONOR_ORGANISM_TYPE, + label: ANVIL_CMG_CATEGORY_LABEL.DONOR_ORGANISM_TYPE, }, { - key: ANVIL_CMG_CATEGORY_KEY.DATASET_CONSENT_GROUP, - label: ANVIL_CMG_CATEGORY_LABEL.DATASET_CONSENT_GROUP, + key: ANVIL_CMG_CATEGORY_KEY.DONOR_REPORTED_ETHNICITY, + label: ANVIL_CMG_CATEGORY_LABEL.DONOR_REPORTED_ETHNICITY, }, { - key: ANVIL_CMG_CATEGORY_KEY.ACTIVITY_DATA_MODALITY, - label: ANVIL_CMG_CATEGORY_LABEL.ACTIVITY_DATA_MODALITY, + key: ANVIL_CMG_CATEGORY_KEY.DONOR_PHENOTYPIC_SEX, + label: ANVIL_CMG_CATEGORY_LABEL.DONOR_PHENOTYPIC_SEX, }, + ], + label: "Donor", + }, + { + categoryConfigs: [ { - key: ANVIL_CMG_CATEGORY_KEY.DIAGNOSE_PHENOTYPE, - label: ANVIL_CMG_CATEGORY_LABEL.DIAGNOSE_PHENOTYPE, + key: ANVIL_CMG_CATEGORY_KEY.BIOSAMPLE_ANATOMICAL_SITE, + label: ANVIL_CMG_CATEGORY_LABEL.BIOSAMPLE_ANATOMICAL_SITE, }, { - key: ANVIL_CMG_CATEGORY_KEY.FILE_FILE_FORMAT, - label: ANVIL_CMG_CATEGORY_LABEL.FILE_FILE_FORMAT, + key: ANVIL_CMG_CATEGORY_KEY.BIOSAMPLE_BIOSAMPLE_TYPE, + label: ANVIL_CMG_CATEGORY_LABEL.BIOSAMPLE_BIOSAMPLE_TYPE, }, + ], + label: "Biosample", + }, + { + categoryConfigs: [ { - key: ANVIL_CMG_CATEGORY_KEY.FILE_FILE_TYPE, - label: ANVIL_CMG_CATEGORY_LABEL.FILE_FILE_TYPE, + key: ANVIL_CMG_CATEGORY_KEY.FILE_FILE_FORMAT, + label: ANVIL_CMG_CATEGORY_LABEL.FILE_FILE_FORMAT, }, + ], + label: "File", + }, + { + categoryConfigs: [ { - key: ANVIL_CMG_CATEGORY_KEY.DONOR_ORGANISM_TYPE, - label: ANVIL_CMG_CATEGORY_LABEL.DONOR_ORGANISM_TYPE, + key: ANVIL_CMG_CATEGORY_KEY.ACTIVITY_DATA_MODALITY, + label: ANVIL_CMG_CATEGORY_LABEL.ACTIVITY_DATA_MODALITY, }, { - key: ANVIL_CMG_CATEGORY_KEY.DONOR_PHENOTYPIC_SEX, - label: ANVIL_CMG_CATEGORY_LABEL.DONOR_PHENOTYPIC_SEX, + key: ANVIL_CMG_CATEGORY_KEY.FILE_FILE_TYPE, + label: ANVIL_CMG_CATEGORY_LABEL.FILE_FILE_TYPE, }, { key: ANVIL_CMG_CATEGORY_KEY.PREP_MATERIAL_NAME, label: ANVIL_CMG_CATEGORY_LABEL.PREP_MATERIAL_NAME, }, - { - key: ANVIL_CMG_CATEGORY_KEY.DONOR_REPORTED_ETHNICITY, - label: ANVIL_CMG_CATEGORY_LABEL.DONOR_REPORTED_ETHNICITY, - }, ], }, ], From 443cca7e85f5a5ab0fdb41ecaeb078e73e54634e Mon Sep 17 00:00:00 2001 From: Jonah Paten Date: Fri, 5 Jul 2024 17:04:52 -0700 Subject: [PATCH 2/2] feat: added filter category for data modality (#4046) --- explorer/site-config/anvil-cmg/dev/config.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/explorer/site-config/anvil-cmg/dev/config.ts b/explorer/site-config/anvil-cmg/dev/config.ts index 6e055ccf4..f94f859ec 100644 --- a/explorer/site-config/anvil-cmg/dev/config.ts +++ b/explorer/site-config/anvil-cmg/dev/config.ts @@ -55,6 +55,10 @@ export function makeConfig( key: ANVIL_CMG_CATEGORY_KEY.DATASET_CONSENT_GROUP, label: ANVIL_CMG_CATEGORY_LABEL.DATASET_CONSENT_GROUP, }, + { + key: ANVIL_CMG_CATEGORY_KEY.ACTIVITY_DATA_MODALITY, + label: ANVIL_CMG_CATEGORY_LABEL.ACTIVITY_DATA_MODALITY, + }, ], label: "Dataset", }, @@ -103,10 +107,6 @@ export function makeConfig( }, { categoryConfigs: [ - { - key: ANVIL_CMG_CATEGORY_KEY.ACTIVITY_DATA_MODALITY, - label: ANVIL_CMG_CATEGORY_LABEL.ACTIVITY_DATA_MODALITY, - }, { key: ANVIL_CMG_CATEGORY_KEY.FILE_FILE_TYPE, label: ANVIL_CMG_CATEGORY_LABEL.FILE_FILE_TYPE,