Approvedpush 20240723 01

vuu-ui/packages/vuu-data-test/src/TickingArrayDataSource.ts

@@ -46,9 +46,11 @@ type DataSourceBroadcastSubscribeMessage = {
   targetId: string;
   targetColumn: string;
   sourceId: string;
+  sourceColumn?: string;
 };
 
 type DataSourceBroadcastSelectionMessage = {
+  sourceColumnName?: string;
   columnName: string;
   linkType: "subscribe-link-filter" | "subscribe-link-select";
   targetId: string;
@@ -65,6 +67,7 @@ const isMessageForSelf = (message: DataSourceBroadcastMessage, id: string) =>
   message.targetId === id;
 
 type LinkSubscription = {
+  sourceColumnName?: string;
   columnName: string;
   linkType: "subscribe-link-filter" | "subscribe-link-select";
 };
@@ -148,8 +151,9 @@ export class TickingArrayDataSource extends ArrayDataSource {
       this.#selectionLinkSubscribers?.size ?? 0;
     if (numberOfSelectionSubscribers > 0) {
       this.#selectionLinkSubscribers?.forEach(
-        ({ columnName, linkType }, targetId) => {
+        ({ sourceColumnName, columnName, linkType }, targetId) => {
           this.sendBroadcastMessage({
+            sourceColumnName,
             columnName,
             linkType,
             sourceId: this.viewport,
@@ -320,6 +324,7 @@ export class TickingArrayDataSource extends ArrayDataSource {
               LinkSubscription
             >());
           subscribers.set(message.sourceId, {
+            sourceColumnName: message.sourceColumn,
             columnName: message.targetColumn,
             linkType: message.type,
           });
@@ -328,7 +333,8 @@ export class TickingArrayDataSource extends ArrayDataSource {
 
       case "selection-changed":
         {
-          const { columnName, linkType, selectedValues } = message;
+          const { sourceColumnName, columnName, linkType, selectedValues } =
+            message;
           const selectedIndices = [];
           const colIndex = this.columnMap[columnName];
           if (linkType === "subscribe-link-select") {
@@ -341,7 +347,9 @@ export class TickingArrayDataSource extends ArrayDataSource {
             this.select(selectedIndices);
           } else {
             this.filter = {
-              filter: `${columnName} in ["${selectedValues.join('","')}"]`,
+              filter: `${sourceColumnName} in ["${selectedValues.join(
+                '","'
+              )}"]`,
             };
           }
         }
@@ -351,4 +359,24 @@ export class TickingArrayDataSource extends ArrayDataSource {
         console.log(`unrecognised message ${message.type}`);
     }
   };
+
+  set visualLink(visualLink: LinkDescriptorWithLabel | undefined) {
+    if (visualLink) {
+      const {
+        parentClientVpId,
+        link: { fromColumn, toColumn },
+      } = visualLink;
+
+      if (this.viewport) {
+        console.log("tables linked");
+        this.sendBroadcastMessage({
+          sourceId: this.viewport,
+          sourceColumn: fromColumn,
+          type: "subscribe-link-filter",
+          targetId: parentClientVpId,
+          targetColumn: toColumn,
+        });
+      }
+    }
+  }
 }

vuu-ui/packages/vuu-data-test/src/VuuModule.ts

@@ -1,19 +1,19 @@
 import {
   DataSource,
   DataSourceRow,
-  DataSourceSubscribedMessage,
   OpenDialogActionWithSchema,
   SuggestionFetcher,
   TableSchema,
 } from "@finos/vuu-data-types";
 import {
   ClientToServerMenuRPC,
   ClientToServerViewportRpcCall,
-  LinkDescriptorWithLabel,
   TypeaheadParams,
   VuuMenu,
   VuuRowDataItemType,
   VuuTable,
+  VuuLink,
+  LinkDescriptorWithLabel,
 } from "@finos/vuu-protocol-types";
 import { uuid } from "@finos/vuu-utils";
 import { Table, buildDataColumnMapFromSchema } from "./Table";
@@ -31,7 +31,7 @@ export interface VuuModuleConstructorProps<T extends string = string> {
   schemas: Record<T, Readonly<TableSchema>>;
   services?: Record<T, RpcService[] | undefined>;
   tables: Record<T, Table>;
-  visualLinks?: Record<T, LinkDescriptorWithLabel[] | undefined>;
+  vuuLinks?: Record<T, VuuLink[] | undefined>;
 }
 
 export type SessionTableMap = Record<string, Table>;
@@ -63,22 +63,27 @@ export type RpcService = {
   service: (rpcRequest: RpcServiceRequest) => Promise<unknown>;
 };
 
+type Subscription = {
+  viewportId: string;
+  dataSource: DataSource;
+};
 export class VuuModule<T extends string = string> implements IVuuModule<T> {
   #menus: Record<T, VuuMenu | undefined> | undefined;
   #name: string;
   #schemas: Record<T, Readonly<TableSchema>>;
   #sessionTableMap: SessionTableMap = {};
   #tables: Record<T, Table>;
   #tableServices: Record<T, RpcService[] | undefined> | undefined;
-  #visualLinks: Record<T, LinkDescriptorWithLabel[] | undefined> | undefined;
+  #visualLinks: Record<T, VuuLink[] | undefined> | undefined;
+  #subscriptionMap: Map<string, Subscription[]> = new Map();
 
   constructor({
     menus,
     name,
     schemas,
     services,
     tables,
-    visualLinks,
+    vuuLinks: visualLinks,
   }: VuuModuleConstructorProps<T>) {
     this.#menus = menus;
     this.#name = name;
@@ -88,19 +93,54 @@ export class VuuModule<T extends string = string> implements IVuuModule<T> {
     this.#visualLinks = visualLinks;
   }
 
-  private registerViewport = (
-    subscriptionDetails: DataSourceSubscribedMessage
-  ) => {
-    console.log("<subscription-open> register new viewport", {
-      subscriptionDetails,
-    });
-  };
-
   private unregisterViewport = (viewportId: string) => {
     console.log(`<subscription-closed> unregister viewport ${viewportId}`);
+
+    for (const [tableName, subscriptions] of this.#subscriptionMap) {
+      if (subscriptions[0].viewportId.toString() === viewportId) {
+        this.#subscriptionMap.delete(tableName);
+      } else {
+        const links = subscriptions[0].dataSource.links;
+        if (links) {
+          for (let i = 0; i < links?.length; i++) {
+            if (links[i].parentClientVpId === viewportId) {
+              links.splice(i);
+            }
+          }
+        }
+        subscriptions[0].dataSource.links = links;
+      }
+    }
+  };
+
+  getLink = (
+    subscriptionMap: Map<string, Subscription[]>,
+    vuuLinks: VuuLink[]
+  ) => {
+    const visualLinks: LinkDescriptorWithLabel[] = [];
+    for (let i = 0; i < vuuLinks.length; i++) {
+      if (subscriptionMap.get(vuuLinks[i].toTable)) {
+        const newLink: LinkDescriptorWithLabel = {
+          parentClientVpId: subscriptionMap.get(vuuLinks[i].toTable)?.[0]
+            .viewportId as string,
+          parentVpId: subscriptionMap.get(vuuLinks[i].toTable)?.[0]
+            .viewportId as string,
+          link: vuuLinks[i],
+        };
+        visualLinks.push(newLink);
+      }
+    }
+    return visualLinks;
   };
 
   createDataSource = (tableName: T) => {
+    const visualLinks =
+      this.#visualLinks?.[tableName] === undefined
+        ? undefined
+        : this.getLink(
+            this.#subscriptionMap,
+            this.#visualLinks[tableName] as VuuLink[]
+          );
     const columnDescriptors = this.getColumnDescriptors(tableName);
     const dataSource = new TickingArrayDataSource({
       columnDescriptors,
@@ -112,12 +152,28 @@ export class VuuModule<T extends string = string> implements IVuuModule<T> {
       menu: this.#menus?.[tableName],
       rpcServices: this.getServices(tableName),
       sessionTables: this.#sessionTableMap,
-      visualLinks: this.#visualLinks?.[tableName],
+      visualLinks,
     });
 
-    dataSource.on("subscribed", this.registerViewport);
     dataSource.on("unsubscribed", this.unregisterViewport);
 
+    this.#subscriptionMap.set(tableName, [
+      { viewportId: dataSource.viewport, dataSource },
+    ]);
+
+    for (const key of this.#subscriptionMap.keys()) {
+      if (this.#visualLinks?.[key as T] && key !== tableName) {
+        const vLink = this.getLink(
+          this.#subscriptionMap,
+          this.#visualLinks?.[key as T] as VuuLink[]
+        );
+        const ds = this.#subscriptionMap.get(key)?.[0].dataSource;
+        if (ds?.links) {
+          ds.links = vLink;
+        }
+      }
+    }
+
     return dataSource;
   };
 

vuu-ui/packages/vuu-data-test/src/basket/basket-module.ts

@@ -1,5 +1,5 @@
 import {
-  LinkDescriptorWithLabel,
+  VuuLink,
   VuuMenu,
   VuuRowDataItemType,
 } from "@finos/vuu-protocol-types";
@@ -212,13 +212,12 @@ export const tables: Record<BasketsTableName, Table> = {
   ),
 };
 
-const visualLinks: Record<
-  BasketsTableName,
-  LinkDescriptorWithLabel[] | undefined
-> = {
+const vuuLinks: Record<BasketsTableName, VuuLink[] | undefined> = {
   algoType: undefined,
   basket: undefined,
-  basketConstituent: undefined,
+  basketConstituent: [
+    { fromColumn: "basketId", toColumn: "id", toTable: "basket" },
+  ],
   basketTrading: undefined,
   basketTradingConstituent: undefined,
   basketTradingConstituentJoin: undefined,
@@ -280,5 +279,5 @@ export const basketModule = new VuuModule<BasketsTableName>({
   schemas,
   services,
   tables,
-  visualLinks,
+  vuuLinks,
 });

vuu-ui/packages/vuu-data-test/src/simul/simul-module.ts

@@ -1,7 +1,7 @@
 import {
   ClientToServerMenuRowRPC,
-  LinkDescriptorWithLabel,
   ShowNotificationAction,
+  VuuLink,
   VuuMenu,
 } from "@finos/vuu-protocol-types";
 import { Table, buildDataColumnMap, joinTables } from "../Table";
@@ -46,10 +46,7 @@ const tables: Record<SimulTableName, Table> = {
   prices: pricesTable,
 };
 
-const visualLinks: Record<
-  SimulTableName,
-  LinkDescriptorWithLabel[] | undefined
-> = {
+const vuuLinks: Record<SimulTableName, VuuLink[] | undefined> = {
   ...undefinedTables,
 };
 
@@ -131,5 +128,5 @@ export const simulModule = new VuuModule<SimulTableName>({
   schemas,
   services,
   tables,
-  visualLinks,
+  vuuLinks,
 });