merge from main:

uc-cdis · Jul 23, 2024 · 0d6369b · 0d6369b
2 parents 65c6380 + 0a06008
commit 0d6369b
Show file tree

Hide file tree

Showing 7 changed files with 223 additions and 209 deletions.
diff --git a/config/gen3/navigation.json b/config/gen3/navigation.json
@@ -17,18 +17,18 @@
         "name": "Discovery",
         "tooltip": "Use free-text search and tags to rapidly find relevant studies."
       },
+      {
+        "icon": "gen3:comparison",
+        "href": "/Crosswalk",
+        "name": "Crosswalk",
+        "tooltip": "Match ids across the mesh."
+      },
       {
         "icon": "gen3:dictionary",
         "href": "/DataDictionary",
         "name": "Dictionary",
         "tooltip": "The Data Dictionary serves to inform the data model and is updated as new data is ingested."
       },
-      {
-        "icon": "gen3:exploration",
-        "href": "/Explorer",
-        "name": "Exploration",
-        "tooltip": "The Exploration Page enables discovery of the data at the subject level and features a cohort builder."
-      },
       {
         "icon": "gen3:profile",
         "href": "/Profile",

diff --git a/config/icons/comparison.svg b/config/icons/comparison.svg
diff --git a/config/icons/gen3.json b/config/icons/gen3.json
@@ -1,6 +1,6 @@
 {
 	"prefix": "gen3",
-	"lastModified": 1718898014,
+	"lastModified": 1721757073,
 	"icons": {
 		"analysis": {
 			"body": "<path fill=\"currentColor\" fill-rule=\"evenodd\" d=\"M2.33 7.12q-.97 0-1.51-.86T.28 3.79t.54-2.45T2.33.5q.96 0 1.5.84t.54 2.45-.54 2.47-1.5.86m0-.66a.87.87 0 00.505-.155q.225-.154.39-.48a3 3 0 00.255-.83q.09-.505.09-1.205t-.09-1.2a2.9 2.9 0 00-.255-.815q-.165-.315-.39-.465a.9.9 0 00-.505-.15.9.9 0 00-.51.15q-.23.15-.395.465t-.255.815-.09 1.2q0 1.4.345 2.035t.905.635M6.6 7v-.68h1.46v-4.7H6.9v-.53q.44-.08.765-.195Q7.991.78 8.25.62h.63v5.7h1.32V7zm7.67.12q-.97 0-1.51-.86t-.54-2.47.54-2.45T14.27.5q.96 0 1.5.84t.54 2.45-.54 2.47-1.5.86m0-.66a.87.87 0 00.505-.155q.225-.154.39-.48a3 3 0 00.255-.83q.09-.505.09-1.205t-.09-1.2a2.9 2.9 0 00-.255-.815q-.165-.315-.39-.465a.9.9 0 00-.505-.15.9.9 0 00-.51.15q-.23.15-.395.465t-.255.815-.09 1.2q0 1.4.345 2.035t.905.635m4.27.54v-.68H20v-4.7h-1.16v-.53q.44-.08.765-.195T20.19.62h.63v5.7h1.32V7zm7.67.12q-.97 0-1.51-.86t-.54-2.47.54-2.45T26.21.5q.96 0 1.5.84t.54 2.45-.54 2.47-1.5.86m0-.66a.87.87 0 00.505-.155q.225-.154.39-.48a3 3 0 00.255-.83q.09-.505.09-1.205t-.09-1.2a2.9 2.9 0 00-.255-.815q-.165-.315-.39-.465a.9.9 0 00-.505-.15.9.9 0 00-.51.15q-.23.15-.395.465t-.255.815-.09 1.2q0 1.4.345 2.035t.905.635m4.27.54v-.68h1.46v-4.7h-1.16v-.53q.44-.08.765-.195.326-.115.585-.275h.63v5.7h1.32V7zM2.33 25.12q-.97 0-1.51-.86t-.54-2.47.54-2.45 1.51-.84q.96 0 1.5.84t.54 2.45-.54 2.47-1.5.86m0-.66a.87.87 0 00.505-.155q.225-.155.39-.48a3 3 0 00.255-.83q.09-.505.09-1.205t-.09-1.2a2.9 2.9 0 00-.255-.815q-.165-.315-.39-.465a.9.9 0 00-.505-.15.9.9 0 00-.51.15q-.23.15-.395.465t-.255.815-.09 1.2q0 1.4.345 2.035t.905.635M6.6 25v-.68h1.46v-4.7H6.9v-.53q.44-.08.765-.195.326-.115.585-.275h.63v5.7h1.32V25zm7.67.12q-.97 0-1.51-.86t-.54-2.47.54-2.45 1.51-.84q.96 0 1.5.84t.54 2.45-.54 2.47-1.5.86m0-.66a.87.87 0 00.505-.155q.225-.155.39-.48a3 3 0 00.255-.83q.09-.505.09-1.205t-.09-1.2a2.9 2.9 0 00-.255-.815q-.165-.315-.39-.465a.9.9 0 00-.505-.15.9.9 0 00-.51.15q-.23.15-.395.465t-.255.815-.09 1.2q0 1.4.345 2.035t.905.635m4.27.54v-.68H20v-4.7h-1.16v-.53q.44-.08.765-.195t.585-.275h.63v5.7h1.32V25zm7.67.12q-.97 0-1.51-.86t-.54-2.47.54-2.45 1.51-.84q.96 0 1.5.84t.54 2.45-.54 2.47-1.5.86m0-.66a.87.87 0 00.505-.155q.225-.155.39-.48a3 3 0 00.255-.83q.09-.505.09-1.205t-.09-1.2a2.9 2.9 0 00-.255-.815q-.165-.315-.39-.465a.9.9 0 00-.505-.15.9.9 0 00-.51.15q-.23.15-.395.465t-.255.815-.09 1.2q0 1.4.345 2.035t.905.635m4.27.54v-.68h1.46v-4.7h-1.16v-.53q.44-.08.765-.195.326-.115.585-.275h.63v5.7h1.32V25zM.63 16v-.68h1.46v-4.7H.93v-.53q.44-.08.765-.195.326-.115.585-.275h.63v5.7h1.32V16zm7.67.12q-.97 0-1.51-.86t-.54-2.47.54-2.45T8.3 9.5q.96 0 1.5.84t.54 2.45-.54 2.47-1.5.86m0-.66a.87.87 0 00.505-.155q.225-.155.39-.48a3 3 0 00.255-.83q.09-.505.09-1.205t-.09-1.2a2.9 2.9 0 00-.255-.815q-.165-.315-.39-.465a.9.9 0 00-.505-.15.9.9 0 00-.51.15q-.23.15-.395.465t-.255.815-.09 1.2q0 1.4.345 2.035t.905.635m4.27.54v-.68h1.46v-4.7h-1.16v-.53q.44-.08.765-.195.326-.115.585-.275h.63v5.7h1.32V16zm7.67.12q-.97 0-1.51-.86t-.54-2.47.54-2.45 1.51-.84q.96 0 1.5.84t.54 2.45-.54 2.47-1.5.86m0-.66a.87.87 0 00.505-.155q.225-.155.39-.48a3 3 0 00.255-.83q.09-.505.09-1.205t-.09-1.2a2.9 2.9 0 00-.255-.815q-.165-.315-.39-.465a.9.9 0 00-.505-.15.9.9 0 00-.51.15q-.23.15-.395.465t-.255.815-.09 1.2q0 1.4.345 2.035t.905.635m4.27.54v-.68h1.46v-4.7h-1.16v-.53q.44-.08.765-.195t.585-.275h.63v5.7h1.32V16zm7.67.12q-.97 0-1.51-.86t-.54-2.47.54-2.45 1.51-.84q.96 0 1.5.84t.54 2.45-.54 2.47-1.5.86m0-.66a.87.87 0 00.505-.155q.225-.155.39-.48a3 3 0 00.255-.83q.09-.505.09-1.205t-.09-1.2a2.9 2.9 0 00-.255-.815q-.165-.315-.39-.465a.9.9 0 00-.505-.15.9.9 0 00-.51.15q-.23.15-.395.465t-.255.815-.09 1.2q0 1.4.345 2.035t.905.635\"/>",
@@ -19,6 +19,11 @@
 			"width": 58.026,
 			"height": 58.026
 		},
+		"comparison": {
+			"body": "<path fill=\"currentColor\" d=\"M467 442c-1.7 0-3.2-.9-4.1-2.3l-20.7-30.4 8.3-5.7 16.5 24.2 35.9-54.5 8.4 5.5-40 60.9c-1 1.3-2.6 2.3-4.3 2.3\"/><path fill=\"currentColor\" d=\"M467 461c-23.1 0-42.2-17.5-44.7-40H267c-2.8 0-5-2.2-5-5V96c0-2.8 2.2-5 5-5h200c2.8 0 5 2.2 5 5v280c0 2.8-2.2 5-5 5-19.3 0-35 15.7-35 35s15.7 35 35 35 35-15.7 35-35c0-8.2-2.9-16.2-8.2-22.5l7.7-6.4c6.8 8.1 10.6 18.4 10.6 29-.1 24.7-20.3 44.9-45.1 44.9m-195-50h150.3c2.3-20.8 18.9-37.4 39.7-39.7V101H272zm-67 50c-24.8 0-45-20.2-45-45s20.2-45 45-45 45 20.2 45 45-20.2 45-45 45m0-80c-19.3 0-35 15.7-35 35s15.7 35 35 35 35-15.7 35-35-15.7-35-35-35\"/><path fill=\"currentColor\" d=\"m216.447 397.397 7.071 7.07-29.981 29.982-7.071-7.07z\"/><path fill=\"currentColor\" d=\"m193.568 397.408 29.981 29.981-7.07 7.071-29.982-29.98zM85 181h90v10H85zm-35 25c-11 0-20-9-20-20s9-20 20-20 20 9 20 20-9 20-20 20m0-30c-5.5 0-10 4.5-10 10s4.5 10 10 10 10-4.5 10-10-4.5-10-10-10m35 75h90v10H85zm-35 25c-11 0-20-9-20-20s9-20 20-20 20 9 20 20-9 20-20 20m0-30c-5.5 0-10 4.5-10 10s4.5 10 10 10 10-4.5 10-10-4.5-10-10-10m35 75h90v10H85zm-35 25c-11 0-20-9-20-20s9-20 20-20 20 9 20 20-9 20-20 20m0-30c-5.5 0-10 4.5-10 10s4.5 10 10 10 10-4.5 10-10-4.5-10-10-10m297-135h90v10h-90zm-35 25c-11 0-20-9-20-20s9-20 20-20 20 9 20 20-9 20-20 20m0-30c-5.5 0-10 4.5-10 10s4.5 10 10 10 10-4.5 10-10-4.5-10-10-10m35 75h90v10h-90zm-35 25c-11 0-20-9-20-20s9-20 20-20 20 9 20 20-9 20-20 20m0-30c-5.5 0-10 4.5-10 10s4.5 10 10 10 10-4.5 10-10-4.5-10-10-10m35 75h90v10h-90zm-35 25c-11 0-20-9-20-20s9-20 20-20 20 9 20 20-9 20-20 20m0-30c-5.5 0-10 4.5-10 10s4.5 10 10 10 10-4.5 10-10-4.5-10-10-10m92.7-256c-43-32.7-94.4-50-148.7-50-53.9 0-105.1 17.1-148 49.5l-6-8C146.6 17.8 199.9 0 256 0c56.4 0 109.9 18 154.7 52zM256 512c-56.1 0-109.4-17.8-154-51.5l6-8c42.9 32.4 94.1 49.5 148 49.5 54.2 0 105.6-17.3 148.7-50l6 8c-44.8 34-98.3 52-154.7 52M63 123h84v10H63zm262 0h84v10h-84z\"/><path fill=\"currentColor\" d=\"M145 421H5c-2.8 0-5-2.2-5-5V96c0-2.8 2.2-5 5-5h200c2.8 0 5 2.2 5 5v280h-10V101H10v310h135z\"/>",
+			"width": 512,
+			"height": 512
+		},
 		"datafile": {
 			"body": "<g fill=\"currentColor\"><path d=\"M57.49 27H54v-6.268A2.736 2.736 0 0051.268 18H50V0H10v2H7v2H4v7H2.732A2.736 2.736 0 000 13.732v43.687h.006c-.005.563.17 1.114.522 1.575A2.55 2.55 0 002.565 60h44.759c1.157 0 2.175-.78 2.449-1.813L60 30.149v-.177C60 28.25 58.944 27 57.49 27m-6.222-7c.404 0 .732.328.732.732V27h-2v-7zM48 2v25H12.731a2.6 2.6 0 00-.674.098c-.018.005-.039.003-.057.008V2zM10 4v25.585l-.063.173L9 32.326V4zM6 6h1v31.81l-1 2.741zm-4 7.732c0-.404.329-.732.732-.732H4v32.943l-2 5.455zm45.868 43.852a.56.56 0 01-.544.416H2.565a.55.55 0 01-.448-.222c-.063-.082-.16-.256-.123-.408L4 51.87v.001l3-8.225 3-8.225v.003l1.932-5.301.068-.185.16-.439.026-.082a.566.566 0 01.545-.417H57.49c.379 0 .477.546.501.819z\"/><path d=\"M18 17h24a1 1 0 100-2H18a1 1 0 100 2m0-7h10a1 1 0 100-2H18a1 1 0 100 2m0 14h24a1 1 0 100-2H18a1 1 0 100 2\"/></g>",
 			"width": 60,