Fix workspaces proxying bug: still need jupyter_server_proxy (#422)

* Fix bug

* Revert let back to const

Author: keller-mark

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "vitessce"
-version = "3.5.5"
+version = "3.5.6"
 authors = [
   { name="Mark Keller", email="[email protected]" },
 ]

src/vitessce/widget.py

@@ -175,15 +175,15 @@ def get_uid_str(uid):
     }
     const { origin, pathname } = new URL(window.location.href);
     const isInWorkspaces = origin.startsWith(WORKSPACES_URL_KEYWORD);
-
     const jupyterLabConfigEl = document.getElementById('jupyter-config-data');
 
     let baseUrl;
     if (isInWorkspaces) {
         const pathSegments = pathname.split('/');
         const passthroughIndex = pathSegments.indexOf('passthrough');
         if (passthroughIndex !== -1) {
-            baseUrl = pathSegments.slice(0, passthroughIndex + 2).join('/');
+            baseUrl = pathSegments.slice(0, passthroughIndex + 3).join('/');
+            baseUrl += '/';
         }
     } else if (jupyterLabConfigEl) {
         // This is jupyter lab
@@ -196,17 +196,10 @@ def get_uid_str(uid):
         ...config,
         datasets: config.datasets.map(d => ({
             ...d,
-            files: d.files.map(f => {
-                if (isInWorkspaces && f.url.startsWith('proxy')) {
-                    // When the user is in workspaces, we do not use jupyter_server_proxy.
-                    // Instead, the workspaces infrastructure has its own "passthrough" functionality.
-                    f.url = f.url.replace('proxy', '');
-                }
-                return {
-                    ...f,
-                    url: `${origin}${baseUrl}${f.url}`,
-                };
-            }),
+            files: d.files.map(f => ({
+                ...f,
+                url: `${origin}${baseUrl}${f.url}`,
+            })),
         })),
     };
 }