@finos/legend-application-studio 22.6.0 → 23.0.0

package/src/stores/LegendStudioBaseStore.ts

@@ -22,14 +22,16 @@ import {
   ActionState,
   LogEvent,
   assertErrorThrown,
+  NetworkClient,
 } from '@finos/legend-shared';
 import {
   type ApplicationStore,
   ActionAlertActionType,
   ActionAlertType,
-  ApplicationTelemetry,
+  LegendApplicationTelemetryHelper,
   matchPath,
   APPLICATION_EVENT,
+  generateExtensionUrlPattern,
 } from '@finos/legend-application';
 import {
   action,
@@ -40,12 +42,12 @@ import {
   observable,
 } from 'mobx';
 import { User, SDLCServerClient } from '@finos/legend-server-sdlc';
-import { LEGEND_STUDIO_APP_EVENT } from './LegendStudioAppEvent.js';
+import { LEGEND_STUDIO_APP_EVENT } from '../application/LegendStudioEvent.js';
 import type { DepotServerClient } from '@finos/legend-server-depot';
 import type { LegendStudioPluginManager } from '../application/LegendStudioPluginManager.js';
 import type { LegendStudioApplicationConfig } from '../application/LegendStudioApplicationConfig.js';
-import { LegendStudioEventService } from './LegendStudioEventService.js';
-import { LEGEND_STUDIO_SDLC_BYPASSED_ROUTE_PATTERN } from './LegendStudioRouter.js';
+import { LegendStudioEventHelper } from '../application/LegendStudioEventHelper.js';
+import { LEGEND_STUDIO_SDLC_BYPASSED_ROUTE_PATTERN } from '../application/LegendStudioNavigation.js';
 
 export type LegendStudioApplicationStore = ApplicationStore<
   LegendStudioApplicationConfig,
@@ -99,14 +101,20 @@ export class LegendStudioBaseStore {
     }
     this.initState.inProgress();
 
+    const SDLCBypassedRoutePatterns = this.applicationStore.pluginManager
+      .getApplicationPlugins()
+      .flatMap((plugin) => plugin.getExtraApplicationPageEntries?.() ?? [])
+      .filter((entry) => entry.bypassSDLC)
+      .flatMap((entry) => entry.urlPatterns.map(generateExtensionUrlPattern));
+
     // authorize SDLC, unless navigation location match SDLC-bypassed patterns
     if (
       !matchPath(
         this.applicationStore.navigationService.navigator.getCurrentLocation(),
         [
-          // TODO: we might want to consider making this extensible
           LEGEND_STUDIO_SDLC_BYPASSED_ROUTE_PATTERN.VIEW_BY_GAV,
           LEGEND_STUDIO_SDLC_BYPASSED_ROUTE_PATTERN.VIEW_BY_GAV_ENTITY,
+          ...SDLCBypassedRoutePatterns,
         ],
       )
     ) {
@@ -124,9 +132,7 @@ export class LegendStudioBaseStore {
       } catch (error) {
         assertErrorThrown(error);
         this.applicationStore.logService.error(
-          LogEvent.create(
-            APPLICATION_EVENT.APPLICATION_IDENTITY_AUTO_FETCH__FAILURE,
-          ),
+          LogEvent.create(APPLICATION_EVENT.IDENTITY_AUTO_FETCH__FAILURE),
           error,
         );
         this.applicationStore.notificationService.notifyWarning(error.message);
@@ -138,14 +144,32 @@ export class LegendStudioBaseStore {
       this.isSDLCAuthorized = undefined;
     }
 
-    ApplicationTelemetry.logEvent_ApplicationInitializationSucceeded(
+    // retrieved the user identity is not already configured
+    if (this.applicationStore.identityService.isAnonymous) {
+      try {
+        this.applicationStore.identityService.setCurrentUser(
+          (yield new NetworkClient().get(
+            `${this.applicationStore.config.engineServerUrl}/server/v1/currentUser`,
+          )) as string,
+        );
+      } catch (error) {
+        assertErrorThrown(error);
+        this.applicationStore.logService.error(
+          LogEvent.create(APPLICATION_EVENT.IDENTITY_AUTO_FETCH__FAILURE),
+          error,
+        );
+        this.applicationStore.notificationService.notifyWarning(error.message);
+      }
+    }
+
+    LegendApplicationTelemetryHelper.logEvent_ApplicationInitializationSucceeded(
       this.applicationStore.telemetryService,
       this.applicationStore,
     );
 
-    LegendStudioEventService.create(
+    LegendStudioEventHelper.notify_ApplicationLoadSucceeded(
       this.applicationStore.eventService,
-    ).notify_ApplicationLoaded();
+    );
 
     this.initState.complete();
   }

package/src/stores/editor/NewElementState.ts

@@ -143,7 +143,7 @@ export const handlePostCreateAction = async (
         DEFAULT_GENERATION_SPECIFICATION_NAME,
       );
       await flowResult(
-        editorStore.addElement(
+        editorStore.graphEditorMode.addElement(
           generationSpec,
           guaranteeNonNullable(generationElement.package).path,
           false,
@@ -338,7 +338,7 @@ export class NewRelationalDatabaseConnectionDriver extends NewConnectionValueDri
 
 export class NewPackageableConnectionDriver extends NewElementDriver<PackageableConnection> {
   store: Store;
-  newConnectionValueDriver: NewConnectionValueDriver<Connection>;
+  newConnectionValueDriver: NewConnectionValueDriver<Connection> | undefined;
 
   constructor(editorStore: EditorStore) {
     super(editorStore);
@@ -356,7 +356,7 @@ export class NewPackageableConnectionDriver extends NewElementDriver<Packageable
   }
 
   geDriverConnectionType(): string {
-    return this.newConnectionValueDriver.getConnectionType();
+    return this.newConnectionValueDriver?.getConnectionType() ?? '';
   }
 
   changeConnectionState(val: string): void {
@@ -391,9 +391,11 @@ export class NewPackageableConnectionDriver extends NewElementDriver<Packageable
             return;
           }
         }
-        throw new UnsupportedOperationError(
-          `Can't create new connection driver for type: no compatible creator available from plugins`,
-          val,
+        this.editorStore.applicationStore.notificationService.notifyError(
+          new UnsupportedOperationError(
+            `Can't create new connection driver for type: no compatible creator available from plugins`,
+            val,
+          ),
         );
       }
     }
@@ -401,11 +403,13 @@ export class NewPackageableConnectionDriver extends NewElementDriver<Packageable
 
   getNewConnectionValueDriverBasedOnStore(
     store: Store,
-  ): NewConnectionValueDriver<Connection> {
+  ): NewConnectionValueDriver<Connection> | undefined {
     if (store instanceof ModelStore) {
       return new NewPureModelConnectionDriver(this.editorStore);
     } else if (store instanceof FlatData) {
       return new NewFlatDataConnectionDriver(this.editorStore);
+    } else if (store instanceof Database) {
+      return new NewRelationalDatabaseConnectionDriver(this.editorStore);
     }
     const extraNewConnectionDriverCreators = this.editorStore.pluginManager
       .getApplicationPlugins()
@@ -421,29 +425,37 @@ export class NewPackageableConnectionDriver extends NewElementDriver<Packageable
         return driver;
       }
     }
-    throw new UnsupportedOperationError(
-      `Can't create new connection driver for store: no compatible creator available from plugins`,
-      store,
+    this.editorStore.applicationStore.notificationService.notifyError(
+      new UnsupportedOperationError(
+        `Can't create new connection driver for store: no compatible creator available from plugins`,
+        store,
+      ),
     );
+    return undefined;
   }
 
   setStore(store: Store): void {
-    this.store = store;
-    this.newConnectionValueDriver =
-      this.getNewConnectionValueDriverBasedOnStore(store);
+    const newDriver = this.getNewConnectionValueDriverBasedOnStore(store);
+    if (newDriver) {
+      this.store = store;
+      this.newConnectionValueDriver = newDriver;
+    }
+    return;
   }
 
   get isValid(): boolean {
-    return this.newConnectionValueDriver.isValid;
+    return this.newConnectionValueDriver?.isValid ?? true;
   }
 
   createElement(name: string): PackageableConnection {
     const connection = new PackageableConnection(name);
-    packageableConnection_setConnectionValue(
-      connection,
-      this.newConnectionValueDriver.createConnection(this.store),
-      this.editorStore.changeDetectionState.observerContext,
-    ); // default to model store
+    if (this.newConnectionValueDriver) {
+      packageableConnection_setConnectionValue(
+        connection,
+        this.newConnectionValueDriver.createConnection(this.store),
+        this.editorStore.changeDetectionState.observerContext,
+      ); // default to model store
+    }
     return connection;
   }
 }
@@ -776,7 +788,11 @@ export class NewElementState {
       } else {
         const element = this.createElement(elementName);
         yield flowResult(
-          this.editorStore.addElement(element, packagePath, true),
+          this.editorStore.graphEditorMode.addElement(
+            element,
+            packagePath,
+            true,
+          ),
         );
 
         // post creation handling

package/src/stores/editor/StandardEditorMode.ts

@@ -24,7 +24,7 @@ import type { EditorStore } from '../EditorStore.js';
 import {
   generateEditorRoute,
   generateViewProjectByGAVRoute,
-} from '../LegendStudioRouter.js';
+} from '../../application/LegendStudioNavigation.js';
 import { EditorMode } from './EditorMode.js';
 
 export class StandardEditorMode extends EditorMode {

package/src/stores/editor-state/ExternalFormatState.ts

@@ -23,7 +23,7 @@ import {
 } from '@finos/legend-shared';
 import { flow, action, makeObservable, observable } from 'mobx';
 import type { EditorStore } from '../EditorStore.js';
-import { LEGEND_STUDIO_APP_EVENT } from '../LegendStudioAppEvent.js';
+import { LEGEND_STUDIO_APP_EVENT } from '../../application/LegendStudioEvent.js';
 import { ElementXTSchemaGenerationState } from './element-editor-state/ElementExternalFormatGenerationState.js';
 
 export type ExternalFormatTypeOption = {

package/src/stores/editor-state/FileGenerationState.ts

@@ -16,7 +16,7 @@
 
 import type { EditorStore } from '../EditorStore.js';
 import { observable, action, makeObservable, flow } from 'mobx';
-import { LEGEND_STUDIO_APP_EVENT } from '../LegendStudioAppEvent.js';
+import { LEGEND_STUDIO_APP_EVENT } from '../../application/LegendStudioEvent.js';
 import {
   type FileSystem_File,
   type FileResult,

package/src/stores/editor-state/GrammarTextEditorState.ts

@@ -45,7 +45,7 @@ import {
 } from '@finos/legend-graph';
 import type { TextEditorPosition } from '@finos/legend-art';
 import { generatePackageableElementTreeNodeDataLabel } from '../shared/PackageTreeUtils.js';
-import { LEGEND_STUDIO_SETTINGS_KEY } from '../LegendStudioStorage.js';
+import { LEGEND_STUDIO_SETTING_KEY } from '../../application/LegendStudioSetting.js';
 
 const getGrammarElementTypeLabelRegexString = (
   typeLabel: string,
@@ -87,10 +87,9 @@ export class GrammarTextEditorState {
 
     this.editorStore = editorStore;
     this.wrapText =
-      this.editorStore.applicationStore.storageService.settingsStore.getBooleanValue(
-        LEGEND_STUDIO_SETTINGS_KEY.EDITOR_WRAP_TEXT,
-        true,
-      );
+      this.editorStore.applicationStore.settingService.getBooleanValue(
+        LEGEND_STUDIO_SETTING_KEY.EDITOR_WRAP_TEXT,
+      ) ?? false;
   }
 
   get currentTextGraphHash(): string {

package/src/stores/editor-state/GraphGenerationState.ts

@@ -31,7 +31,7 @@ import {
   isNonNullable,
   ActionState,
 } from '@finos/legend-shared';
-import { LEGEND_STUDIO_APP_EVENT } from '../LegendStudioAppEvent.js';
+import { LEGEND_STUDIO_APP_EVENT } from '../../application/LegendStudioEvent.js';
 import {
   type FileSystemTreeNodeData,
   type FileResult,
@@ -398,7 +398,11 @@ export class GraphGenerationState {
           [...modelGenerationElements, ...fileGenerations][0]?.package,
         );
         yield flowResult(
-          this.editorStore.addElement(generationSpec, specPackage.path, false),
+          this.editorStore.graphEditorMode.addElement(
+            generationSpec,
+            specPackage.path,
+            false,
+          ),
         );
       }
     }

package/src/stores/editor-state/ModelImporterState.ts

@@ -32,7 +32,7 @@ import {
   ActionState,
   assertTrue,
 } from '@finos/legend-shared';
-import { LEGEND_STUDIO_APP_EVENT } from '../LegendStudioAppEvent.js';
+import { LEGEND_STUDIO_APP_EVENT } from '../../application/LegendStudioEvent.js';
 import type { EditorStore } from '../EditorStore.js';
 import type { Entity } from '@finos/legend-storage';
 import { TAB_SIZE } from '@finos/legend-application';

package/src/stores/editor-state/element-editor-state/ElementExternalFormatGenerationState.ts

@@ -36,7 +36,7 @@ import {
 } from '@finos/legend-shared';
 import { action, flow, flowResult, makeObservable, observable } from 'mobx';
 import type { EditorStore } from '../../EditorStore.js';
-import { LEGEND_STUDIO_APP_EVENT } from '../../LegendStudioAppEvent.js';
+import { LEGEND_STUDIO_APP_EVENT } from '../../../application/LegendStudioEvent.js';
 import { GENERATION_FILE_ROOT_NAME } from '../../shared/FileSystemTreeUtils.js';
 import {
   configurationProperty_addConfigurationProperty,

package/src/stores/editor-state/element-editor-state/ElementFileGenerationState.ts

@@ -67,7 +67,11 @@ export class ElementFileGenerationState {
     const fileGeneration = this.fileGenerationState.fileGeneration;
     fileGeneration.name = name;
     yield flowResult(
-      this.editorStore.addElement(fileGeneration, packagePath, true),
+      this.editorStore.graphEditorMode.addElement(
+        fileGeneration,
+        packagePath,
+        true,
+      ),
     );
     yield handlePostCreateAction(fileGeneration, this.editorStore);
     // reset file generation state so since the current file generation is promoted to a packageable element in the graph

package/src/stores/editor-state/element-editor-state/connection/DatabaseBuilderState.ts

@@ -30,7 +30,7 @@ import {
   ActionState,
 } from '@finos/legend-shared';
 import { observable, action, makeObservable, flow, flowResult } from 'mobx';
-import { LEGEND_STUDIO_APP_EVENT } from '../../../LegendStudioAppEvent.js';
+import { LEGEND_STUDIO_APP_EVENT } from '../../../../application/LegendStudioEvent.js';
 import type { EditorStore } from '../../../EditorStore.js';
 import {
   type RelationalDatabaseConnection,
@@ -50,6 +50,7 @@ import {
   getNullableTable,
 } from '@finos/legend-graph';
 import { connection_setStore } from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+import { GraphEditFormModeState } from '../../../GraphEditFormModeState.js';
 
 export abstract class DatabaseBuilderTreeNodeData implements TreeNodeData {
   isOpen?: boolean | undefined;
@@ -563,7 +564,11 @@ export class DatabaseBuilderState {
           'Database package is missing',
         );
         yield flowResult(
-          this.editorStore.addElement(newDatabase, packagePath, false),
+          this.editorStore.graphEditorMode.addElement(
+            newDatabase,
+            packagePath,
+            false,
+          ),
         );
         currentDatabase = newDatabase;
       } else {
@@ -580,9 +585,11 @@ export class DatabaseBuilderState {
         this.fetchSchemaDefinitions();
         if (isUpdating) {
           yield flowResult(
-            this.editorStore.graphState.globalCompileInFormMode({
-              message: `Can't compile graph after editing database. Redirecting you to text mode`,
-            }),
+            this.editorStore
+              .getGraphEditorMode(GraphEditFormModeState)
+              .globalCompile({
+                message: `Can't compile graph after editing database. Redirecting you to text mode`,
+              }),
           );
         }
       }

package/src/stores/editor-state/element-editor-state/external-format/DSL_ExternalFormat_SchemaSetEditorState.ts

@@ -53,7 +53,7 @@ import type { Entity } from '@finos/legend-storage';
 import { type EntityChange, EntityChangeType } from '@finos/legend-server-sdlc';
 import type { EditorStore } from '../../../EditorStore.js';
 import { ElementEditorState } from '../ElementEditorState.js';
-import { LEGEND_STUDIO_APP_EVENT } from '../../../LegendStudioAppEvent.js';
+import { LEGEND_STUDIO_APP_EVENT } from '../../../../application/LegendStudioEvent.js';
 import {
   configurationProperty_addConfigurationProperty,
   configurationProperty_setValue,

package/src/stores/editor-state/element-editor-state/mapping/MappingEditorState.ts

@@ -842,9 +842,7 @@ export class MappingEditorState extends ElementEditorState {
     }
     // Open mapping element from included mapping in another mapping editor tab
     if (mappingElement._PARENT !== this.element) {
-      this.editorStore.tabManagerState.openElementEditor(
-        mappingElement._PARENT,
-      );
+      this.editorStore.graphEditorMode.openElement(mappingElement._PARENT);
     }
     const currentMappingEditorState =
       this.editorStore.tabManagerState.getCurrentEditorState(

package/src/stores/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.ts

@@ -26,9 +26,9 @@ export class MappingExecutionQueryBuilderState extends QueryBuilderState {
     renderMappingExecutionQueryBuilderSetupPanelContent(this);
 
   constructor(
-    mapping: Mapping,
     applicationStore: GenericLegendApplicationStore,
     graphManagerState: GraphManagerState,
+    mapping: Mapping,
   ) {
     super(applicationStore, graphManagerState);
 

package/src/stores/editor-state/element-editor-state/mapping/MappingExecutionState.ts

@@ -131,11 +131,10 @@ import {
 import { SERIALIZATION_FORMAT } from '../service/testable/ServiceTestEditorState.js';
 import {
   LambdaEditorState,
-  QueryBuilderTelemetry,
+  QueryBuilderTelemetryHelper,
   QUERY_BUILDER_EVENT,
 } from '@finos/legend-query-builder';
 import { MappingEditorTabState } from './MappingTabManagerState.js';
-import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../LegendStudioApplicationNavigationContext.js';
 
 export class MappingExecutionQueryState extends LambdaEditorState {
   editorStore: EditorStore;
@@ -737,7 +736,11 @@ export class MappingExecutionState extends MappingEditorTabState {
             this.editorStore.changeDetectionState.observerContext,
           );
           yield flowResult(
-            this.editorStore.addElement(service, packagePath, true),
+            this.editorStore.graphEditorMode.addElement(
+              service,
+              packagePath,
+              true,
+            ),
           );
         } else {
           throw new UnsupportedOperationError(
@@ -767,12 +770,8 @@ export class MappingExecutionState extends MappingEditorTabState {
       ) {
         this.isExecuting = true;
 
-        QueryBuilderTelemetry.logEvent_QueryRunLaunched(
+        QueryBuilderTelemetryHelper.logEvent_QueryRunLaunched(
           this.editorStore.applicationStore.telemetryService,
-          {
-            applicationContext:
-              LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.MAPPING_EXECUTION_EDITOR,
-          },
         );
 
         const stopWatch = new StopWatch();
@@ -806,7 +805,7 @@ export class MappingExecutionState extends MappingEditorTabState {
             stopWatch,
             report.timings,
           );
-        QueryBuilderTelemetry.logEvent_QueryRunSucceeded(
+        QueryBuilderTelemetryHelper.logEvent_QueryRunSucceeded(
           this.editorStore.applicationStore.telemetryService,
           report,
         );
@@ -842,12 +841,8 @@ export class MappingExecutionState extends MappingEditorTabState {
         );
 
         if (debug) {
-          QueryBuilderTelemetry.logEvent_ExecutionPlanDebugLaunched(
+          QueryBuilderTelemetryHelper.logEvent_ExecutionPlanDebugLaunched(
             this.editorStore.applicationStore.telemetryService,
-            {
-              applicationContext:
-                LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.MAPPING_EXECUTION_EDITOR,
-            },
           );
           const debugResult =
             (yield this.editorStore.graphManagerState.graphManager.debugExecutionPlanGeneration(
@@ -861,12 +856,8 @@ export class MappingExecutionState extends MappingEditorTabState {
           rawPlan = debugResult.plan;
           this.executionPlanState.setDebugText(debugResult.debug);
         } else {
-          QueryBuilderTelemetry.logEvent_ExecutionPlanGenerationLaunched(
+          QueryBuilderTelemetryHelper.logEvent_ExecutionPlanGenerationLaunched(
             this.editorStore.applicationStore.telemetryService,
-            {
-              applicationContext:
-                LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.MAPPING_EXECUTION_EDITOR,
-            },
           );
           rawPlan =
             (yield this.editorStore.graphManagerState.graphManager.generateExecutionPlan(
@@ -899,12 +890,12 @@ export class MappingExecutionState extends MappingEditorTabState {
             report.timings,
           );
         if (debug) {
-          QueryBuilderTelemetry.logEvent_ExecutionPlanDebugSucceeded(
+          QueryBuilderTelemetryHelper.logEvent_ExecutionPlanDebugSucceeded(
             this.editorStore.applicationStore.telemetryService,
             report,
           );
         } else {
-          QueryBuilderTelemetry.logEvent_ExecutionPlanGenerationSucceeded(
+          QueryBuilderTelemetryHelper.logEvent_ExecutionPlanGenerationSucceeded(
             this.editorStore.applicationStore.telemetryService,
             report,
           );

package/src/stores/editor-state/element-editor-state/mapping/MappingTestState.ts

@@ -97,11 +97,10 @@ import {
 } from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
 import {
   LambdaEditorState,
-  QueryBuilderTelemetry,
+  QueryBuilderTelemetryHelper,
   QUERY_BUILDER_EVENT,
 } from '@finos/legend-query-builder';
 import { MappingEditorTabState } from './MappingTabManagerState.js';
-import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../LegendStudioApplicationNavigationContext.js';
 
 export enum TEST_RESULT {
   NONE = 'NONE', // test has not run yet
@@ -786,7 +785,7 @@ export class MappingTestState extends MappingEditorTabState {
         LogEvent.create(GRAPH_MANAGER_EVENT.EXECUTION_FAILURE),
         error.message,
       );
-      yield flowResult(this.editorStore.graphState.globalCompileInFormMode()); // recompile graph if there is problem with the deep fetch tree of a test
+      yield flowResult(this.editorStore.graphEditorMode.globalCompile()); // recompile graph if there is problem with the deep fetch tree of a test
     }
   }
 
@@ -809,12 +808,8 @@ export class MappingTestState extends MappingEditorTabState {
       );
 
       if (debug) {
-        QueryBuilderTelemetry.logEvent_ExecutionPlanDebugLaunched(
+        QueryBuilderTelemetryHelper.logEvent_ExecutionPlanDebugLaunched(
           this.editorStore.applicationStore.telemetryService,
-          {
-            applicationContext:
-              LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.MAPPING_TEST_EDITOR,
-          },
         );
         const debugResult =
           (yield this.editorStore.graphManagerState.graphManager.debugExecutionPlanGeneration(
@@ -827,12 +822,8 @@ export class MappingTestState extends MappingEditorTabState {
         rawPlan = debugResult.plan;
         this.executionPlanState.setDebugText(debugResult.debug);
       } else {
-        QueryBuilderTelemetry.logEvent_ExecutionPlanGenerationLaunched(
+        QueryBuilderTelemetryHelper.logEvent_ExecutionPlanGenerationLaunched(
           this.editorStore.applicationStore.telemetryService,
-          {
-            applicationContext:
-              LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.MAPPING_TEST_EDITOR,
-          },
         );
         rawPlan =
           (yield this.editorStore.graphManagerState.graphManager.generateExecutionPlan(
@@ -865,12 +856,12 @@ export class MappingTestState extends MappingEditorTabState {
           report.timings,
         );
       if (debug) {
-        QueryBuilderTelemetry.logEvent_ExecutionPlanDebugSucceeded(
+        QueryBuilderTelemetryHelper.logEvent_ExecutionPlanDebugSucceeded(
           this.editorStore.applicationStore.telemetryService,
           report,
         );
       } else {
-        QueryBuilderTelemetry.logEvent_ExecutionPlanGenerationSucceeded(
+        QueryBuilderTelemetryHelper.logEvent_ExecutionPlanGenerationSucceeded(
           this.editorStore.applicationStore.telemetryService,
           report,
         );

package/src/stores/editor-state/element-editor-state/service/ServiceExecutionState.ts

@@ -92,10 +92,9 @@ import {
   LambdaParametersState,
   LambdaParameterState,
   PARAMETER_SUBMIT_ACTION,
-  QueryBuilderTelemetry,
+  QueryBuilderTelemetryHelper,
   QUERY_BUILDER_EVENT,
 } from '@finos/legend-query-builder';
-import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../LegendStudioApplicationNavigationContext.js';
 
 enum DSL_SERVICE_PATH_PARAM_TOKEN {
   PROJECT_ID = 'projectId',
@@ -569,12 +568,8 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
       );
 
       if (debug) {
-        QueryBuilderTelemetry.logEvent_ExecutionPlanDebugLaunched(
+        QueryBuilderTelemetryHelper.logEvent_ExecutionPlanDebugLaunched(
           this.editorStore.applicationStore.telemetryService,
-          {
-            applicationContext:
-              LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.SERVICE_EDITOR_EXECUTION,
-          },
         );
         const debugResult =
           (yield this.editorStore.graphManagerState.graphManager.debugExecutionPlanGeneration(
@@ -587,12 +582,8 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
         rawPlan = debugResult.plan;
         this.executionPlanState.setDebugText(debugResult.debug);
       } else {
-        QueryBuilderTelemetry.logEvent_ExecutionPlanGenerationLaunched(
+        QueryBuilderTelemetryHelper.logEvent_ExecutionPlanGenerationLaunched(
           this.editorStore.applicationStore.telemetryService,
-          {
-            applicationContext:
-              LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.SERVICE_EDITOR_EXECUTION,
-          },
         );
         rawPlan =
           (yield this.editorStore.graphManagerState.graphManager.generateExecutionPlan(
@@ -625,12 +616,12 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
           report.timings,
         );
       if (debug) {
-        QueryBuilderTelemetry.logEvent_ExecutionPlanDebugSucceeded(
+        QueryBuilderTelemetryHelper.logEvent_ExecutionPlanDebugSucceeded(
           this.editorStore.applicationStore.telemetryService,
           report,
         );
       } else {
-        QueryBuilderTelemetry.logEvent_ExecutionPlanGenerationSucceeded(
+        QueryBuilderTelemetryHelper.logEvent_ExecutionPlanGenerationSucceeded(
           this.editorStore.applicationStore.telemetryService,
           report,
         );
@@ -665,12 +656,8 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
       return;
     }
 
-    QueryBuilderTelemetry.logEvent_QueryRunLaunched(
+    QueryBuilderTelemetryHelper.logEvent_QueryRunLaunched(
       this.editorStore.applicationStore.telemetryService,
-      {
-        applicationContext:
-          LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.SERVICE_EDITOR_EXECUTION,
-      },
     );
 
     try {
@@ -710,7 +697,7 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
             stopWatch,
             report.timings,
           );
-        QueryBuilderTelemetry.logEvent_QueryRunSucceeded(
+        QueryBuilderTelemetryHelper.logEvent_QueryRunSucceeded(
           this.editorStore.applicationStore.telemetryService,
           report,
         );

package/src/stores/editor-state/element-editor-state/service/ServiceRegistrationState.ts

@@ -31,7 +31,7 @@ import {
   URL_SEPARATOR,
   filterByType,
 } from '@finos/legend-shared';
-import { LEGEND_STUDIO_APP_EVENT } from '../../../LegendStudioAppEvent.js';
+import { LEGEND_STUDIO_APP_EVENT } from '../../../../application/LegendStudioEvent.js';
 import { Version } from '@finos/legend-server-sdlc';
 import {
   type Service,