wiring together calculated column pieces (#931)

* wiring together calculated column pieces * remove logging * re-enable all tests
finos · Oct 26, 2023 · 39cf5c0 · 39cf5c0
1 parent ba1c0af
commit 39cf5c0
Show file tree

Hide file tree

Showing 53 changed files with 757 additions and 2,777 deletions.
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
@@ -16,6 +16,8 @@ import {
   buildColumnMap,
   ColumnMap,
   EventEmitter,
+  getAddedItems,
+  getMissingItems,
   getSelectionStatus,
   KeySet,
   logger,
@@ -57,7 +59,6 @@ export interface ArrayDataSourceConstructorProps
   data: Array<VuuRowDataItemType[]>;
   rangeChangeRowset?: "delta" | "full";
 }
-
 const { debug } = logger("ArrayDataSource");
 
 const { RENDER_IDX, SELECTED } = metadataKeys;
@@ -148,6 +149,10 @@ export class ArrayDataSource
   }: ArrayDataSourceConstructorProps) {
     super();
 
+    console.log(`ArrayDataSource`, {
+      columnDescriptors,
+    });
+
     if (!data || !columnDescriptors) {
       throw Error(
         "ArrayDataSource constructor called without data or without columnDescriptors"
@@ -293,6 +298,10 @@ export class ArrayDataSource
     return this.processedData ?? this.#data;
   }
 
+  get table() {
+    return this.tableSchema.table;
+  }
+
   get config() {
     return this.#config;
   }
@@ -434,6 +443,17 @@ export class ArrayDataSource
   }
 
   set columns(columns: string[]) {
+    const addedColumns = getAddedItems(this.config.columns, columns);
+    if (addedColumns.length > 0) {
+      const columnsWithoutDescriptors = getMissingItems(
+        this.columnDescriptors,
+        addedColumns,
+        (col) => col.name
+      );
+      console.log(`columnsWithoutDescriptors`, {
+        columnsWithoutDescriptors,
+      });
+    }
     this.config = {
       ...this.#config,
       columns,

diff --git a/vuu-ui/packages/vuu-data/src/data-source.ts b/vuu-ui/packages/vuu-data/src/data-source.ts
@@ -212,7 +212,7 @@ const equivalentColumns: DataConfigPredicate = (
   (cols1 === undefined && cols2?.length === 0) ||
   (cols2 === undefined && cols1?.length === 0);
 
-const columnsChanged: DataConfigPredicate = (config, newConfig) => {
+export const columnsChanged: DataConfigPredicate = (config, newConfig) => {
   const { columns: cols1 } = config;
   const { columns: cols2 } = newConfig;
 
@@ -510,6 +510,7 @@ export interface DataSource extends EventEmitter<DataSourceEvents> {
     props: SubscribeProps,
     callback: SubscribeCallback
   ) => Promise<void>;
+  table?: VuuTable;
   title?: string;
   unsubscribe: () => void;
   viewport?: string;