Fix experimental flowjo parsing

src/graph/WorkspaceComponent.tsx

@@ -26,7 +26,11 @@ import GenerateReportModal from "./components/modals/GenerateReportModal";
 import LinkShareModal from "./components/modals/linkShareModal";
 import Plots, { resetPlotSizes } from "./components/workspaces/PlotController";
 import SideMenus from "./components/static/SideMenus";
-import { downloadFileEvent, downloadFileMetadata } from "services/FileService";
+import {
+  dowloadAllFileEvents,
+  downloadFileEvent,
+  downloadFileMetadata,
+} from "services/FileService";
 import {
   loadWorkspaceFromRemoteIfExists,
   saveWorkspaceToRemote,
@@ -87,9 +91,6 @@ const WorkspaceComponent = (props: {
 }) => {
   const store = useStore();
   const classes = useStyles();
-  // store.dispatch({
-  //   type: "workspace.RESET",
-  // });
   const history = useHistory();
   const isLoggedIn = userManager.isLoggedIn();
 
@@ -124,11 +125,17 @@ const WorkspaceComponent = (props: {
     });
 
     initializeWorkspace();
+
+    return () => {
+      store.dispatch({
+        type: "workspace.RESET",
+      });
+    };
   }, []);
 
   const initializeWorkspace = async () => {
     await downloadFileMetadata(props.shared, props.experimentId);
-    await loadWorkspaceFromRemoteIfExists(props.shared, props.experimentId);
+    // await loadWorkspaceFromRemoteIfExists(props.shared, props.experimentId);
   };
 
   const saveWorkspace = () => {
@@ -205,7 +212,15 @@ const WorkspaceComponent = (props: {
   };
 
   const initiateParseFlowJo = async (flowJoJson: any) => {
-    await ParseFlowJoJson(flowJoJson, workspace.files);
+    await dowloadAllFileEvents(props.shared, props.experimentId);
+    try {
+      await ParseFlowJoJson(flowJoJson, workspace.files);
+    } catch (e) {
+      snackbarService.showSnackbar(
+        "Could not parse FlowJo workspace",
+        "warning"
+      );
+    }
     setTimeout(() => {
       setLoading(false);
     }, 4000);
@@ -423,7 +438,7 @@ const WorkspaceComponent = (props: {
                         importFlowJoFunc(e);
                       }}
                     />
-                    Import Flow Jo
+                    Import FlowJo (experimental)
                   </Button>
                 </Grid>
                 {process.env.REACT_APP_NO_WORKSPACES === "true" ? null : (

src/graph/renderers/plotters/scatterPlotter.tsx

@@ -6,8 +6,6 @@ import PluginGraphPlotter, { applyPlugin } from "./PluginGraphPlotter";
 import FCSServices from "services/FCSServices/FCSServices";
 import { OvalGate, PolygonGate } from "graph/resources/types";
 import * as PlotResource from "graph/resources/plots";
-import { getDataset } from "graph/resources/dataset";
-import { getPopulation } from "graph/utils/workspace";
 
 interface ScatterPlotterState extends GraphPlotterState {}
 

src/graph/resources/gates.ts

@@ -42,13 +42,6 @@ export const commitGateChange = async (gate: Gate) => {
   });
 };
 
-export const commitGate = async (gate: Gate) => {
-  store.dispatch({
-    type: "workspace.ADD_GATE",
-    payload: { gate },
-  });
-};
-
 export const isPointInsideGate = (
   gate: Gate,
   point: { x: number; y: number }

src/graph/resources/plots.ts

@@ -41,20 +41,6 @@ export const commitPlotChange = (plot: Plot) => {
   });
 };
 
-export const commitPlot = (plot: Plot) => {
-  store.dispatch({
-    type: "workspace.ADD_PLOT",
-    payload: { plot },
-  });
-};
-
-export const commitPlots = (plots: Array<Plot>) => {
-  store.dispatch({
-    type: "workspace.ADD_PLOTS",
-    payload: { plots },
-  });
-};
-
 export const createPlot = ({
   clonePlot,
   id,

src/graph/resources/populations.ts

@@ -20,13 +20,6 @@ export const commitPopulationChange = async (population: Population) => {
   });
 };
 
-export const commitPopulation = async (population: Population) => {
-  store.dispatch({
-    type: "workspace.ADD_POPULATION",
-    payload: { population },
-  });
-};
-
 export const createPopulation = ({
   clonePopulation,
   id,

src/graph/utils/workspace.ts

@@ -150,6 +150,6 @@ const loadSavedWorkspace = async (
   const newWorkspace = { ...workspaceObj, files: getWorkspace().files };
   await store.dispatch({
     type: "workspace.LOAD_WORKSPACE",
-    payload: { workspace: workspaceObj },
+    payload: { workspace: newWorkspace },
   });
 };