@vuu-ui/vuu-data-test 2.2.1 → 3.0.0-beta.1

package/cjs/core/module/VuuModule.js

@@ -2,7 +2,6 @@
 
 var vuuUtils = require('@vuu-ui/vuu-utils');
 var Table = require('../../Table.js');
-var SessionTable = require('../../SessionTable.js');
 var TickingArrayDataSource = require('../../TickingArrayDataSource.js');
 var RuntimeVisualLink = require('../../RuntimeVisualLink.js');
 var ModuleContainer = require('./ModuleContainer.js');
@@ -18,7 +17,7 @@ var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
-var _name, _sessionTableMessageColumn, _runtimeVisualLinks, _sessionTableMap, _tableServices, _subscriptionMap, _moduleServices, _moduleMenuServices;
+var _name, _sessionTableMessageColumn, _runtimeVisualLinks, _sessionSourceTableMap, _sessionTableMap, _tableServices, _subscriptionMap, _moduleServices, _moduleMenuServices;
 const assertUpdateIsValid = (schema, column, data) => {
   const col = schema.columns.find((col2) => col2.name === column);
   if (col) {
@@ -34,6 +33,7 @@ class VuuModule {
     __privateAdd(this, _name);
     __privateAdd(this, _sessionTableMessageColumn);
     __privateAdd(this, _runtimeVisualLinks, /* @__PURE__ */ new Map());
+    __privateAdd(this, _sessionSourceTableMap, {});
     __privateAdd(this, _sessionTableMap, {});
     __privateAdd(this, _tableServices);
     __privateAdd(this, _subscriptionMap, /* @__PURE__ */ new Map());
@@ -192,7 +192,6 @@ class VuuModule {
         menu: this.menus?.[tableName],
         rpcServices: this.getServices(tableName),
         rpcMenuServices: this.getMenuServices(tableName),
-        sessionTables: __privateGet(this, _sessionTableMap),
         viewport,
         visualLinkService: this.visualLinkService,
         vuuModule
@@ -202,7 +201,9 @@ class VuuModule {
       const existingSubscriptions = __privateGet(this, _subscriptionMap).get(tableName);
       const subscription = {
         viewportId: dataSource.viewport,
-        dataSource
+        dataSource,
+        sessionTableName: sessionTable ? tableName : void 0,
+        sourceTableName: __privateGet(this, _sessionSourceTableMap)[tableName]
       };
       if (existingSubscriptions) {
         existingSubscriptions.push(subscription);
@@ -218,11 +219,7 @@ class VuuModule {
         const sessionTable = this.getSessionTable(viewPortId, false);
         if (sessionTable) {
           if (mode === "soft") {
-            sessionTable.update(
-              key,
-              __privateGet(this, _sessionTableMessageColumn),
-              "SOFT_DELETED"
-            );
+            sessionTable.update(key, "vuu_action", "deleteRow");
           } else {
             sessionTable.delete(key);
           }
@@ -253,23 +250,20 @@ class VuuModule {
         const { viewPortId } = rpcRequest.context;
         const { mode = "soft" } = rpcRequest.params;
         const sessionTable = this.getSessionTable(viewPortId, false);
-        if (sessionTable && SessionTable.isProxySessionTable(sessionTable)) {
+        if (sessionTable) {
           const { dataSource } = this.getSubscriptionByViewport(viewPortId);
           const selectedRowIds = dataSource.getSelectedRowIds();
           const deletedKeys = [];
           if (selectedRowIds.length > 0) {
             for (const key of selectedRowIds) {
               if (mode === "soft") {
-                sessionTable.update(
-                  key,
-                  __privateGet(this, _sessionTableMessageColumn),
-                  "SOFT_DELETED"
-                );
+                sessionTable.update(key, "vuu_action", "deleteRow");
               } else {
                 sessionTable.delete(key);
               }
               deletedKeys.push(key);
             }
+            dataSource.select?.({ type: "DESELECT_ALL" });
           }
           return { type: "SUCCESS_RESULT", data: { deletedKeys } };
         }
@@ -288,34 +282,49 @@ class VuuModule {
         const { viewPortId } = rpcRequest.context;
         const { key } = rpcRequest.params;
         const sessionTable = this.getSessionTable(viewPortId, false);
-        if (sessionTable && SessionTable.isProxySessionTable(sessionTable)) {
-          const { dataSource } = this.getSubscriptionByViewport(viewPortId);
-          const sourceTable = this.tables[dataSource.table?.table];
+        if (sessionTable) {
+          const subscription = this.getSubscriptionByViewport(viewPortId);
+          const { dataSource } = subscription;
+          const sourceTableName = subscription.sourceTableName ?? dataSource.table?.table;
+          const sourceTable = this.tables[sourceTableName];
           if (!sourceTable) {
             return {
               type: "ERROR_RESULT",
               errorMessage: `undoRowChange: source table not found for viewport ${viewPortId}`
             };
           }
-          const sourceRow = sourceTable.findByKey(key);
-          if (!sourceRow) {
+          const sessionRow = sessionTable.findByKey(key);
+          if (!sessionRow) {
+            return {
+              type: "ERROR_RESULT",
+              errorMessage: `undoRowChange: session row not found for key ${key}`
+            };
+          }
+          const action = sessionRow[sessionTable.map.vuu_action];
+          if (action === "addRow") {
             sessionTable.delete(key);
             return { type: "SUCCESS_RESULT", data: { wasInsertedRow: true } };
           }
-          const updates = sessionTable.getSessionUpdates();
-          const rowUpdates = updates.get(key);
-          if (rowUpdates) {
-            for (const column of Object.keys(rowUpdates.cellUpdates)) {
-              const originalValue = sourceRow[sourceTable.map[column]];
-              sessionTable.update(key, column, originalValue);
+          if (action === "deleteRow" || action === "editCell") {
+            const sourceRow = sourceTable.findByKey(key);
+            if (!sourceRow) {
+              return {
+                type: "ERROR_RESULT",
+                errorMessage: `undoRowChange: source row not found for key ${key}`
+              };
+            }
+            const restoredRow = sessionRow.slice();
+            for (const column of sourceTable.schema.columns) {
+              restoredRow[sessionTable.map[column.name]] = sourceRow[sourceTable.map[column.name]];
             }
-            updates.delete(key);
+            sessionTable.updateRow(restoredRow);
+            sessionTable.update(key, "vuu_action", "");
           }
           return { type: "SUCCESS_RESULT", data: void 0 };
         }
         return {
           type: "ERROR_RESULT",
-          errorMessage: `undoRowChange: no active proxy session table for viewport ${viewPortId}`
+          errorMessage: `undoRowChange: no active session table for viewport ${viewPortId}`
         };
       }
       return {
@@ -327,7 +336,8 @@ class VuuModule {
       if (vuuUtils.isEditCellRpcRequest(rpcRequest)) {
         const { viewPortId } = rpcRequest.context;
         const { column, data, key } = rpcRequest.params;
-        let targetTable = __privateGet(this, _sessionTableMap)[viewPortId];
+        const sessionTable = __privateGet(this, _sessionTableMap)[viewPortId];
+        let targetTable = sessionTable;
         if (!targetTable) {
           const { dataSource } = this.getSubscriptionByViewport(viewPortId);
           if (dataSource.table) {
@@ -336,8 +346,15 @@ class VuuModule {
         }
         if (targetTable) {
           try {
+            const sessionRow = sessionTable?.findByKey(key);
+            if (sessionRow?.[sessionTable.map.vuu_action] === "deleteRow") {
+              throw Error("editCell: cannot edit a deleted row");
+            }
             assertUpdateIsValid(targetTable.schema, column, data);
             targetTable.update(key, column, data);
+            if (sessionTable && sessionTable.findByKey(key)?.[sessionTable.map.vuu_action] !== "addRow") {
+              sessionTable.update(key, "vuu_action", "editCell");
+            }
             return {
               type: "SUCCESS_RESULT",
               data: void 0
@@ -353,7 +370,7 @@ class VuuModule {
           throw Error("[VuuModule] editCell unable to find table for dataSource");
         }
       } else {
-        throw Error(`[VuuModule] editCell invalid rpc type`);
+        throw Error("[VuuModule] editCell invalid rpc type");
       }
     });
     __publicField(this, "beginEditSessionMenuHandler", async ({
@@ -424,11 +441,10 @@ class VuuModule {
                 sourceTable,
                 sessionTableName,
                 copyOption,
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
                 dataSource
               );
               __privateGet(this, _sessionTableMap)[sessionTableName] = sessionTable;
+              __privateGet(this, _sessionSourceTableMap)[sessionTableName] = vuuTable.table;
               subscription.sessionTableName = sessionTableName;
               return {
                 data: {
@@ -466,11 +482,10 @@ class VuuModule {
                 sourceTable,
                 sessionTableName,
                 editSessionMode,
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
                 dataSource
               );
               __privateGet(this, _sessionTableMap)[sessionTableName] = sessionTable;
+              __privateGet(this, _sessionSourceTableMap)[sessionTableName] = vuuTable.table;
               subscription.sessionTableName = sessionTableName;
               return {
                 data: {
@@ -491,7 +506,7 @@ class VuuModule {
           }
         }
       } else {
-        throw Error(`[VuuModule] endEditSession invalid rpc type`);
+        throw Error("[VuuModule] endEditSession invalid rpc type");
       }
       return {
         type: "ERROR_RESULT",
@@ -502,7 +517,8 @@ class VuuModule {
       if (vuuUtils.isAddRowRpcRequest(rpcRequest)) {
         const { viewPortId } = rpcRequest.context;
         const subscription = this.getSubscriptionByViewport(viewPortId);
-        const sessionTable = subscription.sessionTableName ? __privateGet(this, _sessionTableMap)[subscription.sessionTableName] : void 0;
+        const sessionTableName = subscription.sessionTableName ?? viewPortId;
+        const sessionTable = __privateGet(this, _sessionTableMap)[sessionTableName];
         if (!sessionTable) {
           return {
             type: "ERROR_RESULT",
@@ -513,6 +529,7 @@ class VuuModule {
         const columnMap = sessionTable.map;
         const columnCount = Object.keys(columnMap).length;
         const row = new Array(columnCount).fill("");
+        row[columnMap.vuu_action] = "addRow";
         for (const [col, idx] of Object.entries(columnMap)) {
           if (data[col] !== void 0) {
             row[idx] = data[col];
@@ -534,44 +551,53 @@ class VuuModule {
         const sessionTable = __privateGet(this, _sessionTableMap)[sessionTableName];
         const { dataSource } = subscription;
         if (dataSource.table) {
-          const sourceTable = this.tables[dataSource.table.table];
+          const sourceTableName = subscription.sourceTableName ?? dataSource.table.table;
+          const sourceTable = this.tables[sourceTableName];
           if (rpcRequest.params.save === true) {
             let rejectedCount = 0;
-            if (SessionTable.isProxySessionTable(sessionTable)) {
-              const updates = sessionTable.getSessionUpdates();
-              updates.forEach((rowUpdates, key) => {
-                const { cellUpdates, lastUpdateTimestamp } = rowUpdates;
-                const currentRow = sourceTable.findByKey(key);
-                const lastUpdateTimestampOnTable = currentRow[sourceTable.map.vuuUpdatedTimestamp];
-                if (lastUpdateTimestamp !== lastUpdateTimestampOnTable) {
-                  rejectedCount += 1;
-                  const sessionTableRow = sessionTable.findByKey(key);
-                  const newRow = sessionTableRow.slice();
-                  const messages = [];
-                  Object.entries(cellUpdates).forEach(([column, value]) => {
-                    messages.push(`${column}:${value}`);
-                  });
-                  newRow[sessionTable.map[__privateGet(this, _sessionTableMessageColumn)]] = messages.join(",");
-                  sessionTable.updateRow(newRow);
-                } else {
-                  const newRow = currentRow.slice();
-                  Object.entries(cellUpdates).forEach(([column, value]) => {
-                    newRow[sourceTable.map[column]] = value;
-                  });
-                  sourceTable.updateRow(newRow);
+            const vuuMsgIdx = sessionTable.map[__privateGet(this, _sessionTableMessageColumn)];
+            const actionIdx = sessionTable.map.vuu_action;
+            const sessionTimestampIdx = sessionTable.map.vuuUpdatedTimestamp;
+            const sourceTimestampIdx = sourceTable.map.vuuUpdatedTimestamp;
+            const sourceColumns = sourceTable.schema.columns;
+            for (let i = 0; i < sessionTable.data.length; i++) {
+              const sessionRow = sessionTable.data[i];
+              const key = String(
+                sessionRow[sessionTable.map[sourceTable.schema.key]]
+              );
+              const currentRow = sourceTable.findByKey(key);
+              const action = sessionRow[actionIdx];
+              if (action === "deleteRow") {
+                if (currentRow) {
+                  const sessionTimestamp = sessionRow[sessionTimestampIdx];
+                  const sourceTimestamp = currentRow[sourceTimestampIdx];
+                  if (typeof sessionTimestamp === "number" && typeof sourceTimestamp === "number" && sourceTimestamp > sessionTimestamp) {
+                    rejectedCount += 1;
+                    sessionTable.update(
+                      key,
+                      __privateGet(this, _sessionTableMessageColumn),
+                      "stale delete"
+                    );
+                  } else {
+                    sourceTable.delete(key);
+                  }
+                }
+                continue;
+              }
+              if (sessionRow[vuuMsgIdx]) continue;
+              if (action === "editCell" && currentRow) {
+                for (const column of sourceColumns) {
+                  const value = sessionRow[sessionTable.map[column.name]];
+                  if (currentRow[sourceTable.map[column.name]] !== value) {
+                    sourceTable.update(key, column.name, value);
+                  }
                 }
-              });
-              updates.clear();
-            } else {
-              const vuuMsgIdx = sessionTable.map[__privateGet(this, _sessionTableMessageColumn)];
-              const sourceColumns = sourceTable.schema.columns;
-              for (let i = 0; i < sessionTable.data.length; i++) {
-                const sessionRow = sessionTable.data[i];
-                if (sessionRow[vuuMsgIdx]) continue;
-                const sourceRow = sourceColumns.map(
-                  (col) => sessionRow[sessionTable.map[col.name]]
+              } else if (action === "addRow" && !currentRow) {
+                sourceTable.insert(
+                  sourceColumns.map(
+                    (column) => sessionRow[sessionTable.map[column.name]]
+                  )
                 );
-                sourceTable.insert(sourceRow);
               }
             }
             if (rejectedCount > 0) {
@@ -579,12 +605,11 @@ class VuuModule {
                 errorMessage: "stale update",
                 type: "ERROR_RESULT"
               };
-            } else {
-              return {
-                type: "SUCCESS_RESULT",
-                data: void 0
-              };
             }
+            return {
+              type: "SUCCESS_RESULT",
+              data: void 0
+            };
           } else {
             return {
               type: "SUCCESS_RESULT",
@@ -595,7 +620,7 @@ class VuuModule {
           throw Error("[VuuModule], exitEditMode");
         }
       } else {
-        throw Error(`[VuuModule] endEditSession invalid rpc type`);
+        throw Error("[VuuModule] endEditSession invalid rpc type");
       }
     });
     // Bulk-edit with input in session table
@@ -618,7 +643,7 @@ class VuuModule {
           data: void 0
         };
       } else {
-        throw Error(`[VuuModule] applyBulkEdits invalid rpc type`);
+        throw Error("[VuuModule] applyBulkEdits invalid rpc type");
       }
     });
     /**
@@ -749,7 +774,7 @@ class VuuModule {
       );
     }
   }
-  createSessionTable(sourceTable, sessionTableName, editSessionMode = "inline-all-rows", dataSource) {
+  createSessionTable(sourceTable, sessionTableName, editSessionMode, dataSource) {
     if (editSessionMode === "All" || editSessionMode.endsWith("all-rows")) {
       return this.createSessionTableWithAllRows(sourceTable, sessionTableName);
     } else if (editSessionMode === "Selected" || editSessionMode === "selected-rows") {
@@ -766,8 +791,13 @@ class VuuModule {
       );
     }
   }
-  createSessionTableWithAllRows(sourceTable, sessionTableName) {
-    return SessionTable.SessionTable(sourceTable, sessionTableName);
+  createSessionTableWithAllRows({ data, schema }, _sessionTableName) {
+    const sessionSchema = sessionTableUtils.sessionTableSchema(schema);
+    return new Table.Table(
+      sessionSchema,
+      data.map((row) => sessionTableUtils.sessionTableRow(row, schema)),
+      Table.buildDataColumnMapFromSchema(sessionSchema)
+    );
   }
   createEmptySessionTable({ schema }, sessionTableName) {
     const sessionSchema = sessionTableUtils.sessionTableSchema({
@@ -787,7 +817,7 @@ class VuuModule {
     for (let i = 0; i < selectedRowIds.length; i++) {
       for (let j = 0; j < data.length; j++) {
         if (data[j][keyIndex] === selectedRowIds[i]) {
-          sessionData.push(data[j]);
+          sessionData.push(sessionTableUtils.sessionTableRow(data[j], schema));
         }
       }
     }
@@ -802,6 +832,7 @@ class VuuModule {
 _name = new WeakMap();
 _sessionTableMessageColumn = new WeakMap();
 _runtimeVisualLinks = new WeakMap();
+_sessionSourceTableMap = new WeakMap();
 _sessionTableMap = new WeakMap();
 _tableServices = new WeakMap();
 _subscriptionMap = new WeakMap();