ensure basket feature tables suspend and resume at right time (finos#969

)
ScottLogic · Nov 14, 2023 · 6a24965 · 6a24965
1 parent 8753c6f
commit 6a24965
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/vuu-ui/packages/vuu-data/src/inlined-worker.js b/vuu-ui/packages/vuu-data/src/inlined-worker.js
@@ -1876,11 +1876,13 @@ var ServerProxy = class {
  this.sendIfReady(request, requestId, viewport.status === "subscribed");
  }
  disableViewport(viewport) {
+ console.log("disable viewport");
  const requestId = nextRequestId();
  const request = viewport.disable(requestId);
  this.sendIfReady(request, requestId, viewport.status === "subscribed");
  }
  enableViewport(viewport) {
+ console.log("enable viewport");
  if (viewport.disabled) {
  const requestId = nextRequestId();
  const request = viewport.enable(requestId);

diff --git a/vuu-ui/packages/vuu-data/src/remote-data-source.ts b/vuu-ui/packages/vuu-data/src/remote-data-source.ts
@@ -238,6 +238,7 @@ export class RemoteDataSource
  }
 
  suspend() {
+ console.log(`suspend #${this.viewport}, current status ${this.#status}`);
  info?.(`suspend #${this.viewport}, current status ${this.#status}`);
  if (this.viewport) {
  this.#status = "suspended";
@@ -266,6 +267,7 @@ export class RemoteDataSource
  }
 
  disable() {
+ console.log(`disable #${this.viewport}, current status ${this.#status}`);
  info?.(`disable #${this.viewport}, current status ${this.#status}`);
  if (this.viewport) {
  this.#status = "disabling";

diff --git a/vuu-ui/packages/vuu-shell/src/layout-management/useLayoutManager.tsx b/vuu-ui/packages/vuu-shell/src/layout-management/useLayoutManager.tsx
@@ -72,7 +72,6 @@ export const LayoutManagementProvider = (
 
  const saveApplicationLayout = useCallback(
  (layout: LayoutJSON) => {
- console.log(`save application layout ${JSON.stringify(layout, null, 2)}`);
  const persistenceManager = getPersistenceManager();
  setApplicationLayout(layout, false);
  persistenceManager.saveApplicationLayout(layout);

diff --git a/vuu-ui/packages/vuu-table/src/table-next/useDataSource.ts b/vuu-ui/packages/vuu-table/src/table-next/useDataSource.ts
@@ -44,13 +44,16 @@ export const useDataSource = ({
 
  const setData = useCallback(
  (updates: DataSourceRow[]) => {
+ console.table(updates);
  for (const row of updates) {
  dataWindow.add(row);
  }
  data.current = dataWindow.data;
  if (isMounted.current) {
  // TODO do we ever need to worry about missing updates here ?
  forceUpdate({});
+ } else {
+ console.log(`ignore update as we're not mounted`);
  }
  },
  [dataWindow]
@@ -84,17 +87,14 @@ export const useDataSource = ({
  return dataWindow.getSelectedRows();
  }, [dataWindow]);
 
- useEffect(
- () => () => {
- isMounted.current = true;
- // if (rafHandle.current) {
- // cancelAnimationFrame(rafHandle.current);
- // rafHandle.current = null;
- // }
+ useEffect(() => {
+ isMounted.current = true;
+ dataSource.resume?.();
+ return () => {
  isMounted.current = false;
- },
- []
- );
+  dataSource.suspend?.();
+ };
+ }, [dataSource]);
 
  // Keep until we'tre sure we don't need it for updates
  // const refreshIfUpdated = useCallback(() => {

diff --git a/vuu-ui/sample-apps/feature-filter-table/src/useFilterTable.tsx b/vuu-ui/sample-apps/feature-filter-table/src/useFilterTable.tsx
@@ -12,7 +12,7 @@ import { ActiveItemChangeHandler, useViewContext } from "@finos/vuu-layout";
 import { useShellContext } from "@finos/vuu-shell";
 import { applyDefaultColumnConfig } from "@finos/vuu-utils";
 import { Button } from "@salt-ds/core";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useMemo, useRef, useState } from "react";
 import { useSessionDataSource } from "./useSessionDataSource";
 import { FilterTableFeatureProps } from "./VuuFilterTableFeature";
 
@@ -161,13 +161,6 @@ export const useFilterTable = ({ tableSchema }: FilterTableFeatureProps) => {
  [load]
  );
 
- useEffect(() => {
- dataSource.resume?.();
- return () => {
- dataSource.suspend?.();
- };
- }, [dataSource]);
-
  const { buildViewserverMenuOptions, handleMenuAction } = useVuuMenuActions({
  dataSource,
  menuActionConfig,