Merge pull request #6469 from voxel51/chore/resolve-dev-conflicts

resolve merge conflicts from develop

Author: tom-vx51

.github/workflows/build-docs.yml

@@ -43,6 +43,7 @@ jobs:
     env:
       FIFTYONE_DO_NOT_TRACK: true
       DOCSEARCH_API_KEY: ${{ secrets.DOCSEARCH_API_KEY }}
+      GITHUB_TOKEN: ${{ secrets.FIFTYONE_GITHUB_TOKEN }}
     steps:
       - name: Clone fiftyone for tag builds
         if: github.ref_type == 'tag'

.github/workflows/e2e.yml

@@ -24,7 +24,7 @@ jobs:
           submodules: true
 
       - name: Setup node 22
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: 22
 

.github/workflows/lint-app.yml

@@ -18,7 +18,7 @@ jobs:
               - 'app/**'
 
       - name: Set up Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: "22"
 

app/package.json

@@ -43,7 +43,7 @@
         "typedoc": "^0.23.21",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^5.4.20",
+        "vite": "^5.4.21",
         "vite-plugin-eslint": "^1.8.1",
         "vite-plugin-relay": "^2.0.0",
         "vitest": "^3.0.8"

app/packages/aggregations/package.json

@@ -27,6 +27,6 @@
         "lodash": "^4.17.21",
         "prettier": "2.2.1",
         "typescript": "4.2.4",
-        "vite": "^5.4.20"
+        "vite": "^5.4.21"
     }
 }

app/packages/app/package.json

@@ -55,7 +55,7 @@
         "rollup-plugin-polyfill-node": "^0.6.2",
         "typescript": "^5.3.2",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^5.4.20",
+        "vite": "^5.4.21",
         "vite-plugin-relay": "^1.0.7",
         "vite-plugin-rewrite-all": "^1.0.2",
         "vite-plugin-svgr": "^4.2.0"

app/packages/components/package.json

@@ -27,7 +27,7 @@
         "prettier": "^2.7.1",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.1.0",
-        "vite": "^5.4.20"
+        "vite": "^5.4.21"
     },
     "peerDependencies": {
         "jotai": "*",

app/packages/components/src/components/ErrorBoundary/ErrorBoundary.tsx

@@ -73,13 +73,16 @@ export const ErrorDisplayMarkup = <T extends AppError>({
         content: JSON.stringify(error.payload, null, 2),
       });
   } else if (error instanceof OperatorError) {
+    if (error.message) {
+      messages.push({ message: "Message", content: error.message });
+    }
     if (error.operator) {
       messages.push({ message: "Operator", content: error.operator });
     }
     if (error instanceof PanelEventError) {
       messages.push({ message: "Event", content: error.event });
     }
-    messages.push({ message: error.message, content: error.stack });
+    messages.push({ message: "Trace", content: error.stack });
   }
   if (error.stack && !(error instanceof OperatorError)) {
     messages = [...messages, { message: "Trace", content: error.stack }];

app/packages/core/package.json

@@ -78,7 +78,7 @@
         "rollup-plugin-polyfill-node": "^0.6.2",
         "typescript": "^5.4.5",
         "typescript-plugin-css-modules": "^5.1.0",
-        "vite": "^5.4.20",
+        "vite": "^5.4.21",
         "vite-plugin-relay": "^1.0.7"
     },
     "peerDependencies": {

app/packages/core/src/components/ColorModal/ColorFooter.tsx

@@ -3,7 +3,7 @@ import * as foq from "@fiftyone/relay";
 import * as fos from "@fiftyone/state";
 import React, { useEffect } from "react";
 import { useMutation } from "react-relay";
-import { useRecoilValue } from "recoil";
+import { useRecoilValue, useSetRecoilState } from "recoil";
 import { ButtonGroup, ModalActionButtonContainer } from "./ShareStyledDiv";
 import { activeColorEntry } from "./state";
 
@@ -15,6 +15,7 @@ const ColorFooter: React.FC = () => {
     : "Save to dataset app config";
   const setColorScheme = fos.useSetSessionColorScheme();
   const activeColorModalField = useRecoilValue(activeColorEntry);
+  const setActiveColorModalField = useSetRecoilState(activeColorEntry);
   const [setDatasetColorScheme] =
     useMutation<foq.setDatasetColorSchemeMutation>(foq.setDatasetColorScheme);
   const colorScheme = useRecoilValue(fos.colorScheme);