@genesislcap/grid-pro 14.228.2-alpha-e1c5cdb.0 → 14.228.2-alpha-caa3483.0

package/dist/custom-elements.json

@@ -7486,6 +7486,19 @@
                 "module": "src/grid-pro-genesis-datasource/grid-pro-genesis-datasource.ts"
               }
             },
+            {
+              "kind": "field",
+              "name": "cancelledTransactions",
+              "type": {
+                "text": "Set<number>"
+              },
+              "privacy": "private",
+              "default": "new Set()",
+              "inheritedFrom": {
+                "name": "GridProGenesisDatasource",
+                "module": "src/grid-pro-genesis-datasource/grid-pro-genesis-datasource.ts"
+              }
+            },
             {
               "kind": "method",
               "name": "colDefsDeepClone",
@@ -7650,6 +7663,12 @@
                   "type": {
                     "text": "RequestServerResult"
                   }
+                },
+                {
+                  "name": "transactionId",
+                  "type": {
+                    "text": "number"
+                  }
                 }
               ],
               "inheritedFrom": {
@@ -7667,6 +7686,12 @@
                   "type": {
                     "text": "FilteredDataServerResult"
                   }
+                },
+                {
+                  "name": "transactionId",
+                  "type": {
+                    "text": "number"
+                  }
                 }
               ],
               "inheritedFrom": {
@@ -11938,6 +11963,15 @@
               "privacy": "private",
               "default": "true"
             },
+            {
+              "kind": "field",
+              "name": "cancelledTransactions",
+              "type": {
+                "text": "Set<number>"
+              },
+              "privacy": "private",
+              "default": "new Set()"
+            },
             {
               "kind": "method",
               "name": "deepClone",
@@ -12075,6 +12109,12 @@
                   "type": {
                     "text": "RequestServerResult"
                   }
+                },
+                {
+                  "name": "transactionId",
+                  "type": {
+                    "text": "number"
+                  }
                 }
               ]
             },
@@ -12088,6 +12128,12 @@
                   "type": {
                     "text": "FilteredDataServerResult"
                   }
+                },
+                {
+                  "name": "transactionId",
+                  "type": {
+                    "text": "number"
+                  }
                 }
               ]
             },

package/dist/dts/grid-pro-genesis-datasource/grid-pro-genesis-datasource.d.ts

