@vuu-ui/vuu-data-local 4.0.0-alpha.20 → 4.0.0-alpha.21

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.0.0-alpha.20",
+  "version": "4.0.0-alpha.21",
   "main": "./src/index.js",
   "author": "heswell",
   "type": "module",
@@ -11,14 +11,14 @@
     "type-defs": "node ../../scripts/build-type-defs.mjs"
   },
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "4.0.0-alpha.20",
-    "@vuu-ui/vuu-table-types": "4.0.0-alpha.20",
-    "@vuu-ui/vuu-filter-types": "4.0.0-alpha.20",
-    "@vuu-ui/vuu-protocol-types": "4.0.0-alpha.20"
+    "@vuu-ui/vuu-data-types": "4.0.0-alpha.21",
+    "@vuu-ui/vuu-table-types": "4.0.0-alpha.21",
+    "@vuu-ui/vuu-filter-types": "4.0.0-alpha.21",
+    "@vuu-ui/vuu-protocol-types": "4.0.0-alpha.21"
   },
   "dependencies": {
-    "@vuu-ui/vuu-filter-parser": "4.0.0-alpha.20",
-    "@vuu-ui/vuu-utils": "4.0.0-alpha.20"
+    "@vuu-ui/vuu-filter-parser": "4.0.0-alpha.21",
+    "@vuu-ui/vuu-utils": "4.0.0-alpha.21"
   },
   "sideEffects": false,
   "files": [

package/src/tree-data-source/TreeDataSource.js

@@ -1,39 +1,17 @@
 import { BaseDataSource, KeySet, NULL_RANGE, getParentRow, isSingleValueFilter, lastPathSegment, metadataKeys, missingAncestor, treeToDataSourceRows, uuid } from "@vuu-ui/vuu-utils";
 import { IconProvider } from "./IconProvider.js";
 import { parseFilter } from "@vuu-ui/vuu-filter-parser";
-const TREE_SCHEMA = {
-    columns: [
-        {
-            name: "nodeData",
-            serverDataType: "string"
-        },
-        {
-            name: "Level 1",
-            serverDataType: "string"
-        },
-        {
-            name: "Level 2",
-            serverDataType: "string"
-        },
-        {
-            name: "Level 3",
-            serverDataType: "string"
-        },
-        {
-            name: "Level 4",
-            serverDataType: "string"
-        },
-        {
-            name: "Level 5",
-            serverDataType: "string"
+const treeSchema = (columns)=>({
+        columns: columns.map(({ name })=>({
+                name,
+                serverDataType: "string"
+            })),
+        key: "",
+        table: {
+            module: "",
+            table: ""
         }
-    ],
-    key: "",
-    table: {
-        module: "",
-        table: ""
-    }
-};
+    });
 const { COUNT: COUNT, DEPTH: DEPTH, IDX: IDX, IS_EXPANDED: IS_EXPANDED, IS_LEAF: IS_LEAF, KEY: KEY, SELECTED: SELECTED } = metadataKeys;
 const toClientRow = (row, keys)=>{
     const [rowIndex] = row;
@@ -61,6 +39,8 @@ class TreeDataSource extends BaseDataSource {
         if (!data) throw Error("TreeDataSource constructor called without data");
         this.#iconProvider = new IconProvider();
         [this.columnDescriptors, this.#data] = treeToDataSourceRows(data, this.#iconProvider);
+        this.expandedRows = getInitiallyExpandedKeys(data);
+        console.table(this.#data);
         if (this.columnDescriptors) {
             const columns = this.columnDescriptors.map((c)=>c.name);
             this._configWithVisualLink = {
@@ -92,7 +72,7 @@ class TreeDataSource extends BaseDataSource {
             groupBy: this._configWithVisualLink.groupBy,
             range: this.range,
             sort: this.sort,
-            tableSchema: TREE_SCHEMA
+            tableSchema: treeSchema(this.columnDescriptors)
         });
         this.clientCallback({
             clientViewportId: this.viewport,
@@ -306,6 +286,14 @@ class TreeDataSource extends BaseDataSource {
         return this.visibleRows[rowIdx];
     }
 }
+const getInitiallyExpandedKeys = (treeSourceNodes, keyBase = "$root", expandedKeys = new Set())=>{
+    for (const { childNodes, expanded, label } of treeSourceNodes){
+        const key = `${keyBase}|${label}`;
+        if (expanded) expandedKeys.add(key);
+        if (childNodes) getInitiallyExpandedKeys(childNodes, key, expandedKeys);
+    }
+    return expandedKeys;
+};
 function getVisibleRows(rows, expandedKeys, filterset) {
     const visibleRows = [];
     const visibleRowIndex = {};