Merge branch 'main' of https://github.com/ScottLogic/finos-vuu into V…

…UU-27-remote-layout-management
ScottLogic · Oct 20, 2023 · 63ea32e · 63ea32e
2 parents 847f7c1 + e2bc781
commit 63ea32e
Show file tree

Hide file tree

Showing 143 changed files with 3,439 additions and 1,361 deletions.
diff --git a/vuu-ui/package-lock.json b/vuu-ui/package-lock.json
diff --git a/vuu-ui/packages/vuu-data/src/array-data-source/array-data-source.ts b/vuu-ui/packages/vuu-data/src/array-data-source/array-data-source.ts
@@ -297,7 +297,7 @@ export class ArrayDataSource
     return this.#config;
   }
 
-  set config(config: DataSourceConfig | undefined) {
+  set config(config: DataSourceConfig) {
     if (configChanged(this.#config, config)) {
       if (config) {
         const originalConfig = this.#config;

diff --git a/vuu-ui/packages/vuu-data/src/connection-manager.ts b/vuu-ui/packages/vuu-data/src/connection-manager.ts
@@ -75,6 +75,8 @@ const pendingRequests = new Map();
 
 type WorkerOptions = {
   protocol: WebSocketProtocol;
+  retryLimitDisconnect?: number;
+  retryLimitStartup?: number;
   url: string;
   token?: string;
   username: string | undefined;
@@ -89,6 +91,8 @@ type WorkerOptions = {
 const getWorker = async ({
   handleConnectionStatusChange,
   protocol,
+  retryLimitDisconnect,
+  retryLimitStartup,
   token = "",
   username,
   url,
@@ -120,6 +124,8 @@ const getWorker = async ({
           window.clearTimeout(timer);
           worker.postMessage({
             protocol,
+            retryLimitDisconnect,
+            retryLimitStartup,
             token,
             type: "connect",
             url,
@@ -274,6 +280,10 @@ export type ConnectOptions = {
   authToken?: string;
   username?: string;
   protocol?: WebSocketProtocol;
+  /** Max number of reconnect attempts in the event of unsuccessful websocket connection at startup */
+  retryLimitStartup?: number;
+  /** Max number of reconnect attempts in the event of a disconnected websocket connection */
+  retryLimitDisconnect?: number;
 };
 
 class _ConnectionManager extends EventEmitter<ConnectionEvents> {
@@ -284,6 +294,8 @@ class _ConnectionManager extends EventEmitter<ConnectionEvents> {
     authToken,
     username,
     protocol,
+    retryLimitDisconnect,
+    retryLimitStartup,
   }: ConnectOptions): Promise<ServerAPI> {
     // By passing handleMessageFromWorker here, we can get connection status
     //messages while we wait for worker to resolve.
@@ -292,6 +304,8 @@ class _ConnectionManager extends EventEmitter<ConnectionEvents> {
       url,
       token: authToken,
       username,
+      retryLimitDisconnect,
+      retryLimitStartup,
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       handleConnectionStatusChange: handleMessageFromWorker,
@@ -321,13 +335,17 @@ export const connectToServer = async ({
   protocol = undefined,
   authToken,
   username,
+  retryLimitDisconnect,
+  retryLimitStartup,
 }: ConnectOptions) => {
   try {
     const serverAPI = await ConnectionManager.connect({
       protocol,
       url,
       authToken,
       username,
+      retryLimitDisconnect,
+      retryLimitStartup,
     });
     resolveServer(serverAPI);
   } catch (err: unknown) {

diff --git a/vuu-ui/packages/vuu-data/src/data-source.ts b/vuu-ui/packages/vuu-data/src/data-source.ts
@@ -485,7 +485,7 @@ export interface DataSource extends EventEmitter<DataSourceEvents> {
   applyEdit: DataSourceEditHandler;
   closeTreeNode: (key: string, cascade?: boolean) => void;
   columns: string[];
-  config: DataSourceConfig | undefined;
+  config: DataSourceConfig;
   suspend?: () => void;
   resume?: () => void;
   enable?: () => void;

diff --git a/vuu-ui/packages/vuu-data/src/json-data-source.ts b/vuu-ui/packages/vuu-data/src/json-data-source.ts
@@ -25,7 +25,9 @@ import type {
   DataSourceEvents,
   SubscribeCallback,
   SubscribeProps,
+  WithFullConfig,
 } from "./data-source";
+import { vanillaConfig } from "./data-source";
 import {
   MenuRpcResponse,
   VuuUIMessageInRPCEditReject,
@@ -59,7 +61,7 @@ export class JsonDataSource
   private visibleRows: DataSourceRow[] = [];
 
   #aggregations: VuuAggregation[] = [];
-  #columns: string[] = [];
+  #config: WithFullConfig = vanillaConfig;
   #data: DataSourceRow[];
   #filter: DataSourceFilter = { filter: "" };
   #groupBy: VuuGroupBy = [];
@@ -100,7 +102,10 @@ export class JsonDataSource
       this.#aggregations = aggregations;
     }
     if (this.columnDescriptors) {
-      this.#columns = this.columnDescriptors.map((c) => c.name);
+      this.#config = {
+        ...this.#config,
+        columns: this.columnDescriptors.map((c) => c.name),
+      };
     }
     if (filter) {
       this.#filter = filter;
@@ -134,7 +139,10 @@ export class JsonDataSource
       this.#aggregations = aggregations;
     }
     if (columns) {
-      this.#columns = columns;
+      this.#config = {
+        ...this.#config,
+        columns,
+      };
     }
     if (filter) {
       this.#filter = filter;
@@ -162,7 +170,7 @@ export class JsonDataSource
       aggregations: this.#aggregations,
       type: "subscribed",
       clientViewportId: this.viewport,
-      columns: this.#columns,
+      columns: this.#config.columns,
       filter: this.#filter,
       groupBy: this.#groupBy,
       range: this.#range,
@@ -240,8 +248,6 @@ export class JsonDataSource
       size: this.visibleRows.length,
       type: "viewport-update",
     });
-
-    console.log(this.expandedRows);
   }
 
   closeTreeNode(key: string, cascade = false) {
@@ -258,7 +264,7 @@ export class JsonDataSource
   }
 
   get config() {
-    return undefined;
+    return this.#config;
   }
 
   get selectedRowsCount() {
@@ -295,12 +301,15 @@ export class JsonDataSource
   }
 
   get columns() {
-    return this.#columns;
+    return this.#config.columns;
   }
 
   set columns(columns: string[]) {
-    this.#columns = columns;
-    console.log(`ArrayDataSource setColumns ${columns.join(",")}`);
+    // TODO use setter
+    this.#config = {
+      ...this.#config,
+      columns,
+    };
   }
 
   get aggregations() {
@@ -327,7 +336,6 @@ export class JsonDataSource
   set filter(filter: DataSourceFilter) {
     // TODO should we wait until server ACK before we assign #sort ?
     this.#filter = filter;
-    console.log(`RemoteDataSource ${JSON.stringify(filter)}`);
   }
 
   get groupBy() {
@@ -402,9 +410,6 @@ export class JsonDataSource
       );
     }
 
-    const sections = rowKey.split("|").slice(1);
-    console.log({ sections, parentRow });
-
     return [];
   }
 

diff --git a/vuu-ui/packages/vuu-data/src/remote-data-source.ts b/vuu-ui/packages/vuu-data/src/remote-data-source.ts
@@ -371,7 +371,7 @@ export class RemoteDataSource
     return this.#config;
   }
 
-  set config(config: DataSourceConfig | undefined) {
+  set config(config: DataSourceConfig) {
     if (configChanged(this.#config, config)) {
       if (config) {
         const newConfig: DataSourceConfig =

diff --git a/vuu-ui/packages/vuu-data/src/vuuUIMessageTypes.ts b/vuu-ui/packages/vuu-data/src/vuuUIMessageTypes.ts
@@ -167,6 +167,8 @@ export interface VuuUIMessageOutConnect {
   token: string;
   url: string;
   username?: string;
+  retryLimitDisconnect?: number;
+  retryLimitStartup?: number;
 }
 
 export interface VuuUIMessageOutSubscribe extends ServerProxySubscribeMessage {