@finos/legend-query-builder 4.17.100 → 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

@@ -0,0 +1,211 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  CustomSelectorInput,
+  PanelHeader,
+  compareLabelFn,
+  createFilter,
+} from '@finos/legend-art';
+import { observer } from 'mobx-react-lite';
+import {
+  type Runtime,
+  RuntimePointer,
+  PackageableElementExplicitReference,
+} from '@finos/legend-graph';
+import { useApplicationStore } from '@finos/legend-application';
+import {
+  buildRuntimeValueOption,
+  getRuntimeOptionFormatter,
+} from '../QueryBuilderSideBar.js';
+import type {
+  AccessorQueryBuilderState,
+  AccessorOwnerOption,
+} from '../../stores/workflows/accessor/AccessorQueryBuilderState.js';
+import { getPackageableElementOptionFormatter } from '@finos/legend-lego/graph-editor';
+
+type AccessorOption = {
+  label: string;
+  value: { schemaName?: string | undefined; tableName: string };
+};
+
+const AccessorQueryBuilderSetupPanelContent = observer(
+  (props: { queryBuilderState: AccessorQueryBuilderState }) => {
+    const { queryBuilderState } = props;
+    const applicationStore = useApplicationStore();
+
+    // accessor owner (IngestDefinition or Database)
+    const accessorOwnerOptions =
+      queryBuilderState.accessorOwnerOptions.sort(compareLabelFn);
+    const selectedAccessorOwnerOption = queryBuilderState.selectedAccessorOwner
+      ? (queryBuilderState.accessorOwnerOptions.find(
+          (opt) => opt.value === queryBuilderState.selectedAccessorOwner,
+        ) ?? null)
+      : null;
+    const changeAccessorOwner = (val: AccessorOwnerOption): void => {
+      if (val.value === queryBuilderState.selectedAccessorOwner) {
+        return;
+      }
+      queryBuilderState.changeAccessorOwner(val.value);
+    };
+    const accessorOwnerFilterOption = createFilter({
+      ignoreCase: true,
+      ignoreAccents: false,
+      stringify: (option: { data: AccessorOwnerOption }): string =>
+        option.data.value.path,
+    });
+
+    // accessor (dataset / table)
+    const accessorOptions =
+      queryBuilderState.accessorsOptions.sort(compareLabelFn);
+    const selectedAccessorOption = queryBuilderState.sourceAccessor
+      ? (queryBuilderState.accessorsOptions.find(
+          (opt) =>
+            opt.value.tableName ===
+              queryBuilderState.sourceAccessor?.accessor &&
+            opt.value.schemaName === queryBuilderState.sourceAccessor.schema,
+        ) ?? null)
+      : null;
+    const changeAccessor = (val: AccessorOption): void => {
+      queryBuilderState.changeAccessor(val.value);
+    };
+    const showAccessorSelector = accessorOptions.length > 0;
+
+    // runtime
+    const runtimeOptions = queryBuilderState.compatibleRuntimes
+      .map(
+        (rt) =>
+          new RuntimePointer(PackageableElementExplicitReference.create(rt)),
+      )
+      .map(buildRuntimeValueOption)
+      .sort(compareLabelFn);
+    const selectedRuntimeOption = queryBuilderState.executionContextState
+      .runtimeValue
+      ? buildRuntimeValueOption(
+          queryBuilderState.executionContextState.runtimeValue,
+        )
+      : null;
+    const changeRuntime = (val: { value: Runtime }): void => {
+      if (val.value === queryBuilderState.executionContextState.runtimeValue) {
+        return;
+      }
+      queryBuilderState.changeRuntime(val.value);
+    };
+    const runtimeFilterOption = createFilter({
+      ignoreCase: true,
+      ignoreAccents: false,
+      stringify: (option: { data: { value: Runtime } }): string =>
+        option.data.value instanceof RuntimePointer
+          ? option.data.value.packageableRuntime.value.path
+          : 'custom',
+    });
+
+    return (
+      <div className="query-builder__setup__config-group">
+        <PanelHeader title="properties" />
+        <div className="query-builder__setup__config-group__content">
+          <div className="query-builder__setup__config-group__item">
+            <label
+              className="btn--sm query-builder__setup__config-group__item__label"
+              title="source"
+              htmlFor="query-builder__setup__source-selector"
+            >
+              Source
+            </label>
+            <CustomSelectorInput
+              inputId="query-builder__setup__source-selector"
+              className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
+              placeholder="Choose a source..."
+              options={accessorOwnerOptions}
+              onChange={changeAccessorOwner}
+              value={selectedAccessorOwnerOption}
+              darkMode={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
+              filterOption={accessorOwnerFilterOption}
+              formatOptionLabel={getPackageableElementOptionFormatter({
+                darkMode:
+                  !applicationStore.layoutService
+                    .TEMPORARY__isLightColorThemeEnabled,
+              })}
+            />
+          </div>
+          {showAccessorSelector && (
+            <div className="query-builder__setup__config-group__item">
+              <label
+                className="btn--sm query-builder__setup__config-group__item__label"
+                title="accessor"
+                htmlFor="query-builder__setup__accessor-selector"
+              >
+                {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 a ${queryBuilderState.accessorLabel.toLocaleLowerCase()}...`}
+                options={accessorOptions}
+                onChange={changeAccessor}
+                value={selectedAccessorOption}
+                darkMode={
+                  !applicationStore.layoutService
+                    .TEMPORARY__isLightColorThemeEnabled
+                }
+              />
+            </div>
+          )}
+          <div className="query-builder__setup__config-group__item">
+            <label
+              className="btn--sm query-builder__setup__config-group__item__label"
+              title="runtime"
+              htmlFor="query-builder__setup__runtime-selector"
+            >
+              Runtime
+            </label>
+            <CustomSelectorInput
+              inputId="query-builder__setup__runtime-selector"
+              className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
+              placeholder="Choose a runtime..."
+              noMatchMessage="No compatible runtime found"
+              disabled={!queryBuilderState.selectedAccessorOwner}
+              options={runtimeOptions}
+              onChange={changeRuntime}
+              value={selectedRuntimeOption}
+              darkMode={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
+              filterOption={runtimeFilterOption}
+              formatOptionLabel={getRuntimeOptionFormatter({
+                darkMode:
+                  !applicationStore.layoutService
+                    .TEMPORARY__isLightColorThemeEnabled,
+              })}
+            />
+          </div>
+        </div>
+      </div>
+    );
+  },
+);
+
+export const renderAccessorQueryBuilderSetupPanelContent = (
+  queryBuilderState: AccessorQueryBuilderState,
+): React.ReactNode => (
+  <AccessorQueryBuilderSetupPanelContent
+    queryBuilderState={queryBuilderState}
+  />
+);

package/src/components/workflows/ClassQueryBuilder.tsx

@@ -64,9 +64,9 @@ const ClassQueryBuilderSetupPanelContent = observer(
 
     // mapping
     const mappingOptions = (
-      queryBuilderState.class
+      queryBuilderState.sourceClass
         ? getClassCompatibleMappings(
-            queryBuilderState.class,
+            queryBuilderState.sourceClass,
             queryBuilderState.graphManagerState.usableMappings,
           )
         : []
@@ -79,7 +79,7 @@ const ClassQueryBuilderSetupPanelContent = observer(
       : null;
     const changeMapping = (val: PackageableElementOption<Mapping>): void => {
       if (
-        !queryBuilderState.class ||
+        !queryBuilderState.sourceElement ||
         val.value === queryBuilderState.executionContextState.mapping
       ) {
         return;
@@ -152,7 +152,7 @@ const ClassQueryBuilderSetupPanelContent = observer(
                   : 'No compatible mapping found for class'
               }
               noMatchMessage="No compatible mapping found for specified class"
-              disabled={!queryBuilderState.class}
+              disabled={!queryBuilderState.sourceElement}
               options={mappingOptions}
               onChange={changeMapping}
               value={selectedMappingOption}
@@ -182,7 +182,7 @@ const ClassQueryBuilderSetupPanelContent = observer(
               placeholder="Choose a runtime..."
               noMatchMessage="No compatible runtime found for specified mapping"
               disabled={
-                !queryBuilderState.class ||
+                !queryBuilderState.sourceElement ||
                 !queryBuilderState.executionContextState.mapping
               }
               options={runtimeOptions}

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

@@ -127,6 +127,13 @@ export enum QUERY_BUILDER_SUPPORTED_FUNCTIONS {
   RELATION_SORT = 'meta::pure::functions::relation::sort',
   RELATION_SLICE = 'meta::pure::functions::relation::slice',
   RELATION_GROUP_BY = 'meta::pure::functions::relation::groupBy',
+  RELATION_EXTEND = 'meta::pure::functions::relation::extend',
+  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',
   ENDS_WITH = 'meta::pure::functions::string::endsWith',

package/src/graph-manager/protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.ts

@@ -26,6 +26,8 @@ import {
   V1_buildSubTypePropertyExpressionTypeInference,
   V1_buildWatermarkFunctionExpression,
   V1_buildGroupByFunctionExpression,
+  V1_buildOverFunctionExpression,
+  V1_buildExtendFunctionExpression,
 } from './v1/V1_QueryValueSpecificationBuilderHelper.js';
 import {
   type V1_GraphBuilderContext,
@@ -237,6 +239,32 @@ export class QueryBuilder_PureProtocolProcessorPlugin extends PureProtocolProces
             new GenericType(PrimitiveType.DATE),
           );
           return expression;
+        } else if (
+          matchFunctionName(
+            functionName,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_EXTEND,
+          )
+        ) {
+          return V1_buildExtendFunctionExpression(
+            functionName,
+            parameters,
+            openVariables,
+            compileContext,
+            processingContext,
+          );
+        } else if (
+          matchFunctionName(
+            functionName,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_OVER,
+          )
+        ) {
+          return V1_buildOverFunctionExpression(
+            functionName,
+            parameters,
+            openVariables,
+            compileContext,
+            processingContext,
+          );
         } else if (
           matchFunctionName(
             functionName,