@datorama/core 22.5.5 → 22.6.2

package/fesm5/datorama-core.js

@@ -11977,11 +11977,23 @@ function deepmerge(target, source, optionsArgument) {
  * found in the LICENSE file at https://github.com/datorama/client-core/blob/master/LICENSE
  */
 var DatoGridV2NoDataOverlayComponent = /** @class */ (function () {
-    function DatoGridV2NoDataOverlayComponent(gridQuery, gridService) {
+    function DatoGridV2NoDataOverlayComponent(gridQuery, gridService, element) {
         this.gridQuery = gridQuery;
         this.gridService = gridService;
+        this.element = element;
         this.config = {};
     }
+    Object.defineProperty(DatoGridV2NoDataOverlayComponent.prototype, "showImage", {
+        get: function () {
+            var elParent = this.element.nativeElement.parentElement;
+            if (elParent.classList.contains('ag-overlay-wrapper')) {
+                return elParent.offsetHeight >= 390;
+            }
+            return true;
+        },
+        enumerable: true,
+        configurable: true
+    });
     DatoGridV2NoDataOverlayComponent.prototype.ngOnInit = function () {
         this.filterActive$ = this.gridQuery.filterActive$;
         this.hasError$ = this.gridQuery.isServerSide ? this.gridQuery.serverSideError$ : of(false);
@@ -12013,7 +12025,8 @@ var DatoGridV2NoDataOverlayComponent = /** @class */ (function () {
     };
     DatoGridV2NoDataOverlayComponent.ctorParameters = function () { return [
         { type: GridQuery },
-        { type: GridService }
+        { type: GridService },
+        { type: ElementRef }
     ]; };
     __decorate([
         Input(),
@@ -12022,11 +12035,11 @@ var DatoGridV2NoDataOverlayComponent = /** @class */ (function () {
     DatoGridV2NoDataOverlayComponent = __decorate([
         Component({
             selector: 'dato-grid-v2-no-data-overlay',
-            template: "<div class=\"container d-flex-column align-center\">\n    <ng-container *ngIf=\"(hasError$ | async) === false; else error\">\n          <ng-container *ngIf=\"(filterActive$ | async) === true; else noData\">\n              <ng-container *ngTemplateOutlet=\"imgNText; context: {$implicit: mergedConfig.noResult }\"></ng-container>\n              <div class=\"d-flex items-center\">\n                  <div class=\"dato-simple primary-400-color\">{{'core.try-to-adjust-or' | translate}}&nbsp;</div>\n                  <dato-link (click)=\"clearFilters()\">{{ 'core.clear-filters' | translate }}</dato-link>\n              </div>\n          </ng-container>\n          <ng-template #noData>\n              <ng-container *ngTemplateOutlet=\"imgNText; context: {$implicit: mergedConfig.noData}\"></ng-container>\n              <ng-content select=\"[no-data-content]\"></ng-content>\n          </ng-template>\n\n    </ng-container>\n    <ng-template #error>\n        <ng-container *ngTemplateOutlet=\"imgNText; context: {$implicit: mergedConfig.serverSideError}\"></ng-container>\n        <div #errorContent><ng-content select=\"[server-error-content]\"></ng-content></div>\n        <div class=\"dato-simple primary-400-color\" *ngIf=\"errorContent.children.length === 0\">{{'core.try-to-refresh-or-contact' | translate}}&nbsp;</div>\n    </ng-template>\n</div>\n\n<ng-template #imgNText let-view>\n    <img class=\"mb-30\" [datoStaticSrc]=\"view.icon\">\n    <div class=\"dato-simple-bold primary-500-color mb-3\">{{ view.text | translate }}</div>\n</ng-template>\n",
+            template: "<div class=\"container d-flex-column align-center\">\n    <ng-container *ngIf=\"(hasError$ | async) === false; else error\">\n          <ng-container *ngIf=\"(filterActive$ | async) === true; else noData\">\n              <ng-container *ngTemplateOutlet=\"imgNText; context: {$implicit: mergedConfig.noResult }\"></ng-container>\n              <div class=\"d-flex items-center\">\n                  <div class=\"dato-simple primary-400-color\">{{'core.try-to-adjust-or' | translate}}&nbsp;</div>\n                  <dato-link (click)=\"clearFilters()\">{{ 'core.clear-filters' | translate }}</dato-link>\n              </div>\n          </ng-container>\n          <ng-template #noData>\n              <ng-container *ngTemplateOutlet=\"imgNText; context: {$implicit: mergedConfig.noData}\"></ng-container>\n              <ng-content select=\"[no-data-content]\"></ng-content>\n          </ng-template>\n\n    </ng-container>\n    <ng-template #error>\n        <ng-container *ngTemplateOutlet=\"imgNText; context: {$implicit: mergedConfig.serverSideError}\"></ng-container>\n        <div #errorContent><ng-content select=\"[server-error-content]\"></ng-content></div>\n        <div class=\"dato-simple primary-400-color\" *ngIf=\"errorContent.children.length === 0\">{{'core.try-to-refresh-or-contact' | translate}}&nbsp;</div>\n    </ng-template>\n</div>\n\n<ng-template #imgNText let-view>\n    <img class=\"mb-30\" [datoStaticSrc]=\"view.icon\" *ngIf=\"showImage && view.icon\">\n    <div class=\"dato-simple-bold primary-500-color mb-3\">{{ view.text | translate }}</div>\n</ng-template>\n",
             changeDetection: ChangeDetectionStrategy.OnPush,
             styles: [":host{pointer-events:all}"]
         }),
-        __metadata("design:paramtypes", [GridQuery, GridService])
+        __metadata("design:paramtypes", [GridQuery, GridService, ElementRef])
     ], DatoGridV2NoDataOverlayComponent);
     return DatoGridV2NoDataOverlayComponent;
 }());
@@ -14254,15 +14267,30 @@ var GridService = /** @class */ (function () {
     };
     GridService.prototype.setGridSort = function (gridSort) {
         if (this.api && gridSort) {
-            var sort = gridSort.sort, sortIndex = gridSort.sortIndex;
+            var sort = gridSort.sort, sortIndex = gridSort.sortIndex, colId_1 = gridSort.colId;
             if (!isNil(sortIndex)) {
-                var columns = this.api.columns.getAllGridColumns();
-                if (columns) {
-                    var column = columns[sortIndex];
-                    if (column) {
-                        var sortToApply = { colId: column.getColId(), sort: sort };
-                        this.updateSettings({ sort: sortToApply });
-                        this.api.grid.setSortModel([sortToApply]);
+                var gridColumns = this.api.columns.getAllGridColumns();
+                if (gridColumns) {
+                    var primaryColumns = this.api.columns.getPrimaryColumns();
+                    var primaryColumn = primaryColumns.find(function (col) { return col.getColId() === colId_1; });
+                    if (primaryColumn) {
+                        /** Column is no pivot value column */
+                        var columnById = gridColumns.find(function (col) {
+                            return col.getColDef().showRowGroup || col.getColId() === colId_1;
+                        });
+                        if (columnById) {
+                            var sortToApply = { colId: columnById.getColId(), sort: sort };
+                            this.updateSettings({ sort: sortToApply });
+                            this.api.grid.setSortModel([sortToApply]);
+                        }
+                    }
+                    else {
+                        var columnByIndex = gridColumns[sortIndex];
+                        if (columnByIndex) {
+                            var sortToApply = { colId: columnByIndex.getColId(), sort: sort };
+                            this.updateSettings({ sort: sortToApply });
+                            this.api.grid.setSortModel([sortToApply]);
+                        }
                     }
                 }
             }
@@ -25212,7 +25240,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '22.5.5';
+window.coreVersion = '22.6.2';
 
 /**
  * @license