@genesislcap/grid-pro 14.183.2 → 14.183.3

package/dist/custom-elements.json

@@ -8204,6 +8204,20 @@
                 "text": "SocketObservable<FilteredDataServerResult>"
               }
             },
+            {
+              "kind": "field",
+              "name": "dataserverStreamSubscription",
+              "type": {
+                "text": "SocketSubscription"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "createDataserverStreamFunc",
+              "type": {
+                "text": "(\n    existingParams?: any,\n  ) => Promise<SocketObservable<FilteredDataServerResult>>"
+              }
+            },
             {
               "kind": "field",
               "name": "resourceName",
@@ -8329,6 +8343,25 @@
                 }
               ]
             },
+            {
+              "kind": "method",
+              "name": "applyServerSideData",
+              "privacy": "private",
+              "parameters": [
+                {
+                  "name": "params",
+                  "type": {
+                    "text": "IServerSideGetRowsParams"
+                  }
+                },
+                {
+                  "name": "result",
+                  "type": {
+                    "text": "RawDataServerResult"
+                  }
+                }
+              ]
+            },
             {
               "kind": "method",
               "name": "sortMapByNumericKey",
@@ -8353,7 +8386,11 @@
             },
             {
               "kind": "method",
-              "name": "restartSubscription",
+              "name": "deinit"
+            },
+            {
+              "kind": "method",
+              "name": "refreshDatasource",
               "privacy": "private",
               "return": {
                 "type": {

package/dist/dts/datasource/server-side.datasource.d.ts

@@ -1,5 +1,5 @@
 import type { IServerSideDatasource, IServerSideGetRowsParams, IServerSideRowModel, RowDataTransaction, ServerSideTransactionResult } from '@ag-grid-community/core';
-import { Auth, Connect, FilteredDataServerResult, MetadataDetail, SocketObservable } from '@genesislcap/foundation-comms';
+import { Auth, Connect, FilteredDataServerResult, MetadataDetail, SocketObservable, SocketSubscription } from '@genesislcap/foundation-comms';
 import { GridProBaseDatasource, StreamBaseDatasource } from './base.datasource';
 /**
  * Type definition for configuration options used for streams.
@@ -8,7 +8,7 @@ import { GridProBaseDatasource, StreamBaseDatasource } from './base.datasource';
  * @alpha
  */
 export type StreamDatasourceOptions = {
-    stream: SocketObservable<FilteredDataServerResult>;
+    createDataserverStreamFunc: (existingParams?: any) => Promise<SocketObservable<FilteredDataServerResult>>;
     resourceName: string;
     resourceParams?: any;
     resourceIndexes?: Map<string, [string]>;
@@ -26,6 +26,8 @@ export declare class StreamDatasource extends StreamBaseDatasource implements IS
     auth: Auth;
     connect: Connect;
     dataserverStream: SocketObservable<FilteredDataServerResult>;
+    dataserverStreamSubscription: SocketSubscription;
+    createDataserverStreamFunc: (existingParams?: any) => Promise<SocketObservable<FilteredDataServerResult>>;
     private resourceName;
     resourceParams: any;
     private resourceIndexes;
@@ -52,9 +54,11 @@ export declare class StreamDatasource extends StreamBaseDatasource implements IS
     private currentSortModel;
     constructor(options: StreamDatasourceOptions);
     getRows(params: IServerSideGetRowsParams): Promise<void>;
+    private applyServerSideData;
     private sortMapByNumericKey;
     dataLogoff(): Promise<void>;
-    private restartSubscription;
+    deinit(): Promise<void>;
+    private refreshDatasource;
     private getOrderByAndToBeSortedColIds;
     private handleCurrentStreamLoad;
     private buildCriteriaMatchFromFilters;
@@ -245,11 +249,6 @@ declare const GridProServerSideDatasource_base: (new (...args: any[]) => {
     ariaReadOnly: string;
     ariaRequired: string;
     ariaRoleDescription: string;
-    /**
-     * A Genesis Datasource element, for server-side | SSRM-compatible data fetching and used exclusively by the GridPro element.
-     * @remarks Only supports Server-Side Row Model. Requires `@ag-grid-enterprise/server-side-row-model` setup and valid AG Grid Enterprise license.
-     * @alpha
-     */
     ariaRowCount: string;
     ariaRowIndex: string;
     ariaRowIndexText: string;

package/dist/dts/datasource/server-side.datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-side.datasource.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.datasource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-side.datasource.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.datasource.ts"],"names":[],"mappings":"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"}

package/dist/esm/datasource/server-side.datasource.js

@@ -26,7 +26,7 @@ export class StreamDatasource extends StreamBaseDatasource {
         this.moreRows = false;
         this.calculatedRowsCount = 0;
         this.lastSequenceId = 0;
-        this.dataserverStream = options.stream;
+        this.createDataserverStreamFunc = options.createDataserverStreamFunc;
         this.resourceName = options.resourceName;
         this.resourceParams = options.resourceParams;
         this.originalCriteriaMatch = options.resourceParams.CRITERIA_MATCH;
@@ -38,7 +38,7 @@ export class StreamDatasource extends StreamBaseDatasource {
         this.pagination = options.pagination;
     }
     getRows(params) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const filterModelBeingApplied = params.request.filterModel;
             const filtersAreBeingApplied = Object.keys(filterModelBeingApplied).length > 0;
@@ -48,28 +48,29 @@ export class StreamDatasource extends StreamBaseDatasource {
                 if (filtersAreGettingCleaned && this.currentFilterModel) {
                     this.currentFilterModel = null;
                     this.resourceParams.CRITERIA_MATCH = this.originalCriteriaMatch;
-                    yield this.restartSubscription(params);
+                    yield this.refreshDatasource(params);
                     return;
                 }
                 else if (filterModelBeingAppliedDiffersFromCurrent && filtersAreBeingApplied) {
                     this.currentFilterModel = filterModelBeingApplied;
                     this.resourceParams.CRITERIA_MATCH = this.buildCriteriaMatchFromFilters();
-                    yield this.restartSubscription(params);
+                    yield this.refreshDatasource(params);
                     return;
                 }
             }
             const toBeAppliedSortModel = params.request.sortModel;
-            if (toBeAppliedSortModel.length !== ((_a = this.currentSortModel) === null || _a === void 0 ? void 0 : _a.length) ||
+            if (((_a = this.currentSortModel) === null || _a === void 0 ? void 0 : _a.length) !== toBeAppliedSortModel.length ||
                 toBeAppliedSortModel.length > 0) {
                 if (toBeAppliedSortModel.length === 0 && this.currentSortModel) {
                     this.calculatedRowsCount = 0;
                     this.currentSortModel = null;
                     this.resourceParams.ORDER_BY = null;
                     this.resourceParams.REVERSE = null;
-                    yield this.restartSubscription(params);
+                    yield this.refreshDatasource(params);
                     return;
                 }
                 else if (toBeAppliedSortModel.length > 0) {
+                    this.currentSortModel = toBeAppliedSortModel;
                     const coldIdBeingSorted = toBeAppliedSortModel[0].colId; // Not allowing multiple sorts by user
                     const sortTypeBeingApplied = toBeAppliedSortModel[0].sort;
                     const orderByAndToBeSortedColIds = this.getOrderByAndToBeSortedColIds(this.resourceIndexes, coldIdBeingSorted);
@@ -80,15 +81,13 @@ export class StreamDatasource extends StreamBaseDatasource {
                         logger.warn('The FIELD/column (${coldIdBeingSorted}) being sorted is not part of an INDEX, required for the [orderBy] operation. See https://learn.genesis.global/docs/database/data-types/index-entities/');
                         logger.debug('Available indexes:', availableIndexes);
                         logger.debug('Columns that can be sorted with the available indexes:', availableIndexFields);
-                        (_b = params.api) === null || _b === void 0 ? void 0 : _b.refreshServerSide({ purge: true });
                         params.fail();
                         return;
                     }
                     else if (JSON.stringify(toBeAppliedSortModel) !== JSON.stringify(this.currentSortModel)) {
-                        this.currentSortModel = toBeAppliedSortModel;
                         this.resourceParams.ORDER_BY = orderByAndToBeSortedColIds.orderBy;
                         this.resourceParams.REVERSE = sortTypeBeingApplied === 'desc' ? true : false;
-                        yield this.restartSubscription(params);
+                        yield this.refreshDatasource(params);
                         return;
                     }
                 }
@@ -96,55 +95,62 @@ export class StreamDatasource extends StreamBaseDatasource {
             if (this.moreRows && params.request.startRow >= Number(this.maxRows)) {
                 this.connect.getMoreRows(this.streamSourceRef);
             }
-            this.dataserverStream.pipe(take(1)).subscribe((result) => {
-                var _a;
-                const messageType = result.MESSAGE_TYPE;
-                if (messageType &&
-                    (messageType === MessageType.LOGOFF_ACK || messageType === MessageType.MSG_NACK)) {
-                    params.fail();
-                    return;
-                }
-                this.moreRows = result.MORE_ROWS;
-                if (result.ROW) {
-                    const nextMessage = dataServerResultFilter(result);
-                    this.handleCurrentStreamLoad(nextMessage);
-                }
-                else {
-                    this.rowData = new Map();
-                    const successRowData = { rowData: [] };
-                    successRowData.rowCount = 0;
-                    params.success(successRowData);
-                    return;
-                }
-                this.lastSequenceId = result.SEQUENCE_ID;
-                if (this.lastSequenceId === 1) {
-                    this.streamSourceRef = result.SOURCE_REF;
-                    this.server_ROWS_COUNT = (_a = result.ROWS_COUNT) !== null && _a !== void 0 ? _a : this.rowData.size;
-                }
-                const successRowData = {
-                    rowData: Array.from(this.sortMapByNumericKey(this.rowData).values()),
-                    rowCount: this.pagination && !this.resourceParams.CRITERIA_MATCH
-                        ? Math.min(this.server_ROWS_COUNT, this.maxView)
-                        : undefined,
-                };
-                this.calculatedRowsCount = this.client_ROWS_COUNT;
-                if (this.calculatedRowsCount === 0) {
-                    this.calculatedRowsCount = params.request.endRow;
-                }
-                if (params.request.endRow > this.maxView ||
-                    params.request.endRow > this.calculatedRowsCount) {
-                    successRowData.rowCount = this.calculatedRowsCount;
-                }
-                else if (params.request.endRow === this.server_ROWS_COUNT) {
-                    successRowData.rowCount = this.server_ROWS_COUNT;
-                }
-                else if (!this.moreRows && this.server_ROWS_COUNT > this.calculatedRowsCount) {
-                    successRowData.rowCount = this.calculatedRowsCount;
-                }
-                params.success(successRowData);
+            if (!this.dataserverStream) {
+                this.dataserverStream = yield this.createDataserverStreamFunc(this.resourceParams);
+            }
+            this.dataserverStreamSubscription = this.dataserverStream
+                .pipe(take(1))
+                .subscribe((dataserverResult) => {
+                this.applyServerSideData(params, dataserverResult);
             });
         });
     }
+    applyServerSideData(params, result) {
+        var _a;
+        const messageType = result.MESSAGE_TYPE;
+        if (messageType &&
+            (messageType === MessageType.LOGOFF_ACK || messageType === MessageType.MSG_NACK)) {
+            params.fail();
+            return;
+        }
+        this.moreRows = result.MORE_ROWS;
+        if (result.ROW) {
+            const nextMessage = dataServerResultFilter(result);
+            this.handleCurrentStreamLoad(nextMessage);
+        }
+        else {
+            this.rowData = new Map();
+            const successRowData = { rowData: [] };
+            successRowData.rowCount = 0;
+            params.success(successRowData);
+            return;
+        }
+        this.lastSequenceId = result.SEQUENCE_ID;
+        if (this.lastSequenceId === 1) {
+            this.streamSourceRef = result.SOURCE_REF;
+            this.server_ROWS_COUNT = (_a = result.ROWS_COUNT) !== null && _a !== void 0 ? _a : this.rowData.size;
+        }
+        const successRowData = {
+            rowData: Array.from(this.sortMapByNumericKey(this.rowData).values()),
+            rowCount: this.pagination && !this.resourceParams.CRITERIA_MATCH
+                ? Math.min(this.server_ROWS_COUNT, this.maxView)
+                : undefined,
+        };
+        this.calculatedRowsCount = this.client_ROWS_COUNT;
+        if (this.calculatedRowsCount === 0) {
+            this.calculatedRowsCount = params.request.endRow;
+        }
+        if (params.request.endRow > this.maxView || params.request.endRow > this.calculatedRowsCount) {
+            successRowData.rowCount = this.calculatedRowsCount;
+        }
+        else if (params.request.endRow === this.server_ROWS_COUNT) {
+            successRowData.rowCount = this.server_ROWS_COUNT;
+        }
+        else if (!this.moreRows && this.server_ROWS_COUNT > this.calculatedRowsCount) {
+            successRowData.rowCount = this.calculatedRowsCount;
+        }
+        params.success(successRowData);
+    }
     sortMapByNumericKey(inputMap) {
         // Convert Map to array of key-value pairs
         const sortedArray = Array.from(inputMap.entries()).sort(([key1], [key2]) => +key2 - +key1);
@@ -161,16 +167,23 @@ export class StreamDatasource extends StreamBaseDatasource {
             this.streamSourceRef = undefined;
         });
     }
-    restartSubscription(params) {
+    deinit() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.dataLogoff();
             this.rowData = new Map();
             this.client_ROWS_COUNT = 0;
-            const streamOnMessage = (message) => message;
-            const onError = (error) => logger.error(error);
+            this.calculatedRowsCount = 0;
+            this.server_ROWS_COUNT = 0;
             this.dataserverStream = undefined;
-            this.dataserverStream = this.connect.stream(this.resourceName, streamOnMessage, onError, this.resourceParams);
+            (_a = this.dataserverStreamSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+            this.dataserverStreamSubscription = undefined;
+            yield this.dataLogoff();
+        });
+    }
+    refreshDatasource(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.deinit();
             (_a = params.api) === null || _a === void 0 ? void 0 : _a.refreshServerSide({ purge: true });
             params.fail();
         });
@@ -342,6 +355,7 @@ let GridProServerSideDatasource = class GridProServerSideDatasource extends Life
     deinit() {
         var _a;
         this.clearRowData();
+        this.ssrmDatasource.deinit();
         this.ssrmDatasource = undefined;
         this.originalFieldDef = undefined;
         (_a = this.agGrid.gridApi) === null || _a === void 0 ? void 0 : _a.refreshServerSide({ purge: true });
@@ -361,7 +375,7 @@ let GridProServerSideDatasource = class GridProServerSideDatasource extends Life
                 }, cacheBlockSize: this.maxRows, defaultColDef: {
                     filter: true,
                     resizable: true,
-                    sortable: true,
+                    sortable: false,
                 }, pagination: this.pagination, paginationPageSize: this.maxRows, rowBuffer: 0, rowModelType: 'serverSide', suppressServerSideInfiniteScroll: false, suppressMultiSort: true, onFilterChanged: (params) => { }, onSortChanged: (params) => { } }, this.deferredGridOptions);
             this.agGrid.addEventListener('onGridReady', () => __awaiter(this, void 0, void 0, function* () {
                 const meta = yield this.connect
@@ -374,9 +388,8 @@ let GridProServerSideDatasource = class GridProServerSideDatasource extends Life
                 const fieldMetadata = toFieldMetadata(this.originalFieldDef);
                 const agColumnDefs = yield this.getAgColumnDefs(fieldMetadata);
                 this.agGrid.gridApi.setColumnDefs(agColumnDefs);
-                const dataserverStream = yield this.createDataserverStream();
                 this.ssrmDatasource = new StreamDatasource({
-                    stream: dataserverStream,
+                    createDataserverStreamFunc: this.createDataserverStream.bind(this),
                     resourceName: this.resourceName,
                     resourceParams: this.params,
                     resourceIndexes: this.indexes,
@@ -447,6 +460,9 @@ let GridProServerSideDatasource = class GridProServerSideDatasource extends Life
                 var _a;
                 const messageType = message.MESSAGE_TYPE;
                 if (messageType === MessageType.QUERY_UPDATE && message.ROW) {
+                    if (!this.ssrmDatasource) {
+                        return;
+                    }
                     const nextMessage = dataServerResultFilter(message);
                     this.agTransaction = { add: [], remove: [], update: [] };
                     this.handleStreamInserts(nextMessage.inserts);
@@ -467,7 +483,9 @@ let GridProServerSideDatasource = class GridProServerSideDatasource extends Life
                 }
             });
             const onError = (error) => logger.error(error);
-            return this.connect.stream(this.resourceName, streamOnMessage, onError, existingParams !== null && existingParams !== void 0 ? existingParams : this.params);
+            return this.connect.streamWithoutAutoTeardown(this.resourceName, (message) => {
+                streamOnMessage(message);
+            }, onError, existingParams !== null && existingParams !== void 0 ? existingParams : this.params);
         });
     }
     handleStreamDeletesTemp(deletes) {

package/dist/grid-pro.d.ts

@@ -45,6 +45,7 @@ import type { ServerSideTransaction } from '@ag-grid-community/core';
 import type { ServerSideTransactionResult } from '@ag-grid-community/core';
 import { Session } from '@genesislcap/foundation-comms';
 import { SocketObservable } from '@genesislcap/foundation-comms';
+import { SocketSubscription } from '@genesislcap/foundation-comms';
 import { Swatch } from '@microsoft/fast-components';
 import { SwatchRGB } from '@microsoft/fast-components';
 import { TextField } from '@genesislcap/foundation-ui';
@@ -2829,11 +2830,6 @@ declare const GridProServerSideDatasource_base: (new (...args: any[]) => {
     ariaReadOnly: string;
     ariaRequired: string;
     ariaRoleDescription: string;
-    /**
-     * A Genesis Datasource element, for server-side | SSRM-compatible data fetching and used exclusively by the GridPro element.
-     * @remarks Only supports Server-Side Row Model. Requires `@ag-grid-enterprise/server-side-row-model` setup and valid AG Grid Enterprise license.
-     * @alpha
-     */
     ariaRowCount: string;
     ariaRowIndex: string;
     ariaRowIndexText: string;
@@ -3221,6 +3217,8 @@ export declare class StreamDatasource extends StreamBaseDatasource implements IS
     auth: Auth;
     connect: Connect;
     dataserverStream: SocketObservable<FilteredDataServerResult>;
+    dataserverStreamSubscription: SocketSubscription;
+    createDataserverStreamFunc: (existingParams?: any) => Promise<SocketObservable<FilteredDataServerResult>>;
     private resourceName;
     resourceParams: any;
     private resourceIndexes;
@@ -3247,9 +3245,11 @@ export declare class StreamDatasource extends StreamBaseDatasource implements IS
     private currentSortModel;
     constructor(options: StreamDatasourceOptions);
     getRows(params: IServerSideGetRowsParams): Promise<void>;
+    private applyServerSideData;
     private sortMapByNumericKey;
     dataLogoff(): Promise<void>;
-    private restartSubscription;
+    deinit(): Promise<void>;
+    private refreshDatasource;
     private getOrderByAndToBeSortedColIds;
     private handleCurrentStreamLoad;
     private buildCriteriaMatchFromFilters;
@@ -3264,7 +3264,7 @@ export declare class StreamDatasource extends StreamBaseDatasource implements IS
  * @alpha
  */
 export declare type StreamDatasourceOptions = {
-    stream: SocketObservable<FilteredDataServerResult>;
+    createDataserverStreamFunc: (existingParams?: any) => Promise<SocketObservable<FilteredDataServerResult>>;
     resourceName: string;
     resourceParams?: any;
     resourceIndexes?: Map<string, [string]>;

package/docs/api-report.md

@@ -51,6 +51,7 @@ import type { ServerSideTransaction } from '@ag-grid-community/core';
 import type { ServerSideTransactionResult } from '@ag-grid-community/core';
 import { Session } from '@genesislcap/foundation-comms';
 import { SocketObservable } from '@genesislcap/foundation-comms';
+import { SocketSubscription } from '@genesislcap/foundation-comms';
 import { Swatch } from '@microsoft/fast-components';
 import { SwatchRGB } from '@microsoft/fast-components';
 import { TextField } from '@genesislcap/foundation-ui';
@@ -1345,10 +1346,16 @@ export class StreamDatasource extends StreamBaseDatasource implements IServerSid
     // (undocumented)
     connect: Connect;
     // (undocumented)
+    createDataserverStreamFunc: (existingParams?: any) => Promise<SocketObservable<FilteredDataServerResult>>;
+    // (undocumented)
     dataLogoff(): Promise<void>;
     // (undocumented)
     dataserverStream: SocketObservable<FilteredDataServerResult>;
     // (undocumented)
+    dataserverStreamSubscription: SocketSubscription;
+    // (undocumented)
+    deinit(): Promise<void>;
+    // (undocumented)
     getRows(params: IServerSideGetRowsParams): Promise<void>;
     // (undocumented)
     resourceParams: any;
@@ -1360,7 +1367,7 @@ export class StreamDatasource extends StreamBaseDatasource implements IServerSid
 
 // @alpha
 export type StreamDatasourceOptions = {
-    stream: SocketObservable<FilteredDataServerResult>;
+    createDataserverStreamFunc: (existingParams?: any) => Promise<SocketObservable<FilteredDataServerResult>>;
     resourceName: string;
     resourceParams?: any;
     resourceIndexes?: Map<string, [string]>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/grid-pro",
   "description": "Genesis Foundation AG Grid",
-  "version": "14.183.2",
+  "version": "14.183.3",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -30,20 +30,20 @@
     "test:debug": "genx test --debug"
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "14.183.2",
-    "@genesislcap/genx": "14.183.2",
-    "@genesislcap/rollup-builder": "14.183.2",
-    "@genesislcap/ts-builder": "14.183.2",
-    "@genesislcap/uvu-playwright-builder": "14.183.2",
-    "@genesislcap/vite-builder": "14.183.2",
-    "@genesislcap/webpack-builder": "14.183.2",
+    "@genesislcap/foundation-testing": "14.183.3",
+    "@genesislcap/genx": "14.183.3",
+    "@genesislcap/rollup-builder": "14.183.3",
+    "@genesislcap/ts-builder": "14.183.3",
+    "@genesislcap/uvu-playwright-builder": "14.183.3",
+    "@genesislcap/vite-builder": "14.183.3",
+    "@genesislcap/webpack-builder": "14.183.3",
     "rimraf": "^3.0.2"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "14.183.2",
-    "@genesislcap/foundation-logger": "14.183.2",
-    "@genesislcap/foundation-ui": "14.183.2",
-    "@genesislcap/foundation-utils": "14.183.2",
+    "@genesislcap/foundation-comms": "14.183.3",
+    "@genesislcap/foundation-logger": "14.183.3",
+    "@genesislcap/foundation-ui": "14.183.3",
+    "@genesislcap/foundation-utils": "14.183.3",
     "@microsoft/fast-colors": "^5.3.1",
     "@microsoft/fast-components": "^2.30.6",
     "@microsoft/fast-element": "^1.12.0",
@@ -69,5 +69,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "fcec30e0c7127ead30b2eee7ac82eddf25d75daf"
+  "gitHead": "ffef17c6fd8f87716f8a5b1a86fa060016d927b4"
 }