@ag-grid-enterprise/server-side-row-model - npm Package Compare versions

Comparing version 23.1.1 to 23.2.0

dist/cjs/serverSideRowModel/serverSideCache.js

@@ -310,3 +310,3 @@ "use strict";
         var newBlock = new serverSideBlock_1.ServerSideBlock(blockNumber, this.parentRowNode, this.cacheParams, this);
-        this.getContext().wireBean(newBlock);
+        this.createBean(newBlock);
         var displayIndexSequence = new core_1.NumberSequence(displayIndex);
@@ -313,0 +313,0 @@ newBlock.setDisplayIndexes(displayIndexSequence, this.getVirtualRowCount(), nextRowTop);

dist/cjs/serverSideRowModel/serverSideRowModel.d.ts

 import { BeanStub, IServerSideDatasource, IServerSideRowModel, RowBounds, RowNode } from "@ag-grid-community/core";
 export declare class ServerSideRowModel extends BeanStub implements IServerSideRowModel {
     private gridOptionsWrapper;
-    private eventService;
     private columnController;
@@ -15,4 +14,4 @@ private filterManager;
     private cacheParams;
+    private rowNodeBlockLoader;
     private logger;
-    private rowNodeBlockLoader;
     ensureRowHeightsValid(startPixel: number, endPixel: number, startLimitIndex: number, endLimitIndex: number): boolean;
@@ -19,0 +18,0 @@ private postConstruct;

dist/cjs/serverSideRowModel/serverSideRowModel.js

@@ -46,9 +46,10 @@ "use strict";
     ServerSideRowModel.prototype.destroyDatasource = function () {
-        if (this.datasource) {
-            if (this.datasource.destroy) {
-                this.datasource.destroy();
-            }
-            this.rowRenderer.datasourceChanged();
-            this.datasource = undefined;
+        if (!this.datasource) {
+            return;
         }
+        if (this.datasource.destroy) {
+            this.datasource.destroy();
+        }
+        this.rowRenderer.datasourceChanged();
+        this.datasource = undefined;
     };
@@ -59,10 +60,10 @@ ServerSideRowModel.prototype.setBeans = function (loggerFactory) {
     ServerSideRowModel.prototype.addEventListeners = function () {
-        this.addDestroyableEventListener(this.eventService, core_1.Events.EVENT_COLUMN_ROW_GROUP_CHANGED, this.onColumnRowGroupChanged.bind(this));
-        this.addDestroyableEventListener(this.eventService, core_1.Events.EVENT_ROW_GROUP_OPENED, this.onRowGroupOpened.bind(this));
-        this.addDestroyableEventListener(this.eventService, core_1.Events.EVENT_COLUMN_PIVOT_MODE_CHANGED, this.onPivotModeChanged.bind(this));
-        this.addDestroyableEventListener(this.eventService, core_1.Events.EVENT_COLUMN_EVERYTHING_CHANGED, this.onColumnEverything.bind(this));
-        this.addDestroyableEventListener(this.eventService, core_1.Events.EVENT_COLUMN_VALUE_CHANGED, this.onValueChanged.bind(this));
-        this.addDestroyableEventListener(this.eventService, core_1.Events.EVENT_COLUMN_PIVOT_CHANGED, this.onColumnPivotChanged.bind(this));
-        this.addDestroyableEventListener(this.eventService, core_1.Events.EVENT_FILTER_CHANGED, this.onFilterChanged.bind(this));
-        this.addDestroyableEventListener(this.eventService, core_1.Events.EVENT_SORT_CHANGED, this.onSortChanged.bind(this));
+        this.addManagedListener(this.eventService, core_1.Events.EVENT_COLUMN_ROW_GROUP_CHANGED, this.onColumnRowGroupChanged.bind(this));
+        this.addManagedListener(this.eventService, core_1.Events.EVENT_ROW_GROUP_OPENED, this.onRowGroupOpened.bind(this));
+        this.addManagedListener(this.eventService, core_1.Events.EVENT_COLUMN_PIVOT_MODE_CHANGED, this.onPivotModeChanged.bind(this));
+        this.addManagedListener(this.eventService, core_1.Events.EVENT_COLUMN_EVERYTHING_CHANGED, this.onColumnEverything.bind(this));
+        this.addManagedListener(this.eventService, core_1.Events.EVENT_COLUMN_VALUE_CHANGED, this.onValueChanged.bind(this));
+        this.addManagedListener(this.eventService, core_1.Events.EVENT_COLUMN_PIVOT_CHANGED, this.onColumnPivotChanged.bind(this));
+        this.addManagedListener(this.eventService, core_1.Events.EVENT_FILTER_CHANGED, this.onFilterChanged.bind(this));
+        this.addManagedListener(this.eventService, core_1.Events.EVENT_SORT_CHANGED, this.onSortChanged.bind(this));
     };
@@ -78,5 +79,3 @@ ServerSideRowModel.prototype.setDatasource = function (datasource) {
         }
-        else {
-            return false;
-        }
+        return false;
     };
@@ -186,7 +185,4 @@ ServerSideRowModel.prototype.onColumnEverything = function () {
         }
-        else {
-            if (this.gridOptionsWrapper.isPurgeClosedRowNodes() && core_1._.exists(rowNode.childrenCache)) {
-                rowNode.childrenCache.destroy();
-                rowNode.childrenCache = null;
-            }
+        else if (this.gridOptionsWrapper.isPurgeClosedRowNodes() && core_1._.exists(rowNode.childrenCache)) {
+            rowNode.childrenCache = this.destroyBean(rowNode.childrenCache);
         }
@@ -216,3 +212,3 @@ var shouldAnimate = function () {
         this.rootNode.level = -1;
-        this.getContext().wireBean(this.rootNode);
+        this.createBean(this.rootNode);
         if (this.datasource) {
@@ -250,7 +246,7 @@ this.createNewRowNodeBlockLoader();
         this.rowNodeBlockLoader = new core_1.RowNodeBlockLoader(maxConcurrentRequests, blockLoadDebounceMillis);
-        this.getContext().wireBean(this.rowNodeBlockLoader);
+        this.createBean(this.rowNodeBlockLoader);
     };
     ServerSideRowModel.prototype.destroyRowNodeBlockLoader = function () {
         if (this.rowNodeBlockLoader) {
-            this.rowNodeBlockLoader.destroy();
+            this.destroyBean(this.rowNodeBlockLoader);
             this.rowNodeBlockLoader = undefined;
@@ -326,3 +322,3 @@ }
         var cache = new serverSideCache_1.ServerSideCache(this.cacheParams, rowNode);
-        this.getContext().wireBean(cache);
+        this.getContext().createBean(cache);
         cache.addEventListener(core_1.RowNodeCache.EVENT_CACHE_UPDATED, this.onCacheUpdated.bind(this));
@@ -429,9 +425,10 @@ rowNode.childrenCache = cache;
     ServerSideRowModel.prototype.executeOnCache = function (route, callback) {
-        if (this.cacheExists()) {
-            var topLevelCache = this.rootNode.childrenCache;
-            var cacheToPurge = topLevelCache.getChildCache(route);
-            if (cacheToPurge) {
-                callback(cacheToPurge);
-            }
+        if (!this.cacheExists()) {
+            return;
         }
+        var topLevelCache = this.rootNode.childrenCache;
+        var cacheToPurge = topLevelCache.getChildCache(route);
+        if (cacheToPurge) {
+            callback(cacheToPurge);
+        }
     };
@@ -464,5 +461,3 @@ ServerSideRowModel.prototype.purgeCache = function (route) {
         }
-        else {
-            return null;
-        }
+        return null;
     };
@@ -553,19 +548,17 @@ // always returns true - this is used by the
         }
-        else {
-            var detailNode = new core_1.RowNode();
-            this.getContext().wireBean(detailNode);
-            detailNode.detail = true;
-            detailNode.selectable = false;
-            detailNode.parent = masterNode;
-            if (core_1._.exists(masterNode.id)) {
-                detailNode.id = 'detail_' + masterNode.id;
-            }
-            detailNode.data = masterNode.data;
-            detailNode.level = masterNode.level + 1;
-            var defaultDetailRowHeight = 200;
-            var rowHeight = this.gridOptionsWrapper.getRowHeightForNode(detailNode).height;
-            detailNode.rowHeight = rowHeight ? rowHeight : defaultDetailRowHeight;
-            masterNode.detailNode = detailNode;
-            return detailNode;
+        var detailNode = new core_1.RowNode();
+        this.getContext().createBean(detailNode);
+        detailNode.detail = true;
+        detailNode.selectable = false;
+        detailNode.parent = masterNode;
+        if (core_1._.exists(masterNode.id)) {
+            detailNode.id = 'detail_' + masterNode.id;
         }
+        detailNode.data = masterNode.data;
+        detailNode.level = masterNode.level + 1;
+        var defaultDetailRowHeight = 200;
+        var rowHeight = this.gridOptionsWrapper.getRowHeightForNode(detailNode).height;
+        detailNode.rowHeight = rowHeight ? rowHeight : defaultDetailRowHeight;
+        masterNode.detailNode = detailNode;
+        return detailNode;
     };
@@ -579,5 +572,2 @@ ServerSideRowModel.prototype.isLoading = function () {
     __decorate([
-        core_1.Autowired('eventService')
-    ], ServerSideRowModel.prototype, "eventService", void 0);
-    __decorate([
         core_1.Autowired('columnController')
@@ -609,2 +599,5 @@ ], ServerSideRowModel.prototype, "columnController", void 0);
     ], ServerSideRowModel.prototype, "setBeans", null);
+    __decorate([
+        core_1.PreDestroy
+    ], ServerSideRowModel.prototype, "destroyRowNodeBlockLoader", null);
     ServerSideRowModel = __decorate([
@@ -611,0 +604,0 @@ core_1.Bean('rowModel')

dist/es6/serverSideRowModel/serverSideBlock.js

@@ -23,3 +23,3 @@ var __extends = (this && this.__extends) || (function () {
 };
-import { Autowired, PostConstruct, Qualifier, _, RowNodeBlock } from "@ag-grid-community/core";
+import { Autowired, PostConstruct, Qualifier, RowNodeBlock, _ } from "@ag-grid-community/core";
 var ServerSideBlock = /** @class */ (function (_super) {
@@ -26,0 +26,0 @@ __extends(ServerSideBlock, _super);

dist/es6/serverSideRowModel/serverSideCache.js

@@ -308,3 +308,3 @@ var __extends = (this && this.__extends) || (function () {
         var newBlock = new ServerSideBlock(blockNumber, this.parentRowNode, this.cacheParams, this);
-        this.getContext().wireBean(newBlock);
+        this.createBean(newBlock);
         var displayIndexSequence = new NumberSequence(displayIndex);
@@ -311,0 +311,0 @@ newBlock.setDisplayIndexes(displayIndexSequence, this.getVirtualRowCount(), nextRowTop);

dist/es6/serverSideRowModel/serverSideRowModel.d.ts

 import { BeanStub, IServerSideDatasource, IServerSideRowModel, RowBounds, RowNode } from "@ag-grid-community/core";
 export declare class ServerSideRowModel extends BeanStub implements IServerSideRowModel {
     private gridOptionsWrapper;
-    private eventService;
     private columnController;
@@ -15,4 +14,4 @@ private filterManager;
     private cacheParams;
+    private rowNodeBlockLoader;
     private logger;
-    private rowNodeBlockLoader;
     ensureRowHeightsValid(startPixel: number, endPixel: number, startLimitIndex: number, endLimitIndex: number): boolean;
@@ -19,0 +18,0 @@ private postConstruct;

dist/es6/serverSideRowModel/serverSideRowModel.js

@@ -44,9 +44,10 @@ var __extends = (this && this.__extends) || (function () {
     ServerSideRowModel.prototype.destroyDatasource = function () {
-        if (this.datasource) {
-            if (this.datasource.destroy) {
-                this.datasource.destroy();
-            }
-            this.rowRenderer.datasourceChanged();
-            this.datasource = undefined;
+        if (!this.datasource) {
+            return;
         }
+        if (this.datasource.destroy) {
+            this.datasource.destroy();
+        }
+        this.rowRenderer.datasourceChanged();
+        this.datasource = undefined;
     };
@@ -57,10 +58,10 @@ ServerSideRowModel.prototype.setBeans = function (loggerFactory) {
     ServerSideRowModel.prototype.addEventListeners = function () {
-        this.addDestroyableEventListener(this.eventService, Events.EVENT_COLUMN_ROW_GROUP_CHANGED, this.onColumnRowGroupChanged.bind(this));
-        this.addDestroyableEventListener(this.eventService, Events.EVENT_ROW_GROUP_OPENED, this.onRowGroupOpened.bind(this));
-        this.addDestroyableEventListener(this.eventService, Events.EVENT_COLUMN_PIVOT_MODE_CHANGED, this.onPivotModeChanged.bind(this));
-        this.addDestroyableEventListener(this.eventService, Events.EVENT_COLUMN_EVERYTHING_CHANGED, this.onColumnEverything.bind(this));
-        this.addDestroyableEventListener(this.eventService, Events.EVENT_COLUMN_VALUE_CHANGED, this.onValueChanged.bind(this));
-        this.addDestroyableEventListener(this.eventService, Events.EVENT_COLUMN_PIVOT_CHANGED, this.onColumnPivotChanged.bind(this));
-        this.addDestroyableEventListener(this.eventService, Events.EVENT_FILTER_CHANGED, this.onFilterChanged.bind(this));
-        this.addDestroyableEventListener(this.eventService, Events.EVENT_SORT_CHANGED, this.onSortChanged.bind(this));
+        this.addManagedListener(this.eventService, Events.EVENT_COLUMN_ROW_GROUP_CHANGED, this.onColumnRowGroupChanged.bind(this));
+        this.addManagedListener(this.eventService, Events.EVENT_ROW_GROUP_OPENED, this.onRowGroupOpened.bind(this));
+        this.addManagedListener(this.eventService, Events.EVENT_COLUMN_PIVOT_MODE_CHANGED, this.onPivotModeChanged.bind(this));
+        this.addManagedListener(this.eventService, Events.EVENT_COLUMN_EVERYTHING_CHANGED, this.onColumnEverything.bind(this));
+        this.addManagedListener(this.eventService, Events.EVENT_COLUMN_VALUE_CHANGED, this.onValueChanged.bind(this));
+        this.addManagedListener(this.eventService, Events.EVENT_COLUMN_PIVOT_CHANGED, this.onColumnPivotChanged.bind(this));
+        this.addManagedListener(this.eventService, Events.EVENT_FILTER_CHANGED, this.onFilterChanged.bind(this));
+        this.addManagedListener(this.eventService, Events.EVENT_SORT_CHANGED, this.onSortChanged.bind(this));
     };
@@ -76,5 +77,3 @@ ServerSideRowModel.prototype.setDatasource = function (datasource) {
         }
-        else {
-            return false;
-        }
+        return false;
     };
@@ -184,7 +183,4 @@ ServerSideRowModel.prototype.onColumnEverything = function () {
         }
-        else {
-            if (this.gridOptionsWrapper.isPurgeClosedRowNodes() && _.exists(rowNode.childrenCache)) {
-                rowNode.childrenCache.destroy();
-                rowNode.childrenCache = null;
-            }
+        else if (this.gridOptionsWrapper.isPurgeClosedRowNodes() && _.exists(rowNode.childrenCache)) {
+            rowNode.childrenCache = this.destroyBean(rowNode.childrenCache);
         }
@@ -214,3 +210,3 @@ var shouldAnimate = function () {
         this.rootNode.level = -1;
-        this.getContext().wireBean(this.rootNode);
+        this.createBean(this.rootNode);
         if (this.datasource) {
@@ -248,7 +244,7 @@ this.createNewRowNodeBlockLoader();
         this.rowNodeBlockLoader = new RowNodeBlockLoader(maxConcurrentRequests, blockLoadDebounceMillis);
-        this.getContext().wireBean(this.rowNodeBlockLoader);
+        this.createBean(this.rowNodeBlockLoader);
     };
     ServerSideRowModel.prototype.destroyRowNodeBlockLoader = function () {
         if (this.rowNodeBlockLoader) {
-            this.rowNodeBlockLoader.destroy();
+            this.destroyBean(this.rowNodeBlockLoader);
             this.rowNodeBlockLoader = undefined;
@@ -324,3 +320,3 @@ }
         var cache = new ServerSideCache(this.cacheParams, rowNode);
-        this.getContext().wireBean(cache);
+        this.getContext().createBean(cache);
         cache.addEventListener(RowNodeCache.EVENT_CACHE_UPDATED, this.onCacheUpdated.bind(this));
@@ -427,9 +423,10 @@ rowNode.childrenCache = cache;
     ServerSideRowModel.prototype.executeOnCache = function (route, callback) {
-        if (this.cacheExists()) {
-            var topLevelCache = this.rootNode.childrenCache;
-            var cacheToPurge = topLevelCache.getChildCache(route);
-            if (cacheToPurge) {
-                callback(cacheToPurge);
-            }
+        if (!this.cacheExists()) {
+            return;
         }
+        var topLevelCache = this.rootNode.childrenCache;
+        var cacheToPurge = topLevelCache.getChildCache(route);
+        if (cacheToPurge) {
+            callback(cacheToPurge);
+        }
     };
@@ -462,5 +459,3 @@ ServerSideRowModel.prototype.purgeCache = function (route) {
         }
-        else {
-            return null;
-        }
+        return null;
     };
@@ -551,19 +546,17 @@ // always returns true - this is used by the
         }
-        else {
-            var detailNode = new RowNode();
-            this.getContext().wireBean(detailNode);
-            detailNode.detail = true;
-            detailNode.selectable = false;
-            detailNode.parent = masterNode;
-            if (_.exists(masterNode.id)) {
-                detailNode.id = 'detail_' + masterNode.id;
-            }
-            detailNode.data = masterNode.data;
-            detailNode.level = masterNode.level + 1;
-            var defaultDetailRowHeight = 200;
-            var rowHeight = this.gridOptionsWrapper.getRowHeightForNode(detailNode).height;
-            detailNode.rowHeight = rowHeight ? rowHeight : defaultDetailRowHeight;
-            masterNode.detailNode = detailNode;
-            return detailNode;
+        var detailNode = new RowNode();
+        this.getContext().createBean(detailNode);
+        detailNode.detail = true;
+        detailNode.selectable = false;
+        detailNode.parent = masterNode;
+        if (_.exists(masterNode.id)) {
+            detailNode.id = 'detail_' + masterNode.id;
         }
+        detailNode.data = masterNode.data;
+        detailNode.level = masterNode.level + 1;
+        var defaultDetailRowHeight = 200;
+        var rowHeight = this.gridOptionsWrapper.getRowHeightForNode(detailNode).height;
+        detailNode.rowHeight = rowHeight ? rowHeight : defaultDetailRowHeight;
+        masterNode.detailNode = detailNode;
+        return detailNode;
     };
@@ -577,5 +570,2 @@ ServerSideRowModel.prototype.isLoading = function () {
     __decorate([
-        Autowired('eventService')
-    ], ServerSideRowModel.prototype, "eventService", void 0);
-    __decorate([
         Autowired('columnController')
@@ -607,2 +597,5 @@ ], ServerSideRowModel.prototype, "columnController", void 0);
     ], ServerSideRowModel.prototype, "setBeans", null);
+    __decorate([
+        PreDestroy
+    ], ServerSideRowModel.prototype, "destroyRowNodeBlockLoader", null);
     ServerSideRowModel = __decorate([
@@ -609,0 +602,0 @@ Bean('rowModel')

package.json

 {
   "name": "@ag-grid-enterprise/server-side-row-model",
-  "version": "23.1.1",
+  "version": "23.2.0",
   "description": "Advanced Data Grid / Data Table supporting Javascript / React / AngularJS / Web Components",
@@ -45,4 +45,4 @@ "main": "./dist/cjs/main.js",
   "dependencies": {
-    "@ag-grid-community/core": "~23.1.0",
-    "@ag-grid-enterprise/core": "~23.1.0"
+    "@ag-grid-community/core": "~23.2.0",
+    "@ag-grid-enterprise/core": "~23.2.0"
   },
@@ -49,0 +49,0 @@ "devDependencies": {

No alert changes

Improved metrics

Total package byte prevSize

5796271

increased by4.52%

Lines of code

92052

increased by4.41%

Dependency changes

• + Added@ag-grid-community/core@23.2.1(transitive)

• + Added@ag-grid-enterprise/core@23.2.1(transitive)

• - Removed@ag-grid-community/core@23.1.1(transitive)

• - Removed@ag-grid-enterprise/core@23.1.1(transitive)

• Updated@ag-grid-community/core@~23.2.0

• Updated@ag-grid-enterprise/core@~23.2.0