PORTALS-3259

jay-hodgson · Sep 26, 2024 · c9c68a4 · c9c68a4
1 parent 1ce8daf
commit c9c68a4
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 19 deletions.
diff --git a/apps/portals-e2e/src/configs/exploreConfig.ts b/apps/portals-e2e/src/configs/exploreConfig.ts
@@ -47,7 +47,7 @@ const exploreConfig: ExploreConfig = {
     table_charts: ['Data'],
   },
   elportal: {
-    table_charts: ['Data By Files', 'Data by Participants'],
+    table_charts: ['Data', 'Cohort Builder'],
     cards_charts: [
       'Projects',
       'Studies',

diff --git a/apps/portals-e2e/src/explore.spec.ts b/apps/portals-e2e/src/explore.spec.ts
@@ -75,12 +75,12 @@ const expectTopLevelControls = async (
       let exploreTabHeading = exploreTab
       if (
         (getPortal() === 'arkportal' && exploreTab === 'All Data') ||
-        (getPortal() === 'elportal' && exploreTab === 'Data By Files')
+        (getPortal() === 'elportal' && exploreTab === 'Data')
       ) {
         exploreTabHeading = 'Data'
       } else if (
         getPortal() === 'elportal' &&
-        exploreTab === 'Data by Participants'
+        exploreTab === 'Cohort Builder'
       ) {
         exploreTabHeading = 'Participants'
       }

diff --git a/apps/portals/elportal/src/config/routeControlWrapperProps.ts b/apps/portals/elportal/src/config/routeControlWrapperProps.ts
@@ -11,9 +11,9 @@ import computationalTools from './synapseConfigs/computational_tools'
 
 const routeControlWrapper: RouteControlWrapperProps = {
   customRoutes: [
-    { path: 'Data by Files', synapseConfigArray: [filesView] },
+    { path: 'Data', synapseConfigArray: [filesView] },
     {
-      path: 'Data by Participants',
+      path: 'Cohort Builder',
       synapseConfigArray: [individualsView],
     },
     { path: 'Projects', synapseConfigArray: [projects] },

diff --git a/apps/portals/elportal/src/config/routesConfig.tsx b/apps/portals/elportal/src/config/routesConfig.tsx
@@ -222,27 +222,35 @@ const routes: GenericRoute[] = [
     routes: [
       {
         exact: true,
-        path: 'Data by Files',
+        path: 'Data',
         hideRouteFromNavbar: false,
       },
       {
         exact: true,
-        path: 'Data by Participants',
+        path: 'Cohort Builder',
         synapseConfigArray: [
           {
             name: 'OrientationBanner',
             isOutsideContainer: true,
             props: {
               name: 'CohortBuilder',
-              title: 'Getting Started With Explore Data by Participants',
+              title: 'Getting Started With Cohort Builder',
               text: (
                 <>
-                  This page helps you find data related to anonymized
-                  Participants in the ELITE Portal. Add filters to build a list
-                  of participants, select the participants you are interested
-                  in, and view the files associated with your selected cohort.
-                  From there, you can download the related data files or{' '}
-                  <strong>Send to CAVATICA</strong> for analysis.
+                  This page helps you explore and find data in the ELITE Portal
+                  related to a specific group of Participants. Add filters to
+                  build a list of participants, select specific participants you
+                  are interested in, and view the files associated with your
+                  chosen cohort. From there, you can download the related data
+                  files or Sent to CAVATICA for analysis. See the ELITE Portal
+                  Help Docs for more information about{' '}
+                  <a
+                    href="https://help.eliteportal.org/help/cohort-builder"
+                    target="_blank"
+                  >
+                    Cohort Builder
+                  </a>
+                  .
                 </>
               ),
               sx: { position: 'relative', zIndex: 1, marginBottom: '0px' },

diff --git a/apps/portals/elportal/src/config/synapseConfigs/handleFilesToParticipants.tsx b/apps/portals/elportal/src/config/synapseConfigs/handleFilesToParticipants.tsx
@@ -73,5 +73,5 @@ export const handleSelectedFilesToParticipants = async (
       ),
     )
   }
-  window.location.href = '/Explore/Data by Participants'
+  window.location.href = '/Explore/Cohort Builder'
 }
diff --git a/apps/portals/elportal/src/config/synapseConfigs/handleParticipantsToFiles.tsx b/apps/portals/elportal/src/config/synapseConfigs/handleParticipantsToFiles.tsx
@@ -72,5 +72,5 @@ export const handleSelectedParticipantsToFiles = async (
       ),
     )
   }
-  window.location.href = '/Explore/Data by Files'
+  window.location.href = '/Explore/Data'
 }
diff --git a/apps/portals/elportal/src/config/synapseConfigs/projects.ts b/apps/portals/elportal/src/config/synapseConfigs/projects.ts
@@ -103,10 +103,10 @@ const projects: SynapseConfig = {
     cardConfiguration: projectCardConfiguration,
     // unitDescription: 'Projects',
     facetsToPlot: [
-      'name',
+      // 'name', //PORTALS-3259
       'institutions',
       'principalInvestigators',
-      'grant',
+      // 'grant', //PORTALS-3259
       // 'Program',
     ],
     searchConfiguration: defaultSearchConfiguration,

diff --git a/packages/synapse-react-client/src/components/Goals/Goals.Desktop.tsx b/packages/synapse-react-client/src/components/Goals/Goals.Desktop.tsx
@@ -11,7 +11,11 @@ export default function GoalsDesktop({
   title,
 }: GoalsDataProps) {
   return (
-    <div className="Goals__Card">
+    <div
+      className="Goals__Card"
+      style={{ cursor: 'pointer' }}
+      onClick={() => window.open(link)}
+    >
       <div
         className="Goals__Card__header"
         style={{ background: `url('${asset}')` }}