@vuu-ui/vuu-data-remote 3.3.1 → 3.3.3

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.1",
+  "version": "3.3.3",
   "main": "./src/index.js",
   "author": "heswell",
   "license": "Apache-2.0",
@@ -11,14 +11,14 @@
     "type-defs": "node ../../scripts/build-type-defs.mjs"
   },
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "3.3.1",
-    "@vuu-ui/vuu-table-types": "3.3.1",
-    "@vuu-ui/vuu-filter-types": "3.3.1",
-    "@vuu-ui/vuu-protocol-types": "3.3.1"
+    "@vuu-ui/vuu-data-types": "3.3.3",
+    "@vuu-ui/vuu-table-types": "3.3.3",
+    "@vuu-ui/vuu-filter-types": "3.3.3",
+    "@vuu-ui/vuu-protocol-types": "3.3.3"
   },
   "dependencies": {
-    "@vuu-ui/vuu-filter-parser": "3.3.1",
-    "@vuu-ui/vuu-utils": "3.3.1"
+    "@vuu-ui/vuu-filter-parser": "3.3.3",
+    "@vuu-ui/vuu-utils": "3.3.3"
   },
   "files": [
     "README.md",

package/src/VuuDataSource.js

@@ -1,4 +1,4 @@
-import { BaseDataSource, Range, StaleUpdateError, combineFilters, constrainRange, debounce, isConfigChanged, isRpcSuccess, isSelectSuccessWithRowCount, isViewportMenusAction, isVisualLinksAction, itemsOrOrderChanged, logger, throttle, uuid } from "@vuu-ui/vuu-utils";
+import { BaseDataSource, Range, StaleUpdateError, assertExpectedSessionTable, combineFilters, constrainRange, debounce, isConfigChanged, isRpcSuccess, isSelectSuccessWithRowCount, isViewportMenusAction, isVisualLinksAction, itemsOrOrderChanged, logger, sessionDataSourceConfig, throttle, uuid } from "@vuu-ui/vuu-utils";
 import ConnectionManager from "./ConnectionManager.js";
 import { isDataSourceConfigMessage } from "./data-source.js";
 const { info: info, infoEnabled: infoEnabled } = logger("VuuDataSource");
@@ -25,18 +25,21 @@ class VuuDataSource extends BaseDataSource {
     #menu;
     #optimize = "throttle";
     #selectedRowsCount = 0;
+    #session;
     #sessionDataSource = void 0;
     #sessionTableMessageColumn = void 0;
     #status = "initialising";
     #tableSchema;
+    isRemote = true;
     table;
-    constructor({ sessionTableMessageColumn, ...props }){
+    constructor({ session, sessionTableMessageColumn, ...props }){
         super(props);
         const { bufferSize = 100, table, visualLink } = props;
         if (!table) throw Error("RemoteDataSource constructor called without table");
         this.bufferSize = bufferSize;
         this.table = table;
         this.#pendingVisualLink = visualLink;
+        this.#session = session;
         this.#sessionTableMessageColumn = sessionTableMessageColumn;
         this.rangeRequest = this.rawRangeRequest;
         if (props.autosubscribeColumns) {
@@ -420,7 +423,7 @@ class VuuDataSource extends BaseDataSource {
     async remoteProcedureCall() {
         return Promise.reject();
     }
-    async createSessionDataSource(copyOption, sessionType = "edit") {
+    async createSessionDataSource(copyOption, sessionType = "edit", overrides) {
         const rpcResponse = await this?.rpcRequest?.({
             type: "RPC_REQUEST",
             rpcName: "createSessionTable",
@@ -431,8 +434,10 @@ class VuuDataSource extends BaseDataSource {
         });
         if (isRpcSuccess(rpcResponse)) {
             const { table: sessionTable } = rpcResponse.data;
+            const effectiveOverrides = overrides ?? this.#session;
+            assertExpectedSessionTable(sessionTable, effectiveOverrides?.table);
             return new VuuDataSource({
-                ...this.config,
+                ...sessionDataSourceConfig(this.config, effectiveOverrides?.columns),
                 table: sessionTable,
                 viewport: sessionTable.table
             });

package/types/VuuDataSource.d.ts

@@ -1,4 +1,4 @@
-import type { CopyOption, DataSourceBase, SessionType, DataSourceCallbackMessage, DataSourceConstructorProps, DataSourceStatus, DataSourceSubscribeCallback, DataSourceSubscribeProps, DeleteRowMode, EditSessionMode, OptimizeStrategy, TableSchema, WithBaseFilter, WithFullConfig } from "@vuu-ui/vuu-data-types";
+import type { CopyOption, DataSourceBase, SessionType, DataSourceCallbackMessage, DataSourceConstructorProps, DataSourceStatus, DataSourceSubscribeCallback, DataSourceSubscribeProps, DeleteRowMode, EditSessionMode, OptimizeStrategy, SessionDataSourceOverrides, TableSchema, WithBaseFilter, WithFullConfig } from "@vuu-ui/vuu-data-types";
 import type { MenuRpcResponse } from "@vuu-ui/vuu-data-types";
 import type { LinkDescriptorWithLabel, RpcResultError, RpcResultSuccess, SelectRequest, VuuGroupBy, VuuMenu, VuuRange, VuuRowDataItemType, VuuRpcMenuRequest, VuuRpcResponse, VuuRpcServiceRequest, VuuTable } from "@vuu-ui/vuu-protocol-types";
 import { BaseDataSource, Range } from "@vuu-ui/vuu-utils";
@@ -8,8 +8,9 @@ export declare class VuuDataSource extends BaseDataSource implements DataSourceB
     private bufferSize;
     private server;
     rangeRequest: RangeRequest;
+    readonly isRemote = true;
     table: VuuTable;
-    constructor({ sessionTableMessageColumn, ...props }: DataSourceConstructorProps);
+    constructor({ session, sessionTableMessageColumn, ...props }: DataSourceConstructorProps);
     subscribe(subscribeProps: DataSourceSubscribeProps, callback: DataSourceSubscribeCallback): Promise<void>;
     handleMessageFromServer: (message: DataSourceCallbackMessage) => void;
     handleSessionMessageFromServer: (msg: DataSourceCallbackMessage) => void;
@@ -57,7 +58,7 @@ export declare class VuuDataSource extends BaseDataSource implements DataSourceB
     get visualLink(): LinkDescriptorWithLabel | undefined;
     set visualLink(visualLink: LinkDescriptorWithLabel | undefined);
     remoteProcedureCall<T extends VuuRpcResponse = VuuRpcResponse>(): Promise<T>;
-    createSessionDataSource(copyOption: CopyOption, sessionType?: SessionType): Promise<VuuDataSource | undefined>;
+    createSessionDataSource(copyOption: CopyOption, sessionType?: SessionType, overrides?: SessionDataSourceOverrides): Promise<VuuDataSource | undefined>;
     beginEditSession(editSessionMode?: EditSessionMode): Promise<void>;
     editCell(key: string, column: string, data: VuuRowDataItemType): Promise<RpcResultSuccess | RpcResultError | undefined>;
     endEditSession(saveChanges?: boolean, force?: boolean): Promise<void>;