Merge remote-tracking branch 'origin/main' into 245-ez-time-filter-co…

…mponent
VEuPathDB · Sep 7, 2023 · 28c0a68 · 28c0a68
2 parents d77a2d4 + c4bf80e
commit 28c0a68
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/nx.json b/nx.json
@@ -37,6 +37,11 @@
         "^build-npm-modules"
       ]
     },
+    "compile:check": {
+      "dependsOn": [
+        "^build-npm-modules"
+      ]
+    },
     "bundle:dev": {
       "dependsOn": [
         "^build-npm-modules"

diff --git a/packages/libs/eda/src/lib/core/hooks/study.ts b/packages/libs/eda/src/lib/core/hooks/study.ts
@@ -70,6 +70,7 @@ export function useWdkStudyRecord(datasetId: string): HookValue | undefined {
           'bulk_download_url',
           'request_needs_approval',
           'is_public',
+          'study_access',
         ])
         .filter((attribute) => attribute in studyRecordClass.attributesMap);
       const studyRecord = await wdkService

diff --git a/...genomics-site/webapp/wdkCustomization/js/client/components/homepage/VEuPathDBHomePage.tsx b/...genomics-site/webapp/wdkCustomization/js/client/components/homepage/VEuPathDBHomePage.tsx
@@ -368,8 +368,9 @@ const useHeaderMenuItems = (
       (q) => q.urlSegment === QUESTION_FOR_MAP_DATASETS
     )
   );
-  const showInteractiveMaps = mapMenuItemsQuestion != null;
-  const mapMenuItems = useMapMenuItems(mapMenuItemsQuestion);
+  // const showInteractiveMaps = mapMenuItemsQuestion != null;
+  // const mapMenuItems = useMapMenuItems(mapMenuItemsQuestion);
+  const showInteractiveMaps = projectId === VectorBase && !!useEda;
 
   // type: reactRoute, webAppRoute, externalLink, subMenu, custom
   const fullMenuItemEntries: HeaderMenuItemEntry[] = [
@@ -577,24 +578,37 @@ const useHeaderMenuItems = (
             include: [EuPathDB, UniDB],
           },
         },
+        // {
+        //   key: 'maps-alpha',
+        //   display: (
+        //     <>
+        //       Interactive maps <img alt="BETA" src={betaImage} />
+        //     </>
+        //   ),
+        //   type: 'subMenu',
+        //   metadata: {
+        //     test: () => showInteractiveMaps,
+        //   },
+        //   items: mapMenuItems ?? [
+        //     {
+        //       key: 'maps-loading',
+        //       type: 'custom',
+        //       display: <Loading radius={4} />,
+        //     },
+        //   ],
+        // },
         {
-          key: 'maps-alpha',
+          type: 'reactRoute',
           display: (
             <>
-              Interactive maps <img alt="BETA" src={betaImage} />
+              <img alt="BETA" src={betaImage} /> Multi-study Interactive Map
             </>
           ),
-          type: 'subMenu',
+          key: 'map--mega-study',
+          url: '/workspace/maps/DS_480c976ef9/new',
           metadata: {
             test: () => showInteractiveMaps,
           },
-          items: mapMenuItems ?? [
-            {
-              key: 'maps-loading',
-              type: 'custom',
-              display: <Loading radius={4} />,
-            },
-          ],
         },
         {
           key: 'pubcrawler',