@finos/legend-application-query 13.8.52 → 13.8.54

package/src/components/data-space/LegendQueryDataSpaceQueryBuilder.tsx

@@ -65,6 +65,7 @@ import { LakehouseRuntimeConfigModal } from '../shared/LakehouseRuntimeConfigMod
 import type { DataProductWithLegacyOption } from '../../stores/data-space/DataProductSelectorState.js';
 import { formatDataProductOrSpaceOptionLabel } from '../shared/LegendQueryDataProductOptionLabel.js';
 import type { LegendQueryDataSpaceQueryBuilderState } from '../../stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.js';
+import { LegendQueryTelemetryHelper } from '../../__lib__/LegendQueryTelemetryHelper.js';
 
 const resolveExecutionContextRuntimes = (
   queryBuilderState: LegendQueryDataSpaceQueryBuilderState,
@@ -117,11 +118,35 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
       const value = option.value;
       if (value instanceof ResolvedDataSpaceEntityWithOrigin) {
         queryBuilderState.queryAgentChatState?.abort();
+        LegendQueryTelemetryHelper.logEvent_ChangeDataSpace(
+          applicationStore.telemetryService,
+          {
+            sourceInfo: queryBuilderState.sourceInfo,
+            to: {
+              groupId: value.origin?.groupId,
+              artifactId: value.origin?.artifactId,
+              versionId: value.origin?.versionId,
+              path: value.path,
+            },
+          },
+        );
         queryBuilderState
           .onDataSpaceChange(value)
           .catch(queryBuilderState.applicationStore.alertUnhandledError);
       } else if (value instanceof DepotEntityWithOrigin) {
         queryBuilderState.queryAgentChatState?.abort();
+        LegendQueryTelemetryHelper.logEvent_ChangeDataProduct(
+          applicationStore.telemetryService,
+          {
+            sourceInfo: queryBuilderState.sourceInfo,
+            to: {
+              groupId: value.origin?.groupId,
+              artifactId: value.origin?.artifactId,
+              versionId: value.origin?.versionId,
+              path: value.path,
+            },
+          },
+        );
         queryBuilderState.onDataProductChange(value);
       }
     };

package/src/index.ts

@@ -21,7 +21,12 @@ export * from './application/LegendQueryPluginManager.js';
 
 export * from './__lib__/LegendQueryEvent.js';
 export * from './__lib__/LegendQueryEventHelper.js';
-export { LegendQueryTelemetryHelper } from './__lib__/LegendQueryTelemetryHelper.js';
+export {
+  LegendQueryTelemetryHelper,
+  type InitializeQueryCreator_TelemetryData,
+  type InitializeQueryCreatorFailure_TelemetryData,
+} from './__lib__/LegendQueryTelemetryHelper.js';
+export * from './__lib__/LegendQuerySourceInfo.js';
 export { LegendQueryAgentChatTelemetryHelper } from './__lib__/LegendQueryAgentChatTelemetryHelper.js';
 export {
   generateExistingQueryEditorRoute,

package/src/stores/EditExistingQuerySetupStore.ts

@@ -22,10 +22,10 @@ import { BaseQuerySetupStore } from './QuerySetupStore.js';
 import type { DepotServerClient } from '@finos/legend-server-depot';
 import { quantifyList } from '@finos/legend-shared';
 import { LegendQueryUserDataHelper } from '../__lib__/LegendQueryUserDataHelper.js';
+import { buildQueryLoaderLifecycleTelemetryHandlers } from '../__lib__/LegendQueryLifecycleTelemetry.js';
 import type { LegendQueryApplicationStore } from './LegendQueryBaseStore.js';
 import { QuerySearchSpecification, type LightQuery } from '@finos/legend-graph';
 import { generateExistingQueryEditorRoute } from '../__lib__/LegendQueryNavigation.js';
-import { LegendQueryTelemetryHelper } from '../__lib__/LegendQueryTelemetryHelper.js';
 
 export class EditExistingQuerySetupStore extends BaseQuerySetupStore {
   readonly queryLoaderState: QueryLoaderState;
@@ -74,25 +74,13 @@ export class EditExistingQuerySetupStore extends BaseQuerySetupStore {
                 'recently viewed queries',
               )}`
             : `No recently viewed queries`,
-        onQueryDeleted: (queryId): void =>
-          LegendQueryUserDataHelper.removeRecentlyViewedQuery(
-            this.applicationStore.userDataService,
-            queryId,
-          ),
-        onQueryRenamed: (query): void => {
-          LegendQueryTelemetryHelper.logEvent_RenameQuerySucceeded(
-            applicationStore.telemetryService,
-            {
-              query: {
-                id: query.id,
-                name: query.name,
-                groupId: query.groupId,
-                artifactId: query.artifactId,
-                versionId: query.versionId,
-              },
-            },
-          );
-        },
+        ...buildQueryLoaderLifecycleTelemetryHandlers(this.applicationStore, {
+          onQueryDeleted: (queryId): void =>
+            LegendQueryUserDataHelper.removeRecentlyViewedQuery(
+              this.applicationStore.userDataService,
+              queryId,
+            ),
+        }),
         handleFetchDefaultQueriesFailure: (): void =>
           LegendQueryUserDataHelper.removeRecentlyViewedQueries(
             this.applicationStore.userDataService,

package/src/stores/LegendQueryApplicationPlugin.tsx

@@ -16,9 +16,16 @@
 
 import { LegendApplicationPlugin } from '@finos/legend-application';
 import type {
+  DataProductAccessRequestLinkBuilder,
   QueryBuilder_LegendApplicationPlugin_Extension,
   QueryBuilderState,
 } from '@finos/legend-query-builder';
+import {
+  isSnapshotVersion,
+  SNAPSHOT_VERSION_ALIAS,
+} from '@finos/legend-server-depot';
+import { LegendQueryDataProductQueryBuilderState } from './data-product/query-builder/LegendQueryDataProductQueryBuilderState.js';
+import { EXTERNAL_APPLICATION_NAVIGATION__generateMarketplaceDataProductUrl } from '../__lib__/LegendQueryNavigation.js';
 import type { LegendQueryPluginManager } from '../application/LegendQueryPluginManager.js';
 import type {
   ExistingQueryEditorStore,
@@ -136,4 +143,35 @@ export class LegendQueryApplicationPlugin
     request: QueryTitleDescriptionAISuggestionRequest,
     legendAIUrl: string,
   ) => Promise<QueryTitleDescriptionSuggestion>;
+
+  getDataProductAccessRequestLinkBuilders(): DataProductAccessRequestLinkBuilder[] {
+    return [
+      (info, queryBuilderState): string | undefined => {
+        if (
+          !(
+            queryBuilderState instanceof LegendQueryDataProductQueryBuilderState
+          ) ||
+          info.deploymentId === undefined
+        ) {
+          return undefined;
+        }
+        const versionId = queryBuilderState.project.versionId;
+        const marketplaceUrl =
+          isSnapshotVersion(versionId) || versionId === SNAPSHOT_VERSION_ALIAS
+            ? queryBuilderState.applicationStore.config
+                .marketplaceProductionParallelUrl
+            : queryBuilderState.applicationStore.config
+                .marketplaceApplicationUrl;
+        if (marketplaceUrl === undefined) {
+          return undefined;
+        }
+        return EXTERNAL_APPLICATION_NAVIGATION__generateMarketplaceDataProductUrl(
+          marketplaceUrl,
+          info.dataProductId,
+          info.deploymentId,
+          info.accessPointGroupId,
+        );
+      },
+    ];
+  }
 }