Dynamic groups modal updates (voxel51#3209)

* data flow updates * tweaks * cypress debug script * tweaks * fixes * cleanup, fix carousel highlighting * v4 * v4s * cleaning --------- Co-authored-by: imanjra <ibrahim@voxel51.com>
jainanisha90 · Jun 23, 2023 · bf650d5 · bf650d5
1 parent 62e7b69
commit bf650d5
Show file tree

Hide file tree

Showing 52 changed files with 889 additions and 894 deletions.
diff --git a/.github/workflows/build-db.yml b/.github/workflows/build-db.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Clone fiftyone
         uses: actions/checkout@v1
       - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
       - name: Install dependencies

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           submodules: true
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
       - name: Install dependencies

diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -52,7 +52,7 @@ jobs:
           token: ${{ secrets.TEAMS_GITHUB_PAT }}
           ref: main
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
       - name: Install pip dependencies

diff --git a/.github/workflows/build-graphql.yml b/.github/workflows/build-graphql.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Clone fiftyone
         uses: actions/checkout@v1
       - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
       - name: Install dependencies

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
         with:
           submodules: true
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
       - name: Install dependencies

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -18,7 +18,7 @@ jobs:
           submodules: true
 
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         id: pip-cache
         with:
           python-version: 3.8
@@ -72,13 +72,6 @@ jobs:
           yarn start
         working-directory: ./e2e
 
-      - name: Upload videos
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: videos
-          path: e2e/cypress/videos
-
       - name: Upload snapshots
         if: always()
         uses: actions/upload-artifact@v2

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         id: pip-cache
         with:
           python-version: ${{ matrix.python }}

diff --git a/app/.eslintrc.js b/app/.eslintrc.js
@@ -61,6 +61,7 @@ module.exports = {
         ],
       },
     ],
+    "react/prop-types": 0,
   },
   settings: {
     react: {

diff --git a/app/packages/app/vite.config.ts b/app/packages/app/vite.config.ts
@@ -18,6 +18,7 @@ export default defineConfig({
     pluginRewriteAll(),
   ],
   server: {
+    port: parseInt(process.env.FIFTYONE_DEFAULT_APP_PORT || "5173"),
     proxy: {
       "/plugins": {
         target: `http://127.0.0.1:${

diff --git a/app/packages/core/src/Root/Root.tsx b/app/packages/core/src/Root/Root.tsx
@@ -120,7 +120,7 @@ export const useGA = (prepared: PreloadedQuery<RootQuery>) => {
     const buildType = dev ? "dev" : "prod";
 
     ReactGA.initialize(gaConfig.app_ids[buildType], {
-      debug: dev,
+      debug: false,
       gaOptions: {
         storage: "none",
         cookieDomain: "none",

diff --git a/app/packages/core/src/components/Actions/Selected.tsx b/app/packages/core/src/components/Actions/Selected.tsx
@@ -1,3 +1,10 @@
+import {
+  AbstractLooker,
+  FrameLooker,
+  ImageLooker,
+  VideoLooker,
+} from "@fiftyone/looker";
+import { useEventHandler, useSetSelected } from "@fiftyone/state";
 import React, {
   MutableRefObject,
   RefObject,
@@ -11,15 +18,6 @@ import {
   useRecoilValue,
 } from "recoil";
 
-import {
-  AbstractLooker,
-  FrameLooker,
-  ImageLooker,
-  VideoLooker,
-} from "@fiftyone/looker";
-
-import { useEventHandler, useSetSelected } from "@fiftyone/state";
-
 import * as fos from "@fiftyone/state";
 import { State } from "@fiftyone/state";
 import { ActionOption } from "./Common";
@@ -160,8 +158,7 @@ const toIds = (labels: State.SelectedLabel[]) =>
 
 const useVisibleSampleLabels = (lookerRef: RefObject<AbstractLooker>) => {
   const isGroup = useRecoilValue(fos.isGroup);
-  const activeSlice = useRecoilValue(fos.currentSlice(true));
-  const activeSample = useRecoilValue(fos.activeModalSample(activeSlice));
+  const activeSample = useRecoilValue(fos.activeModalSample);
   const labelValues = useRecoilValue(fos.labelValues({ sample: activeSample }));
 
   const currentSampleLabels = lookerRef.current

diff --git a/app/packages/core/src/components/Grid/Grid.tsx b/app/packages/core/src/components/Grid/Grid.tsx
@@ -1,14 +1,11 @@
+import Flashlight from "@fiftyone/flashlight";
+import { freeVideos } from "@fiftyone/looker";
+import { useEventHandler, useExpandSample } from "@fiftyone/state";
 import React, { useEffect, useLayoutEffect, useRef } from "react";
 import { useRecoilCallback, useRecoilValue } from "recoil";
 import { v4 as uuid } from "uuid";
-
-import Flashlight from "@fiftyone/flashlight";
-import { freeVideos } from "@fiftyone/looker";
-
-import { useEventHandler } from "@fiftyone/state";
 import { flashlightLooker } from "./Grid.module.css";
 import { rowAspectRatioThreshold } from "./recoil";
-import useExpandSample from "./useExpandSample";
 import usePage from "./usePage";
 import useResize from "./useResize";
 

diff --git a/app/packages/core/src/components/Grid/useExpandSample.ts b/app/packages/core/src/components/Grid/useExpandSample.ts
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,7 @@ module.exports = { @@
             ],
           },
         ],
+        "react/prop-types": 0,
       },
       settings: {
         react: {
@@ Expand Down @@