@finos/legend-query-builder 4.18.0 → 4.18.1

package/src/components/fetch-structure/QueryBuilderTDSWindowPanel.tsx

@@ -233,6 +233,9 @@ const QueryBuilderWindowColumnModalEditor = observer(
 
     // Window operator
     const operators = windowState.operators;
+    const supportedOperators = tdsState.queryBuilderState.useRelation
+      ? operators.filter((op) => op.relationFunc !== undefined)
+      : operators.filter((op) => op.pureFunc !== undefined);
     const operatorState = windowColumnState.operatorState;
     const [selectedOperatorState, setSelectedOperatorState] = useState(() => {
       if (
@@ -449,10 +452,10 @@ const QueryBuilderWindowColumnModalEditor = observer(
                     <ControlledDropdownMenu
                       className="query-builder__olap__column__operation__operator__dropdown"
                       title="Choose Window Function Operator..."
-                      disabled={!operators.length}
+                      disabled={!supportedOperators.length}
                       content={
                         <MenuContent>
-                          {operators.map((op) => (
+                          {supportedOperators.map((op) => (
                             <MenuContentItem
                               key={op.uuid}
                               className="query-builder__olap__column__operation__operator__dropdown__option"
@@ -779,6 +782,9 @@ const QueryBuilderWindowColumnEditor = observer(
     const windowState = windowColumnState.windowState;
     const tdsState = windowState.tdsState;
     const operators = windowState.operators;
+    const supportedOperators = tdsState.queryBuilderState.useRelation
+      ? operators.filter((op) => op.relationFunc !== undefined)
+      : operators.filter((op) => op.pureFunc !== undefined);
     // state
     const ref = useRef<HTMLDivElement>(null);
     const handleRef = useRef<HTMLDivElement>(null);
@@ -1021,11 +1027,11 @@ const QueryBuilderWindowColumnEditor = observer(
               </div>
               <ControlledDropdownMenu
                 className="query-builder__olap__column__operation__operator__dropdown"
-                disabled={!operators.length}
+                disabled={!supportedOperators.length}
                 title="Choose Window Function Operator..."
                 content={
                   <MenuContent>
-                    {operators.map((op) => (
+                    {supportedOperators.map((op) => (
                       <MenuContentItem
                         key={op.uuid}
                         className="query-builder__olap__column__operation__operator__dropdown__option"

package/src/components/workflows/AccessorQueryBuilder.tsx

@@ -151,12 +151,12 @@ const AccessorQueryBuilderSetupPanelContent = observer(
                 title="accessor"
                 htmlFor="query-builder__setup__accessor-selector"
               >
-                Accessor
+                {queryBuilderState.accessorLabel}
               </label>
               <CustomSelectorInput
                 inputId="query-builder__setup__accessor-selector"
                 className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
-                placeholder="Choose an accessor..."
+                placeholder={`Choose a ${queryBuilderState.accessorLabel.toLocaleLowerCase()}...`}
                 options={accessorOptions}
                 onChange={changeAccessor}
                 value={selectedAccessorOption}

package/src/components/workflows/DataProductQueryBuilder.tsx

@@ -18,6 +18,8 @@ import { useApplicationStore } from '@finos/legend-application';
 import {
   type DataProductOption,
   type DataProductQueryBuilderState,
+  type ExecutionIdOption,
+  LakehouseDataProductExecutionState,
   ModelAccessPointDataProductExecutionState,
 } from '../../stores/workflows/dataProduct/DataProductQueryBuilderState.js';
 import {
@@ -27,11 +29,7 @@ import {
 import { CustomSelectorInput } from '@finos/legend-art';
 import { QueryBuilderClassSelector } from '../QueryBuilderSideBar.js';
 import { observer } from 'mobx-react-lite';
-import type {
-  PackageableRuntime,
-  NativeModelExecutionContext,
-  ModelAccessPointGroup,
-} from '@finos/legend-graph';
+import type { PackageableRuntime } from '@finos/legend-graph';
 import { useEffect } from 'react';
 import { flowResult } from 'mobx';
 
@@ -95,29 +93,35 @@ export const DataProductQueryBuilderSetupFormContent = observer(
             {...(formatOptionLabel ? { formatOptionLabel } : {})}
           />
         </div>
-        {Boolean(queryBuilderState.showExecutionContextOptions) && (
+        {Boolean(queryBuilderState.showExecutionIdSelector) && (
           <div className="query-builder__setup__config-group__item">
             <label
               className="btn--sm query-builder__setup__config-group__item__label"
-              title="execution context"
-              htmlFor="query-builder__setup__context-selector"
+              title="execution id"
+              htmlFor="query-builder__setup__execution-id-selector"
             >
-              Context
+              Execution ID
             </label>
             <CustomSelectorInput
-              inputId="query-builder__setup__context-selector"
+              inputId="query-builder__setup__execution-id-selector"
               className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
-              placeholder="Choose an execution context..."
-              options={queryBuilderState.execOptions}
-              disabled={
-                queryBuilderState.execOptions.length < 1 ||
-                (queryBuilderState.execOptions.length === 1 &&
-                  Boolean(queryBuilderState.selectedExecOption))
-              }
-              onChange={(option: { value: NativeModelExecutionContext }) =>
-                queryBuilderState.changeNativeExecutionContext(option.value)
-              }
-              value={queryBuilderState.selectedExecOption}
+              placeholder="Choose an execution id..."
+              options={queryBuilderState.executionIdOptions}
+              disabled={queryBuilderState.executionIdOptions.length < 2}
+              onChange={(option: ExecutionIdOption) => {
+                queryBuilderState
+                  .changeExecutionId(option)
+                  .catch(applicationStore.alertUnhandledError);
+              }}
+              value={queryBuilderState.selectedExecutionIdOption}
+              formatOptionLabel={(option: ExecutionIdOption) => (
+                <div className="query-builder__setup__config-group__item__selector__option">
+                  <span>{option.label}</span>
+                  <span className="query-builder__setup__config-group__item__selector__option__tag">
+                    {option.tag}
+                  </span>
+                </div>
+              )}
               darkMode={
                 !applicationStore.layoutService
                   .TEMPORARY__isLightColorThemeEnabled
@@ -125,42 +129,16 @@ export const DataProductQueryBuilderSetupFormContent = observer(
             />
           </div>
         )}
-        {Boolean(queryBuilderState.showModelAccessPointGroupSelector) && (
+        {!queryBuilderState.isLakehouseMode && (
           <div className="query-builder__setup__config-group__item">
-            <label
-              className="btn--sm query-builder__setup__config-group__item__label"
-              title="access point group"
-              htmlFor="query-builder__setup__access-point-group-selector"
-            >
-              Access Point Group
-            </label>
-            <CustomSelectorInput
-              inputId="query-builder__setup__access-point-group-selector"
-              className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
-              placeholder="Choose an access point group..."
-              options={queryBuilderState.modelAccessPointGroupOptions}
-              disabled={
-                queryBuilderState.modelAccessPointGroupOptions.length < 1
-              }
-              onChange={(option: { value: ModelAccessPointGroup }) =>
-                queryBuilderState.changeModelAccessPointGroupValue(option.value)
-              }
-              value={queryBuilderState.selectedModelAccessPointGroupOption}
-              darkMode={
-                !applicationStore.layoutService
-                  .TEMPORARY__isLightColorThemeEnabled
-              }
+            <QueryBuilderClassSelector
+              queryBuilderState={queryBuilderState}
+              classes={queryBuilderState.usableClasses}
+              onClassChange={queryBuilderState.onClassChange}
+              noMatchMessage="No compatible entity found for specified execution context"
             />
           </div>
         )}
-        <div className="query-builder__setup__config-group__item">
-          <QueryBuilderClassSelector
-            queryBuilderState={queryBuilderState}
-            classes={queryBuilderState.usableClasses}
-            onClassChange={queryBuilderState.onClassChange}
-            noMatchMessage="No compatible entity found for specified execution context"
-          />
-        </div>
       </>
     );
   },
@@ -173,23 +151,23 @@ const DataProductQueryBuilderSetupPanelContent = observer(
     const executionState = queryBuilderState.executionState;
 
     // runtime options (only for model access point group)
+    const runtimeRequired =
+      executionState instanceof ModelAccessPointDataProductExecutionState ||
+      executionState instanceof LakehouseDataProductExecutionState;
     const showRuntimeSelector =
-      executionState instanceof ModelAccessPointDataProductExecutionState &&
-      executionState.showRuntimeOptions;
-    const runtimeOptions =
-      executionState instanceof ModelAccessPointDataProductExecutionState
-        ? executionState.compatibleRuntimes.map(buildElementOption)
-        : [];
+      runtimeRequired && executionState.showRuntimeOptions;
+    const runtimeOptions = runtimeRequired
+      ? executionState.compatibleRuntimes.map(buildElementOption)
+      : [];
     const selectedRuntimeOption =
-      executionState instanceof ModelAccessPointDataProductExecutionState &&
-      executionState.selectedRuntime
+      runtimeRequired && executionState.selectedRuntime
         ? buildElementOption(executionState.selectedRuntime)
         : null;
 
     const onRuntimeOptionChange = (
       option: PackageableElementOption<PackageableRuntime>,
     ): void => {
-      if (executionState instanceof ModelAccessPointDataProductExecutionState) {
+      if (runtimeRequired) {
         if (option.value === executionState.selectedRuntime) {
           return;
         }

package/src/graph/QueryBuilderMetaModelConst.ts

@@ -131,6 +131,8 @@ export enum QUERY_BUILDER_SUPPORTED_FUNCTIONS {
   RELATION_OVER = 'meta::pure::functions::relation::over',
   RELATION_RANK = 'meta::pure::functions::relation::rank',
   RELATION_DENSE_RANK = 'meta::pure::functions::relation::denseRank',
+  RELATION_ROW_NUMBER = 'meta::pure::functions::relation::rowNumber',
+  RELATION_PERCENT_RANK = 'meta::pure::functions::relation::percentRank',
 
   // filter
   CONTAINS = 'meta::pure::functions::string::contains',

package/src/index.ts

@@ -66,8 +66,11 @@ export {
   buildExecOptions,
   type ModelAccessPointGroupOption,
   buildModelAccessPointGroupOption,
+  type ExecutionIdOption,
+  buildDataProductAccessor,
   NativeModelDataProductExecutionState,
   ModelAccessPointDataProductExecutionState,
+  LakehouseDataProductExecutionState,
 } from './stores/workflows/dataProduct/DataProductQueryBuilderState.js';
 export { DataProductQueryBuilderSetupFormContent } from './components/workflows/DataProductQueryBuilder.js';
 export { AccessorQueryBuilderState } from './stores/workflows/accessor/AccessorQueryBuilderState.js';

package/src/stores/QueryBuilderStateHashUtils.ts

@@ -86,6 +86,7 @@ export enum QUERY_BUILDER_STATE_HASH_STRUCTURE {
   TDS_WINDOW_OPERATOR_MIN = 'TDS_WINDOW_OPERATOR_MIN',
   TDS_WINDOW_OPERATOR_COUNT = 'TDS_WINDOW_OPERATOR_COUNT',
   TDS_WINDOW_OPERATOR_AVERAGE = 'TDS_WINDOW_OPERATOR_AVERAGE',
+  TDS_WINDOW_OPERATOR_PERCENT_RANK = 'TDS_WINDOW_OPERATOR_PERCENT_RANK',
 
   // filter state
   FILTER_TREE_GROUP_NODE_DATA = 'FILTER_TREE_GROUP_NODE_DATA',

package/src/stores/QueryBuilderTypeaheadHelper.ts

@@ -220,7 +220,7 @@ const buildRawLambda = (
     colAliases.values.push(colAlias);
     const columnLambda = propertyExpression
       ? buildGenericLambdaFunctionInstanceValue(
-          DEFAULT_LAMBDA_VARIABLE_NAME,
+          [DEFAULT_LAMBDA_VARIABLE_NAME],
           [propertyExpression],
           queryBuilderState.graphManagerState.graph,
         )
@@ -229,7 +229,7 @@ const buildRawLambda = (
       extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_AGG),
     );
     const aggregateLambda = buildGenericLambdaFunctionInstanceValue(
-      DEFAULT_LAMBDA_VARIABLE_NAME,
+      [DEFAULT_LAMBDA_VARIABLE_NAME],
       [
         aggregationOperator.buildAggregateExpression(
           propertyExpression,
@@ -267,7 +267,7 @@ const buildRawLambda = (
     colAliases.values.push(colAlias);
     const columnLambda = propertyExpression
       ? buildGenericLambdaFunctionInstanceValue(
-          DEFAULT_LAMBDA_VARIABLE_NAME,
+          [DEFAULT_LAMBDA_VARIABLE_NAME],
           [propertyExpression],
           queryBuilderState.graphManagerState.graph,
         )
@@ -322,7 +322,7 @@ const buildRawLambda = (
     postFilterExpression.parametersValues.push(value);
   }
   const filterLambda = buildGenericLambdaFunctionInstanceValue(
-    DEFAULT_POST_FILTER_LAMBDA_VARIABLE_NAME,
+    [DEFAULT_POST_FILTER_LAMBDA_VARIABLE_NAME],
     [postFilterExpression],
     queryBuilderState.graphManagerState.graph,
   );

package/src/stores/QueryBuilderValueSpecificationHelper.ts

@@ -299,7 +299,7 @@ export const generateDefaultValueForPrimitiveType = (
 };
 
 export const buildGenericLambdaFunctionInstanceValue = (
-  lambdaParameterName: string,
+  lambdaParameterNames: string[],
   lambdaBodyExpressions: ValueSpecification[],
   graph: PureModel,
 ): LambdaFunctionInstanceValue => {
@@ -310,9 +310,11 @@ export const buildGenericLambdaFunctionInstanceValue = (
     ),
     Multiplicity.ONE,
   );
-  functionType.parameters.push(
-    new VariableExpression(lambdaParameterName, Multiplicity.ONE),
+
+  functionType.parameters = lambdaParameterNames.map(
+    (parameterName) => new VariableExpression(parameterName, Multiplicity.ONE),
   );
+
   const lambdaFunction = new LambdaFunction(functionType);
   lambdaFunction.expressionSequence = lambdaBodyExpressions;
   functionInstanceValue.values.push(lambdaFunction);