@finos/legend-query-builder 4.19.12 → 4.19.13

package/src/stores/QueryLoaderState.ts

@@ -68,6 +68,40 @@ export interface QueryRevisionDiffInput {
   content: string | undefined;
 }
 
+/**
+ * Callbacks the query loader invokes across the saved-query lifecycle. Hosts
+ * implement these to report the actions to telemetry and to keep their own
+ * state (a recently-viewed list, say) in sync.
+ *
+ * Declared as one interface so the loader's fields, its constructor options and
+ * a host's handler bundle all derive from a single contract rather than
+ * repeating four signatures three times.
+ */
+export interface QueryLoaderLifecycleHandlers {
+  onQueryRenamed?: ((query: LightQuery) => void) | undefined;
+  /**
+   * The deleted query is passed alongside its id where it could be resolved
+   * from the loaded list, so hosts can report more than a bare id.
+   */
+  onQueryDeleted?:
+    | ((queryId: string, deletedQuery?: LightQuery | undefined) => void)
+    | undefined;
+  onQueryRenameFailed?: ((queryId: string, error: Error) => void) | undefined;
+  onQueryDeleteFailed?: ((queryId: string, error: Error) => void) | undefined;
+}
+
+/**
+ * The same handlers with every one provided — what a host's complete bundle
+ * looks like. Derived from {@link QueryLoaderLifecycleHandlers} so the two
+ * cannot drift; `Required` alone would not do, since it strips optionality but
+ * leaves the explicit `| undefined` in each property's type.
+ */
+export type CompleteQueryLoaderLifecycleHandlers = {
+  [K in keyof QueryLoaderLifecycleHandlers]-?: NonNullable<
+    QueryLoaderLifecycleHandlers[K]
+  >;
+};
+
 export class QueryLoaderState {
   readonly applicationStore: GenericLegendApplicationStore;
   readonly graphManager: AbstractPureGraphManager;
@@ -94,8 +128,10 @@ export class QueryLoaderState {
     | undefined;
 
   readonly isReadOnly?: boolean | undefined;
-  readonly onQueryRenamed?: ((query: LightQuery) => void) | undefined;
-  readonly onQueryDeleted?: ((query: string) => void) | undefined;
+  readonly onQueryRenamed?: QueryLoaderLifecycleHandlers['onQueryRenamed'];
+  readonly onQueryDeleted?: QueryLoaderLifecycleHandlers['onQueryDeleted'];
+  readonly onQueryRenameFailed?: QueryLoaderLifecycleHandlers['onQueryRenameFailed'];
+  readonly onQueryDeleteFailed?: QueryLoaderLifecycleHandlers['onQueryDeleteFailed'];
   readonly handleFetchDefaultQueriesFailure?: (() => void) | undefined;
 
   queryBuilderState?: QueryBuilderState | undefined;
@@ -144,10 +180,8 @@ export class QueryLoaderState {
         | ((queries: LightQuery[]) => string)
         | undefined;
       isReadOnly?: boolean | undefined;
-      onQueryRenamed?: ((query: LightQuery) => void) | undefined;
-      onQueryDeleted?: ((query: string) => void) | undefined;
       handleFetchDefaultQueriesFailure?: (() => void) | undefined;
-    },
+    } & QueryLoaderLifecycleHandlers,
   ) {
     makeObservable(this, {
       isQueryLoaderDialogOpen: observable,
@@ -201,6 +235,8 @@ export class QueryLoaderState {
     this.isReadOnly = options.isReadOnly;
     this.onQueryRenamed = options.onQueryRenamed;
     this.onQueryDeleted = options.onQueryDeleted;
+    this.onQueryRenameFailed = options.onQueryRenameFailed;
+    this.onQueryDeleteFailed = options.onQueryDeleteFailed;
     this.handleFetchDefaultQueriesFailure =
       options.handleFetchDefaultQueriesFailure;
   }
@@ -429,6 +465,7 @@ export class QueryLoaderState {
       this.searchQueries(this.searchText); // trigger a search to refresh the query list
     } catch (error) {
       assertErrorThrown(error);
+      this.onQueryRenameFailed?.(queryId, error);
       this.applicationStore.notificationService.notifyError(error);
       this.renameQueryState.fail();
     }
@@ -463,9 +500,12 @@ export class QueryLoaderState {
 
   *deleteQuery(queryId: string): GeneratorFn<void> {
     this.deleteQueryState.inProgress();
+    // resolve before the delete: afterwards the list is refreshed and the entry
+    // is gone, so this is the only point where more than the id is available
+    const deletedQuery = this.queries.find((query) => query.id === queryId);
     try {
       yield this.graphManager.deleteQuery(queryId);
-      this.onQueryDeleted?.(queryId);
+      this.onQueryDeleted?.(queryId, deletedQuery);
       this.applicationStore.notificationService.notifySuccess(
         'Deleted query successfully',
       );
@@ -473,6 +513,7 @@ export class QueryLoaderState {
       this.searchQueries(this.searchText); // trigger a search to refresh the query list
     } catch (error) {
       assertErrorThrown(error);
+      this.onQueryDeleteFailed?.(queryId, error);
       this.applicationStore.notificationService.notifyError(error);
       this.deleteQueryState.fail();
     }

package/src/stores/data-access/DataProductAccessInfo.ts

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2026-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.
+ */
+
+/**
+ * Plain description of the data product a query runs against, used to explain
+ * entitlement failures and to point the user at where access can be requested.
+ *
+ * NOTE: this is intentionally plain data rather than the query builder state itself,
+ * so the result panel does not have to depend on `DataProductQueryBuilderState`.
+ */
+export type DataProductAccessInfo = {
+  dataProductLabel: string;
+  /**
+   * Identifier of the data product as used by external applications (e.g. Marketplace
+   * routing), which is not necessarily the same as the display label.
+   */
+  dataProductId: string;
+  accessPointGroupId: string | undefined;
+  accessPointGroupLabel: string | undefined;
+  deploymentId: string | undefined;
+  environment: string | undefined;
+  warehouse: string | undefined;
+  supportEmails: string[];
+};

package/src/stores/data-cube/QueryBuilderDataCubeEngine.ts

@@ -242,7 +242,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
       const reportWithState = Object.assign(
         {},
         report,
-        this.queryBuilderState.getStateInfo(),
+        this.queryBuilderState.safeGetTelemetryContext(),
       );
       QueryBuilderTelemetryHelper.logEvent_EmbeddedDataCubeQueryRunSucceeded(
         this.queryBuilderState.applicationStore.telemetryService,

package/src/stores/explorer/QueryBuilderExplorerState.ts

@@ -979,7 +979,7 @@ export class QueryBuilderExplorerState {
         const reportWithState = Object.assign(
           {},
           report,
-          this.queryBuilderState.getStateInfo(),
+          this.queryBuilderState.safeGetTelemetryContext(),
         );
         QueryBuilderTelemetryHelper.logEvent_QueryMappingModelCoverageAnalysisSucceeded(
           this.queryBuilderState.applicationStore.telemetryService,

package/src/stores/milestoning/QueryBuilderMilestoningHelper.ts

@@ -26,6 +26,7 @@ import {
   PrimitiveInstanceValue,
   PRIMITIVE_TYPE,
   type PureModel,
+  SimpleFunctionExpression,
   VariableExpression,
 } from '@finos/legend-graph';
 import {
@@ -289,6 +290,52 @@ export const generateMilestonedPropertyParameterValue = (
       derivedPropertyExpressionState,
     );
 };
+const isResolvableInQueryScope = (
+  value: ValueSpecification | undefined,
+  queryBuilderState: QueryBuilderState,
+): boolean => {
+  if (value instanceof PrimitiveInstanceValue) {
+    return true;
+  } else if (value instanceof VariableExpression) {
+    return (
+      queryBuilderState.parametersState.parameterStates.some(
+        (parameterState) => parameterState.variableName === value.name,
+      ) ||
+      queryBuilderState.constantState.constants.some(
+        (constant) => constant.variable.name === value.name,
+      )
+    );
+  } else if (value instanceof SimpleFunctionExpression) {
+    return value.parametersValues.every((parameterValue) =>
+      isResolvableInQueryScope(parameterValue, queryBuilderState),
+    );
+  }
+  return false;
+};
+
+const seedQueryBusinessDate = (
+  value: ValueSpecification | undefined,
+  queryBuilderState: QueryBuilderState,
+): void => {
+  if (
+    queryBuilderState.milestoningState.businessDate === undefined &&
+    isResolvableInQueryScope(value, queryBuilderState)
+  ) {
+    queryBuilderState.milestoningState.setBusinessDate(value);
+  }
+};
+
+const seedQueryProcessingDate = (
+  value: ValueSpecification | undefined,
+  queryBuilderState: QueryBuilderState,
+): void => {
+  if (
+    queryBuilderState.milestoningState.processingDate === undefined &&
+    isResolvableInQueryScope(value, queryBuilderState)
+  ) {
+    queryBuilderState.milestoningState.setProcessingDate(value);
+  }
+};
 
 export const validateMilestoningPropertyExpressionChain = (
   sourceStereotype: MILESTONING_STEREOTYPE | undefined,
@@ -317,11 +364,13 @@ export const validateMilestoningPropertyExpressionChain = (
           `Property of milestoning sterotype '${MILESTONING_STEREOTYPE.BITEMPORAL}' should not have more than two parameters`,
         );
       }
-      queryBuilderState.milestoningState.setProcessingDate(
+      seedQueryProcessingDate(
         propertyExpression.parametersValues[1],
+        queryBuilderState,
       );
-      queryBuilderState.milestoningState.setBusinessDate(
+      seedQueryBusinessDate(
         propertyExpression.parametersValues[2],
+        queryBuilderState,
       );
     } else if (propertyExpression.parametersValues.length !== 2) {
       throw new UnsupportedOperationError(
@@ -329,14 +378,16 @@ export const validateMilestoningPropertyExpressionChain = (
       );
     }
     if (targetStereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL) {
-      queryBuilderState.milestoningState.setBusinessDate(
+      seedQueryBusinessDate(
         propertyExpression.parametersValues[1],
+        queryBuilderState,
       );
     } else if (
       targetStereotype === MILESTONING_STEREOTYPE.PROCESSING_TEMPORAL
     ) {
-      queryBuilderState.milestoningState.setProcessingDate(
+      seedQueryProcessingDate(
         propertyExpression.parametersValues[1],
+        queryBuilderState,
       );
     }
   }
@@ -346,23 +397,27 @@ export const validateMilestoningPropertyExpressionChain = (
       propertyExpression.parametersValues.length === 3 &&
       targetStereotype === MILESTONING_STEREOTYPE.BITEMPORAL
     ) {
-      queryBuilderState.milestoningState.setProcessingDate(
+      seedQueryProcessingDate(
         propertyExpression.parametersValues[1],
+        queryBuilderState,
       );
-      queryBuilderState.milestoningState.setBusinessDate(
+      seedQueryBusinessDate(
         propertyExpression.parametersValues[2],
+        queryBuilderState,
       );
     }
     if (propertyExpression.parametersValues.length === 2) {
       if (targetStereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL) {
-        queryBuilderState.milestoningState.setBusinessDate(
+        seedQueryBusinessDate(
           propertyExpression.parametersValues[1],
+          queryBuilderState,
         );
       } else if (
         targetStereotype === MILESTONING_STEREOTYPE.PROCESSING_TEMPORAL
       ) {
-        queryBuilderState.milestoningState.setProcessingDate(
+        seedQueryProcessingDate(
           propertyExpression.parametersValues[1],
+          queryBuilderState,
         );
       }
     }

package/src/stores/milestoning/QueryBuilderMilestoningState.ts

@@ -54,6 +54,12 @@ import {
   FilterPropertyExpressionSourceState,
 } from '../filter/QueryBuilderFilterState.js';
 
+export type QueryBuilderMilestoningKind =
+  | 'get-all'
+  | 'all-versions'
+  | 'all-versions-in-range'
+  | 'none';
+
 export class QueryBuilderMilestoningState implements Hashable {
   readonly milestoningImplementations: QueryBuilderMilestoningImplementation[] =
     [];
@@ -92,6 +98,7 @@ export class QueryBuilderMilestoningState implements Hashable {
       isAllVersionsEnabled: computed,
       isAllVersionsInRangeEnabled: computed,
       isMilestonedQuery: computed,
+      milestoningKind: computed,
       hashCode: computed,
     });
 
@@ -240,6 +247,19 @@ export class QueryBuilderMilestoningState implements Hashable {
     );
   }
 
+  /**
+   * Shape-only summary of the milestoning configuration, for telemetry.
+   */
+  get milestoningKind(): QueryBuilderMilestoningKind {
+    return this.isAllVersionsInRangeEnabled
+      ? 'all-versions-in-range'
+      : this.isAllVersionsEnabled
+        ? 'all-versions'
+        : this.isMilestonedQuery
+          ? 'get-all'
+          : 'none';
+  }
+
   get isInvalidAllVersionsInRange(): boolean {
     if (
       (this.startDate && !this.endDate) ||

package/src/stores/workflows/dataProduct/DataProductQueryBuilderState.ts

@@ -19,6 +19,7 @@ import {
   type Class,
   DataProduct,
   type V1_DataProductArtifact,
+  type V1_DataProductInfo,
   ModelAccessPointGroup,
   NativeModelExecutionContext,
   CORE_PURE_PATH,
@@ -29,6 +30,7 @@ import {
   resolveUsableDataProductClasses,
   LakehouseRuntime,
   type LambdaFunction,
+  attachRuntimeFromQuery,
   attachWithFromQuery,
   type MappingModelCoverageAnalysisResult,
   PackageableElementExplicitReference,
@@ -77,6 +79,7 @@ import {
 } from '@finos/legend-storage';
 import { compareLabelFn } from '@finos/legend-art';
 import { QueryBuilderEmbeddedFromExecutionContextState } from '../../QueryBuilderExecutionContextState.js';
+import type { DataProductAccessInfo } from '../../data-access/DataProductAccessInfo.js';
 
 export const resolveDataProductAccessor = (
   dataProduct: DataProduct,
@@ -418,6 +421,7 @@ export class DataProductQueryBuilderState extends QueryBuilderState {
       modelAccessPointGroupOptions: computed,
       activeMapping: computed,
       activeFeaturedElements: computed,
+      dataProductAccessInfo: computed,
       loadEntities: flow,
       entities: observable,
     });
@@ -858,6 +862,21 @@ export class DataProductQueryBuilderState extends QueryBuilderState {
         relationMetadata,
       );
       this.changeSourceElement(accessor);
+      this.executionContextState.setMapping(undefined);
+      if (
+        this.executionState instanceof LakehouseDataProductExecutionState &&
+        this.executionState.selectedRuntime
+      ) {
+        this.executionContextState.setRuntimeValue(
+          new RuntimePointer(
+            PackageableElementExplicitReference.create(
+              this.executionState.selectedRuntime,
+            ),
+          ),
+        );
+      } else {
+        this.executionContextState.setRuntimeValue(undefined);
+      }
     }
   }
 
@@ -885,6 +904,47 @@ export class DataProductQueryBuilderState extends QueryBuilderState {
     return this.executionState.featuredElements;
   }
 
+  get dataProductAccessInfo(): DataProductAccessInfo {
+    const execValue = this.executionState.exectionValue;
+    // for lakehouse access points, access is granted on the group the access point
+    // belongs to, so resolve it from the access point
+    const accessPointGroup =
+      execValue instanceof ModelAccessPointGroup
+        ? execValue
+        : execValue instanceof LakehouseAccessPoint
+          ? findLakehouseAccessPointGroup(this.dataProduct, execValue.id)?.group
+          : undefined;
+    const selectedRuntime =
+      this.executionState instanceof
+        ModelAccessPointDataProductExecutionState ||
+      this.executionState instanceof LakehouseDataProductExecutionState
+        ? this.executionState.selectedRuntime
+        : undefined;
+    const lakehouseRuntime =
+      selectedRuntime?.runtimeValue instanceof LakehouseRuntime
+        ? selectedRuntime.runtimeValue
+        : undefined;
+    // NOTE: `dataProduct` is declared with definite assignment, but is genuinely unset
+    // on an artifact which was constructed rather than deserialized
+    const artifactInfo: V1_DataProductInfo | undefined =
+      this.dataProductArtifact?.dataProduct;
+
+    return {
+      dataProductLabel: this.dataProduct.title ?? this.dataProduct.name,
+      dataProductId: this.dataProduct.name,
+      accessPointGroupId: accessPointGroup?.id,
+      accessPointGroupLabel: accessPointGroup
+        ? (accessPointGroup.title ?? accessPointGroup.id)
+        : undefined,
+      deploymentId: artifactInfo?.deploymentId,
+      environment: lakehouseRuntime?.environment,
+      warehouse: lakehouseRuntime?.warehouse,
+      supportEmails: (this.dataProduct.supportInfo?.emails ?? []).map(
+        (email) => email.address,
+      ),
+    };
+  }
+
   override buildExecutionContextExpression(
     lambdaFunction: LambdaFunction,
   ): LambdaFunction {
@@ -896,6 +956,14 @@ export class DataProductQueryBuilderState extends QueryBuilderState {
         return attachWithFromQuery(lambdaFunction, this.dataProduct, runtime);
       }
       return lambdaFunction;
+    } else if (
+      this.executionState instanceof LakehouseDataProductExecutionState
+    ) {
+      const runtime = this.executionState.selectedRuntime;
+      if (runtime) {
+        return attachRuntimeFromQuery(lambdaFunction, runtime);
+      }
+      return lambdaFunction;
     }
     return super.buildExecutionContextExpression(lambdaFunction);
   }

package/tsconfig.json

@@ -108,6 +108,7 @@
     "./src/stores/__test-utils__/QueryBuilderStateTestUtils.ts",
     "./src/stores/__test-utils__/TEST_DATA__QueryBuilder_Accessors.ts",
     "./src/stores/data-access/DataAccessState.ts",
+    "./src/stores/data-access/DataProductAccessInfo.ts",
     "./src/stores/data-cube/QueryBuilderDataCubeEngine.ts",
     "./src/stores/data-cube/QueryBuilderDataCubeHelper.ts",
     "./src/stores/data-cube/QueryBuilderDataCubeViewerState.ts",
@@ -282,6 +283,7 @@
     "./src/components/lakehouse/IngestionDefinitionArtifactViewer.tsx",
     "./src/components/lineage/LineageViewer.tsx",
     "./src/components/lineage/PropertyOwnerNode.tsx",
+    "./src/components/result/QueryBuilderDataProductErrorPanel.tsx",
     "./src/components/result/QueryBuilderResultPanel.tsx",
     "./src/components/result/tds/QueryBuilderTDSCellSelectionStatsBar.tsx",
     "./src/components/result/tds/QueryBuilderTDSGridResult.tsx",