chore: Use staging env deep zoom assets for localhost (#1103)

chanzuckerberg · Sep 13, 2024 · c951f21 · c951f21
1 parent f767f66
commit c951f21
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/.infra/rdev/values.yaml b/.infra/rdev/values.yaml
@@ -2,7 +2,7 @@ stack:
   services:
     explorer:
       image:
-        tag: sha-5ec059bf
+        tag: sha-f55da22f
       replicaCount: 1
       env:
         # env vars common to all deployment stages

diff --git a/client/src/components/graph/util.ts b/client/src/components/graph/util.ts
@@ -169,12 +169,18 @@ function getSpatialUrl(s3URI: string) {
 
   // TODO(thuang): Take rdev into account
 
-  if (hostname.includes("staging")) {
+  if (
+    /**
+     * (thuang): `dev` env for Explorer is out of sync with Terraform, so don't
+     * use it anymore
+     */
+    hostname.includes("dev") ||
+    hostname.includes("staging") ||
+    hostname.includes("localhost")
+  ) {
     return `https://cellxgene.staging.single-cell.czi.technology/spatial-deep-zoom/${datasetVersionId}/`;
   }
-  if (hostname.includes("dev") || hostname.includes("localhost")) {
-    return `https://cellxgene.dev.single-cell.czi.technology/spatial-deep-zoom/${datasetVersionId}/`;
-  }
+
   return `https://cellxgene.cziscience.com/spatial-deep-zoom/${datasetVersionId}/`;
 }
 

diff --git a/server/ecs/app.py b/server/ecs/app.py
@@ -45,14 +45,17 @@ def _before_adding_routes(app, app_config):
 
         EXPLORER_DEV_URL = "https://cellxgene.dev.single-cell.czi.technology"
 
+        EXPLORER_STAGING_URL = "https://cellxgene.staging.single-cell.czi.technology"
+
         csp = {
             "default-src": ["'self'", HUBSPOT_FORMS_URL, HUBSPOT_JS_URL],
             "form-action": ["'self'", HUBSPOT_FORMS_URL],
-            "connect-src": ["'self'", PLAUSIBLE_URL, HUBSPOT_FORMS_URL, EXPLORER_DEV_URL] + extra_connect_src,
+            "connect-src": ["'self'", PLAUSIBLE_URL, HUBSPOT_FORMS_URL, EXPLORER_DEV_URL, EXPLORER_STAGING_URL]
+            + extra_connect_src,
             "script-src": ["'self'", "'unsafe-eval'", PLAUSIBLE_URL, HUBSPOT_FORMS_URL, HUBSPOT_JS_URL] + script_hashes,
             "style-src": ["'self'", "'unsafe-inline'", "https://fonts.googleapis.com"],
             "font-src": ["'self'", "https://fonts.gstatic.com"],
-            "img-src": ["'self'", "https://cellxgene.cziscience.com", EXPLORER_DEV_URL]
+            "img-src": ["'self'", "https://cellxgene.cziscience.com", EXPLORER_DEV_URL, EXPLORER_STAGING_URL]
             + extra_connect_src
             + ["data:", HUBSPOT_FORMS_URL],
             "object-src": ["'none'"],