@datorama/core 22.5.5 → 22.6.2

package/fesm2015/datorama-core.js

@@ -10637,11 +10637,19 @@ function deepmerge(target, source, optionsArgument = { arrayMerge: useDestinatio
  * found in the LICENSE file at https://github.com/datorama/client-core/blob/master/LICENSE
  */
 let DatoGridV2NoDataOverlayComponent = class DatoGridV2NoDataOverlayComponent {
-    constructor(gridQuery, gridService) {
+    constructor(gridQuery, gridService, element) {
         this.gridQuery = gridQuery;
         this.gridService = gridService;
+        this.element = element;
         this.config = {};
     }
+    get showImage() {
+        const elParent = this.element.nativeElement.parentElement;
+        if (elParent.classList.contains('ag-overlay-wrapper')) {
+            return elParent.offsetHeight >= 390;
+        }
+        return true;
+    }
     ngOnInit() {
         this.filterActive$ = this.gridQuery.filterActive$;
         this.hasError$ = this.gridQuery.isServerSide ? this.gridQuery.serverSideError$ : of(false);
@@ -10674,7 +10682,8 @@ let DatoGridV2NoDataOverlayComponent = class DatoGridV2NoDataOverlayComponent {
 };
 DatoGridV2NoDataOverlayComponent.ctorParameters = () => [
     { type: GridQuery },
-    { type: GridService }
+    { type: GridService },
+    { type: ElementRef }
 ];
 __decorate([
     Input(),
@@ -10683,11 +10692,11 @@ __decorate([
 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);
 
 /**
@@ -12713,15 +12722,30 @@ let GridService = class GridService {
     }
     setGridSort(gridSort) {
         if (this.api && gridSort) {
-            const { sort, sortIndex } = gridSort;
+            const { sort, sortIndex, colId } = gridSort;
             if (!isNil(sortIndex)) {
-                const columns = this.api.columns.getAllGridColumns();
-                if (columns) {
-                    const column = columns[sortIndex];
-                    if (column) {
-                        const sortToApply = { colId: column.getColId(), sort };
-                        this.updateSettings({ sort: sortToApply });
-                        this.api.grid.setSortModel([sortToApply]);
+                const gridColumns = this.api.columns.getAllGridColumns();
+                if (gridColumns) {
+                    const primaryColumns = this.api.columns.getPrimaryColumns();
+                    const primaryColumn = primaryColumns.find(col => col.getColId() === colId);
+                    if (primaryColumn) {
+                        /** Column is no pivot value column */
+                        const columnById = gridColumns.find((col) => {
+                            return col.getColDef().showRowGroup || col.getColId() === colId;
+                        });
+                        if (columnById) {
+                            const sortToApply = { colId: columnById.getColId(), sort };
+                            this.updateSettings({ sort: sortToApply });
+                            this.api.grid.setSortModel([sortToApply]);
+                        }
+                    }
+                    else {
+                        const columnByIndex = gridColumns[sortIndex];
+                        if (columnByIndex) {
+                            const sortToApply = { colId: columnByIndex.getColId(), sort };
+                            this.updateSettings({ sort: sortToApply });
+                            this.api.grid.setSortModel([sortToApply]);
+                        }
                     }
                 }
             }
@@ -22670,7 +22694,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '22.5.5';
+window.coreVersion = '22.6.2';
 
 /**
  * @license