Merge pull request #4460 from voxel51/merge/v0.24.1-to-main

Merge `release/v0.24.1` to `main`
voxel51 · Jun 11, 2024 · c1132ec · c1132ec
2 parents 8fbbdd1 + 5ba1a2f
commit c1132ec
Show file tree

Hide file tree

Showing 64 changed files with 2,583 additions and 1,715 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -16,6 +16,24 @@ jobs:
   e2e:
     uses: ./.github/workflows/e2e.yml
 
+  teams:
+    runs-on: ubuntu-latest
+    if: github.base_ref == 'develop'
+    steps:
+      - uses: convictional/[email protected]
+        with:
+          owner: voxel51
+          repo: fiftyone-teams
+          github_token: ${{ secrets.FIFTYONE_GITHUB_TOKEN }}
+          github_user: voxel51-bot
+          workflow_file_name: merge-oss.yml
+          ref: develop
+          wait_interval: 20
+          client_payload: '{ "branch": "${{ github.head_ref || github.ref_name }}" }'
+          propagate_failure: true
+          trigger_workflow: true
+          wait_workflow: true
+
   test:
     uses: ./.github/workflows/test.yml
 

diff --git a/.github/workflows/push-release.yml b/.github/workflows/push-release.yml
@@ -0,0 +1,37 @@
+name: Push Release
+
+on:
+  push:
+    branches:
+      - main
+      - release/v[0-9]+.[0-9]+.[0-9]+
+  workflow_dispatch:
+    inputs:
+      ref_name:
+        type: string
+
+jobs:
+  pr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: develop
+          fetch-depth: 0
+      - run: |
+          git config user.name 'voxel51-bot'
+          git config user.email '[email protected]'
+          git checkout merge/${{ inputs.ref_name || github.ref_name }} \
+          || git checkout -b merge/${{ inputs.ref_name || github.ref_name }}
+          git push -u origin merge/${{ inputs.ref_name || github.ref_name }}
+          git checkout develop
+          git pull origin merge/${{ inputs.ref_name || github.ref_name }} --no-rebase
+          git pull origin ${{ inputs.ref_name || github.ref_name }} --no-rebase
+      - uses: peter-evans/create-pull-request@v6
+        with:
+          author: voxel51-bot <[email protected]>
+          token: ${{ secrets.FIFTYONE_GITHUB_TOKEN }}
+          base: develop
+          body: Merge `${{ inputs.ref_name || github.ref_name }}` to `develop`
+          branch: merge/${{ inputs.ref_name || github.ref_name }}
+          title: Merge `${{ inputs.ref_name || github.ref_name }}` to `develop`
diff --git a/app/package.json b/app/package.json
@@ -42,10 +42,10 @@
         "typedoc": "^0.23.21",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^3.2.10",
+        "vite": "^5.2.12",
         "vite-plugin-eslint": "^1.8.1",
         "vite-plugin-relay": "^2.0.0",
-        "vitest": "^0.34.6"
+        "vitest": "^1.6.0"
     },
     "workspaces": [
         "packages/*"

diff --git a/app/packages/aggregations/package.json b/app/packages/aggregations/package.json
@@ -23,10 +23,10 @@
         "@babel/preset-typescript": "^7.17.12",
         "@types/react": "^18.0.12",
         "fs-extra": "^10.1.0",
-        "jest": "^28.1.1",
+        "jest": "^29.7.0",
         "lodash": "^4.17.21",
         "prettier": "2.2.1",
         "typescript": "4.2.4",
-        "vite": "^3.2.10"
+        "vite": "^5.2.12"
     }
 }
diff --git a/app/packages/app/package.json b/app/packages/app/package.json
@@ -53,7 +53,7 @@
         "rollup-plugin-polyfill-node": "^0.6.2",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^3.2.10",
+        "vite": "^5.2.12",
         "vite-plugin-relay": "^1.0.7",
         "vite-plugin-rewrite-all": "^1.0.2"
     },

diff --git a/app/packages/components/package.json b/app/packages/components/package.json
@@ -27,7 +27,7 @@
         "prettier": "^2.7.1",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^3.2.10"
