removed client root requirement

Author: sunray1

src/biorepo_components/BiorepoPage.jsx

@@ -8,23 +8,6 @@ import NeonPage from '../lib_components/components/NeonPage/NeonPage';
 export default function BiorepoPage() {
   const [config, setConfig] = useState(null);
 
-  const getDefaultSidebarLinks = () => {
-    if (window.location.pathname.endsWith('/publiclist.php')) {
-      return [
-        {
-          name: 'Papers & Publications',
-          hash: 'https://www.neonscience.org/impact/papers-publications',
-        },
-      ];
-    }
-    return [
-      {
-        name: 'Sample Portal',
-        hash: 'https://biokic4.rc.asu.edu/neon/portal/index.php',
-      },
-    ];
-  };
-
   // Get breadcrumbs and sidebar from json based on pathname
   const [breadcrumbs, setBreadcrumbs] = useState([]);
   const [sidebarLinks, setSidebarLinks] = useState([]);
@@ -66,7 +49,6 @@ export default function BiorepoPage() {
 
   useEffect(() => {
     if (!config) return;
-    setSidebarLinks(getDefaultSidebarLinks());
     const fetchBreadcrumbs = async () => {
       try {
         const response = await fetch(`${config.CLIENT_ROOT}/neon-react/biorepo_lib/breadcrumbs.json`);
@@ -94,9 +76,21 @@ export default function BiorepoPage() {
           throw new Error('Failed to fetch sidebar links');
         }
         const data = await response.json();
-        const pathname = window.location;
+        const { pathname } = window.location;
+        const filename = pathname.split('/').pop();
 
-        const sidebarData = data[pathname] || data.default;
+        const sidebarData = data[filename] || data.default;
+        if (data[pathname] === undefined) {
+          sidebarData.links = sidebarData.links.map((link) => {
+            if (link.name === 'Sample Portal') {
+              return {
+                ...link,
+                hash: `${config.CLIENT_ROOT}/${link.hash}`,
+              };
+            }
+            return link;
+          });
+        }
         setSidebarLinks(sidebarData.links);
         setSidebarTitle(sidebarData.sidebarTitle);
       } catch (error) {

src/lib_components/components/NeonPage/NeonPage.jsx

@@ -418,8 +418,17 @@ const NeonPage = (props) => {
   const sidebarHashMap = !hasSidebarLinks ? {} : Object.fromEntries(
     sidebarLinks.map((link, idx) => [link.hash || '#', idx]),
   );
-  const initialCurrentSidebarHash = sidebarLinks[0].hash;
-  const [currentSidebarHash, setCurrentSidebarHash] = useState(initialCurrentSidebarHash);
+  const initialCurrentSidebarHash = (() => {
+    if (sidebarLinks.length === 5) {
+      return sidebarLinks[3].hash;
+    }
+    if (sidebarLinks.length === 7) {
+      return sidebarLinks[1].hash;
+    }
+    return '#';
+  })();
+  const currentSidebarHash = initialCurrentSidebarHash;
+  // const [currentSidebarHash, setCurrentSidebarHash] = useState(initialCurrentSidebarHash);
   const [hashInitialized, setHashInitialized] = useState(false);
   const [sidebarExpanded, setSidebarExpanded] = useState(false); // for small viewports only
 
@@ -441,7 +450,7 @@ const NeonPage = (props) => {
     const handleHashChange = () => {
       const { hash } = document.location;
       if (currentSidebarHash === hash) { return; }
-      setCurrentSidebarHash(hash);
+      // setCurrentSidebarHash(hash);
       // If standard sidebar mode (scroll to content) also perform the scroll offset here
       if (!sidebarLinksAsStandaloneChildren) {
         window.setTimeout(() => {
@@ -486,7 +495,7 @@ const NeonPage = (props) => {
           (curr.y !== -1 && window.scrollY >= curr.y - detectionBuffer) ? curr.hash : acc
         ), sidebarLinks[0].hash || '#');
       if (currentScrolledHash !== currentSidebarHash) {
-        setCurrentSidebarHash(currentScrolledHash);
+        // setCurrentSidebarHash(currentScrolledHash);
       }
     };
     window.addEventListener('scroll', handleScroll);
@@ -503,7 +512,7 @@ const NeonPage = (props) => {
     hashInitialized,
     setHashInitialized,
     currentSidebarHash,
-    setCurrentSidebarHash,
+    // setCurrentSidebarHash,
     sidebarLinksContainerRef,
     getSidebarLinkScrollPosition,
     sidebarLinksAsStandaloneChildren,
@@ -808,7 +817,7 @@ const NeonPage = (props) => {
           href={hash}
           onClick={(
             sidebarLinksAsStandaloneChildren ? () => {
-              setCurrentSidebarHash(hash);
+              // setCurrentSidebarHash(hash);
               if (sidebarExpanded) { setSidebarExpanded(false); }
             } : null
           )}