@finos/legend-application-query 13.8.51 → 13.8.53

package/src/stores/data-space/DataProductQueryCreatorStore.ts

@@ -71,6 +71,7 @@ import {
 import { createQueryDataProductTaggedValue } from '../../components/data-product/QueryDataProductUtil.js';
 import { DataProductSelectorState } from './DataProductSelectorState.js';
 import { LegendQueryUserDataHelper } from '../../__lib__/LegendQueryUserDataHelper.js';
+import type { InitializeTelemetrySource } from '../../__lib__/LegendQueryTelemetryHelper.js';
 import {
   type VisitedLegacyDataProduct,
   type VisitedDataProduct,
@@ -81,6 +82,12 @@ import {
   createSimpleVisitedDataProduct,
 } from '../../__lib__/LegendQueryUserDataSpaceHelper.js';
 import { LEGEND_QUERY_APP_EVENT } from '../../__lib__/LegendQueryEvent.js';
+import {
+  type LegendQueryDataProductSourceInfo,
+  type LegendQueryDataSpaceSourceInfo,
+  type LegendQueryUnselectedSourceInfo,
+  LegendQuerySourceType,
+} from '../../__lib__/LegendQuerySourceInfo.js';
 import {
   action,
   computed,
@@ -177,9 +184,37 @@ const enum VisitedEntityType {
   DATAPRODUCT = 'DATAPRODUCT',
 }
 
+const getDataProductSourceInfo = (
+  element: QueryableDataProduct,
+): LegendQueryDataProductSourceInfo => ({
+  sourceType: LegendQuerySourceType.DATA_PRODUCT,
+  groupId: element.groupId,
+  artifactId: element.artifactId,
+  versionId: element.versionId,
+  dataProduct: element.dataProductPath,
+  // NOTE: these can be empty when reopening a data product visited before
+  // they were recorded
+  accessType: element.dataProductType || undefined,
+  accessId: element.id || undefined,
+});
+
+const getDataSpaceSourceInfo = (
+  element: QueryableLegacyDataProduct,
+): LegendQueryDataSpaceSourceInfo => ({
+  sourceType: LegendQuerySourceType.DATA_SPACE,
+  groupId: element.groupId,
+  artifactId: element.artifactId,
+  versionId: element.versionId,
+  dataSpace: element.dataSpacePath,
+  // NOTE: this can be empty when reopening a data space visited before it
+  // was recorded
+  executionContext: element.executionContext || undefined,
+});
+
 export class DataProductQueryCreatorStore extends QueryEditorStore {
   queryableElement: LegendQueryableElement | undefined;
   productSelectorState: DataProductSelectorState;
+  isRestoredFromRecent = false;
   declare queryBuilderState:
     | DataSpaceQueryBuilderState
     | LegendQueryDataProductQueryBuilderState
@@ -204,6 +239,7 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
     this.productSelectorState = new DataProductSelectorState(
       depotServerClient,
       applicationStore,
+      this.lakehouseState?.contractServerClient,
     );
   }
 
@@ -259,35 +295,45 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
     return undefined;
   }
 
+  /**
+   * Reopens the most recently visited data product or data space, used when
+   * the route does not specify one
+   */
+  restoreMostRecentlyVisited(): void {
+    const mostRecent = this.getMostRecentlyVisited();
+    if (!mostRecent) {
+      return;
+    }
+    if (mostRecent.type === VisitedEntityType.DATAPRODUCT) {
+      const visited = mostRecent.visited as VisitedDataProduct;
+      this.setQueryableElement(
+        new QueryableDataProduct(
+          visited.groupId,
+          visited.artifactId,
+          visited.versionId ?? LATEST_VERSION_ALIAS,
+          visited.path,
+          visited.dataProductAccessType ?? '',
+          visited.accessId ?? '',
+        ),
+      );
+    } else {
+      const visited = mostRecent.visited as VisitedLegacyDataProduct;
+      this.setQueryableElement(
+        new QueryableLegacyDataProduct(
+          visited.groupId,
+          visited.artifactId,
+          visited.versionId ?? LATEST_VERSION_ALIAS,
+          visited.path,
+          visited.execContext ?? '',
+        ),
+      );
+    }
+    this.isRestoredFromRecent = true;
+  }
+
   override *initialize(): GeneratorFn<void> {
     if (!this.queryableElement) {
-      const mostRecent = this.getMostRecentlyVisited();
-      if (mostRecent) {
-        if (mostRecent.type === VisitedEntityType.DATAPRODUCT) {
-          const visited = mostRecent.visited as VisitedDataProduct;
-          this.setQueryableElement(
-            new QueryableDataProduct(
-              visited.groupId,
-              visited.artifactId,
-              visited.versionId ?? LATEST_VERSION_ALIAS,
-              visited.path,
-              visited.dataProductAccessType ?? '',
-              visited.accessId ?? '',
-            ),
-          );
-        } else {
-          const visited = mostRecent.visited as VisitedLegacyDataProduct;
-          this.setQueryableElement(
-            new QueryableLegacyDataProduct(
-              visited.groupId,
-              visited.artifactId,
-              visited.versionId ?? LATEST_VERSION_ALIAS,
-              visited.path,
-              visited.execContext ?? '',
-            ),
-          );
-        }
-      }
+      this.restoreMostRecentlyVisited();
     }
     // Kick off product loading so dropdown data is available for all flows
     if (!this.productSelectorState.isCompletelyLoaded) {
@@ -298,6 +344,26 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
     yield flowResult(super.initialize());
   }
 
+  override getSourceInfo():
+    | LegendQueryDataProductSourceInfo
+    | LegendQueryDataSpaceSourceInfo
+    | LegendQueryUnselectedSourceInfo {
+    if (this.queryableElement instanceof QueryableDataProduct) {
+      return getDataProductSourceInfo(this.queryableElement);
+    } else if (this.queryableElement instanceof QueryableLegacyDataProduct) {
+      return getDataSpaceSourceInfo(this.queryableElement);
+    }
+    // no data product or data space selected yet
+    return { sourceType: LegendQuerySourceType.UNSELECTED };
+  }
+
+  override getInitializeTelemetrySource(): InitializeTelemetrySource {
+    return {
+      ...this.getSourceInfo(),
+      restoredFromRecent: this.isRestoredFromRecent,
+    };
+  }
+
   async initializeQueryBuilderState(): Promise<QueryBuilderState> {
     if (this.queryableElement) {
       if (this.queryableElement instanceof QueryableDataProduct) {
@@ -412,6 +478,7 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
         );
       },
       this.productSelectorState,
+      getDataProductSourceInfo(queryableDataProduct),
     );
 
     // add to visited data products
@@ -461,12 +528,7 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
       isSnapshotVersion(queryableDataSpace.versionId) ||
         queryableDataSpace.versionId === SNAPSHOT_VERSION_ALIAS,
     );
-    const sourceInfo = {
-      groupId: queryableDataSpace.groupId,
-      artifactId: queryableDataSpace.artifactId,
-      versionId: queryableDataSpace.versionId,
-      dataSpace: dataSpace.path,
-    };
+    const sourceInfo = getDataSpaceSourceInfo(queryableDataSpace);
     const visitedDataSpaces =
       LegendQueryUserDataHelper.getRecentlyVisitedDataSpaces(
         this.applicationStore.userDataService,
@@ -601,6 +663,10 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
         )) as LegendQueryDataProductQueryBuilderState;
       this.queryLoaderState.initialize(this.queryBuilderState);
       this.initState.pass();
+      this.queryBuilderState.logOpened(
+        this.getOpenedFrom(),
+        this.getInitializeTelemetrySource(),
+      );
     } catch (error) {
       assertErrorThrown(error);
       this.applicationStore.notificationService.notify(

package/src/stores/data-space/DataProductSelectorState.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { CORE_PURE_PATH } from '@finos/legend-graph';
 import {
   DepotScope,
   type DepotServerClient,
@@ -26,9 +25,10 @@ import {
   ActionState,
   LogEvent,
   assertErrorThrown,
+  isNonNullable,
   type GeneratorFn,
 } from '@finos/legend-shared';
-import type { DepotEntityWithOrigin } from '@finos/legend-storage';
+import { DepotEntityWithOrigin } from '@finos/legend-storage';
 import {
   DATA_SPACE_ELEMENT_CLASSIFIER_PATH,
   extractDataSpaceInfo,
@@ -38,6 +38,35 @@ import type { DataSpaceOption } from '@finos/legend-extension-dsl-data-space/app
 import { action, flow, makeObservable, observable } from 'mobx';
 import { APPLICATION_EVENT } from '@finos/legend-application';
 import type { LegendQueryApplicationStore } from '../LegendQueryBaseStore.js';
+import { type LakehouseContractServerClient } from '@finos/legend-server-lakehouse';
+import {
+  CORE_PURE_PATH,
+  type V1_EntitlementsDataProductLite,
+  V1_EntitlementsLakehouseEnvironmentType,
+  V1_SdlcDeploymentDataProductOrigin,
+  V1_entitlementsDataProductLiteResponseToDataProductLite,
+} from '@finos/legend-graph';
+
+const createDepotEntityFromLiteDataProduct = (
+  value: V1_EntitlementsDataProductLite,
+): DepotEntityWithOrigin | undefined => {
+  if (value.origin instanceof V1_SdlcDeploymentDataProductOrigin) {
+    const origin = {
+      groupId: value.origin.group,
+      artifactId: value.origin.artifact,
+      versionId: value.origin.version,
+    };
+
+    return new DepotEntityWithOrigin(
+      origin,
+      value.title ?? value.id,
+      value.fullPath ?? value.id,
+      CORE_PURE_PATH.DATA_PRODUCT,
+    );
+  }
+  // do not include non sdlc data products
+  return undefined;
+};
 
 export type DataProductOption = {
   label: string;
@@ -67,12 +96,16 @@ export class DataProductSelectorState {
   dataProducts: DepotEntityWithOrigin[] | undefined;
   readonly loadProductsState = ActionState.create();
   readonly depotServerClient: DepotServerClient;
+  readonly lakehouseContractServerClient:
+    | LakehouseContractServerClient
+    | undefined;
   readonly applicationStore: LegendQueryApplicationStore;
   disableDataProducts = false;
 
   constructor(
     depotServerClient: DepotServerClient,
     applicationStore: LegendQueryApplicationStore,
+    lakehouseContractServerClient?: LakehouseContractServerClient,
   ) {
     makeObservable(this, {
       legacyDataProducts: observable,
@@ -85,6 +118,7 @@ export class DataProductSelectorState {
     });
     this.applicationStore = applicationStore;
     this.depotServerClient = depotServerClient;
+    this.lakehouseContractServerClient = lakehouseContractServerClient;
 
     // TEMPORARY: Disable data products when NonProductionFeatureFlag is off.
     // Remove once the feature is fully tested.
@@ -116,6 +150,7 @@ export class DataProductSelectorState {
   *loadProducts(): GeneratorFn<void> {
     this.loadProductsState.inProgress();
     try {
+      const accessToken = this.applicationStore.getAccessToken();
       // Load DataSpaces
       const dataSpaces = (
         (yield this.depotServerClient.getEntitiesByClassifier(
@@ -129,17 +164,27 @@ export class DataProductSelectorState {
       });
       const dataProducts = this.disableDataProducts
         ? []
-        : (
-            (yield this.depotServerClient.getEntitiesSummaryByClassifier(
-              CORE_PURE_PATH.DATA_PRODUCT,
-              {
-                scope: DepotScope.RELEASES,
-                summary: true,
-              },
-            )) as StoredSummaryEntity[]
-          ).map((storedEntity) => {
-            return extractDepotEntityInfo(storedEntity, false);
-          });
+        : this.lakehouseContractServerClient
+          ? V1_entitlementsDataProductLiteResponseToDataProductLite(
+              yield this.lakehouseContractServerClient.getAllLiteDataProducts(
+                V1_EntitlementsLakehouseEnvironmentType.PRODUCTION,
+                undefined,
+                accessToken,
+              ),
+            )
+              .map(createDepotEntityFromLiteDataProduct)
+              .filter(isNonNullable)
+          : (
+              (yield this.depotServerClient.getEntitiesSummaryByClassifier(
+                CORE_PURE_PATH.DATA_PRODUCT,
+                {
+                  scope: DepotScope.RELEASES,
+                  summary: true,
+                },
+              )) as StoredSummaryEntity[]
+            ).map((storedEntity) => {
+              return extractDepotEntityInfo(storedEntity, false);
+            });
       // Set both lists separately
       this.legacyDataProducts = dataSpaces;
       this.dataProducts = dataProducts;

package/src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts

@@ -41,6 +41,10 @@ import {
 import { LegendQueryDataSpaceQueryBuilderState } from './query-builder/LegendQueryDataSpaceQueryBuilderState.js';
 import { DataProductSelectorState } from './DataProductSelectorState.js';
 import { BaseTemplateQueryCreatorStore } from '../BaseTemplateQueryCreatorStore.js';
+import {
+  type LegendQueryDataSpaceTemplateSourceInfo,
+  LegendQuerySourceType,
+} from '../../__lib__/LegendQuerySourceInfo.js';
 
 export class DataSpaceTemplateQueryCreatorStore extends BaseTemplateQueryCreatorStore {
   readonly dataSpacePath: string;
@@ -95,6 +99,17 @@ export class DataSpaceTemplateQueryCreatorStore extends BaseTemplateQueryCreator
     return undefined;
   }
 
+  override getSourceInfo(): LegendQueryDataSpaceTemplateSourceInfo {
+    return {
+      sourceType: LegendQuerySourceType.DATA_SPACE_TEMPLATE,
+      groupId: this.groupId,
+      artifactId: this.artifactId,
+      versionId: this.versionId,
+      dataSpace: this.dataSpacePath,
+      templateQueryId: this.templateQueryId,
+    };
+  }
+
   async initializeQueryBuilderState(): Promise<QueryBuilderState> {
     const { dataSpaceAnalysisResult, isLightGraphEnabled } =
       await this.buildGraphAndDataspaceAnalyticsResult(
@@ -184,12 +199,7 @@ export class DataSpaceTemplateQueryCreatorStore extends BaseTemplateQueryCreator
       isSnapshotVersion(this.versionId) ||
         this.versionId === SNAPSHOT_VERSION_ALIAS,
     );
-    const sourceInfo = {
-      groupId: this.groupId,
-      artifactId: this.artifactId,
-      versionId: this.versionId,
-      dataSpace: dataSpace.path,
-    };
+    const sourceInfo = this.getSourceInfo();
     const queryBuilderState = new LegendQueryDataSpaceQueryBuilderState(
       this.applicationStore,
       this.graphManagerState,
@@ -213,6 +223,7 @@ export class DataSpaceTemplateQueryCreatorStore extends BaseTemplateQueryCreator
       new DataProductSelectorState(
         this.depotServerClient,
         this.applicationStore,
+        this.lakehouseState?.contractServerClient,
       ),
       () => {
         this.applicationStore.notificationService.notifyWarning(

package/src/stores/data-space/LegendQueryBareQueryBuilderState.ts

@@ -89,7 +89,11 @@ export class LegendQueryBareQueryBuilderState extends BaseQueryBuilderState {
     this.changeHandlers = changeHandlers;
     this.productSelectorState =
       productSelectorState ??
-      new DataProductSelectorState(depotServerClient, applicationStore);
+      new DataProductSelectorState(
+        depotServerClient,
+        applicationStore,
+        editorStore.lakehouseState?.contractServerClient,
+      );
   }
 
   override get sideBarClassName(): string | undefined {

package/src/stores/ingest/IngestQueryCreatorStore.ts

@@ -46,6 +46,10 @@ import {
   QueryBuilderActionConfig_QueryApplication,
 } from '../QueryEditorStore.js';
 import { LEGEND_QUERY_APP_EVENT } from '../../__lib__/LegendQueryEvent.js';
+import {
+  type LegendQueryIngestSourceInfo,
+  LegendQuerySourceType,
+} from '../../__lib__/LegendQuerySourceInfo.js';
 import { IngestLegendQueryBuilderState } from './IngestLegendQueryBuilderState.js';
 import {
   fetchIngestEntitiesByClassifier,
@@ -172,6 +176,17 @@ export class IngestQueryCreatorStore extends QueryEditorStore {
     });
   }
 
+  override getSourceInfo(): LegendQueryIngestSourceInfo {
+    return {
+      sourceType: LegendQuerySourceType.INGEST,
+      groupId: this.groupId,
+      artifactId: this.artifactId,
+      versionId: this.versionId,
+      ingestDefinitionPath: this.ingestDefinitionPath,
+      dataSet: this.dataSet,
+    };
+  }
+
   async initializeQueryBuilderState(): Promise<QueryBuilderState> {
     const ingestDefinition = guaranteeType(
       this.graphManagerState.graph.getElement(this.ingestDefinitionPath),
@@ -179,11 +194,7 @@ export class IngestQueryCreatorStore extends QueryEditorStore {
       `Can't find ingest definition '${this.ingestDefinitionPath}'`,
     );
 
-    const sourceInfo = {
-      groupId: this.groupId,
-      artifactId: this.artifactId,
-      versionId: this.versionId,
-    };
+    const sourceInfo = this.getSourceInfo();
 
     // Build an adhoc lakehouse runtime using the user's lakehouse env +
     // consumer warehouse — same machinery used by the data product flow for

package/tsconfig.json

@@ -58,7 +58,9 @@
     "./src/__lib__/LegendQueryApplicationNavigationContext.ts",
     "./src/__lib__/LegendQueryEvent.ts",
     "./src/__lib__/LegendQueryEventHelper.ts",
+    "./src/__lib__/LegendQueryLifecycleTelemetry.ts",
     "./src/__lib__/LegendQueryNavigation.ts",
+    "./src/__lib__/LegendQuerySourceInfo.ts",
     "./src/__lib__/LegendQueryTelemetryHelper.ts",
     "./src/__lib__/LegendQueryUserDataHelper.ts",
     "./src/__lib__/LegendQueryUserDataSpaceHelper.ts",