@finos/legend-application-repl 0.0.29 → 0.0.31

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

@@ -17,44 +17,47 @@
 import { action, makeObservable, observable } from 'mobx';
 import type { DataCubeState } from '../DataCubeState.js';
 import {
-  DataCubeQuerySnapshotSortDirection,
+  DataCubeQuerySnapshotSortOperation,
   _getCol,
   type DataCubeQuerySnapshot,
   type DataCubeQuerySnapshotColumn,
-  type DataCubeQuerySnapshotSortColumn,
 } from '../core/DataCubeQuerySnapshot.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
-import { deepEqual } from '@finos/legend-shared';
 import {
   DataCubeEditorColumnsSelectorColumnState,
   DataCubeEditorColumnsSelectorState,
 } from './DataCubeEditorColumnsSelectorState.js';
+import type { DataCubeEditorState } from './DataCubeEditorState.js';
 
 export class DataCubeEditorSortColumnState extends DataCubeEditorColumnsSelectorColumnState {
   readonly column: DataCubeQuerySnapshotColumn;
-  direction: DataCubeQuerySnapshotSortDirection;
+  operation: DataCubeQuerySnapshotSortOperation;
 
   constructor(
     column: DataCubeQuerySnapshotColumn,
-    direction: DataCubeQuerySnapshotSortDirection,
+    direction: DataCubeQuerySnapshotSortOperation,
   ) {
     super();
 
     makeObservable(this, {
-      direction: observable,
-      setDirection: action,
+      operation: observable,
+      setOperation: action,
     });
 
     this.column = column;
-    this.direction = direction;
+    this.operation = direction;
   }
 
   get name(): string {
     return this.column.name;
   }
 
-  setDirection(val: DataCubeQuerySnapshotSortDirection): void {
-    this.direction = val;
+  override resetWhenMadeAvailable(): void {
+    this.setOperation(DataCubeQuerySnapshotSortOperation.ASCENDING);
+  }
+
+  setOperation(val: DataCubeQuerySnapshotSortOperation): void {
+    this.operation = val;
   }
 }
 
@@ -62,13 +65,82 @@ export class DataCubeEditorSortsPanelState
   implements DataCubeQueryEditorPanelState
 {
   readonly dataCube!: DataCubeState;
+  readonly editor!: DataCubeEditorState;
   readonly columnsSelector!: DataCubeEditorColumnsSelectorState<DataCubeEditorSortColumnState>;
 
-  constructor(dataCube: DataCubeState) {
-    this.dataCube = dataCube;
+  constructor(editor: DataCubeEditorState) {
+    this.editor = editor;
+    this.dataCube = editor.dataCube;
     this.columnsSelector = new DataCubeEditorColumnsSelectorState();
   }
 
+  getActionableSortColumn(
+    colName: string,
+    operation: DataCubeQuerySnapshotSortOperation,
+  ): DataCubeEditorSortColumnState | undefined {
+    let column = this.columnsSelector.getAvailableColumn(colName);
+    if (!column) {
+      const selectedColumn = this.columnsSelector.getSelectedColumn(colName);
+      if (selectedColumn && selectedColumn.operation !== operation) {
+        column = selectedColumn;
+      }
+    }
+    return column;
+  }
+
+  sortByColumn(
+    colName: string,
+    operation: DataCubeQuerySnapshotSortOperation,
+  ): void {
+    const column = this.getActionableSortColumn(colName, operation);
+    if (!column) {
+      return;
+    }
+    column.setOperation(operation);
+
+    this.columnsSelector.setAvailableColumns(
+      [
+        ...this.columnsSelector.availableColumns,
+        ...this.columnsSelector.selectedColumns,
+      ].filter((col) => col.name !== colName),
+    );
+    this.columnsSelector.setSelectedColumns([column]);
+    this.editor.applyChanges();
+  }
+
+  addSortByColumn(
+    colName: string,
+    operation: DataCubeQuerySnapshotSortOperation,
+  ): void {
+    const column = this.getActionableSortColumn(colName, operation);
+    if (!column) {
+      return;
+    }
+    column.setOperation(operation);
+
+    this.columnsSelector.setAvailableColumns(
+      this.columnsSelector.availableColumns.filter(
+        (col) => col.name !== colName,
+      ),
+    );
+    this.columnsSelector.setSelectedColumns([
+      ...this.columnsSelector.selectedColumns,
+      column,
+    ]);
+    this.editor.applyChanges();
+  }
+
+  clearAllSorts(): void {
+    if (this.columnsSelector.selectedColumns.length !== 0) {
+      this.columnsSelector.setAvailableColumns([
+        ...this.columnsSelector.availableColumns,
+        ...this.columnsSelector.selectedColumns,
+      ]);
+      this.columnsSelector.setSelectedColumns([]);
+      this.editor.applyChanges();
+    }
+  }
+
   applySnaphot(snapshot: DataCubeQuerySnapshot): void {
     const columns = snapshot.stageCols('sort');
     const sortColumns = snapshot.data.sortColumns;
@@ -81,7 +153,7 @@ export class DataCubeEditorSortsPanelState
           (col) =>
             new DataCubeEditorSortColumnState(
               _getCol(columns, col.name),
-              DataCubeQuerySnapshotSortDirection.ASCENDING,
+              DataCubeQuerySnapshotSortOperation.ASCENDING,
             ),
         ),
     );
@@ -90,7 +162,7 @@ export class DataCubeEditorSortsPanelState
         (col) =>
           new DataCubeEditorSortColumnState(
             _getCol(columns, col.name),
-            col.direction,
+            col.operation,
           ),
       ),
     );