@@ -45,10 +45,6 @@ declare const GridProGenesisDatasource_base: (new (...args: any[]) => {
     readonly classList: DOMTokenList;
     className: string;
     readonly clientHeight: number;
-    /**
-     * Destroys the datasource, resetting it to its initial state.
-     * @public
-     */
     readonly clientLeft: number;
     readonly clientTop: number;
     readonly clientWidth: number;
@@ -136,6 +132,12 @@ declare const GridProGenesisDatasource_base: (new (...args: any[]) => {
     isDefaultNamespace(namespace: string): boolean;
     isEqualNode(otherNode: Node): boolean;
     isSameNode(otherNode: Node): boolean;
+    /**
+     * Resets the grid data while keeping columnDefs and sends a DATA_LOGOFF message if it's a stream.
+     * Proxies to {@link @genesislcap/grid-pro#GridProGenesisDatasource.loadResourceData} but without the full init (no metadata fetch).
+     * @remarks This is used when the grid is already initialized and we want to reload the data due to a criteria/filter change.
+     * @internal
+     */
     lookupNamespaceURI(prefix: string): string;
     lookupPrefix(namespace: string): string;
     normalize(): void;
@@ -346,6 +348,7 @@ export declare class GridProGenesisDatasource extends GridProGenesisDatasource_b
     private updateSub;
     private connectionSub;
     private requiresFullRowDataAndColDefs;
+    private cancelledTransactions;
     connectedCallback(): void;
     disconnectedCallback(): void;
     deepClone(): Node;

package/dist/dts/grid-pro-genesis-datasource/grid-pro-genesis-datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-pro-genesis-datasource.d.ts","sourceRoot":"","sources":["../../../src/grid-pro-genesis-datasource/grid-pro-genesis-datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,WAAW,EAGX,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AAejC,OAAO,EAAqB,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAgLvF;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAzKL;;;;GAIG;AACH,qBAGa,wBAAyB,SAAQ,6BAAqC;IACjF,aAAa,SAAsB;IACnC,kBAAkB,SAA2B;IAG7C,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IASxD,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAQrD,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAKW,qBAAqB,UAAS;IAG/F,yBAAyB,UAAS;IAElC,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,SAAS,CAAe;IAChC,OAAO,CAAC,aAAa,CAAe;IAEpC,OAAO,CAAC,6BAA6B,CAAQ;IAE7C,iBAAiB;IAuBjB,oBAAoB;IAWX,SAAS,IAAI,IAAI;IAqB1B,OAAO,CAAC,gBAAgB;IAgBxB;;;;;;OAMG;IACG,IAAI,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,WAAW,EAAE;IA0CrE;;;OAGG;IACH,OAAO;IAIP;;;;OAIG;IACH,MAAM;IAIN;;;;OAIG;IACH,KAAK;IAiCL;;;OAGG;IACH,OAAO;IAYP;;OAEG;IACH,WAAW;IAIX;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAWpB;;;;OAIG;YACW,UAAU;IAoDxB;;;;;OAKG;YACW,kBAAkB;IA8BhC;;;;;;OAMG;YACW,gBAAgB;IAiE9B,OAAO,CAAC,cAAc;IActB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE;IAyBnC,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,sBAAsB;IAgE9B,OAAO,CAAC,mBAAmB;YAyBb,eAAe;IActB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAK9C,YAAY,CAAC,SAAS,EAAE,MAAM;IAK5B,gBAAgB,CACvB,aAAa,EAAE,kBAAkB,GAChC,kBAAkB,GAAG,IAAI,GAAG,SAAS;IAI/B,qBAAqB,CAC5B,aAAa,EAAE,kBAAkB,EACjC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,IAAI,GAC3C,IAAI;IAIP,OAAO,CAAC,iBAAiB;CAO1B"}
+{"version":3,"file":"grid-pro-genesis-datasource.d.ts","sourceRoot":"","sources":["../../../src/grid-pro-genesis-datasource/grid-pro-genesis-datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,WAAW,EAGX,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AAejC,OAAO,EAAqB,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA+UvF;;;;;OAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA1UL;;;;GAIG;AACH,qBAGa,wBAAyB,SAAQ,6BAAqC;IACjF,aAAa,SAAsB;IACnC,kBAAkB,SAA2B;IAG7C,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IASxD,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAQrD,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAKW,qBAAqB,UAAS;IAG/F,yBAAyB,UAAS;IAElC,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,SAAS,CAAe;IAChC,OAAO,CAAC,aAAa,CAAe;IAEpC,OAAO,CAAC,6BAA6B,CAAQ;IAG7C,OAAO,CAAC,qBAAqB,CAA0B;IAEvD,iBAAiB;IAuBjB,oBAAoB;IAWX,SAAS,IAAI,IAAI;IAqB1B,OAAO,CAAC,gBAAgB;IAgBxB;;;;;;OAMG;IACG,IAAI,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,WAAW,EAAE;IA0CrE;;;OAGG;IACH,OAAO;IAIP;;;;OAIG;IACH,MAAM;IAIN;;;;OAIG;IACH,KAAK;IAiCL;;;OAGG;IACH,OAAO;IAYP;;OAEG;IACH,WAAW;IAIX;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAepB;;;;OAIG;YACW,UAAU;IAoDxB;;;;;OAKG;YACW,kBAAkB;IAyBhC;;;;;;OAMG;YACW,gBAAgB;IAiE9B,OAAO,CAAC,cAAc;IActB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE;IAyBnC,OAAO,CAAC,kBAAkB;IAgB1B,OAAO,CAAC,sBAAsB;IAuE9B,OAAO,CAAC,mBAAmB;YAgCb,eAAe;IActB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAK9C,YAAY,CAAC,SAAS,EAAE,MAAM;IAK5B,gBAAgB,CACvB,aAAa,EAAE,kBAAkB,GAChC,kBAAkB,GAAG,IAAI,GAAG,SAAS;IAI/B,qBAAqB,CAC5B,aAAa,EAAE,kBAAkB,EACjC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,IAAI,GAC3C,IAAI;IAIP,OAAO,CAAC,iBAAiB;CAO1B"}

package/dist/esm/grid-pro-genesis-datasource/grid-pro-genesis-datasource.js

@@ -24,6 +24,8 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         this.restartOnReconnection = false;
         this.keepColDefsOnClearRowData = false;
         this.requiresFullRowDataAndColDefs = true;
+        // Track cancelled transaction IDs
+        this.cancelledTransactions = new Set();
     }
     // DatasourceOptions
     criteriaChanged(oldCriteria, newCriteria) {
@@ -211,6 +213,9 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
      */
     clearRowData(withColumnDefs = true) {
         var _a, _b, _c, _d;
+        // Cancel any in-flight transactions for this clear operation
+        const clearTransactionId = Date.now();
+        this.cancelledTransactions.add(clearTransactionId);
         this.rowData = new Map();
         this.agTransaction = undefined;
         if (withColumnDefs && !this.keepColDefsOnClearRowData) {
@@ -285,14 +290,9 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
                 logger.debug(`[Reload ${reloadId}] Cancelling existing subscription`);
                 this.dataSub.unsubscribe();
                 this.dataSub = undefined;
+                // Cancel any in-flight transactions for this reload
+                this.cancelledTransactions.add(reloadId);
             }
-            // Ensure synchronous cleanup before starting new load
-            yield new Promise((resolve) => {
-                setTimeout(() => {
-                    logger.debug(`[Reload ${reloadId}] Executing cleanup`);
-                    resolve();
-                }, 0);
-            });
             logger.debug(`[Reload ${reloadId}] Clearing row data`);
             this.clearRowData(withoutColumnDefs);
             (_b = (_a = this.agGrid) === null || _a === void 0 ? void 0 : _a.gridApi) === null || _b === void 0 ? void 0 : _b.showLoadingOverlay();
@@ -402,15 +402,26 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
     handleStreamResult(result) {
         if (!result)
             return;
+        const transactionId = Date.now();
+        logger.debug(`[Stream ${transactionId}] Processing result:`, {
+            type: this.isRequestServer ? 'RequestServer' : 'DataServer',
+            hasData: !!result,
+        });
         if (this.isRequestServer) {
-            this.applyRequestServerData(result);
+            this.applyRequestServerData(result, transactionId);
         }
         else {
-            this.applyDataserverData(result);
+            this.applyDataserverData(result, transactionId);
         }
     }
-    applyRequestServerData(requestServerResult) {
+    applyRequestServerData(requestServerResult, transactionId) {
         var _a;
+        // Skip if this transaction was cancelled
+        if (this.cancelledTransactions.has(transactionId)) {
+            logger.debug(`[Stream ${transactionId}] Skipped - transaction was cancelled`);
+            this.cancelledTransactions.delete(transactionId); // Cleanup
+            return;
+        }
         const previousSize = this.rowData.size;
         const requestServerData = requestServerResult.REPLY;
         if (!Array.isArray(requestServerData) ||
@@ -458,8 +469,14 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         this.applyAllAgTransactions();
         this.handleSizeChanged(previousSize, this.rowData.size);
     }
-    applyDataserverData(dataServerResult) {
+    applyDataserverData(dataServerResult, transactionId) {
         var _a;
+        // Skip if this transaction was cancelled
+        if (this.cancelledTransactions.has(transactionId)) {
+            logger.debug(`[Stream ${transactionId}] Skipped - transaction was cancelled`);
+            this.cancelledTransactions.delete(transactionId); // Cleanup
+            return;
+        }
         const previousSize = this.rowData.size;
         if (this.requiresFullRowDataAndColDefs) {
             (_a = dataServerResult.inserts) === null || _a === void 0 ? void 0 : _a.forEach((insertData) => {

package/dist/grid-pro.d.ts

@@ -2550,6 +2550,7 @@ export declare class GridProGenesisDatasource extends GridProGenesisDatasource_b
     private updateSub;
     private connectionSub;
     private requiresFullRowDataAndColDefs;
+    private cancelledTransactions;
     connectedCallback(): void;
     disconnectedCallback(): void;
     deepClone(): Node;
@@ -2674,10 +2675,6 @@ declare const GridProGenesisDatasource_base: (new (...args: any[]) => {
     readonly classList: DOMTokenList;
     className: string;
     readonly clientHeight: number;
-    /**
-     * Destroys the datasource, resetting it to its initial state.
-     * @public
-     */
     readonly clientLeft: number;
     readonly clientTop: number;
     readonly clientWidth: number;
@@ -2765,6 +2762,12 @@ declare const GridProGenesisDatasource_base: (new (...args: any[]) => {
     isDefaultNamespace(namespace: string): boolean;
     isEqualNode(otherNode: Node): boolean;
     isSameNode(otherNode: Node): boolean;
+    /**
+     * Resets the grid data while keeping columnDefs and sends a DATA_LOGOFF message if it's a stream.
+     * Proxies to {@link @genesislcap/grid-pro#GridProGenesisDatasource.loadResourceData} but without the full init (no metadata fetch).
+     * @remarks This is used when the grid is already initialized and we want to reload the data due to a criteria/filter change.
+     * @internal
+     */
     lookupNamespaceURI(prefix: string): string;
     lookupPrefix(namespace: string): string;
     normalize(): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/grid-pro",
   "description": "Genesis Foundation AG Grid",
-  "version": "14.228.2-alpha-e1c5cdb.0",
+  "version": "14.228.2-alpha-caa3483.0",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -38,20 +38,20 @@
     }
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "14.228.2-alpha-e1c5cdb.0",
-    "@genesislcap/genx": "14.228.2-alpha-e1c5cdb.0",
-    "@genesislcap/rollup-builder": "14.228.2-alpha-e1c5cdb.0",
-    "@genesislcap/ts-builder": "14.228.2-alpha-e1c5cdb.0",
-    "@genesislcap/uvu-playwright-builder": "14.228.2-alpha-e1c5cdb.0",
-    "@genesislcap/vite-builder": "14.228.2-alpha-e1c5cdb.0",
-    "@genesislcap/webpack-builder": "14.228.2-alpha-e1c5cdb.0",
+    "@genesislcap/foundation-testing": "14.228.2-alpha-caa3483.0",
+    "@genesislcap/genx": "14.228.2-alpha-caa3483.0",
+    "@genesislcap/rollup-builder": "14.228.2-alpha-caa3483.0",
+    "@genesislcap/ts-builder": "14.228.2-alpha-caa3483.0",
+    "@genesislcap/uvu-playwright-builder": "14.228.2-alpha-caa3483.0",
+    "@genesislcap/vite-builder": "14.228.2-alpha-caa3483.0",
+    "@genesislcap/webpack-builder": "14.228.2-alpha-caa3483.0",
     "rimraf": "^5.0.0"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "14.228.2-alpha-e1c5cdb.0",
-    "@genesislcap/foundation-logger": "14.228.2-alpha-e1c5cdb.0",
-    "@genesislcap/foundation-ui": "14.228.2-alpha-e1c5cdb.0",
-    "@genesislcap/foundation-utils": "14.228.2-alpha-e1c5cdb.0",
+    "@genesislcap/foundation-comms": "14.228.2-alpha-caa3483.0",
+    "@genesislcap/foundation-logger": "14.228.2-alpha-caa3483.0",
+    "@genesislcap/foundation-ui": "14.228.2-alpha-caa3483.0",
+    "@genesislcap/foundation-utils": "14.228.2-alpha-caa3483.0",
     "@microsoft/fast-colors": "5.3.1",
     "@microsoft/fast-components": "2.30.6",
     "@microsoft/fast-element": "1.14.0",
@@ -77,5 +77,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "dadb4cc5a8eba712629793874b2b5a0e2256ea60"
+  "gitHead": "6769dadb4b6162f0e5b44056786e7bc06efc8010"
 }