Merge release/v1.9.0 to develop

.github/workflows/pr.yml

@@ -3,11 +3,6 @@ name: Pull Request
 on:
   pull_request:
     types: [opened, synchronize]
-    branches:
-      - develop
-      - feat/*
-      - main
-      - release/v[0-9]+.[0-9]+.[0-9]+
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

app/package.json

@@ -56,5 +56,8 @@
         "colormap": "^2.3.2",
         "react-player": "^2.16.0",
         "react-plotly.js": "^2.6.0"
+    },
+    "resolutions": {
+        "brace-expansion": "^2.0.2"
     }
 }

app/packages/embeddings/package.json

@@ -16,7 +16,7 @@
         "@fiftyone/components": "*",
         "@fiftyone/plugins": "*",
         "@fiftyone/state": "*",
-        "plotly.js": "^3.0.1",
+        "plotly.js": "^3.1.1",
         "use-resize-observer": "^9.0.2"
     },
     "devDependencies": {

app/packages/looker-3d/src/hooks/use-fo-loaders.ts

@@ -1,5 +1,13 @@
 import { useLoader } from "@react-three/fiber";
 
+function ensureArray(value) {
+  if (Array.isArray(value)) {
+    return value;
+  } else {
+    return [value];
+  }
+}
+
 /**
  * Decorates useLoader() to support credentials forwarding
  */
@@ -12,8 +20,17 @@ export function useFoLoader<
   loaderFunction?: Parameters<typeof useLoader>[2]
 ) {
   return useLoader(loader, urls, (loaderInstance) => {
-    if (sessionStorage.getItem("customCredentialsAudience")?.length) {
-      loaderInstance.setWithCredentials(true);
+    const customCredentialsAudience = sessionStorage.getItem(
+      "customCredentialsAudience"
+    );
+    if (customCredentialsAudience) {
+      // The types say that `urls` is string | string[]
+      // But! Our code also sometimes passes in string[][]
+      // So, we're both calling ensureArray() and flat()
+      const urlArray = ensureArray(urls).flat();
+      if (urlArray.some((url) => url.includes(customCredentialsAudience))) {
+        loaderInstance.setWithCredentials(true);
+      }
     }
     if (loaderFunction) {
       loaderFunction(loaderInstance);