@vuu-ui/vuu-data-editing 3.3.1 → 3.3.2

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Shared data editing APIs and React components for VUU UI",
   "main": "./src/index.js",
   "author": "heswell",
@@ -12,13 +12,13 @@
   },
   "dependencies": {
     "@salt-ds/core": "1.54.1",
-    "@vuu-ui/vuu-ui-controls": "3.3.1",
-    "@vuu-ui/vuu-utils": "3.3.1"
+    "@vuu-ui/vuu-ui-controls": "3.3.2",
+    "@vuu-ui/vuu-utils": "3.3.2"
   },
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "3.3.1",
-    "@vuu-ui/vuu-protocol-types": "3.3.1",
-    "@vuu-ui/vuu-table-types": "3.3.1"
+    "@vuu-ui/vuu-data-types": "3.3.2",
+    "@vuu-ui/vuu-protocol-types": "3.3.2",
+    "@vuu-ui/vuu-table-types": "3.3.2"
   },
   "peerDependencies": {
     "react": "^19.2.3"

package/src/EditSession.js

@@ -363,17 +363,7 @@ class EditSession extends EventEmitter {
                     status: "active",
                     sessionDataSource
                 });
-                if (Object.keys(this.#rowDefaults).length > 0) {
-                    const schema = sessionDataSource.tableSchema;
-                    if (schema) {
-                        const columnNames = new Set(schema.columns.map((c)=>c.name));
-                        const unknown = Object.keys(this.#rowDefaults).filter((key)=>!columnNames.has(key));
-                        if (unknown.length > 0) {
-                            console.warn(`[EditSession] rowDefaults contains columns not in table schema, removing: ${unknown.join(", ")}`);
-                            for (const key of unknown)delete this.#rowDefaults[key];
-                        }
-                    }
-                }
+                this.reconcileWithSessionSchema();
                 return sessionDataSource;
             } catch (cause) {
                 const error = cause instanceof Error ? cause : new Error(String(cause));
@@ -386,6 +376,21 @@ class EditSession extends EventEmitter {
             }
         });
     }
+    reconcileWithSessionSchema() {
+        const sessionSchema = this.#sessionDataSource?.tableSchema;
+        if (void 0 === sessionSchema) return;
+        const columnNames = new Set(sessionSchema.columns.map((c)=>c.name));
+        const unknown = Object.keys(this.#rowDefaults).filter((key)=>!columnNames.has(key));
+        if (unknown.length > 0) {
+            console.warn(`[EditSession] rowDefaults contains columns not in table schema, removing: ${unknown.join(", ")}`);
+            for (const key of unknown)delete this.#rowDefaults[key];
+        }
+        const sourceKey = this.#sourceTableDataSource?.tableSchema?.key;
+        if (void 0 !== sourceKey && sourceKey !== sessionSchema.key) {
+            console.warn(`[EditSession] source table key '${sourceKey}' differs from session table key '${sessionSchema.key}', discarding pending edits`);
+            this.#clearEdits();
+        }
+    }
     get dataSource() {
         return this.#sessionDataSource ?? this.#sourceTableDataSource;
     }

package/src/useEditableTable.js

@@ -85,12 +85,16 @@ const useEditableTable = ({ columns, dataSource: dataSourceProp, deleteMode = "s
     ]);
     useEffect(()=>{
         if (!sessionDataSource) return void setSubscribedSessionDataSource(void 0);
-        const handleSubscribed = ()=>setSubscribedSessionDataSource(sessionDataSource);
+        const handleSubscribed = ()=>{
+            editSession.reconcileWithSessionSchema();
+            setSubscribedSessionDataSource(sessionDataSource);
+        };
         setSubscribedSessionDataSource(void 0);
         sessionDataSource.on("subscribed", handleSubscribed);
         if ("subscribed" === sessionDataSource.status && sessionDataSource.tableSchema) handleSubscribed();
         return ()=>sessionDataSource.removeListener("subscribed", handleSubscribed);
     }, [
+        editSession,
         sessionDataSource
     ]);
     useEffect(()=>{
@@ -127,10 +131,15 @@ const useEditableTable = ({ columns, dataSource: dataSourceProp, deleteMode = "s
     const canCancel = "active" === lifecycle.status || "error" === lifecycle.status && "end" === lifecycle.operation;
     const canSave = canCancel && ("dirty" === editState || "stale" === editState) && 0 === editSession.invalidCount;
     const isEditSessionReady = isEditMode && void 0 !== sessionDataSource && sessionDataSource === editSession.sessionDataSource && subscribedSessionDataSource === sessionDataSource && "subscribed" === sessionDataSource.status && void 0 !== sessionDataSource.tableSchema;
+    const editSchema = subscribedSessionDataSource?.tableSchema;
+    const viewSchema = sourceDataSource.tableSchema;
+    const columnsDiverge = void 0 !== editSchema && void 0 !== viewSchema && (editSchema.columns.length !== viewSchema.columns.length || editSchema.columns.some((column, index)=>column.name !== viewSchema.columns[index]?.name));
     return {
         canCancel,
         canSave,
+        columnsDiverge,
         dataSource,
+        editSchema,
         editSession,
         lifecycle,
         hasSelection: selectionCount > 0,

package/types/EditSession.d.ts

@@ -74,6 +74,11 @@ export declare class EditSession extends EventEmitter<EditSessionEvents> {
     isCellEdited(key: string, columnName: string): boolean;
     undoRowChange(key: string): Promise<void>;
     begin(copyOption?: CopyOption, sessionType?: SessionType): Promise<DataSource>;
+    /**
+     * Safe to call repeatedly - schema of a remote session table typically arrives
+     * after begin() resolves, so callers re-invoke this once 'subscribed' fires.
+     */
+    reconcileWithSessionSchema(): void;
     get dataSource(): EditApi<import("@vuu-ui/vuu-data-types").DataSourceRow<VuuRowDataItemType>> | undefined;
     get sessionDataSource(): DataSource | undefined;
     end(saveChanges?: boolean, force?: boolean): Promise<void>;

package/types/useEditableTable.d.ts

@@ -27,7 +27,9 @@ export interface EditableTableHookProps {
 export declare const useEditableTable: ({ columns, dataSource: dataSourceProp, deleteMode, editSessionApi, copyOption, isEditMode, onCancel, onSave, rowDefaults, table, }: EditableTableHookProps) => {
     canCancel: boolean;
     canSave: boolean;
+    columnsDiverge: boolean;
     dataSource: DataSource;
+    editSchema: import("@vuu-ui/vuu-data-types").TableSchema | undefined;
     editSession: EditSession;
     lifecycle: EditLifecycle;
     hasSelection: boolean;