@finos/legend-application-repl 0.0.40 → 0.0.42

package/src/stores/dataCube/editor/DataCubeEditorColumnPropertiesPanelState.ts

@@ -16,7 +16,10 @@
 
 import { action, computed, makeObservable, observable } from 'mobx';
 import type { DataCubeState } from '../DataCubeState.js';
-import type { DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
+import {
+  _findCol,
+  type DataCubeQuerySnapshot,
+} from '../core/DataCubeQuerySnapshot.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { DataCubeMutableColumnConfiguration } from './DataCubeMutableConfiguration.js';
@@ -26,6 +29,11 @@ import {
   type PlainObject,
 } from '@finos/legend-shared';
 import type { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import {
+  DataCubeAggregateOperation,
+  DataCubeColumnKind,
+} from '../core/DataCubeQueryEngine.js';
+import { PRIMITIVE_TYPE } from '@finos/legend-graph';
 
 export class DataCubeEditorColumnPropertiesPanelState
   implements DataCubeQueryEditorPanelState
@@ -57,11 +65,11 @@ export class DataCubeEditorColumnPropertiesPanelState
     this.dataCube = editor.dataCube;
   }
 
-  get hiddenColumns(): DataCubeMutableColumnConfiguration[] {
+  get hiddenColumns() {
     return this.columns.filter((column) => column.hideFromView);
   }
 
-  get configurableColumns(): DataCubeMutableColumnConfiguration[] {
+  get configurableColumns() {
     return this.columns
       .filter((column) =>
         this.editor.columns.selector.selectedColumns.find(
@@ -71,39 +79,62 @@ export class DataCubeEditorColumnPropertiesPanelState
       .sort((a, b) => a.name.localeCompare(b.name));
   }
 
-  getColumnConfiguration(
-    colName: string | undefined,
-  ): DataCubeMutableColumnConfiguration | undefined {
+  getColumnConfiguration(colName: string | undefined) {
     return this.columns.find((col) => col.name === colName);
   }
 
-  setColumns(val: DataCubeMutableColumnConfiguration[]): void {
+  setColumns(val: DataCubeMutableColumnConfiguration[]) {
     this.columns = val;
   }
 
-  setSelectedColumnName(val: string | undefined): void {
+  setSelectedColumnName(val: string | undefined) {
     this.selectedColumnName = val;
   }
 
-  get selectedColumn(): DataCubeMutableColumnConfiguration | undefined {
+  get selectedColumn() {
     return this.configurableColumns.find(
       (column) => column.name === this.selectedColumnName,
     );
   }
 
-  setShowAdvancedSettings(val: boolean): void {
+  setShowAdvancedSettings(val: boolean) {
     this.showAdvancedSettings = val;
   }
 
   applySnaphot(
     snapshot: DataCubeQuerySnapshot,
     configuration: DataCubeConfiguration,
-  ): void {
+  ) {
     this.setColumns(
       (snapshot.data.configuration as { columns: PlainObject[] }).columns.map(
         (column) => DataCubeMutableColumnConfiguration.create(column),
       ),
     );
+    // derive the aggregation operation
+    this.columns.forEach((column) => {
+      if (column.kind === DataCubeColumnKind.MEASURE) {
+        const aggCol = _findCol(snapshot.data.groupBy?.aggColumns, column.name);
+        if (aggCol) {
+          column.setAggregateFunction(aggCol.operation);
+          column.setAggregateFunctionParameters(aggCol.parameters);
+        } else {
+          switch (column.type) {
+            case PRIMITIVE_TYPE.NUMBER:
+            case PRIMITIVE_TYPE.INTEGER:
+            case PRIMITIVE_TYPE.DECIMAL:
+            case PRIMITIVE_TYPE.FLOAT: {
+              column.setAggregateFunction(DataCubeAggregateOperation.SUM);
+              column.setAggregateFunctionParameters([]);
+              break;
+            }
+            default: {
+              break;
+            }
+          }
+        }
+      }
+    });
+
     if (!this.selectedColumn && this.columns.length) {
       this.setSelectedColumnName(
         getNonNullableEntry(this.configurableColumns, 0).name,
@@ -114,7 +145,7 @@ export class DataCubeEditorColumnPropertiesPanelState
   buildSnapshot(
     newSnapshot: DataCubeQuerySnapshot,
     baseSnapshot: DataCubeQuerySnapshot,
-  ): void {
+  ) {
     newSnapshot.data.configuration = {
       ...newSnapshot.data.configuration,
       // NOTE: make sure the order of column configurations is consistent with the order of selected columns

package/src/stores/dataCube/editor/DataCubeEditorColumnsPanelState.ts

@@ -31,16 +31,14 @@ import { type DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
 import { DataCubeMutableColumnConfiguration } from './DataCubeMutableConfiguration.js';
 
 export class DataCubeEditorBasicColumnsSelectorState extends DataCubeEditorColumnsSelectorState<DataCubeEditorColumnsSelectorColumnState> {
-  override cloneColumn(
-    column: DataCubeEditorColumnsSelectorColumnState,
-  ): DataCubeEditorColumnsSelectorColumnState {
+  override cloneColumn(column: DataCubeEditorColumnsSelectorColumnState) {
     return new DataCubeEditorColumnsSelectorColumnState(
       column.name,
       column.type,
     );
   }
 
-  override get availableColumns(): DataCubeEditorColumnsSelectorColumnState[] {
+  override get availableColumns() {
     return [
       ...this.editor.columns.sourceColumns,
       // TODO: add extended columns
@@ -100,7 +98,7 @@ export class DataCubeEditorColumnsPanelState
    * not propagate this change until user either leaves this panel or explicitly applies changes
    * (i.e. publishes a new snapshot)
    */
-  propagateColumnSelectionChanges(): void {
+  propagateColumnSelectionChanges() {
     // prune column properties
     this.editor.columnProperties.setColumns(
       this.editor.columnProperties.columns.filter((column) =>
@@ -125,14 +123,14 @@ export class DataCubeEditorColumnsPanelState
     // TODO: prune horizontal pivots columns
   }
 
-  setSourceColumns(columns: DataCubeQuerySnapshotColumn[]): void {
+  setSourceColumns(columns: DataCubeQuerySnapshotColumn[]) {
     this.sourceColumns = columns;
   }
 
   applySnaphot(
     snapshot: DataCubeQuerySnapshot,
     configuration: DataCubeConfiguration,
-  ): void {
+  ) {
     this.setSourceColumns(snapshot.data.sourceColumns);
     this.selector.setSelectedColumns(
       // extract selected columns from the configuration since the configuration specifies the order
@@ -150,7 +148,7 @@ export class DataCubeEditorColumnsPanelState
   buildSnapshot(
     newSnapshot: DataCubeQuerySnapshot,
     baseSnapshot: DataCubeQuerySnapshot,
-  ): void {
+  ) {
     this.propagateColumnSelectionChanges();
     newSnapshot.data.selectColumns = this.selector.selectedColumns
       // TODO: filter by group extended columns

package/src/stores/dataCube/editor/DataCubeEditorColumnsSelectorState.ts

@@ -90,7 +90,7 @@ export abstract class DataCubeEditorColumnsSelectorState<
 
   setColumnsVisibility(
     visibility: DataCubeEditorColumnsSelectorColumnsVisibility,
-  ): void {
+  ) {
     this.columnsVisibility = visibility;
   }
 
@@ -124,16 +124,16 @@ export abstract class DataCubeEditorColumnsSelectorState<
     );
   }
 
-  setSelectedColumns(val: T[]): void {
+  setSelectedColumns(val: T[]) {
     this.selectedColumns = val.map((col) => this.cloneColumn(col));
     this.onChange?.(this);
   }
 
-  setAvailableColumnsSearchText(val: string): void {
+  setAvailableColumnsSearchText(val: string) {
     this.availableColumnsSearchText = val;
   }
 
-  setSelectedColumnsSearchText(val: string): void {
+  setSelectedColumnsSearchText(val: string) {
     this.selectedColumnsSearchText = val;
   }
 

package/src/stores/dataCube/editor/DataCubeEditorGeneralPropertiesPanelState.ts

@@ -48,22 +48,22 @@ export class DataCubeEditorGeneralPropertiesPanelState
     this.dataCube = editor.dataCube;
   }
 
-  setName(val: string): void {
+  setName(val: string) {
     this.name = val;
   }
 
-  setLimit(val: number): void {
+  setLimit(val: number) {
     this.limit = val;
   }
 
-  setConfiguration(val: DataCubeMutableConfiguration): void {
+  setConfiguration(val: DataCubeMutableConfiguration) {
     this.configuration = val;
   }
 
   applySnaphot(
     snapshot: DataCubeQuerySnapshot,
     configuration: DataCubeConfiguration,
-  ): void {
+  ) {
     this.setName(snapshot.data.name);
     this.setLimit(
       snapshot.data.limit !== undefined && snapshot.data.limit > 0
@@ -78,7 +78,7 @@ export class DataCubeEditorGeneralPropertiesPanelState
   buildSnapshot(
     newSnapshot: DataCubeQuerySnapshot,
     baseSnapshot: DataCubeQuerySnapshot,
-  ): void {
+  ) {
     const data = newSnapshot.data;
     data.name = this.name;
     data.limit = this.limit <= 0 ? undefined : this.limit;

package/src/stores/dataCube/editor/DataCubeEditorSortsPanelState.ts

@@ -44,15 +44,13 @@ export class DataCubeEditorSortColumnState extends DataCubeEditorColumnsSelector
     this.operation = direction;
   }
 
-  setOperation(val: DataCubeQuerySortOperation): void {
+  setOperation(val: DataCubeQuerySortOperation) {
     this.operation = val;
   }
 }
 
 export class DataCubeEditorSortColumnsSelectorState extends DataCubeEditorColumnsSelectorState<DataCubeEditorSortColumnState> {
-  override cloneColumn(
-    column: DataCubeEditorSortColumnState,
-  ): DataCubeEditorSortColumnState {
+  override cloneColumn(column: DataCubeEditorSortColumnState) {
     return new DataCubeEditorSortColumnState(
       column.name,
       column.type,
@@ -60,7 +58,7 @@ export class DataCubeEditorSortColumnsSelectorState extends DataCubeEditorColumn
     );
   }
 
-  override get availableColumns(): DataCubeEditorSortColumnState[] {
+  override get availableColumns() {
     return this.editor.columns.selector.selectedColumns.map(
       (col) =>
         new DataCubeEditorSortColumnState(
@@ -88,7 +86,7 @@ export class DataCubeEditorSortsPanelState
   applySnaphot(
     snapshot: DataCubeQuerySnapshot,
     configuration: DataCubeConfiguration,
-  ): void {
+  ) {
     this.selector.setSelectedColumns(
       snapshot.data.sortColumns.map((col) => {
         const column = this.selector.getColumn(col.name);
@@ -104,7 +102,7 @@ export class DataCubeEditorSortsPanelState
   buildSnapshot(
     newSnapshot: DataCubeQuerySnapshot,
     baseSnapshot: DataCubeQuerySnapshot,
-  ): void {
+  ) {
     newSnapshot.data.sortColumns = this.selector.selectedColumns.map((col) => ({
       name: col.name,
       type: col.type,

package/src/stores/dataCube/editor/DataCubeEditorState.tsx

@@ -77,11 +77,11 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotSubscriber {
     this.code = new DataCubeEditorCodePanelState(this);
   }
 
-  setCurrentTab(val: DataCubeEditorTab): void {
+  setCurrentTab(val: DataCubeEditorTab) {
     this.currentTab = val;
   }
 
-  applyChanges(): void {
+  applyChanges() {
     const baseSnapshot = guaranteeNonNullable(this.getLatestSnapshot());
     const snapshot = baseSnapshot.clone();
 
@@ -106,7 +106,7 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotSubscriber {
   override async applySnapshot(
     snapshot: DataCubeQuerySnapshot,
     previousSnapshot: DataCubeQuerySnapshot | undefined,
-  ): Promise<void> {
+  ) {
     const configuration = DataCubeConfiguration.serialization.fromJson(
       snapshot.data.configuration,
     );
@@ -119,7 +119,7 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotSubscriber {
     this.columnProperties.applySnaphot(snapshot, configuration);
   }
 
-  override async initialize(): Promise<void> {
+  override async initialize() {
     // do nothing
   }
 }

package/src/stores/dataCube/editor/DataCubeEditorVerticalPivotsPanelState.ts

@@ -68,7 +68,7 @@ export class DataCubeEditorVerticalPivotsPanelState
   applySnaphot(
     snapshot: DataCubeQuerySnapshot,
     configuration: DataCubeConfiguration,
-  ): void {
+  ) {
     this.selector.setSelectedColumns(
       (snapshot.data.groupBy?.columns ?? []).map(
         (col) =>
@@ -80,7 +80,7 @@ export class DataCubeEditorVerticalPivotsPanelState
   buildSnapshot(
     newSnapshot: DataCubeQuerySnapshot,
     baseSnapshot: DataCubeQuerySnapshot,
-  ): void {
+  ) {
     newSnapshot.data.groupBy = this.selector.selectedColumns.length
       ? {
           columns: this.selector.selectedColumns.map((column) => ({
@@ -99,7 +99,8 @@ export class DataCubeEditorVerticalPivotsPanelState
             .map((column) => ({
               name: column.name,
               type: column.type,
-              function: guaranteeNonNullable(column.aggregateFunction),
+              operation: guaranteeNonNullable(column.aggregateFunction),
+              parameters: column.aggregateFunctionParameters,
             })),
         }
       : undefined;