Maintain active dataset fields (#1878)

* reset active field only on dataset change

* rm log

* address feedback, fix patches

app/packages/app/src/Root/Datasets/Dataset.tsx

@@ -1,18 +1,17 @@
 import { Route, RouterContext } from "@fiftyone/components";
+import { toCamelCase } from "@fiftyone/utilities";
 import React, { useContext, useEffect } from "react";
 import { graphql, usePreloadedQuery } from "react-relay";
+import { useRecoilValue } from "recoil";
 
 import DatasetComponent from "../../components/Dataset";
 import { useStateUpdate } from "../../utils/hooks";
 import { DatasetQuery } from "./__generated__/DatasetQuery.graphql";
 import { datasetName } from "../../recoil/selectors";
-import { useRecoilValue } from "recoil";
 import transformDataset from "./transformDataset";
 import { filters } from "../../recoil/filters";
-import { _activeFields } from "../../recoil/schema";
 import { State } from "../../recoil/types";
 import { similarityParameters } from "../../components/Actions/Similar";
-import { toCamelCase } from "@fiftyone/utilities";
 
 const Query = graphql`
   query DatasetQuery($name: String!, $view: BSONArray) {
@@ -99,7 +98,6 @@ export const Dataset: Route<DatasetQuery> = ({ prepared }) => {
   useEffect(() => {
     update(({ reset }) => {
       reset(filters);
-      reset(_activeFields({ modal: false }));
       reset(similarityParameters);
 
       return {

app/packages/app/src/utils/hooks.ts

@@ -38,6 +38,7 @@ import { getDatasetName } from "./generic";
 import { RouterContext } from "@fiftyone/components";
 import { RGB } from "@fiftyone/looker";
 import { DatasetQuery } from "../Root/Datasets/__generated__/DatasetQuery.graphql";
+import { _activeFields } from "../recoil/schema";
 
 export const useEventHandler = (
   target,
@@ -310,7 +311,7 @@ export const useStateUpdate = () => {
       const { colorscale, config, dataset, state } =
         resolve instanceof Function ? resolve(t) : resolve;
 
-      const { get, set } = t;
+      const { get, reset, set } = t;
 
       if (state) {
         const view = get(viewAtoms.view);
@@ -351,16 +352,21 @@ export const useStateUpdate = () => {
         dataset.evaluations = Object.values(dataset.evaluations || {});
 
         const groups = resolveGroups(dataset);
-        const current = get(sidebarGroupsDefinition(false));
+        const currentSidebar = get(sidebarGroupsDefinition(false));
 
-        if (JSON.stringify(groups) !== JSON.stringify(current)) {
+        if (JSON.stringify(groups) !== JSON.stringify(currentSidebar)) {
           set(sidebarGroupsDefinition(false), groups);
           set(
             aggregationAtoms.aggregationsTick,
             get(aggregationAtoms.aggregationsTick) + 1
           );
         }
 
+        const previousDataset = get(atoms.dataset);
+        if (!previousDataset || previousDataset.id !== dataset.id) {
+          reset(_activeFields({ modal: false }));
+        }
+
         set(atoms.dataset, dataset);
       }
 

fiftyone/server/query.py

@@ -175,9 +175,7 @@ async def resolver(
         view = fov.DatasetView._build(ds, view or [])
         if view._dataset != ds:
             d = view._dataset._serialize()
-            dataset.id = (
-                ObjectId()
-            )  # if it is not the root dataset, change the id (relay requires it)
+            dataset.id = view._dataset._doc.id
             dataset.media_type = d["media_type"]
             dataset.sample_fields = [
                 from_dict(SampleField, s)
@@ -285,7 +283,7 @@ def serialize_dataset(dataset: fod.Dataset, view: fov.DatasetView) -> t.Dict:
     if view is not None and view._dataset != dataset:
         d = view._dataset._serialize()
         data.media_type = d["media_type"]
-        data.id = ObjectId()
+        data.id = view._dataset._doc.id
         data.sample_fields = [
             from_dict(SampleField, s)
             for s in _flatten_fields([], d["sample_fields"])