@@ -99,18 +171,13 @@ export class DataCubeEditorSortsPanelState
   buildSnapshot(
     newSnapshot: DataCubeQuerySnapshot,
     baseSnapshot: DataCubeQuerySnapshot,
-  ): boolean {
-    const newSortColumns: DataCubeQuerySnapshotSortColumn[] =
-      this.columnsSelector.selectedColumns.map((sortInfo) => ({
+  ): void {
+    newSnapshot.data.sortColumns = this.columnsSelector.selectedColumns.map(
+      (sortInfo) => ({
         name: sortInfo.column.name,
         type: sortInfo.column.type,
-        direction: sortInfo.direction,
-      }));
-
-    if (!deepEqual(newSortColumns, baseSnapshot.data.sortColumns)) {
-      newSnapshot.data.sortColumns = newSortColumns;
-      return true;
-    }
-    return false;
+        operation: sortInfo.operation,
+      }),
+    );
   }
 }

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

@@ -22,6 +22,7 @@ import { DataCubeQuerySnapshotSubscriber } from '../core/DataCubeQuerySnapshotSu
 import { type DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { DataCubeEditorGeneralPropertiesPanelState } from './DataCubeEditorGeneralPropertiesPanelState.js';
+import { DataCubeEditorColumnPropertiesPanelState } from './DataCubeEditorColumnPropertiesPanelState.js';
 
 export enum DATA_CUBE_EDITOR_TAB {
   COLUMNS = 'Columns',
@@ -33,13 +34,13 @@ export enum DATA_CUBE_EDITOR_TAB {
   GENERAL_PROPERTIES = 'General Properties',
   COLUMN_PROPERTIES = 'Column Properties',
   CODE = 'Code',
-  // DEVELOPER_OPTIONS = 'Developer',
-  // PIVOT_LAYOUT = 'Pivot Layout',
+  DEVELOPER = 'Developer',
 }
 
 export class DataCubeEditorState extends DataCubeQuerySnapshotSubscriber {
   readonly sortsPanel: DataCubeEditorSortsPanelState;
   readonly generalPropertiesPanel: DataCubeEditorGeneralPropertiesPanelState;
+  readonly columnPropertiesPanel: DataCubeEditorColumnPropertiesPanelState;
   readonly codePanel: DataCubeEditorCodePanelState;
 
   isPanelOpen = false;
@@ -59,11 +60,14 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotSubscriber {
       closePanel: action,
     });
 
-    this.sortsPanel = new DataCubeEditorSortsPanelState(this.dataCube);
+    this.sortsPanel = new DataCubeEditorSortsPanelState(this);
     this.generalPropertiesPanel = new DataCubeEditorGeneralPropertiesPanelState(
-      this.dataCube,
+      this,
     );
-    this.codePanel = new DataCubeEditorCodePanelState(this.dataCube);
+    this.columnPropertiesPanel = new DataCubeEditorColumnPropertiesPanelState(
+      this,
+    );
+    this.codePanel = new DataCubeEditorCodePanelState(this);
   }
 
   openPanel(): void {
@@ -82,12 +86,14 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotSubscriber {
     const baseSnapshot = guaranteeNonNullable(this.getLatestSnapshot());
     const snapshot = baseSnapshot.clone();
 
-    const createNew = [
-      this.sortsPanel.buildSnapshot(snapshot, baseSnapshot),
-      this.generalPropertiesPanel.buildSnapshot(snapshot, baseSnapshot),
-    ].some(Boolean);
+    this.sortsPanel.buildSnapshot(snapshot, baseSnapshot);
+    // NOTE: snapshot must be processed first to build the container configuration
+    // before proceeding to process the columns' configuration
+    this.generalPropertiesPanel.buildSnapshot(snapshot, baseSnapshot);
+    this.columnPropertiesPanel.buildSnapshot(snapshot, baseSnapshot);
 
-    if (createNew) {
+    snapshot.finalize();
+    if (snapshot.hashCode !== baseSnapshot.hashCode) {
       this.publishSnapshot(snapshot);
     }
   }
@@ -95,6 +101,7 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotSubscriber {
   override async applySnapshot(snapshot: DataCubeQuerySnapshot): Promise<void> {
     this.sortsPanel.applySnaphot(snapshot);
     this.generalPropertiesPanel.applySnaphot(snapshot);
+    this.columnPropertiesPanel.applySnaphot(snapshot);
   }
 
   override async initialize(): Promise<void> {