+        "vite": "^5.2.12"
     },
     "peerDependencies": {
         "re-resizable": "*",

diff --git a/app/packages/core/package.json b/app/packages/core/package.json
@@ -66,7 +66,7 @@
         "rollup-plugin-polyfill-node": "^0.6.2",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^3.2.10",
+        "vite": "^5.2.12",
         "vite-plugin-relay": "^1.0.7"
     },
     "peerDependencies": {

diff --git a/app/packages/core/src/components/MainSpace/MainSpace.tsx b/app/packages/core/src/components/MainSpace/MainSpace.tsx
@@ -8,12 +8,17 @@ const { FIFTYONE_SPACE_ID } = constants;
 function MainSpace() {
   const [sessionSpaces, setSessionSpaces, sessionPanelsState] =
     useSessionSpaces();
-  const { spaces, updateSpaces } = useSpaces(FIFTYONE_SPACE_ID, sessionSpaces);
+  const { spaces, updateSpaces, clearSpaces } = useSpaces(
+    FIFTYONE_SPACE_ID,
+    sessionSpaces
+  );
   const [panelsState, setPanelsState] = usePanelsState();
   const oldSpaces = useRef(spaces);
   const oldPanelsState = useRef(panelsState);
   const isMounted = useRef(false);
 
+  useEffect(() => clearSpaces, [clearSpaces]);
+
   useEffect(() => {
     if (!spaces.equals(sessionSpaces)) {
       updateSpaces(sessionSpaces);

diff --git a/app/packages/core/src/components/Sidebar/ViewSelection/index.tsx b/app/packages/core/src/components/Sidebar/ViewSelection/index.tsx
@@ -80,6 +80,10 @@ export default function ViewSelection() {
     [viewOptions, viewSearch]
   );
 
+  useEffect(() => {
+    refetch({ name: datasetName });
+  }, [datasetName]);
+
   useEffect(() => {
     if (
       selected &&

diff --git a/app/packages/embeddings/package.json b/app/packages/embeddings/package.json
@@ -23,9 +23,9 @@
     "devDependencies": {
         "@vitest/ui": "^0.34.6",
         "typescript": "^4.7.4",
-        "vite": "^3.2.10",
+        "vite": "^5.2.12",
         "vite-plugin-externals": "^0.5.0",
-        "vitest": "^0.34.6"
+        "vitest": "^1.6.0"
     },
     "fiftyone": {
         "script": "dist/index.umd.js"

diff --git a/app/packages/flashlight/package.json b/app/packages/flashlight/package.json
@@ -21,6 +21,6 @@
         "prettier": "^2.7.1",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^3.2.10"
+        "vite": "^5.2.12"
     }
 }
diff --git a/app/packages/looker-3d/package.json b/app/packages/looker-3d/package.json
@@ -34,9 +34,9 @@
         "nodemon": "^3.0.3",
         "rollup-plugin-external-globals": "^0.6.1",
         "typescript": "^5.4.5",
-        "vite": "^3.2.10",
+        "vite": "^5.2.12",
         "vite-plugin-externals": "^0.5.0",
-        "vitest": "^1.5.0"
+        "vitest": "^1.6.0"
     },
     "peerDependencies": {
         "@mui/icons-material": "*",

diff --git a/app/packages/looker/package.json b/app/packages/looker/package.json
@@ -38,6 +38,6 @@
         "prettier": "^2.7.1",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^3.2.10"
+        "vite": "^5.2.12"
     }
 }
diff --git a/app/packages/map/package.json b/app/packages/map/package.json
@@ -29,7 +29,7 @@
         "@types/react-map-gl": "^6.1.3",
         "@types/robust-point-in-polygon": "^1.0.2",
         "typescript": "^4.7.4",
-        "vite": "^3.2.10",
+        "vite": "^5.2.12",
         "vite-plugin-externals": "^0.5.0"
     },
     "fiftyone": {

diff --git a/app/packages/operators/package.json b/app/packages/operators/package.json
@@ -21,10 +21,10 @@
         "@babel/preset-typescript": "^7.17.12",
         "@fiftyone/utilities": "workspace:^",
         "@types/react": "^18.0.12",
-        "jest": "^28.1.1",
+        "jest": "^29.7.0",
         "prettier": "2.2.1",
         "typescript": "4.2.4",
-        "vite": "^3.2.10"
+        "vite": "^5.2.12"
     },
     "peerDependencies": {
         "@mui/icons-material": "*",

diff --git a/app/packages/operators/src/OperatorInvocationRequestExecutor.tsx b/app/packages/operators/src/OperatorInvocationRequestExecutor.tsx
@@ -1,15 +1,21 @@
-import { useEffect } from "react";
+import { useEffect, useMemo } from "react";
 import {
   useInvocationRequestExecutor,
   useInvocationRequestQueue,
 } from "./state";
+import { QueueItemStatus } from "./constants";
 
 export default function OperatorInvocationRequestExecutor() {
   const { requests, onSuccess, onError } = useInvocationRequestQueue();
+  const pendingRequests = useMemo(() => {
+    return requests.filter(
+      (queueItem) => queueItem.status === QueueItemStatus.Pending
+    );
+  }, [requests]);
 
   return (
     <>
-      {requests.map((queueItem) => (
+      {pendingRequests.map((queueItem) => (
         <RequestExecutor
           key={queueItem.id}
           queueItem={queueItem}

diff --git a/app/packages/operators/src/OperatorPrompt/OperatorDrawerPrompt.tsx b/app/packages/operators/src/OperatorPrompt/OperatorDrawerPrompt.tsx
@@ -1,4 +1,4 @@
-import { Resizable } from "@fiftyone/components";
+import { Resizable, scrollable } from "@fiftyone/components";
 import { Close } from "@mui/icons-material";
 import { Box, IconButton, Stack } from "@mui/material";
 import { useState } from "react";
@@ -32,6 +32,7 @@ export default function OperatorDrawerPrompt(props: OperatorPromptPropsType) {
       onResizeReset={() => {
         setWidth(DEFAULT_WIDTH);
       }}
+      data-cy="operators-prompt-drawer"
     >
       <IconButton
         onClick={prompt.close}
@@ -42,8 +43,21 @@ export default function OperatorDrawerPrompt(props: OperatorPromptPropsType) {
       <Box sx={{ p: 1 }}>
         <OperatorPromptHeader title={title} />
       </Box>
-      <OperatorPromptBody operatorPrompt={prompt} />
-      <Stack direction="row" spacing={1} justifyContent="center">
+      <Box
+        data-cy="operators-prompt-drawer-content"
+        sx={{ overflow: "auto" }}
+        className={scrollable}
+      >
+        <OperatorPromptBody operatorPrompt={prompt} />
+      </Box>
+      <Stack
+        direction="row"
+        spacing={1}
+        justifyContent="center"
+        alignItems="center"
+        data-cy="operators-prompt-drawer-footer"
+        sx={{ py: 1 }}
+      >
         <OperatorPromptFooter {...otherConfigs} />
       </Stack>
     </Resizable>

diff --git a/app/packages/operators/src/OperatorPrompt/OperatorModalPrompt.tsx b/app/packages/operators/src/OperatorPrompt/OperatorModalPrompt.tsx
@@ -6,28 +6,12 @@ import { getOperatorPromptConfigs } from "../utils";
 
 export default function OperatorModalPrompt(props: OperatorPromptPropsType) {
   const { prompt } = props;
-  const {
-    title,
-    hasValidationErrors,
-    resolving,
-    pendingResolve,
-    validationErrorsStr,
-    ...otherConfigs
-  } = getOperatorPromptConfigs(prompt);
+  const promptConfig = getOperatorPromptConfigs(prompt);
   return (
     <OperatorPalette
-      {...otherConfigs}
-      title={title}
-      onClose={otherConfigs.onCancel || prompt.close}
+      {...promptConfig}
       submitOnControlEnter
-      disableSubmit={hasValidationErrors || resolving || pendingResolve}
-      disabledReason={
-        hasValidationErrors
-          ? "Cannot execute operator with validation errors\n\n" +
-            validationErrorsStr
-          : "Cannot execute operator while validating form"
-      }
-      loading={resolving || pendingResolve}
+      dialogProps={{ PaperProps: { "data-cy": "operators-prompt-modal" } }}
     >
       <PaletteContentContainer>
         <OperatorPromptBody operatorPrompt={prompt} />

diff --git a/app/packages/operators/src/OperatorPrompt/OperatorViewModal.tsx b/app/packages/operators/src/OperatorPrompt/OperatorViewModal.tsx
@@ -13,6 +13,7 @@ export default function OperatorViewModal() {
       onSubmit={io.hide}
       onClose={io.hide}
       submitButtonText="Done"
+      dialogProps={{ PaperProps: { "data-cy": "operators-prompt-view-modal" } }}
     >
       <PaletteContentContainer>
         <OperatorIO schema={io.schema} data={io.data || {}} type={io.type} />

diff --git a/app/packages/operators/src/OperatorPrompt/index.tsx b/app/packages/operators/src/OperatorPrompt/index.tsx
@@ -25,8 +25,6 @@ function DynamicOperatorPrompt() {
   const target = getPromptTarget(prompt);
   const Component = getPromptComponent(prompt);
 
-  if (!prompt.resolvedIO.input && !prompt.resolvedIO.output) return null;
-
   return createPortal(<Component prompt={prompt} />, target);
 }
 

diff --git a/app/packages/operators/src/constants.ts b/app/packages/operators/src/constants.ts
@@ -7,3 +7,9 @@ export enum OPERATOR_PROMPT_AREAS {
   DRAWER_LEFT = "operator_prompt_area_drawer_left",
   DRAWER_RIGHT = "operator_prompt_area_drawer_right",
 }
+export enum QueueItemStatus {
+  Pending,
+  Executing,
+  Completed,
+  Failed,
+}
diff --git a/app/packages/operators/src/operators.ts b/app/packages/operators/src/operators.ts
@@ -4,6 +4,7 @@ import * as types from "./types";
 import { stringifyError } from "./utils";
 import { ValidationContext, ValidationError } from "./validation";
 import { ExecutionCallback, OperatorExecutorOptions } from "./types-internal";
+import { QueueItemStatus } from "./constants";
 
 class InvocationRequest {
   constructor(
@@ -747,16 +748,6 @@ export async function resolveLocalPlacements(ctx: ExecutionContext) {
   return localPlacements;
 }
 
-// and allows for the execution of the requests in order of arrival
-// and removing the requests that have been completed
-
-enum QueueItemStatus {
-  Pending,
-  Executing,
-  Completed,
-  Failed,
-}
-
 class QueueItem {
   constructor(
     public id: string,

diff --git a/app/packages/operators/src/utils.ts b/app/packages/operators/src/utils.ts
@@ -77,6 +77,12 @@ export function getOperatorPromptConfigs(operatorPrompt: OperatorPromptType) {
   const validationErrorsStr = formatValidationErrors(
     operatorPrompt.validationErrors
   );
+  const loading = resolving || pendingResolve;
+  const disableSubmit = hasValidationErrors || resolving || pendingResolve;
+  const disabledReason = hasValidationErrors
+    ? "Cannot execute operator with validation errors\n\n" + validationErrorsStr
+    : "Cannot execute operator while validating form";
+  const onClose = onCancel || operatorPrompt.close;
 
   return {
     title,
@@ -99,6 +105,10 @@ export function getOperatorPromptConfigs(operatorPrompt: OperatorPromptType) {
     cancelButtonText,
     onSubmit,
     onCancel,
+    loading,
+    disableSubmit,
+    disabledReason,
+    onClose,
   };
 }
 

diff --git a/app/packages/plugins/package.json b/app/packages/plugins/package.json
@@ -22,10 +22,10 @@
         "@babel/preset-typescript": "^7.17.12",
         "@fiftyone/utilities": "workspace:^",
         "@types/react": "^18.0.12",
-        "jest": "^28.1.1",
+        "jest": "^29.7.0",
         "prettier": "2.2.1",
         "typescript": "4.2.4",
-        "vite": "^3.2.10"
+        "vite": "^5.2.12"
     },
     "dependencies": {
         "moment": "^2.29.4"

diff --git a/app/packages/relay/package.json b/app/packages/relay/package.json
@@ -23,7 +23,7 @@
         "relay-compiler-language-typescript": "^15.0.1",
         "relay-config": "^12.0.1",
         "typescript": "^4.7.4",
-        "vite": "^3.2.10"
+        "vite": "^5.2.12"
     },
     "dependencies": {
         "@recoiljs/refine": "^0.1.1",