always be debugging

voxel51 · Nov 10, 2022 · 29a1d77 · 29a1d77
1 parent fdc0082
commit 29a1d77
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/app/packages/app/src/Network.tsx b/app/packages/app/src/Network.tsx
@@ -36,7 +36,6 @@ const Network: React.FC<{
 };
 
 export const NetworkRenderer = ({ makeRoutes }) => {
-  const refreshRouter = useRecoilValue(fos.refresher);
   const { context, environment } = fos.useRouter(makeRoutes, []);
 
   const isModalActive = Boolean(useRecoilValue(fos.modal));

diff --git a/app/packages/core/src/Dataset.ts b/app/packages/core/src/Dataset.ts
@@ -1,6 +1,6 @@
 import * as fos from "@fiftyone/state";
 import { toCamelCase } from "@fiftyone/utilities";
-import { useEffect, useLayoutEffect, useState } from "react";
+import { useContext, useLayoutEffect, useState } from "react";
 import { graphql, usePreloadedQuery, useQueryLoader } from "react-relay";
 
 import {
@@ -108,14 +108,12 @@ const DatasetQuery = graphql`
   }
 `;
 
-export function usePrepareDataset(
-  dataset,
-  { colorscale, config, state },
-  setReady
-) {
+export function usePrepareDataset(dataset, setReady) {
   const update = fos.useStateUpdate();
+  const router = useContext(fos.RouterContext);
 
   useLayoutEffect(() => {
+    const { colorscale, config, state } = router.state;
     if (dataset) {
       update(() => {
         return {
@@ -129,16 +127,15 @@ export function usePrepareDataset(
       });
       setReady(true);
     }
-  }, [dataset, colorscale, config, state]);
+  }, [dataset, router]);
 }
 export function usePreLoadedDataset(
-  queryRef,
-  { colorscale, config, state } = {}
+  queryRef
 ): [DatasetQuery$data["dataset"], boolean] {
   const [ready, setReady] = useState(false);
 
   const { dataset } = usePreloadedQuery<DatasetQuery>(DatasetQuery, queryRef);
-  usePrepareDataset(dataset, { colorscale, config, state }, setReady);
+  usePrepareDataset(dataset, setReady);
   return [dataset, ready];
 }
 export function useDatasetLoader() {

diff --git a/app/packages/core/src/Root/Datasets/Dataset.tsx b/app/packages/core/src/Root/Datasets/Dataset.tsx
@@ -12,7 +12,7 @@ import { DatasetQuery } from "../../__generated__/DatasetQuery.graphql";
 
 export const Dataset: Route<DatasetQuery> = ({ prepared }) => {
   const router = useContext(RouterContext);
-  const [dataset, ready] = usePreLoadedDataset(prepared, router?.state);
+  const [dataset, ready] = usePreLoadedDataset(prepared);
   const name = useRecoilValue(fos.datasetName);
   if (!ready) return null;
   if (dataset === null) {

diff --git a/app/packages/state/src/recoil/sidebar.ts b/app/packages/state/src/recoil/sidebar.ts
@@ -225,9 +225,11 @@ export const resolveGroups = (
       }, {})
     : {};
   if (!groups) {
-    groups = dataset.frameFields.length
-      ? DEFAULT_VIDEO_GROUPS
-      : DEFAULT_IMAGE_GROUPS;
+    groups = JSON.parse(
+      JSON.stringify(
+        dataset.frameFields.length ? DEFAULT_VIDEO_GROUPS : DEFAULT_IMAGE_GROUPS
+      )
+    );
   }
 
   groups = groups.map((group) => {