@finos/legend-data-cube 0.0.41 → 0.0.43

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotStartWith.tsx

@@ -15,7 +15,7 @@
  */
 import {
   DataCubeQueryFilterOperation,
-  generateDefaultFilterConditionPrimitiveTypeValue,
+  _defaultPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
@@ -23,6 +23,7 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   DataCubeQueryFilterOperator,
+  isPrimitiveType,
   ofDataType,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
@@ -33,15 +34,11 @@ import {
   _property,
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
+import { guaranteeNonNullable, returnUndefOnError } from '@finos/legend-shared';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
 import {
-  V1_PrimitiveValueSpecification,
-  type V1_AppliedFunction,
-  type V1_AppliedProperty,
-} from '@finos/legend-graph';
-import {
-  _buildConditionSnapshotProperty,
-  _dataCubeOperationValue,
+  _unwrapNotFilterCondition,
+  _baseFilterCondition,
 } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__NotStartWith extends DataCubeQueryFilterOperation {
@@ -67,8 +64,9 @@ export class DataCubeQueryFilterOperation__NotStartWith extends DataCubeQueryFil
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       value.value !== undefined &&
+      isPrimitiveType(value.type) &&
+      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       !Array.isArray(value.value)
     );
   }
@@ -76,20 +74,27 @@ export class DataCubeQueryFilterOperation__NotStartWith extends DataCubeQueryFil
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    const unwrapped = returnUndefOnError(() =>
+      _unwrapNotFilterCondition(expression),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
+    if (!unwrapped) {
+      return undefined;
     }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(
+        unwrapped,
+        columnGetter,
+        DataCubeFunction.STARTS_WITH,
+      ),
+    );
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__StartWith.tsx

@@ -15,7 +15,7 @@
  */
 import {
   DataCubeQueryFilterOperation,
-  generateDefaultFilterConditionPrimitiveTypeValue,
+  _defaultPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
@@ -23,6 +23,7 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   DataCubeQueryFilterOperator,
+  isPrimitiveType,
   ofDataType,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
@@ -33,15 +34,8 @@ import {
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import {
-  V1_PrimitiveValueSpecification,
-  type V1_AppliedFunction,
-  type V1_AppliedProperty,
-} from '@finos/legend-graph';
-import {
-  _buildConditionSnapshotProperty,
-  _dataCubeOperationValue,
-} from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__StartWith extends DataCubeQueryFilterOperation {
   override get label() {
@@ -66,8 +60,9 @@ export class DataCubeQueryFilterOperation__StartWith extends DataCubeQueryFilter
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       value.value !== undefined &&
+      isPrimitiveType(value.type) &&
+      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       !Array.isArray(value.value)
     );
   }
@@ -75,20 +70,21 @@ export class DataCubeQueryFilterOperation__StartWith extends DataCubeQueryFilter
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.STARTS_WITH,
+      ),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__StartWithCaseInsensitive.tsx

@@ -15,7 +15,7 @@
  */
 import {
   DataCubeQueryFilterOperation,
-  generateDefaultFilterConditionPrimitiveTypeValue,
+  _defaultPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
@@ -23,6 +23,7 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   DataCubeQueryFilterOperator,
+  isPrimitiveType,
   ofDataType,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
@@ -34,15 +35,8 @@ import {
   _var,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import {
-  V1_PrimitiveValueSpecification,
-  type V1_AppliedFunction,
-  type V1_AppliedProperty,
-} from '@finos/legend-graph';
-import {
-  _buildConditionSnapshotProperty,
-  _dataCubeOperationValue,
-} from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _caseSensitiveBaseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__StartWithCaseInsensitive extends DataCubeQueryFilterOperation {
   override get label() {
@@ -67,8 +61,9 @@ export class DataCubeQueryFilterOperation__StartWithCaseInsensitive extends Data
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       value.value !== undefined &&
+      isPrimitiveType(value.type) &&
+      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       !Array.isArray(value.value)
     );
   }
@@ -76,20 +71,21 @@ export class DataCubeQueryFilterOperation__StartWithCaseInsensitive extends Data
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _caseSensitiveBaseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.STARTS_WITH,
+      ),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/model/DataCubeConfiguration.ts

@@ -42,7 +42,11 @@ import {
   DEFAULT_TREE_COLUMN_SORT_DIRECTION,
   DEFAULT_REPORT_NAME,
 } from '../DataCubeQueryEngine.js';
-import { SerializationFactory, usingModelSchema } from '@finos/legend-shared';
+import {
+  SerializationFactory,
+  usingModelSchema,
+  uuid,
+} from '@finos/legend-shared';
 import { createModelSchema, list, optional, primitive, raw } from 'serializr';
 
 export type DataCubeConfigurationColorKey =
@@ -52,6 +56,8 @@ export type DataCubeConfigurationColorKey =
   | 'error';
 
 export class DataCubeColumnConfiguration {
+  readonly uuid = uuid();
+
   name: string;
   type: string;
 
@@ -181,6 +187,8 @@ export class DataCubePivotLayoutConfiguration {
 }
 
 export class DataCubeConfiguration {
+  readonly uuid = uuid();
+
   name = DEFAULT_REPORT_NAME;
   description?: string | undefined;
   columns: DataCubeColumnConfiguration[] = [];

package/src/stores/view/DataCubeViewState.ts

@@ -139,6 +139,7 @@ export class DataCubeViewState {
         source,
         query,
         this.engine.filterOperations,
+        this.engine.aggregateOperations,
       );
       this.snapshotService.broadcastSnapshot(initialSnapshot);
       this.dataCube.options?.onViewInitialized?.({

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

@@ -21,7 +21,7 @@ import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.j
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { DataCubeEditorMutableColumnConfiguration } from './DataCubeEditorMutableConfiguration.js';
 import {
-  getNonNullableEntry,
+  at,
   guaranteeNonNullable,
   type PlainObject,
 } from '@finos/legend-shared';
@@ -93,7 +93,7 @@ export class DataCubeEditorColumnPropertiesPanelState
     );
 
     if (!this.selectedColumn && this.columns.length) {
-      this.setSelectedColumnName(getNonNullableEntry(this.columns, 0).name);
+      this.setSelectedColumnName(at(this.columns, 0).name);
     }
   }
 

package/src/stores/view/extend/DataCubeColumnEditorState.tsx

@@ -32,6 +32,7 @@ import {
   DataCubeColumnKind,
   DEFAULT_LAMBDA_VARIABLE_NAME,
   getDataType,
+  isPrimitiveType,
 } from '../../core/DataCubeQueryEngine.js';
 import {
   clearMarkers,
@@ -41,7 +42,6 @@ import {
 import type { DataCubeExtendManagerState } from './DataCubeExtendManagerState.js';
 import {
   EngineError,
-  PRIMITIVE_TYPE,
   V1_Lambda,
   type V1_ValueSpecification,
 } from '@finos/legend-graph';
@@ -248,10 +248,7 @@ export abstract class DataCubeColumnBaseEditorState {
         (col) => col.name === this._name,
       )?.type;
       returnType =
-        returnType &&
-        (Object.values(PRIMITIVE_TYPE) as string[]).includes(returnType)
-          ? returnType
-          : undefined;
+        returnType && isPrimitiveType(returnType) ? returnType : undefined;
       this.setReturnType(returnType);
       return returnType;
     } catch (error) {

package/src/stores/view/filter/DataCubeFilterEditorState.tsx

@@ -20,11 +20,7 @@ import {
   DataCubeQueryFilterOperator,
 } from '../../core/DataCubeQueryEngine.js';
 import type { DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
-import {
-  deepClone,
-  getNonNullableEntry,
-  guaranteeNonNullable,
-} from '@finos/legend-shared';
+import { deepClone, at, guaranteeNonNullable } from '@finos/legend-shared';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
 import {
   type DataCubeFilterEditorTree,
@@ -141,7 +137,7 @@ export class DataCubeFilterEditorState extends DataCubeQuerySnapshotController {
       );
     } else if (baseNode instanceof DataCubeFilterEditorConditionGroupTreeNode) {
       if (this.columns.length !== 0) {
-        const columnConfig = getNonNullableEntry(this.columns, 0);
+        const columnConfig = at(this.columns, 0);
         const column = {
           name: columnConfig.name,
           type: columnConfig.type,
@@ -222,7 +218,7 @@ export class DataCubeFilterEditorState extends DataCubeQuerySnapshotController {
         // flattening means completely remove the filter tree
         if (parentNode.children.length === 1) {
           if (parentNode !== this.tree.root) {
-            const childNode = getNonNullableEntry(parentNode.children, 0);
+            const childNode = at(parentNode.children, 0);
             const grandParentNode = guaranteeNonNullable(parentNode.parent);
 
             parentNode.removeChild(childNode);

package/src/stores/view/grid/DataCubeGridClientEngine.ts

@@ -370,7 +370,7 @@ export class DataCubeGridClientServerSideDataSource
 
       // NOTE: if h-pivot is enabled, update the cast columns
       // and panels which might be affected by this (e.g. sorts)
-      // Because is an expensive operation in certain case, we only
+      // Because this can be an expensive operation, we will only
       // recompute when it's not a drilldown or paging request,
       // but we could still optimize further if needed.
       if (!this._grid.isPaginationEnabled || request.startRow === 0) {

package/src/stores/view/grid/DataCubeGridConfigurationBuilder.tsx

@@ -57,8 +57,8 @@ import {
   INTERNAL__GRID_CLIENT_ROOT_AGGREGATION_COLUMN_ID,
 } from './DataCubeGridClientEngine.js';
 import {
-  getNonNullableEntry,
-  getNullableLastEntry,
+  at,
+  last,
   getQueryParameters,
   getQueryParameterValue,
   guaranteeNonNullable,
@@ -681,10 +681,10 @@ function generateDefinitionForPivotResultColumns(
     let leaf: ColDef | undefined = undefined;
     let id = '';
     for (let i = 0; i < col.values.length; i++) {
-      const value = getNonNullableEntry(col.values, i);
+      const value = at(col.values, i);
       id =
         id === ''
-          ? getNonNullableEntry(col.values, i)
+          ? at(col.values, i)
           : `${id}${PIVOT_COLUMN_NAME_VALUE_SEPARATOR}${value}`;
 
       if (i !== col.values.length - 1) {
@@ -756,13 +756,13 @@ function generateDefinitionForPivotResultColumns(
 
       // sort the leaf level columns based on the order of selected/configuration columns
       (currentCollection as ColDef[]).sort((a, b) => {
-        const colAName = getNullableLastEntry(
+        const colAName = last(
           a.colId?.split(PIVOT_COLUMN_NAME_VALUE_SEPARATOR) ?? [],
         );
         const colAConf = colAName
           ? _findCol(configuration.columns, colAName)
           : undefined;
-        const colBName = getNullableLastEntry(
+        const colBName = last(
           b.colId?.split(PIVOT_COLUMN_NAME_VALUE_SEPARATOR) ?? [],
         );
         const colBConf = colBName

package/src/stores/view/grid/DataCubeGridMenuBuilder.tsx

@@ -30,6 +30,7 @@ import {
   DataCubeQueryFilterOperator,
   isPivotResultColumnName,
   getPivotResultColumnBaseColumnName,
+  DataCubeOperationAdvancedValueType,
 } from '../../core/DataCubeQueryEngine.js';
 import {
   guaranteeIsNumber,
@@ -134,12 +135,12 @@ function getColumnFilterOperations(
 function buildNewFilterConditionMenuItem(
   columnConfiguration: DataCubeColumnConfiguration,
   operator: string,
-  value: { label: string; value: DataCubeOperationValue } | undefined,
+  value: { label?: string | undefined; value: DataCubeOperationValue },
   controller: DataCubeGridControllerState,
 ): MenuItemDef {
   const operation = controller.view.engine.getFilterOperation(operator);
   return {
-    name: `Add Filter: ${columnConfiguration.name} ${operation.textLabel}${value ? ` ${value.label}` : ''}`,
+    name: `Add Filter: ${columnConfiguration.name} ${operation.textLabel}${value.label ? ` ${value.label}` : ''}`,
     action: () => {
       controller.addNewFilterCondition(
         new DataCubeFilterEditorConditionTreeNode(
@@ -149,7 +150,7 @@ function buildNewFilterConditionMenuItem(
             type: columnConfiguration.type,
           },
           operation,
-          value?.value,
+          value.value,
           undefined,
         ),
       );
@@ -324,13 +325,21 @@ export function generateMenuBuilder(
             buildNewFilterConditionMenuItem(
               _columnConfiguration,
               DataCubeQueryFilterOperator.IS_NULL,
-              undefined,
+              {
+                value: {
+                  type: DataCubeOperationAdvancedValueType.VOID,
+                },
+              },
               controller,
             ),
             buildNewFilterConditionMenuItem(
               _columnConfiguration,
               DataCubeQueryFilterOperator.IS_NOT_NULL,
-              undefined,
+              {
+                value: {
+                  type: DataCubeOperationAdvancedValueType.VOID,
+                },
+              },
               controller,
             ),
           ];

package/src/stores/view/grid/DataCubeGridQueryBuilder.ts

@@ -32,6 +32,7 @@ import {
   isPivotResultColumnName,
   PIVOT_COLUMN_NAME_VALUE_SEPARATOR,
   DataCubeQuerySortDirection,
+  DataCubeOperationAdvancedValueType,
 } from '../../core/DataCubeQueryEngine.js';
 import {
   guaranteeNonNullable,
@@ -234,13 +235,14 @@ function generateGridDataFetchExecutableQueryPostProcessor(
                         return {
                           ...groupByColumn,
                           operator: DataCubeQueryFilterOperator.IS_NULL,
-                          value: undefined,
+                          value: {
+                            type: DataCubeOperationAdvancedValueType.VOID,
+                          },
                         };
                       }
                       const condition = {
                         ...groupByColumn,
                         operator: DataCubeQueryFilterOperator.EQUAL,
-                        value: undefined,
                       };
                       switch (groupByColumn.type) {
                         case PRIMITIVE_TYPE.BOOLEAN:
@@ -291,11 +293,13 @@ function generateGridDataFetchExecutableQueryPostProcessor(
         );
       }
 
+      // if pivot is present, populate the count aggregation columns
+      // by modifying pivot and pivot cast function expressions
+      const countAggColumns: V1_ColSpec[] = [];
+      _addCountAggColumnToPivot(funcMap, countAggColumns);
+
       // modify groupBy() based off the current drilldown level
       if (request.groupKeys.length < groupBy.columns.length) {
-        const countAggColumns: V1_ColSpec[] = [];
-        _addCountAggColumnToPivot(funcMap, countAggColumns);
-
         const groupByIdx = sequence.indexOf(funcMap.groupBy);
         const groupByColumns = groupBy.columns.slice(
           0,