feat: display named filter groups for hca data explorer filters (#4041) (#4042)

* feat: display named filter groups for hca data explorer filters (#4041)

* chore: updated findable-ui to latest (#4041)

---------

Co-authored-by: Fran McDade <[email protected]>

Author: frano-m

explorer/package-lock.json

@@ -36,7 +36,7 @@
     "test:anvil-catalog": "playwright test -c playwright_anvil-catalog.config.ts --trace retain-on-failure"
   },
   "dependencies": {
-    "@databiosphere/findable-ui": "2.0.1",
+    "@databiosphere/findable-ui": "2.1.0",
     "@emotion/react": "11.11.1",
     "@emotion/styled": "11.11.0",
     "@mdx-js/loader": "^3.0.1",

explorer/package.json

@@ -66,44 +66,67 @@ export function makeConfig(
               label: HCA_DCP_CATEGORY_LABEL.INSTITUTION,
             },
           ],
+          label: "Project",
         },
         {
           categoryConfigs: [
             {
-              key: HCA_DCP_CATEGORY_KEY.ANALYSIS_PROTOCOL, // workflow
-              label: HCA_DCP_CATEGORY_LABEL.ANALYSIS_PROTOCOL,
+              key: HCA_DCP_CATEGORY_KEY.BIOLOGICAL_SEX,
+              label: HCA_DCP_CATEGORY_LABEL.BIOLOGICAL_SEX,
+            },
+            {
+              key: HCA_DCP_CATEGORY_KEY.DEVELOPMENT_STAGE,
+              label: HCA_DCP_CATEGORY_LABEL.DEVELOPMENT_STAGE,
+            },
+            {
+              key: HCA_DCP_CATEGORY_KEY.DONOR_DISEASE,
+              label: HCA_DCP_CATEGORY_LABEL.DONOR_DISEASE,
+            },
+            {
+              key: HCA_DCP_CATEGORY_KEY.GENUS_SPECIES,
+              label: HCA_DCP_CATEGORY_LABEL.GENUS_SPECIES,
             },
+          ],
+          label: "Donor",
+        },
+        {
+          categoryConfigs: [
             {
               key: HCA_DCP_CATEGORY_KEY.ANATOMICAL_ENTITY, // specimenOrgan
               label: HCA_DCP_CATEGORY_LABEL.ANATOMICAL_ENTITY,
             },
             {
-              key: HCA_DCP_CATEGORY_KEY.BIOLOGICAL_SEX,
-              label: HCA_DCP_CATEGORY_LABEL.BIOLOGICAL_SEX,
+              key: HCA_DCP_CATEGORY_KEY.ORGAN_PART,
+              label: HCA_DCP_CATEGORY_LABEL.ORGAN_PART,
             },
             {
-              key: HCA_DCP_CATEGORY_KEY.CONTENT_DESCRIPTION,
-              label: HCA_DCP_CATEGORY_LABEL.CONTENT_DESCRIPTION,
+              key: HCA_DCP_CATEGORY_KEY.PRESERVATION_METHOD,
+              label: HCA_DCP_CATEGORY_LABEL.PRESERVATION_METHOD,
             },
             {
-              key: HCA_DCP_CATEGORY_KEY.DEVELOPMENT_STAGE,
-              label: HCA_DCP_CATEGORY_LABEL.DEVELOPMENT_STAGE,
+              key: HCA_DCP_CATEGORY_KEY.MODEL_ORGAN,
+              label: HCA_DCP_CATEGORY_LABEL.MODEL_ORGAN,
             },
             {
-              key: HCA_DCP_CATEGORY_KEY.DONOR_DISEASE,
-              label: HCA_DCP_CATEGORY_LABEL.DONOR_DISEASE,
+              key: HCA_DCP_CATEGORY_KEY.SAMPLE_ENTITY_TYPE,
+              label: HCA_DCP_CATEGORY_LABEL.SAMPLE_ENTITY_TYPE,
             },
             {
-              key: HCA_DCP_CATEGORY_KEY.FILE_FORMAT,
-              label: HCA_DCP_CATEGORY_LABEL.FILE_FORMAT,
+              key: HCA_DCP_CATEGORY_KEY.SELECTED_CELL_TYPE,
+              label: HCA_DCP_CATEGORY_LABEL.SELECTED_CELL_TYPE,
             },
             {
-              key: HCA_DCP_CATEGORY_KEY.FILE_SOURCE,
-              label: HCA_DCP_CATEGORY_LABEL.FILE_SOURCE,
+              key: HCA_DCP_CATEGORY_KEY.SPECIMEN_DISEASE,
+              label: HCA_DCP_CATEGORY_LABEL.SPECIMEN_DISEASE,
             },
+          ],
+          label: "Sample",
+        },
+        {
+          categoryConfigs: [
             {
-              key: HCA_DCP_CATEGORY_KEY.GENUS_SPECIES,
-              label: HCA_DCP_CATEGORY_LABEL.GENUS_SPECIES,
+              key: HCA_DCP_CATEGORY_KEY.ANALYSIS_PROTOCOL, // workflow
+              label: HCA_DCP_CATEGORY_LABEL.ANALYSIS_PROTOCOL,
             },
             {
               key: HCA_DCP_CATEGORY_KEY.INSTRUMENT_MANUFACTURER_MODEL,
@@ -113,39 +136,33 @@ export function makeConfig(
               key: HCA_DCP_CATEGORY_KEY.LIBRARY_CONSTRUCTION_METHOD,
               label: HCA_DCP_CATEGORY_LABEL.LIBRARY_CONSTRUCTION_METHOD,
             },
-            {
-              key: HCA_DCP_CATEGORY_KEY.MODEL_ORGAN,
-              label: HCA_DCP_CATEGORY_LABEL.MODEL_ORGAN,
-            },
             {
               key: HCA_DCP_CATEGORY_KEY.NUCLEIC_ACID_SOURCE,
               label: HCA_DCP_CATEGORY_LABEL.NUCLEIC_ACID_SOURCE,
             },
-            {
-              key: HCA_DCP_CATEGORY_KEY.ORGAN_PART,
-              label: HCA_DCP_CATEGORY_LABEL.ORGAN_PART,
-            },
             {
               key: HCA_DCP_CATEGORY_KEY.PAIRED_END,
               label: HCA_DCP_CATEGORY_LABEL.PAIRED_END,
             },
+          ],
+          label: "Protocol",
+        },
+        {
+          categoryConfigs: [
             {
-              key: HCA_DCP_CATEGORY_KEY.PRESERVATION_METHOD,
-              label: HCA_DCP_CATEGORY_LABEL.PRESERVATION_METHOD,
-            },
-            {
-              key: HCA_DCP_CATEGORY_KEY.SAMPLE_ENTITY_TYPE,
-              label: HCA_DCP_CATEGORY_LABEL.SAMPLE_ENTITY_TYPE,
+              key: HCA_DCP_CATEGORY_KEY.CONTENT_DESCRIPTION,
+              label: HCA_DCP_CATEGORY_LABEL.CONTENT_DESCRIPTION,
             },
             {
-              key: HCA_DCP_CATEGORY_KEY.SELECTED_CELL_TYPE,
-              label: HCA_DCP_CATEGORY_LABEL.SELECTED_CELL_TYPE,
+              key: HCA_DCP_CATEGORY_KEY.FILE_FORMAT,
+              label: HCA_DCP_CATEGORY_LABEL.FILE_FORMAT,
             },
             {
-              key: HCA_DCP_CATEGORY_KEY.SPECIMEN_DISEASE,
-              label: HCA_DCP_CATEGORY_LABEL.SPECIMEN_DISEASE,
+              key: HCA_DCP_CATEGORY_KEY.FILE_SOURCE,
+              label: HCA_DCP_CATEGORY_LABEL.FILE_SOURCE,
             },
           ],
+          label: "File",
         },
       ],
       key: "hca-dcp",