@finos/legend-application-query 10.0.2 → 10.0.4

package/src/stores/EditExistingQuerySetupStore.ts

@@ -82,7 +82,7 @@ export class EditExistingQuerySetupStore extends BaseQuerySetupStore {
         this.currentQueryInfo = queryInfo;
       } catch (error) {
         assertErrorThrown(error);
-        this.applicationStore.notifyError(error);
+        this.applicationStore.notificationService.notifyError(error);
       } finally {
         this.loadQueryState.reset();
       }
@@ -109,7 +109,7 @@ export class EditExistingQuerySetupStore extends BaseQuerySetupStore {
       this.loadQueriesState.pass();
     } catch (error) {
       assertErrorThrown(error);
-      this.applicationStore.notifyError(error);
+      this.applicationStore.notificationService.notifyError(error);
       this.loadQueriesState.fail();
     }
   }

package/src/stores/LegendQueryBaseStore.ts

@@ -63,49 +63,36 @@ export class LegendQueryBaseStore {
 
   *initialize(): GeneratorFn<void> {
     if (!this.initState.isInInitialState) {
-      this.applicationStore.notifyIllegalState('Base store is re-initialized');
+      this.applicationStore.notificationService.notifyIllegalState(
+        'Base store is re-initialized',
+      );
       return;
     }
     this.initState.inProgress();
 
     try {
-      this.applicationStore.setCurrentUser(
+      this.applicationStore.identityService.setCurrentUser(
         (yield new NetworkClient().get(
           `${this.applicationStore.config.engineServerUrl}/server/v1/currentUser`,
         )) as string,
       );
     } catch (error) {
       assertErrorThrown(error);
-      this.applicationStore.log.error(
+      this.applicationStore.logService.error(
         LogEvent.create(
           APPLICATION_EVENT.APPLICATION_IDENTITY_AUTO_FETCH__FAILURE,
         ),
         error,
       );
-      this.applicationStore.notifyWarning(error.message);
+      this.applicationStore.notificationService.notifyWarning(error.message);
     }
 
     // setup telemetry service
-    this.applicationStore.telemetryService.setUserId(
-      this.applicationStore.currentUser,
-    );
+    this.applicationStore.telemetryService.setup();
 
     ApplicationTelemetry.logEvent_ApplicationInitializationSucceeded(
       this.applicationStore.telemetryService,
-      {
-        application: {
-          name: this.applicationStore.config.appName,
-          version: this.applicationStore.config.appVersion,
-          env: this.applicationStore.config.env,
-        },
-        browser: {
-          userAgent: navigator.userAgent,
-        },
-        screen: {
-          height: window.screen.height,
-          width: window.screen.width,
-        },
-      },
+      this.applicationStore,
     );
 
     this.initState.complete();

package/src/stores/LegendQueryTelemetry.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { TelemetryService } from '@finos/legend-shared';
+import type { TelemetryService } from '@finos/legend-application';
 import { LEGEND_QUERY_APP_EVENT } from './LegendQueryAppEvent.js';
 
 type Query_TelemetryData = {

package/src/stores/LoadProjectServiceQuerySetupStore.ts

@@ -55,7 +55,7 @@ export class LoadProjectServiceQuerySetupStore extends BaseQuerySetupStore {
       this.loadProjectsState.pass();
     } catch (error) {
       assertErrorThrown(error);
-      this.applicationStore.notifyError(error);
+      this.applicationStore.notificationService.notifyError(error);
       this.loadProjectsState.fail();
     }
   }
@@ -67,19 +67,19 @@ export class LoadProjectServiceQuerySetupStore extends BaseQuerySetupStore {
       (entry) => entry.sdlcProjectIDPrefix === projectIDPrefix,
     );
     if (matchingSDLCEntry) {
-      this.applicationStore.setBlockingAlert({
+      this.applicationStore.alertService.setBlockingAlert({
         message: `Loading service project...`,
         prompt: 'Please do not close the application',
         showLoading: true,
       });
-      this.applicationStore.navigator.goToAddress(
+      this.applicationStore.navigationService.navigator.goToAddress(
         EXTERNAL_APPLICATION_NAVIGATION__generateStudioUpdateProjectServiceQueryUrl(
           matchingSDLCEntry.url,
           project.projectId,
         ),
       );
     } else {
-      this.applicationStore.notifyWarning(
+      this.applicationStore.notificationService.notifyWarning(
         `Can't find the corresponding SDLC instance to load project '${project.projectId}'`,
       );
     }

package/src/stores/QueryEditorStore.ts

@@ -44,7 +44,6 @@ import {
   PackageableElementExplicitReference,
   RuntimePointer,
   GRAPH_MANAGER_EVENT,
-  GraphManagerTelemetry,
   extractElementNameFromPath,
   QuerySearchSpecification,
   Mapping,
@@ -76,6 +75,7 @@ import {
   TAB_SIZE,
   DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
   DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
+  ApplicationTelemetry,
 } from '@finos/legend-application';
 import type { LegendQueryPluginManager } from '../application/LegendQueryPluginManager.js';
 import { LegendQueryEventService } from './LegendQueryEventService.js';
@@ -98,7 +98,7 @@ export const createViewProjectHandler =
     versionId: string,
     entityPath: string | undefined,
   ): void =>
-    applicationStore.navigator.visitAddress(
+    applicationStore.navigationService.navigator.visitAddress(
       EXTERNAL_APPLICATION_NAVIGATION__generateStudioProjectViewUrl(
         applicationStore.config.studioUrl,
         groupId,
@@ -128,7 +128,7 @@ export const createViewSDLCProjectHandler =
       (entry) => entry.sdlcProjectIDPrefix === projectIDPrefix,
     );
     if (matchingSDLCEntry) {
-      applicationStore.navigator.visitAddress(
+      applicationStore.navigationService.navigator.visitAddress(
         EXTERNAL_APPLICATION_NAVIGATION__generateStudioSDLCProjectViewUrl(
           matchingSDLCEntry.url,
           project.projectId,
@@ -136,7 +136,7 @@ export const createViewSDLCProjectHandler =
         ),
       );
     } else {
-      applicationStore.notifyWarning(
+      applicationStore.notificationService.notifyWarning(
         `Can't find the corresponding SDLC instance to view the SDLC project`,
       );
     }
@@ -215,11 +215,11 @@ export class QueryExportState {
         );
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_QUERY_APP_EVENT.GENERIC_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
       this.persistQueryState.reset();
       return;
     }
@@ -232,7 +232,7 @@ export class QueryExportState {
             query,
             this.editorStore.graphManagerState.graph,
           );
-        this.editorStore.applicationStore.notifySuccess(
+        this.editorStore.applicationStore.notificationService.notifySuccess(
           `Successfully created query!`,
         );
 
@@ -253,7 +253,7 @@ export class QueryExportState {
           },
         );
 
-        this.editorStore.applicationStore.navigator.goToLocation(
+        this.editorStore.applicationStore.navigationService.navigator.goToLocation(
           generateExistingQueryEditorRoute(newQuery.id),
         );
       } else {
@@ -262,7 +262,7 @@ export class QueryExportState {
             query,
             this.editorStore.graphManagerState.graph,
           );
-        this.editorStore.applicationStore.notifySuccess(
+        this.editorStore.applicationStore.notificationService.notifySuccess(
           `Successfully updated query!`,
         );
 
@@ -283,11 +283,11 @@ export class QueryExportState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_QUERY_APP_EVENT.GENERIC_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.persistQueryState.reset();
       this.editorStore.setExportState(undefined);
@@ -347,7 +347,7 @@ export class QueryLoaderState {
     } catch (error) {
       this.loadQueriesState.fail();
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     }
   }
 
@@ -384,7 +384,7 @@ export abstract class QueryEditorStore {
     this.pluginManager = applicationStore.pluginManager;
     this.graphManagerState = new GraphManagerState(
       applicationStore.pluginManager,
-      applicationStore.log,
+      applicationStore.logService,
     );
     this.queryLoaderState = new QueryLoaderState(this);
   }
@@ -450,11 +450,11 @@ export abstract class QueryEditorStore {
       this.initState.pass();
     } catch (error) {
       assertErrorThrown(error);
-      this.applicationStore.log.error(
+      this.applicationStore.logService.error(
         LogEvent.create(LEGEND_QUERY_APP_EVENT.GENERIC_FAILURE),
         error,
       );
-      this.applicationStore.notifyError(error);
+      this.applicationStore.notificationService.notifyError(error);
       this.initState.fail();
     }
   }
@@ -534,26 +534,20 @@ export abstract class QueryEditorStore {
     // report
     stopWatch.record(GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS);
     const graphBuilderReportData = {
-      timings: {
-        [GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH_SYSTEM__SUCCESS]:
-          stopWatch.getRecord(
-            GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH_SYSTEM__SUCCESS,
-          ),
-        [GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS]: stopWatch.getRecord(
-          GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS,
-        ),
-      },
+      timings:
+        this.applicationStore.timeService.finalizeTimingsRecord(stopWatch),
       dependencies: dependency_buildReport,
       dependenciesCount:
         this.graphManagerState.graph.dependencyManager.numberOfDependencies,
       graph: graph_buildReport,
     };
-    this.applicationStore.log.info(
-      LogEvent.create(GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS),
+    ApplicationTelemetry.logEvent_GraphInitializationSucceeded(
+      this.applicationStore.telemetryService,
       graphBuilderReportData,
     );
-    GraphManagerTelemetry.logEvent_GraphInitializationSucceeded(
-      this.applicationStore.telemetryService,
+
+    this.applicationStore.logService.info(
+      LogEvent.create(GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS),
       graphBuilderReportData,
     );
   }
@@ -597,7 +591,7 @@ export class MappingQueryCreatorStore extends QueryEditorStore {
       this.applicationStore,
       this.graphManagerState,
       (val: Mapping) => {
-        this.applicationStore.navigator.updateCurrentLocation(
+        this.applicationStore.navigationService.navigator.updateCurrentLocation(
           generateMappingQueryCreatorRoute(
             this.groupId,
             this.artifactId,
@@ -609,7 +603,7 @@ export class MappingQueryCreatorStore extends QueryEditorStore {
         );
       },
       (val: Runtime) => {
-        this.applicationStore.navigator.updateCurrentLocation(
+        this.applicationStore.navigationService.navigator.updateCurrentLocation(
           generateMappingQueryCreatorRoute(
             this.groupId,
             this.artifactId,
@@ -694,7 +688,7 @@ export class ServiceQueryCreatorStore extends QueryEditorStore {
       this.graphManagerState.usableServices,
       this.executionKey,
       (val: Service): void => {
-        this.applicationStore.navigator.goToLocation(
+        this.applicationStore.navigationService.navigator.goToLocation(
           generateServiceQueryCreatorRoute(
             this.groupId,
             this.artifactId,
@@ -704,7 +698,7 @@ export class ServiceQueryCreatorStore extends QueryEditorStore {
         );
       },
       (val: ServiceExecutionContext): void => {
-        this.applicationStore.navigator.updateCurrentLocation(
+        this.applicationStore.navigationService.navigator.updateCurrentLocation(
           generateServiceQueryCreatorRoute(
             this.groupId,
             this.artifactId,

package/src/stores/QueryProductionizerSetupStore.ts

@@ -79,19 +79,19 @@ export class QueryProductionizerSetupStore extends BaseQuerySetupStore {
       (entry) => entry.sdlcProjectIDPrefix === projectIDPrefix,
     );
     if (matchingSDLCEntry) {
-      this.applicationStore.setBlockingAlert({
+      this.applicationStore.alertService.setBlockingAlert({
         message: `Loading query...`,
         prompt: 'Please do not close the application',
         showLoading: true,
       });
-      this.applicationStore.navigator.goToAddress(
+      this.applicationStore.navigationService.navigator.goToAddress(
         EXTERNAL_APPLICATION_NAVIGATION__generateStudioProductionizeQueryUrl(
           matchingSDLCEntry.url,
           this.currentQuery.id,
         ),
       );
     } else {
-      this.applicationStore.notifyWarning(
+      this.applicationStore.notificationService.notifyWarning(
         `Can't find the corresponding SDLC instance to productionize the query`,
       );
     }
@@ -116,7 +116,7 @@ export class QueryProductionizerSetupStore extends BaseQuerySetupStore {
         this.currentQueryInfo = queryInfo;
       } catch (error) {
         assertErrorThrown(error);
-        this.applicationStore.notifyError(error);
+        this.applicationStore.notificationService.notifyError(error);
       } finally {
         this.loadQueryState.reset();
       }
@@ -141,7 +141,7 @@ export class QueryProductionizerSetupStore extends BaseQuerySetupStore {
       this.loadQueriesState.pass();
     } catch (error) {
       assertErrorThrown(error);
-      this.applicationStore.notifyError(error);
+      this.applicationStore.notificationService.notifyError(error);
       this.loadQueriesState.fail();
     }
   }

package/src/stores/QuerySetupStore.ts

@@ -51,7 +51,7 @@ export abstract class BaseQuerySetupStore {
     this.applicationStore = applicationStore;
     this.graphManagerState = new BasicGraphManagerState(
       applicationStore.pluginManager,
-      applicationStore.log,
+      applicationStore.logService,
     );
     this.depotServerClient = depotServerClient;
     this.pluginManager = applicationStore.pluginManager;
@@ -82,11 +82,11 @@ export abstract class BaseQuerySetupStore {
       this.initState.pass();
     } catch (error) {
       assertErrorThrown(error);
-      this.applicationStore.log.error(
+      this.applicationStore.logService.error(
         LogEvent.create(LEGEND_QUERY_APP_EVENT.GENERIC_FAILURE),
         error,
       );
-      this.applicationStore.setBlockingAlert({
+      this.applicationStore.alertService.setBlockingAlert({
         message: `Can't initialize query setup store`,
       });
       this.initState.fail();
@@ -163,7 +163,7 @@ export class QuerySetupLandingPageStore {
   }
 
   private updateCurentLocation(): void {
-    this.applicationStore.navigator.updateCurrentLocation(
+    this.applicationStore.navigationService.navigator.updateCurrentLocation(
       generateQuerySetupRoute(
         this.showAllGroups,
         this.showAdvancedActions,

package/src/stores/UpdateExistingServiceQuerySetupStore.ts

@@ -71,12 +71,12 @@ export class UpdateExistingServiceQuerySetupStore extends BaseQuerySetupStore {
       (entry) => entry.sdlcProjectIDPrefix === projectIDPrefix,
     );
     if (matchingSDLCEntry) {
-      this.applicationStore.setBlockingAlert({
+      this.applicationStore.alertService.setBlockingAlert({
         message: `Loading service...`,
         prompt: 'Please do not close the application',
         showLoading: true,
       });
-      this.applicationStore.navigator.goToAddress(
+      this.applicationStore.navigationService.navigator.goToAddress(
         EXTERNAL_APPLICATION_NAVIGATION__generateStudioUpdateExistingServiceQueryUrl(
           matchingSDLCEntry.url,
           serviceInfo.groupId,
@@ -85,7 +85,7 @@ export class UpdateExistingServiceQuerySetupStore extends BaseQuerySetupStore {
         ),
       );
     } else {
-      this.applicationStore.notifyWarning(
+      this.applicationStore.notificationService.notifyWarning(
         `Can't find the corresponding SDLC instance to update the service`,
       );
     }
@@ -111,7 +111,7 @@ export class UpdateExistingServiceQuerySetupStore extends BaseQuerySetupStore {
       this.loadServicesState.pass();
     } catch (error) {
       assertErrorThrown(error);
-      this.applicationStore.notifyError(error);
+      this.applicationStore.notificationService.notifyError(error);
       this.loadServicesState.fail();
     }
   }