@genesislcap/grid-pro 14.228.2-alpha-16265c5.0 → 14.228.2-alpha-abb55b6.0

package/dist/custom-elements.json

@@ -7486,19 +7486,6 @@
                 "module": "src/grid-pro-genesis-datasource/grid-pro-genesis-datasource.ts"
               }
             },
-            {
-              "kind": "field",
-              "name": "loadingData",
-              "type": {
-                "text": "boolean"
-              },
-              "privacy": "private",
-              "default": "false",
-              "inheritedFrom": {
-                "name": "GridProGenesisDatasource",
-                "module": "src/grid-pro-genesis-datasource/grid-pro-genesis-datasource.ts"
-              }
-            },
             {
               "kind": "field",
               "name": "destroy$",
@@ -11961,15 +11948,6 @@
               "privacy": "private",
               "default": "true"
             },
-            {
-              "kind": "field",
-              "name": "loadingData",
-              "type": {
-                "text": "boolean"
-              },
-              "privacy": "private",
-              "default": "false"
-            },
             {
               "kind": "field",
               "name": "destroy$",

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

@@ -21,6 +21,13 @@ declare const GridProGenesisDatasource_base: (new (...args: any[]) => {
     readonly accessKeyLabel: string;
     autocapitalize: string;
     dir: string;
+    /**
+     * Initializes the datasource.
+     * @public
+     * @param columnDefinitions - Optionally set the `gridOptions` up with column definitions
+     * @param columnStates  - Optionally set the grid up with column state
+     * @remarks This method is called automatically when the element is connected to the DOM.
+     */
     draggable: boolean;
     hidden: boolean;
     inert: boolean;
@@ -56,11 +63,6 @@ declare const GridProGenesisDatasource_base: (new (...args: any[]) => {
     outerHTML: string;
     readonly ownerDocument: Document;
     readonly part: DOMTokenList;
-    /**
-     * Deinitialises the datasource, resetting it to its initial state.
-     * @deprecated Use `destroy` instead
-     * @public
-     */
     readonly prefix: string;
     readonly scrollHeight: number;
     scrollLeft: number;
@@ -87,12 +89,7 @@ declare const GridProGenesisDatasource_base: (new (...args: any[]) => {
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/1999/xhtml", localName: string): HTMLCollectionOf<HTMLElement>;
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/2000/svg", localName: string): HTMLCollectionOf<SVGElement>;
     getElementsByTagNameNS(namespace: string, localName: string): HTMLCollectionOf<Element>;
-    hasAttribute(qualifiedName: string): boolean; /**
-     * Clears the rowData and columnDefs for the grid.
-     * @remarks This is called when `reloadResourceData` happens, on criteria and filters change or full `reset`.
-     * @param withColumnDefs - Whether to clear the columnDefs as well. Defaults to true.
-     * @internal
-     */
+    hasAttribute(qualifiedName: string): boolean;
     hasAttributeNS(namespace: string, localName: string): boolean;
     hasAttributes(): boolean;
     hasPointerCapture(pointerId: number): boolean;
@@ -352,7 +349,6 @@ export declare class GridProGenesisDatasource extends GridProGenesisDatasource_b
     private updateSub;
     private connectionSub;
     private requiresFullRowDataAndColDefs;
-    private loadingData;
     private destroy$;
     connectedCallback(): void;
     disconnectedCallback(): void;

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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqMvF;;;;OAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;kDAwEH;;;;;OAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA5QL;;;;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,OAAO,CAAC,WAAW,CAAS;IAE5B,OAAO,CAAC,QAAQ,CAAuB;IAEvC,iBAAiB;IAuBjB,oBAAoB;IAmBX,SAAS,IAAI,IAAI;IAqB1B,OAAO,CAAC,gBAAgB;IAgBxB;;;;;;OAMG;IACG,IAAI,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,WAAW,EAAE;IA2CrE;;;OAGG;IACH,OAAO;IAIP;;;;OAIG;IACH,MAAM;IAIN;;;;OAIG;IACH,KAAK;IAuCL;;;OAGG;IACH,OAAO;IAYP;;OAEG;IACH,WAAW;IAIX;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAgBpB;;;;OAIG;YACW,UAAU;IAmCxB;;;;;OAKG;YACW,kBAAkB;IAyBhC;;;;;;OAMG;YACW,gBAAgB;IAkE9B,OAAO,CAAC,cAAc;IActB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE;IAyBnC,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,sBAAsB;IAgE9B,OAAO,CAAC,mBAAmB;YAwCb,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;;;;;;;;;;;;;;;;;;;;;;IAyIvF;;;;;;OAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AArIL;;;;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,OAAO,CAAC,QAAQ,CAAuB;IAEvC,iBAAiB;IAuBjB,oBAAoB;IAmBX,SAAS,IAAI,IAAI;IAqB1B,OAAO,CAAC,gBAAgB;IAgBxB;;;;;;OAMG;IACG,IAAI,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,WAAW,EAAE;IA2CrE;;;OAGG;IACH,OAAO;IAWP;;;;OAIG;IACH,MAAM;IAIN;;;;OAIG;IACH,KAAK;IAoCL;;;OAGG;IACH,OAAO;IAYP;;OAEG;IACH,WAAW;IAIX;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAgBpB;;;;OAIG;YACW,UAAU;IAmCxB;;;;;OAKG;YACW,kBAAkB;IA4BhC;;;;;;OAMG;YACW,gBAAgB;IAqE9B,OAAO,CAAC,cAAc;IActB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE;IAyBnC,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,sBAAsB;IAgE9B,OAAO,CAAC,mBAAmB;YAwCb,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,19 +24,20 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         this.restartOnReconnection = false;
         this.keepColDefsOnClearRowData = false;
         this.requiresFullRowDataAndColDefs = true;
-        this.loadingData = false;
         this.destroy$ = new Subject();
     }
     // DatasourceOptions
     criteriaChanged(oldCriteria, newCriteria) {
+        var _a;
         const criteriaIsNotDuplicate = oldCriteria !== normaliseCriteria(newCriteria, criteriaDelimiter);
-        if (this.datasource.initialized && criteriaIsNotDuplicate) {
+        if (this.datasource.initialized && criteriaIsNotDuplicate && ((_a = this.agGrid) === null || _a === void 0 ? void 0 : _a.gridApi)) {
             this.reloadResourceData();
         }
     }
     requestChanged(oldRequest, newRequest) {
+        var _a;
         const requestIsNotDuplicate = oldRequest !== newRequest;
-        if (this.datasource.initialized && requestIsNotDuplicate) {
+        if (this.datasource.initialized && requestIsNotDuplicate && ((_a = this.agGrid) === null || _a === void 0 ? void 0 : _a.gridApi)) {
             this.reloadResourceData();
         }
     }
@@ -152,7 +153,15 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
      * @public
      */
     destroy() {
-        this.reset();
+        try {
+            // Clear data first
+            this.clearRowData();
+            // Then reset everything else
+            this.reset();
+        }
+        catch (e) {
+            logger.debug('Error during destroy:', e);
+        }
     }
     /**
      * Deinitialises the datasource, resetting it to its initial state.
@@ -184,16 +193,14 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
             this.connectionSub.unsubscribe();
             this.connectionSub = undefined;
         }
-        this.clearRowData();
+        // Don't call clearRowData here since destroy already does it
         this.requiresFullRowDataAndColDefs = true;
         this.dataSubWasLoggedOff = false;
         this.criteriaFromFilters = new Map();
-        this.loadingData = false;
         this.update = new BehaviorSubject(new Map());
         if (this.agGrid) {
             this.agGrid.removeAttribute('ds-disconnected');
         }
-        // TODO: There may need to be a full destroy path. Datasources need some love!
         this.datasource.destroy();
     }
     /**
@@ -281,23 +288,26 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             logger.debug('GridProGenesisDatasource.reloadResourceData()', this.resourceName);
-            if (this.loadingData) {
-                logger.debug('Data loading in progress, skipping reload');
-                return;
-            }
-            this.loadingData = true;
             try {
+                // Signal to complete any existing subscriptions
+                this.destroy$.next();
+                this.destroy$.complete();
+                this.destroy$ = new Subject();
+                // Ensure we unsubscribe from current data stream
                 if (this.dataSub) {
                     this.dataSub.unsubscribe();
                     this.dataSub = undefined;
                 }
+                // Clear existing data and show loading state
                 this.clearRowData(withoutColumnDefs);
                 (_b = (_a = this.agGrid) === null || _a === void 0 ? void 0 : _a.gridApi) === null || _b === void 0 ? void 0 : _b.showLoadingOverlay();
                 this.agGrid.removeAttribute('ds-disconnected');
+                // Force a new data load
+                this.requiresFullRowDataAndColDefs = true;
                 yield this.loadResourceData(withoutFullInit);
             }
             finally {
-                this.loadingData = false;
+                logger.debug('Completed reloading resource data for:', this.resourceName);
             }
         });
     }
@@ -319,6 +329,8 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
                     return;
                 }
                 this.$emit(gridProGenesisDatasourceEventNames.dataInit);
+                // Clear any existing data before loading new data
+                this.rowData = new Map();
                 if (this.isSnapshot) {
                     const result = yield this.datasource.snapshot();
                     if (result) {
@@ -400,9 +412,8 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         }
     }
     handleStreamResult(result) {
-        if (!result || this.loadingData) {
+        if (!result)
             return;
-        }
         if (this.isRequestServer) {
             this.applyRequestServerData(result);
         }

package/dist/grid-pro.d.ts

@@ -2550,7 +2550,6 @@ export declare class GridProGenesisDatasource extends GridProGenesisDatasource_b
     private updateSub;
     private connectionSub;
     private requiresFullRowDataAndColDefs;
-    private loadingData;
     private destroy$;
     connectedCallback(): void;
     disconnectedCallback(): void;
@@ -2652,6 +2651,13 @@ declare const GridProGenesisDatasource_base: (new (...args: any[]) => {
     readonly accessKeyLabel: string;
     autocapitalize: string;
     dir: string;
+    /**
+     * Initializes the datasource.
+     * @public
+     * @param columnDefinitions - Optionally set the `gridOptions` up with column definitions
+     * @param columnStates  - Optionally set the grid up with column state
+     * @remarks This method is called automatically when the element is connected to the DOM.
+     */
     draggable: boolean;
     hidden: boolean;
     inert: boolean;
@@ -2687,11 +2693,6 @@ declare const GridProGenesisDatasource_base: (new (...args: any[]) => {
     outerHTML: string;
     readonly ownerDocument: Document;
     readonly part: DOMTokenList;
-    /**
-     * Deinitialises the datasource, resetting it to its initial state.
-     * @deprecated Use `destroy` instead
-     * @public
-     */
     readonly prefix: string;
     readonly scrollHeight: number;
     scrollLeft: number;
@@ -2718,12 +2719,7 @@ declare const GridProGenesisDatasource_base: (new (...args: any[]) => {
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/1999/xhtml", localName: string): HTMLCollectionOf<HTMLElement>;
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/2000/svg", localName: string): HTMLCollectionOf<SVGElement>;
     getElementsByTagNameNS(namespace: string, localName: string): HTMLCollectionOf<Element>;
-    hasAttribute(qualifiedName: string): boolean; /**
-    * Clears the rowData and columnDefs for the grid.
-    * @remarks This is called when `reloadResourceData` happens, on criteria and filters change or full `reset`.
-    * @param withColumnDefs - Whether to clear the columnDefs as well. Defaults to true.
-    * @internal
-    */
+    hasAttribute(qualifiedName: string): boolean;
     hasAttributeNS(namespace: string, localName: string): boolean;
     hasAttributes(): boolean;
     hasPointerCapture(pointerId: number): boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/grid-pro",
   "description": "Genesis Foundation AG Grid",
-  "version": "14.228.2-alpha-16265c5.0",
+  "version": "14.228.2-alpha-abb55b6.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-16265c5.0",
-    "@genesislcap/genx": "14.228.2-alpha-16265c5.0",
-    "@genesislcap/rollup-builder": "14.228.2-alpha-16265c5.0",
-    "@genesislcap/ts-builder": "14.228.2-alpha-16265c5.0",
-    "@genesislcap/uvu-playwright-builder": "14.228.2-alpha-16265c5.0",
-    "@genesislcap/vite-builder": "14.228.2-alpha-16265c5.0",
-    "@genesislcap/webpack-builder": "14.228.2-alpha-16265c5.0",
+    "@genesislcap/foundation-testing": "14.228.2-alpha-abb55b6.0",
+    "@genesislcap/genx": "14.228.2-alpha-abb55b6.0",
+    "@genesislcap/rollup-builder": "14.228.2-alpha-abb55b6.0",
+    "@genesislcap/ts-builder": "14.228.2-alpha-abb55b6.0",
+    "@genesislcap/uvu-playwright-builder": "14.228.2-alpha-abb55b6.0",
+    "@genesislcap/vite-builder": "14.228.2-alpha-abb55b6.0",
+    "@genesislcap/webpack-builder": "14.228.2-alpha-abb55b6.0",
     "rimraf": "^5.0.0"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "14.228.2-alpha-16265c5.0",
-    "@genesislcap/foundation-logger": "14.228.2-alpha-16265c5.0",
-    "@genesislcap/foundation-ui": "14.228.2-alpha-16265c5.0",
-    "@genesislcap/foundation-utils": "14.228.2-alpha-16265c5.0",
+    "@genesislcap/foundation-comms": "14.228.2-alpha-abb55b6.0",
+    "@genesislcap/foundation-logger": "14.228.2-alpha-abb55b6.0",
+    "@genesislcap/foundation-ui": "14.228.2-alpha-abb55b6.0",
+    "@genesislcap/foundation-utils": "14.228.2-alpha-abb55b6.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": "68ea2e550c2f3f561cb894538eceb490f7a950cf"
+  "gitHead": "01e080c975f3a69266bea2b6a38df78312158dc9"
 }