@finos/legend-data-cube 0.0.3 → 0.0.5

package/src/components/editor/DataCubeEditorGeneralPropertiesPanel.tsx

@@ -21,7 +21,7 @@ import {
   DataCubeFontCase,
   DataCubeFontFormatUnderlineVariant,
   DataCubeFontTextAlignment,
-  DataCubeSelectionStat,
+  DataCubeQuerySortDirection,
   DEFAULT_BACKGROUND_COLOR,
   DEFAULT_ERROR_FOREGROUND_COLOR,
   DEFAULT_FOREGROUND_COLOR,
@@ -48,20 +48,18 @@ export const DataCubeEditorGeneralPropertiesPanel = observer(
     const { view } = props;
     const panel = view.editor.generalProperties;
     const configuration = panel.configuration;
+    const [
+      openTreeColumnSortDirectionDropdown,
+      closeTreeColumnSortDirectionDropdown,
+      treeColumnSortDirectionDropdownProps,
+      treeColumnSortDirectionDropdownPropsOpen,
+    ] = useDropdownMenu();
     const [
       openInitialExpandLevelDropdown,
       closeInitialExpandLevelDropdown,
       initialExpandLevelDropdownProps,
       initialExpandLevelDropdownPropsOpen,
     ] = useDropdownMenu();
-    // TODO: selection stats should be shown as a list of checkboxes
-    // rather than a dropdown!
-    const [
-      openSelectionStatDropdown,
-      closeSelectionStatDropdown,
-      selectionStatDropdownProps,
-      selectionStatDropdownPropsOpen,
-    ] = useDropdownMenu();
     const [
       openFontFamilyDropdown,
       closeFontFamilyDropdown,
@@ -109,12 +107,69 @@ export const DataCubeEditorGeneralPropertiesPanel = observer(
 
             <div className="mt-2 flex h-5 w-full items-center">
               <div className="flex h-full w-32 flex-shrink-0 items-center text-sm">
-                Initially Expand to Level:
+                Tree Column:
+              </div>
+              <FormCheckbox
+                label="Show root aggregation"
+                checked={configuration.showRootAggregation}
+                onChange={() =>
+                  configuration.setShowRootAggregation(
+                    !configuration.showRootAggregation,
+                  )
+                }
+                disabled={true}
+              />
+              <FormBadge_WIP />
+              <FormCheckbox
+                className="ml-3"
+                label="Show leaf count"
+                checked={configuration.showLeafCount}
+                onChange={() =>
+                  configuration.setShowLeafCount(!configuration.showLeafCount)
+                }
+              />
+              <div className="ml-3 mr-1.5 flex h-full flex-shrink-0 items-center text-sm">
+                Sort:
+              </div>
+              <FormDropdownMenuTrigger
+                className="w-20"
+                onClick={openTreeColumnSortDirectionDropdown}
+                open={treeColumnSortDirectionDropdownPropsOpen}
+              >
+                {configuration.treeColumnSortDirection}
+              </FormDropdownMenuTrigger>
+              <FormDropdownMenu
+                className="w-20"
+                {...treeColumnSortDirectionDropdownProps}
+              >
+                {[
+                  DataCubeQuerySortDirection.ASCENDING,
+                  DataCubeQuerySortDirection.DESCENDING,
+                ].map((direction) => (
+                  <FormDropdownMenuItem
+                    key={direction}
+                    onClick={() => {
+                      configuration.setTreeColumnSortDirection(direction);
+                      closeTreeColumnSortDirectionDropdown();
+                    }}
+                    autoFocus={
+                      direction === configuration.treeColumnSortDirection
+                    }
+                  >
+                    {direction}
+                  </FormDropdownMenuItem>
+                ))}
+              </FormDropdownMenu>
+            </div>
+
+            <div className="mt-2 flex h-5 w-full items-center">
+              <div className="flex h-full w-32 flex-shrink-0 items-center text-sm" />
+              <div className="mr-1.5 flex h-full flex-shrink-0 items-center text-sm">
+                Initially expand to level:
               </div>
               <FormDropdownMenuTrigger
                 className="w-16"
                 onClick={openInitialExpandLevelDropdown}
-                disabled={true}
                 open={initialExpandLevelDropdownPropsOpen}
               >
                 {configuration.initialExpandLevel ?? '(None)'}
@@ -136,33 +191,50 @@ export const DataCubeEditorGeneralPropertiesPanel = observer(
                   </FormDropdownMenuItem>
                 ))}
               </FormDropdownMenu>
-              <FormBadge_WIP />
             </div>
 
             <div className="mt-2 flex h-5 w-full items-center">
               <div className="flex h-full w-32 flex-shrink-0 items-center text-sm">
-                Show Root Aggregation?
+                Row Limit:
+              </div>
+              <FormNumberInput
+                className="w-16 text-sm"
+                value={panel.limit}
+                min={-1}
+                step={1}
+                defaultValue={-1}
+                isValid={(value) => value !== undefined && value >= -1}
+                setValue={(value) => panel.setLimit(value ?? -1)}
+              />
+              <div className="flex-shrink-0 pl-1 text-sm italic text-neutral-500">
+                Truncate result to this many rows at every level. Use -1 for
+                unlimited.
               </div>
+            </div>
+
+            <div className="mt-2 flex h-5 w-full items-center">
+              <div className="flex h-full w-32 flex-shrink-0 items-center text-sm" />
               <FormCheckbox
-                checked={configuration.showRootAggregation}
+                label="Display warning when truncated"
+                checked={configuration.showWarningForTruncatedResult}
                 onChange={() =>
-                  configuration.setShowRootAggregation(
-                    !configuration.showRootAggregation,
+                  configuration.setShowWarningForTruncatedResult(
+                    !configuration.showWarningForTruncatedResult,
                   )
                 }
-                disabled={true}
               />
-              <FormBadge_WIP />
             </div>
 
             <div className="mt-2 flex h-5 w-full items-center">
               <div className="flex h-full w-32 flex-shrink-0 items-center text-sm">
-                Show Leaf Count?
+                Show Selection Stats?
               </div>
               <FormCheckbox
-                checked={configuration.showLeafCount}
+                checked={configuration.showSelectionStats}
                 onChange={() =>
-                  configuration.setShowLeafCount(!configuration.showLeafCount)
+                  configuration.setShowSelectionStats(
+                    !configuration.showSelectionStats,
+                  )
                 }
                 disabled={true}
               />
@@ -174,16 +246,6 @@ export const DataCubeEditorGeneralPropertiesPanel = observer(
                 Show Lines?
               </div>
               <FormCheckbox
-                label="Tree"
-                checked={configuration.showTreeLines}
-                onChange={() =>
-                  configuration.setShowTreeLines(!configuration.showTreeLines)
-                }
-                disabled={true}
-              />
-              <FormBadge_WIP />
-              <FormCheckbox
-                className="ml-2"
                 label="Horizontal"
                 checked={configuration.showHorizontalGridLines}
                 onChange={() =>
@@ -193,7 +255,7 @@ export const DataCubeEditorGeneralPropertiesPanel = observer(
                 }
               />
               <FormCheckbox
-                className="ml-2"
+                className="ml-3"
                 label="Vertical"
                 checked={configuration.showVerticalGridLines}
                 onChange={() =>
@@ -211,75 +273,6 @@ export const DataCubeEditorGeneralPropertiesPanel = observer(
               />
             </div>
 
-            <div className="mt-2 flex h-5 w-full items-center">
-              <div className="flex h-full w-32 flex-shrink-0 items-center text-sm">
-                Show Selection Stats:
-              </div>
-              <FormDropdownMenuTrigger
-                className="w-16"
-                onClick={openSelectionStatDropdown}
-                disabled={true}
-                open={selectionStatDropdownPropsOpen}
-              >
-                {'(None)'}
-              </FormDropdownMenuTrigger>
-              <FormDropdownMenu
-                className="w-16"
-                {...selectionStatDropdownProps}
-              >
-                {[
-                  DataCubeSelectionStat.SUM,
-                  DataCubeSelectionStat.AVERAGE,
-                  DataCubeSelectionStat.COUNT,
-                  DataCubeSelectionStat.MIN,
-                  DataCubeSelectionStat.MAX,
-                ].map((operation) => (
-                  <FormDropdownMenuItem
-                    key={operation}
-                    onClick={() => {
-                      // TODO
-                      closeSelectionStatDropdown();
-                    }}
-                  >
-                    {operation}
-                  </FormDropdownMenuItem>
-                ))}
-              </FormDropdownMenu>
-              <FormBadge_WIP />
-            </div>
-
-            <div className="mt-2 flex h-5 w-full items-center">
-              <div className="flex h-full w-32 flex-shrink-0 items-center text-sm">
-                Row Limit:
-              </div>
-              <FormNumberInput
-                className="w-16 text-sm"
-                value={panel.limit}
-                min={-1}
-                step={1}
-                defaultValue={-1}
-                isValid={(value) => value !== undefined && value >= -1}
-                setValue={(value) => panel.setLimit(value ?? -1)}
-              />
-              <div className="flex-shrink-0 pl-1 text-sm italic text-neutral-500">
-                Truncate result to this many rows at every level. Use -1 for
-                unlimited.
-              </div>
-            </div>
-
-            <div className="mt-2 flex h-5 w-full items-center">
-              <div className="flex h-full w-32 flex-shrink-0 items-center text-sm" />
-              <FormCheckbox
-                label="Display warning when truncated"
-                checked={configuration.showWarningForTruncatedResult}
-                onChange={() =>
-                  configuration.setShowWarningForTruncatedResult(
-                    !configuration.showWarningForTruncatedResult,
-                  )
-                }
-              />
-            </div>
-
             <div className="mt-2 flex h-5 w-full items-center">
               <div className="flex h-full w-32 flex-shrink-0 items-center text-sm">
                 Hightlight Rows:

package/src/components/editor/DataCubeEditorSortsPanel.tsx

@@ -20,7 +20,7 @@ import { DataCubeEditorColumnsSelector } from './DataCubeEditorColumnsSelector.j
 import type { DataCubeEditorColumnsSelectorState } from '../../stores/editor/DataCubeEditorColumnsSelectorState.js';
 import type { DataCubeEditorSortColumnState } from '../../stores/editor/DataCubeEditorSortsPanelState.js';
 import {
-  DataCubeQuerySortOperator,
+  DataCubeQuerySortDirection,
   PIVOT_COLUMN_NAME_VALUE_SEPARATOR,
 } from '../../stores/core/DataCubeQueryEngine.js';
 import { IllegalStateError } from '@finos/legend-shared';
@@ -33,9 +33,9 @@ import type { DataCubeViewState } from '../../stores/DataCubeViewState.js';
 
 function getSortDirectionLabel(operation: string) {
   switch (operation) {
-    case DataCubeQuerySortOperator.ASCENDING:
+    case DataCubeQuerySortDirection.ASCENDING:
       return 'Ascending';
-    case DataCubeQuerySortOperator.DESCENDING:
+    case DataCubeQuerySortDirection.DESCENDING:
       return 'Descending';
     default:
       throw new IllegalStateError(`Unsupported sort operation '${operation}'`);
@@ -59,12 +59,12 @@ const SortDirectionDropdown = observer(
       <div className="group relative flex h-full items-center">
         {!operationsDropdownPropsOpen && (
           <div className="flex h-[18px] w-32 items-center border border-transparent px-2 text-sm text-neutral-400 group-hover:invisible">
-            {getSortDirectionLabel(column.operation)}
+            {getSortDirectionLabel(column.direction)}
           </div>
         )}
         {operationsDropdownPropsOpen && (
           <div className="flex h-[18px] w-32 items-center justify-between border border-sky-600 bg-sky-50 pl-2 pr-0.5 text-sm">
-            <div>{getSortDirectionLabel(column.operation)}</div>
+            <div>{getSortDirectionLabel(column.direction)}</div>
             <div>
               <DataCubeIcon.CaretDown />
             </div>
@@ -83,7 +83,7 @@ const SortDirectionDropdown = observer(
           }}
           onClick={(event) => event.stopPropagation()}
         >
-          <div>{getSortDirectionLabel(column.operation)}</div>
+          <div>{getSortDirectionLabel(column.direction)}</div>
           <div>
             <DataCubeIcon.CaretDown />
           </div>
@@ -91,10 +91,12 @@ const SortDirectionDropdown = observer(
         <FormDropdownMenu className="w-32" {...operationsDropdownProps}>
           <FormDropdownMenuItem
             onClick={() => {
-              column.setOperation(DataCubeQuerySortOperator.ASCENDING);
+              column.setDirection(DataCubeQuerySortDirection.ASCENDING);
               closeOperationsDropdown();
             }}
-            autoFocus={column.operation === DataCubeQuerySortOperator.ASCENDING}
+            autoFocus={
+              column.direction === DataCubeQuerySortDirection.ASCENDING
+            }
           >
             Ascending
           </FormDropdownMenuItem>
@@ -104,11 +106,11 @@ const SortDirectionDropdown = observer(
           </FormDropdownMenuItem>
           <FormDropdownMenuItem
             onClick={() => {
-              column.setOperation(DataCubeQuerySortOperator.DESCENDING);
+              column.setDirection(DataCubeQuerySortDirection.DESCENDING);
               closeOperationsDropdown();
             }}
             autoFocus={
-              column.operation === DataCubeQuerySortOperator.DESCENDING
+              column.direction === DataCubeQuerySortDirection.DESCENDING
             }
           >
             Descending

package/src/stores/core/DataCubeConfiguration.ts

@@ -35,10 +35,11 @@ import {
   type DataCubeFontTextAlignment,
   type DataCubeFontFormatUnderlineVariant,
   type DataCubeNumberScale,
-  type DataCubeSelectionStat,
   type DataCubeColumnPinPlacement,
   type DataCubeFontCase,
   type DataCubeOperationValue,
+  DEFAULT_PIVOT_STATISTIC_COLUMN_NAME,
+  DEFAULT_TREE_COLUMN_SORT_DIRECTION,
 } from './DataCubeQueryEngine.js';
 import { SerializationFactory, usingModelSchema } from '@finos/legend-shared';
 import { createModelSchema, list, optional, primitive, raw } from 'serializr';
@@ -104,8 +105,9 @@ export class DataCubeColumnConfiguration {
   // NOTE: these configurations, when changed, would potentially trigger data-fetching
   aggregateOperator!: string;
   aggregationParameters: DataCubeOperationValue[] = [];
-  excludedFromHorizontalPivot = true; // this agrees with default column kind set as Dimension
-  horizontalPivotSortFunction?: string | undefined;
+  excludedFromPivot = true; // this agrees with default column kind set as Dimension
+  pivotSortDirection?: string | undefined;
+  pivotStatisticColumnFunction?: string | undefined;
 
   constructor(name: string, type: string) {
     this.name = name;
@@ -123,7 +125,7 @@ export class DataCubeColumnConfiguration {
       displayName: optional(primitive()),
       errorBackgroundColor: optional(primitive()),
       errorForegroundColor: optional(primitive()),
-      excludedFromHorizontalPivot: primitive(),
+      excludedFromPivot: primitive(),
       fixedWidth: optional(primitive()),
       fontBold: optional(primitive()),
       fontCase: optional(primitive()),
@@ -133,7 +135,6 @@ export class DataCubeColumnConfiguration {
       fontStrikethrough: optional(primitive()),
       fontUnderline: optional(primitive()),
       hideFromView: primitive(),
-      horizontalPivotSortFunction: optional(primitive()),
       isSelected: primitive(),
       kind: primitive(),
       linkLabelParameter: optional(primitive()),
@@ -148,6 +149,8 @@ export class DataCubeColumnConfiguration {
       negativeNumberInParens: primitive(),
       numberScale: optional(primitive()),
       pinned: optional(primitive()),
+      pivotSortDirection: optional(primitive()),
+      pivotStatisticColumnFunction: optional(primitive()),
       textAlign: optional(primitive()),
       type: primitive(),
       zeroBackgroundColor: optional(primitive()),
@@ -156,11 +159,20 @@ export class DataCubeColumnConfiguration {
   );
 }
 
+export class DataCubePivotLayoutConfiguration {
+  expandedPaths: string[] = [];
+
+  static readonly serialization = new SerializationFactory(
+    createModelSchema(DataCubePivotLayoutConfiguration, {
+      expandedPaths: list(primitive()),
+    }),
+  );
+}
+
 export class DataCubeConfiguration {
   description?: string | undefined;
   columns: DataCubeColumnConfiguration[] = [];
 
-  showTreeLines = false;
   showHorizontalGridLines = false;
   showVerticalGridLines = true;
   gridLineColor = DEFAULT_GRID_LINE_COLOR;
@@ -188,15 +200,18 @@ export class DataCubeConfiguration {
   alternateRowsColor = DEFAULT_ROW_HIGHLIGHT_BACKGROUND_COLOR;
   alternateRowsCount = 1;
 
-  selectionStats: DataCubeSelectionStat[] = [];
+  showSelectionStats = false;
   showWarningForTruncatedResult = true;
 
-  // NOTE: these configurations, when changed, would potentially trigger data-fetching
+  // these configurations, when changed, would potentially trigger data-fetching
   initialExpandLevel?: number | undefined;
   showRootAggregation = false;
-  showLeafCount = false;
-  pivotTotalColumnPlacement?: DataCubeColumnPinPlacement | undefined;
-  treeGroupSortFunction?: string | undefined;
+  showLeafCount = true;
+  treeColumnSortDirection = DEFAULT_TREE_COLUMN_SORT_DIRECTION;
+  pivotStatisticColumnName = DEFAULT_PIVOT_STATISTIC_COLUMN_NAME;
+  pivotStatisticColumnPlacement?: DataCubeColumnPinPlacement | undefined; // unspecified -> hide the column
+
+  pivotLayout = new DataCubePivotLayoutConfiguration();
 
   static readonly serialization = new SerializationFactory(
     createModelSchema(DataCubeConfiguration, {
@@ -223,16 +238,19 @@ export class DataCubeConfiguration {
       negativeForegroundColor: primitive(),
       normalBackgroundColor: primitive(),
       normalForegroundColor: primitive(),
-      pivotTotalColumnPlacement: optional(primitive()),
-      selectionStats: list(primitive()),
+      pivotStatisticColumnName: primitive(),
+      pivotStatisticColumnPlacement: optional(primitive()),
+      pivotLayout: usingModelSchema(
+        DataCubePivotLayoutConfiguration.serialization.schema,
+      ),
       showHorizontalGridLines: primitive(),
       showLeafCount: primitive(),
+      showSelectionStats: primitive(),
       showRootAggregation: primitive(),
-      showTreeLines: primitive(),
       showVerticalGridLines: primitive(),
       showWarningForTruncatedResult: primitive(),
       textAlign: primitive(),
-      treeGroupSortFunction: optional(primitive()),
+      treeColumnSortDirection: primitive(),
       zeroBackgroundColor: primitive(),
       zeroForegroundColor: primitive(),
     }),

package/src/stores/core/DataCubeConfigurationBuilder.ts

@@ -41,13 +41,14 @@ export function buildDefaultColumnConfiguration(column: {
       config.displayCommas = true;
       config.negativeNumberInParens = true;
       config.textAlign = DataCubeFontTextAlignment.RIGHT; // always align number to the right
-      config.excludedFromHorizontalPivot = false;
+      config.excludedFromPivot = false;
       config.aggregateOperator = DataCubeAggregateOperator.SUM;
+      config.pivotStatisticColumnFunction = DataCubeAggregateOperator.SUM;
       break;
     }
     default: {
       config.kind = DataCubeColumnKind.DIMENSION;
-      config.excludedFromHorizontalPivot = true;
+      config.excludedFromPivot = true;
       config.aggregateOperator = DataCubeAggregateOperator.UNIQUE;
       break;
     }

package/src/stores/core/DataCubeQueryBuilder.ts

@@ -25,7 +25,6 @@ import {
   PRIMITIVE_TYPE,
   type V1_AppliedFunction,
   V1_deserializeValueSpecification,
-  extractElementNameFromPath as _name,
 } from '@finos/legend-graph';
 import {
   type DataCubeQuerySnapshot,
@@ -39,7 +38,7 @@ import {
 import {
   DataCubeExtendedColumnType,
   DataCubeFunction,
-  DataCubeQuerySortOperator,
+  DataCubeQuerySortDirection,
   type DataCubeQueryFunctionMap,
 } from './DataCubeQueryEngine.js';
 import { DataCubeConfiguration } from './DataCubeConfiguration.js';
@@ -98,7 +97,7 @@ export function buildExecutableQuery(
   if (data.leafExtendedColumns.length) {
     _process(
       'leafExtend',
-      _function(_name(DataCubeFunction.EXTEND), [
+      _function(DataCubeFunction.EXTEND, [
         _cols(
           data.leafExtendedColumns.map((col) => {
             if (col._type === DataCubeExtendedColumnType.SIMPLE) {
@@ -119,7 +118,7 @@ export function buildExecutableQuery(
   if (data.filter) {
     _process(
       'filter',
-      _function(_name(DataCubeFunction.FILTER), [
+      _function(DataCubeFunction.FILTER, [
         _lambda([_var()], [_filter(data.filter, filterOperations)]),
       ]),
     );
@@ -130,7 +129,7 @@ export function buildExecutableQuery(
   if (data.selectColumns.length) {
     _process(
       'select',
-      _function(_name(DataCubeFunction.SELECT), [
+      _function(DataCubeFunction.SELECT, [
         _cols(data.selectColumns.map((col) => _colSpec(col.name))),
       ]),
     );
@@ -144,10 +143,10 @@ export function buildExecutableQuery(
     // pre-sort to maintain stable order for pivot result columns
     _process(
       'sort',
-      _function(_name(DataCubeFunction.SORT), [
+      _function(DataCubeFunction.SORT, [
         _collection(
           data.pivot.columns.map((col) =>
-            _function(_name(DataCubeFunction.ASC), [_col(col.name)]),
+            _function(DataCubeFunction.ASC, [_col(col.name)]),
           ),
         ),
       ]),
@@ -155,7 +154,7 @@ export function buildExecutableQuery(
 
     _process(
       'pivot',
-      _function(_name(DataCubeFunction.PIVOT), [
+      _function(DataCubeFunction.PIVOT, [
         _cols(pivot.columns.map((col) => _colSpec(col.name))),
         _cols(
           _pivotAggCols(
@@ -171,7 +170,7 @@ export function buildExecutableQuery(
     if (pivot.castColumns.length) {
       _process(
         'pivotCast',
-        _function(_name(DataCubeFunction.CAST), [_castCols(pivot.castColumns)]),
+        _function(DataCubeFunction.CAST, [_castCols(pivot.castColumns)]),
       );
     }
   }
@@ -182,7 +181,7 @@ export function buildExecutableQuery(
     const groupBy = data.groupBy;
     _process(
       'groupBy',
-      _function(_name(DataCubeFunction.GROUP_BY), [
+      _function(DataCubeFunction.GROUP_BY, [
         _cols(groupBy.columns.map((col) => _colSpec(col.name))),
         _cols(
           _groupByAggCols(
@@ -194,6 +193,22 @@ export function buildExecutableQuery(
         ),
       ]),
     );
+    _process(
+      'groupBySort',
+      _function(DataCubeFunction.SORT, [
+        _collection(
+          groupBy.columns.map((col) =>
+            _function(
+              configuration.treeColumnSortDirection ===
+                DataCubeQuerySortDirection.ASCENDING
+                ? DataCubeFunction.ASC
+                : DataCubeFunction.DESC,
+              [_col(col.name)],
+            ),
+          ),
+        ),
+      ]),
+    );
   }
 
   // --------------------------------- GROUP-LEVEL EXTEND ---------------------------------
@@ -201,7 +216,7 @@ export function buildExecutableQuery(
   if (data.groupExtendedColumns.length) {
     _process(
       'groupExtend',
-      _function(_name(DataCubeFunction.EXTEND), [
+      _function(DataCubeFunction.EXTEND, [
         _cols(
           data.groupExtendedColumns.map((col) => {
             if (col._type === DataCubeExtendedColumnType.SIMPLE) {
@@ -222,15 +237,13 @@ export function buildExecutableQuery(
   if (data.sortColumns.length) {
     _process(
       'sort',
-      _function(_name(DataCubeFunction.SORT), [
+      _function(DataCubeFunction.SORT, [
         _collection(
           data.sortColumns.map((col) =>
             _function(
-              _name(
-                col.operation === DataCubeQuerySortOperator.ASCENDING
-                  ? DataCubeFunction.ASC
-                  : DataCubeFunction.DESC,
-              ),
+              col.direction === DataCubeQuerySortDirection.ASCENDING
+                ? DataCubeFunction.ASC
+                : DataCubeFunction.DESC,
               [_col(col.name)],
             ),
           ),
@@ -244,7 +257,7 @@ export function buildExecutableQuery(
   if (data.limit !== undefined) {
     _process(
       'limit',
-      _function(_name(DataCubeFunction.LIMIT), [
+      _function(DataCubeFunction.LIMIT, [
         _primitiveValue(PRIMITIVE_TYPE.INTEGER, data.limit),
       ]),
     );
@@ -254,7 +267,7 @@ export function buildExecutableQuery(
 
   if (options?.pagination) {
     sequence.push(
-      _function(_name(DataCubeFunction.SLICE), [
+      _function(DataCubeFunction.SLICE, [
         _primitiveValue(PRIMITIVE_TYPE.INTEGER, options.pagination.start),
         _primitiveValue(PRIMITIVE_TYPE.INTEGER, options.pagination.end),
       ]),
@@ -265,7 +278,7 @@ export function buildExecutableQuery(
 
   sequence.push(
     _function(
-      _name(DataCubeFunction.FROM),
+      DataCubeFunction.FROM,
       [
         data.mapping ? _elementPtr(data.mapping) : undefined,
         _elementPtr(data.runtime),

package/src/stores/core/DataCubeQueryBuilderUtils.ts

@@ -352,7 +352,7 @@ export function _pivotAggCols(
       // are not helpful and therefore excluded
       column.kind === DataCubeColumnKind.MEASURE &&
       !pivotColumns.find((col) => col.name === column.name) &&
-      !column.excludedFromHorizontalPivot &&
+      !column.excludedFromPivot &&
       !snapshot.data.groupExtendedColumns.find(
         (col) => col.name === column.name,
       ),
@@ -453,7 +453,7 @@ export function _groupByAggCols(
         }
         return aggCol;
       }),
-    // these are the columns which are available for group-by but not selected for group-by
+    // these are the columns which are available for groupBy but not selected for groupBy
     // operation, they would be aggregated as well
     ...pivotGroupByColumns
       .filter(