@easyquery/core 7.2.5-rc01 → 7.2.5-rc03

package/dist/easyquery.core.cjs.js

@@ -1,10 +1,10 @@
 
 /*
- * EasyQuery.JS Core v7.2.5-rc01
+ * EasyQuery.JS Core v7.2.5-rc03
  * Copyright 2024 Korzh.com
  * Licensed under MIT
  *
- * Build time: 1/6/2024 3:16:32 PM
+ * Build time: 1/15/2024 11:04:57 AM
  */
 
 'use strict';
@@ -2192,7 +2192,7 @@ class Query {
                 }
             }
             if (group.columns.length == 0) {
-                aggrSettings.groups.slice(i, 1);
+                aggrSettings.groups.splice(i, 1);
             }
         }
         const aggregates = aggrSettings.getAggregates();
@@ -2203,10 +2203,15 @@ class Query {
                 hasChanged = true;
             }
         }
+        // const isValidAggration = (aggrSettings.hasGroups() && (aggrSettings.hasAggregates() || aggrSettings.hasRecordCount())) 
+        //                          || (aggrSettings.hasAggregates && aggrSettings.hasGrandTotals());
+        // if (!isValidAggration) {
+        //     this.enableAggregation = false;
+        // }
         return hasChanged;
     }
     createSubQuery() {
-        return new Query(this.model, null, { context: this.context });
+        return new Query(this.model, null, { parent: this, context: this.context });
     }
     useAggregation(settingsTuner, silent = false) {
         this.aggrSettings.clear();
@@ -2553,6 +2558,9 @@ class Query {
                 }
             }
         }
+        if (this._enableAggregation) {
+            this.updateAggregationSettings();
+        }
         noErrors = true;
         if (noErrors) {
             if (options.changeStatus) {
@@ -3130,7 +3138,7 @@ class Query {
         this.adjustColumnsSorting();
     }
     /**
-     * Removes the column.
+     * Removes a column.
      * @param column The column to be removed.
      */
     removeColumn(column) {
@@ -3996,7 +4004,7 @@ class EqServiceProvider {
         this.httpClient.defaultHeaders['x-eqjs-version'] = '7.2.0';
         this.modelResolver = (_) => new DataModel();
         this.modelStorageResolver = null;
-        this.queryResolver = (context) => new Query(context.getModel(), null, { context });
+        this.queryResolver = (context) => new Query(context.getModel(), null, { context: context });
         this.modelLoaderResolver = (context) => new EqServerModelLoader(context);
         this.queryStorageResolver = (context) => new BrowserQueryStorage(context);
         this.querySynchronizerResolver = (context) => new EqServerQuerySynchronizer(context);
@@ -4761,7 +4769,7 @@ class EqContext {
     }
     /**
      * Sets the content of the current data model
-    */
+     */
     loadModelFromData(modelPlainData) {
         this.getQuery().loadModelData(modelPlainData);
         this.dataModel = this.getQuery().getModel();

package/dist/easyquery.core.esm.js

@@ -1,10 +1,10 @@
 
 /*
- * EasyQuery.JS Core v7.2.5-rc01
+ * EasyQuery.JS Core v7.2.5-rc03
  * Copyright 2024 Korzh.com
  * Licensed under MIT
  *
- * Build time: 1/6/2024 3:16:32 PM
+ * Build time: 1/15/2024 11:04:57 AM
  */
 
 import { i18n, DataType, utils, ValueEditor, MetaEntity, MetaEntityAttr, EditorTag, MetaData, EventEmitter, AggregationSettings, HttpClient, EasyDataTable } from '@easydata/core';
@@ -2191,7 +2191,7 @@ class Query {
                 }
             }
             if (group.columns.length == 0) {
-                aggrSettings.groups.slice(i, 1);
+                aggrSettings.groups.splice(i, 1);
             }
         }
         const aggregates = aggrSettings.getAggregates();
@@ -2202,10 +2202,15 @@ class Query {
                 hasChanged = true;
             }
         }
+        // const isValidAggration = (aggrSettings.hasGroups() && (aggrSettings.hasAggregates() || aggrSettings.hasRecordCount())) 
+        //                          || (aggrSettings.hasAggregates && aggrSettings.hasGrandTotals());
+        // if (!isValidAggration) {
+        //     this.enableAggregation = false;
+        // }
         return hasChanged;
     }
     createSubQuery() {
-        return new Query(this.model, null, { context: this.context });
+        return new Query(this.model, null, { parent: this, context: this.context });
     }
     useAggregation(settingsTuner, silent = false) {
         this.aggrSettings.clear();
@@ -2552,6 +2557,9 @@ class Query {
                 }
             }
         }
+        if (this._enableAggregation) {
+            this.updateAggregationSettings();
+        }
         noErrors = true;
         if (noErrors) {
             if (options.changeStatus) {
@@ -3129,7 +3137,7 @@ class Query {
         this.adjustColumnsSorting();
     }
     /**
-     * Removes the column.
+     * Removes a column.
      * @param column The column to be removed.
      */
     removeColumn(column) {
@@ -3995,7 +4003,7 @@ class EqServiceProvider {
         this.httpClient.defaultHeaders['x-eqjs-version'] = '7.2.0';
         this.modelResolver = (_) => new DataModel();
         this.modelStorageResolver = null;
-        this.queryResolver = (context) => new Query(context.getModel(), null, { context });
+        this.queryResolver = (context) => new Query(context.getModel(), null, { context: context });
         this.modelLoaderResolver = (context) => new EqServerModelLoader(context);
         this.queryStorageResolver = (context) => new BrowserQueryStorage(context);
         this.querySynchronizerResolver = (context) => new EqServerQuerySynchronizer(context);
@@ -4760,7 +4768,7 @@ class EqContext {
     }
     /**
      * Sets the content of the current data model
-    */
+     */
     loadModelFromData(modelPlainData) {
         this.getQuery().loadModelData(modelPlainData);
         this.dataModel = this.getQuery().getModel();

package/dist/types/main/context.d.ts

@@ -162,7 +162,7 @@ export declare class EqContext {
     getModel(): DataModel;
     /**
      * Sets the content of the current data model
-    */
+     */
     loadModelFromData(modelPlainData: ModelPlainData): void;
     /**
      * Sets the ID of the default model

package/dist/types/query/query.d.ts

@@ -324,7 +324,7 @@ export declare class Query implements AggregationColumnStore {
      */
     moveColumn(index1: number, index2: number): void;
     /**
-     * Removes the column.
+     * Removes a column.
      * @param column The column to be removed.
      */
     removeColumn(column: QueryColumn): void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@easyquery/core",
-    "version": "7.2.5-rc01",
+    "version": "7.2.5-rc03",
     "description": "EasyQuery.JS Community core modules",
     "types": "./dist/types/public_api.d.ts",
     "main": "./dist/easyquery.core.cjs.js",