@finos/legend-query-builder 0.6.17 → 0.6.19

package/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts

@@ -428,6 +428,11 @@ export class QueryBuilderTDSState
     changeEntry(this.projectionColumns, oldVal, newVal);
   }
 
+  removeAllColumns(): void {
+    this.projectionColumns = [];
+    this.aggregationState.columns = [];
+  }
+
   removeColumn(val: QueryBuilderProjectionColumnState): void {
     deleteEntry(this.projectionColumns, val);
 
@@ -603,6 +608,28 @@ export class QueryBuilderTDSState
     });
   }
 
+  checkBeforeClearingColumns(onChange: () => void): void {
+    this.queryBuilderState.applicationStore.setActionAlertInfo({
+      message:
+        'You will be clearing all projection columns. Do you still want to proceed?',
+      type: ActionAlertType.CAUTION,
+      actions: [
+        {
+          label: 'Proceed',
+          type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+          handler: this.queryBuilderState.applicationStore.guardUnhandledError(
+            async () => onChange(),
+          ),
+        },
+        {
+          label: 'Cancel',
+          type: ActionAlertActionType.PROCEED,
+          default: true,
+        },
+      ],
+    });
+  }
+
   checkBeforeChangingImplementation(onChange: () => void): void {
     if (
       this.projectionColumns.length > 0

package/src/stores/fetch-structure/tds/QueryResultSetModifierState.ts

@@ -16,7 +16,6 @@
 
 import { action, computed, makeObservable, observable } from 'mobx';
 import type { QueryBuilderTDSState } from './QueryBuilderTDSState.js';
-import type { QueryBuilderProjectionColumnState } from './projection/QueryBuilderProjectionColumnState.js';
 import {
   addUniqueEntry,
   deleteEntry,
@@ -24,6 +23,7 @@ import {
   hashArray,
 } from '@finos/legend-shared';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
+import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState.js';
 
 export enum COLUMN_SORT_TYPE {
   ASC = 'ASC',
@@ -31,10 +31,10 @@ export enum COLUMN_SORT_TYPE {
 }
 
 export class SortColumnState implements Hashable {
-  columnState: QueryBuilderProjectionColumnState;
+  columnState: QueryBuilderTDSColumnState;
   sortType = COLUMN_SORT_TYPE.ASC;
 
-  constructor(columnState: QueryBuilderProjectionColumnState) {
+  constructor(columnState: QueryBuilderTDSColumnState) {
     makeObservable(this, {
       columnState: observable,
       sortType: observable,
@@ -46,7 +46,7 @@ export class SortColumnState implements Hashable {
     this.columnState = columnState;
   }
 
-  setColumnState(val: QueryBuilderProjectionColumnState): void {
+  setColumnState(val: QueryBuilderTDSColumnState): void {
     this.columnState = val;
   }
 
@@ -109,8 +109,8 @@ export class QueryResultSetModifierState implements Hashable {
   }
 
   updateSortColumns(): void {
-    this.sortColumns = this.sortColumns.filter((e) =>
-      this.tdsState.projectionColumns.includes(e.columnState),
+    this.sortColumns = this.sortColumns.filter((colState) =>
+      this.tdsState.tdsColumns.includes(colState.columnState),
     );
   }
 

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts

@@ -263,6 +263,7 @@ export const processTDSTakeExpression = (
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_PROJECT,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_GROUP_BY,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.OLAP_GROUPBY,
     ]),
     `Can't process take() expression: only support take() in TDS expression`,
   );
@@ -311,6 +312,7 @@ export const processTDSDistinctExpression = (
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_PROJECT,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_GROUP_BY,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.OLAP_GROUPBY,
     ]),
     `Can't process distinct() expression: only support distinct() in TDS expression`,
   );
@@ -418,10 +420,9 @@ export const processTDSSortDirectionExpression = (
     const sortColumnName = extractNullableStringFromInstanceValue(
       guaranteeNonNullable(expression.parametersValues[0]),
     );
-    const queryBuilderProjectionColumnState =
-      projectionState.projectionColumns.find(
-        (e) => e.columnName === sortColumnName,
-      );
+    const queryBuilderProjectionColumnState = projectionState.tdsColumns.find(
+      (e) => e.columnName === sortColumnName,
+    );
     if (queryBuilderProjectionColumnState) {
       const sortColumnState = new SortColumnState(
         queryBuilderProjectionColumnState,

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.ts

@@ -85,6 +85,7 @@ const appendResultSetModifier = (
           QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_PROJECT,
           QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_GROUP_BY,
           QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.OLAP_GROUPBY,
         ])
       ) {
         let currentExpression = func;