@finos/legend-application-studio 22.4.7 → 22.5.0

package/src/stores/editor-state/element-editor-state/service/testable/ServiceTestDataState.ts

@@ -195,7 +195,7 @@ export class ConnectionTestDataState {
       this.generatingTestDataSate.pass();
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(
+      this.editorStore.applicationStore.notificationService.notifyError(
         `Unable to generate test data: ${error.message}`,
       );
       this.generatingTestDataSate.fail();

package/src/stores/editor-state/element-editor-state/service/testable/ServiceTestEditorState.ts

@@ -282,7 +282,7 @@ export class ServiceTestSetupState {
       this.addExpressionParameterValue(expression);
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.setShowNewParameterModal(false);
     }
@@ -316,7 +316,7 @@ export class ServiceTestSetupState {
       this.parameterValueStates.push(paramValueState);
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     }
   }
 
@@ -406,7 +406,7 @@ export class ServiceTestSetupState {
       this.parameterValueStates = parameterValueStates;
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(
+      this.editorStore.applicationStore.notificationService.notifyError(
         `Unable to generate param values: ${error.message}`,
       );
     }

package/src/stores/editor-state/element-editor-state/service/testable/ServiceTestableState.ts

@@ -160,7 +160,7 @@ export class ServiceTestSuiteState {
       this.isRunningTest.complete();
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
       this.isRunningTest.fail();
     } finally {
       this.testStates.forEach((t) => t.runningTestAction.complete());
@@ -198,7 +198,7 @@ export class ServiceTestSuiteState {
       this.isRunningTest.complete();
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
       this.isRunningTest.fail();
     } finally {
       this.testStates.forEach((t) => t.runningTestAction.complete());

package/src/stores/editor-state/element-editor-state/testable/TestAssertionState.ts

@@ -314,7 +314,7 @@ export class TestAssertionEditorState {
       this.generatingExpectedAction.complete();
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(
+      this.editorStore.applicationStore.notificationService.notifyError(
         `Error generating expected result: ${error.message}`,
       );
       this.generatingExpectedAction.fail();

package/src/stores/editor-state/element-editor-state/testable/TestableEditorState.ts

@@ -159,7 +159,7 @@ export class TestableTestEditorState {
       this.runningTestAction.complete();
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(
+      this.editorStore.applicationStore.notificationService.notifyError(
         `Error running test: ${error.message}`,
       );
       this.runningTestAction.fail();

package/src/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.ts

@@ -450,7 +450,7 @@ export class EntityChangeConflictEditorState extends EntityDiffViewerState {
           ),
         );
       } else {
-        this.editorStore.applicationStore.notifyWarning(
+        this.editorStore.applicationStore.notificationService.notifyWarning(
           `Can't mark conflict as resolved: more than one element found in parsed text`,
         );
         return;
@@ -459,7 +459,7 @@ export class EntityChangeConflictEditorState extends EntityDiffViewerState {
       assertErrorThrown(error);
       if (error instanceof ParserError) {
         this.mergeEditorParserError = error;
-        this.editorStore.applicationStore.notifyWarning(
+        this.editorStore.applicationStore.notificationService.notifyWarning(
           `Can't mark conflict as resolved. Parsing error: ${this.mergeEditorParserError.message}`,
         );
       }

package/src/stores/editor-state/entity-diff-editor-state/EntityDiffViewState.ts

@@ -209,7 +209,7 @@ export class EntityDiffViewState extends EntityDiffViewerState {
         this.setFromGrammarText(
           '/* Failed to transform grammar text, see JSON diff instead */',
         );
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
           error,
         );
@@ -232,7 +232,7 @@ export class EntityDiffViewState extends EntityDiffViewerState {
         this.setFromGrammarText(
           '/* Failed to transform grammar text, see JSON diff instead */',
         );
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
           error,
         );

package/src/stores/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.ts

@@ -81,6 +81,9 @@ export class ProjectConfigurationEditorState extends EditorState {
       latestProjectStructureVersion: observable,
       projectDependencyEditorState: observable,
       originalConfig: computed,
+      isGroupIdChanged: computed,
+      isArtifactIdChanged: computed,
+
       setOriginalProjectConfiguration: action,
       setProjectConfiguration: action,
       setSelectedTab: action,
@@ -136,6 +139,20 @@ export class ProjectConfigurationEditorState extends EditorState {
     );
   }
 
+  get isGroupIdChanged(): boolean {
+    return (
+      this.currentProjectConfiguration.groupId !==
+      this.originalProjectConfiguration?.groupId
+    );
+  }
+
+  get isArtifactIdChanged(): boolean {
+    return (
+      this.currentProjectConfiguration.artifactId !==
+      this.originalProjectConfiguration?.artifactId
+    );
+  }
+
   get containsSnapshotDependencies(): boolean {
     return Boolean(
       this.originalProjectConfiguration?.projectDependencies.some(
@@ -173,11 +190,11 @@ export class ProjectConfigurationEditorState extends EditorState {
       this.associatedProjectsAndVersionsFetched = true;
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(
+      this.editorStore.applicationStore.notificationService.notifyError(
         `Can't get project dependencies data. Error:\n${error.message}`,
       );
     } finally {
@@ -218,11 +235,11 @@ export class ProjectConfigurationEditorState extends EditorState {
       );
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.updatingConfigurationState.complete();
     }
@@ -240,11 +257,13 @@ export class ProjectConfigurationEditorState extends EditorState {
         yield flowResult(this.updateProjectConfiguration(updateCommand));
       } catch (error) {
         assertErrorThrown(error);
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
           error,
         );
-        this.editorStore.applicationStore.notifyError(error);
+        this.editorStore.applicationStore.notificationService.notifyError(
+          error,
+        );
       }
     }
   }
@@ -253,7 +272,7 @@ export class ProjectConfigurationEditorState extends EditorState {
   // See https://github.com/finos/legend-studio/issues/952
   *updateConfigs(): GeneratorFn<void> {
     this.updatingConfigurationState.inProgress();
-    this.editorStore.applicationStore.setBlockingAlert({
+    this.editorStore.applicationStore.alertService.setBlockingAlert({
       message: `Updating project configuration...`,
       prompt: `Please do not reload the application`,
       showLoading: true,
@@ -296,14 +315,16 @@ export class ProjectConfigurationEditorState extends EditorState {
       );
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.updatingConfigurationState.complete();
-      this.editorStore.applicationStore.setBlockingAlert(undefined);
+      this.editorStore.applicationStore.alertService.setBlockingAlert(
+        undefined,
+      );
     }
   }
 
@@ -315,11 +336,11 @@ export class ProjectConfigurationEditorState extends EditorState {
         );
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     }
   }
 }

package/src/stores/editor-state/project-configuration-editor-state/ProjectDependencyEditorState.ts

@@ -412,7 +412,7 @@ export class ProjectDependencyEditorState {
       assertErrorThrown(error);
       this.fetchingDependencyInfoState.fail();
       this.dependencyReport = undefined;
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.DEPOT_MANAGER_FAILURE),
         error,
       );
@@ -436,7 +436,7 @@ export class ProjectDependencyEditorState {
         assertErrorThrown(error);
         this.setConflictStates([]);
         this.buildConflictPathState.fail();
-        this.editorStore.applicationStore.notifyError(
+        this.editorStore.applicationStore.notificationService.notifyError(
           `Unable to build conflict paths ${error.message}`,
         );
       }

package/src/stores/project-viewer/ProjectViewerStore.ts

@@ -47,7 +47,7 @@ import {
   Workspace,
 } from '@finos/legend-server-sdlc';
 import { LEGEND_STUDIO_APP_EVENT } from '../LegendStudioAppEvent.js';
-import { TAB_SIZE } from '@finos/legend-application';
+import { ApplicationTelemetry, TAB_SIZE } from '@finos/legend-application';
 import { ProjectData, resolveVersion } from '@finos/legend-server-depot';
 import {
   type WorkflowManagerState,
@@ -55,7 +55,6 @@ import {
   ProjectWorkflowManagerState,
 } from '../sidebar-state/WorkflowManagerState.js';
 import {
-  GraphManagerTelemetry,
   GRAPH_MANAGER_EVENT,
   DependencyGraphBuilderError,
   GraphDataDeserializationError,
@@ -127,7 +126,7 @@ export class ProjectViewerStore {
     if (entityPath) {
       this.initialEntityPath = entityPath;
       if (projectId) {
-        this.editorStore.applicationStore.navigator.updateCurrentLocation(
+        this.editorStore.applicationStore.navigationService.navigator.updateCurrentLocation(
           versionId
             ? generateViewVersionRoute(projectId, versionId)
             : revisionId
@@ -140,7 +139,7 @@ export class ProjectViewerStore {
           artifactId,
           versionId: _versionId,
         } = parseGAVCoordinates(gav);
-        this.editorStore.applicationStore.navigator.updateCurrentLocation(
+        this.editorStore.applicationStore.navigationService.navigator.updateCurrentLocation(
           generateViewProjectByGAVRoute(groupId, artifactId, _versionId),
         );
       }
@@ -412,23 +411,23 @@ export class ProjectViewerStore {
       // report
       stopWatch.record(GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS);
       const graphBuilderReportData = {
-        timings: {
-          [GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS]: stopWatch.getRecord(
-            GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS,
+        timings:
+          this.editorStore.applicationStore.timeService.finalizeTimingsRecord(
+            stopWatch,
           ),
-        },
         dependencies: dependency_buildReport,
         dependenciesCount:
           this.editorStore.graphManagerState.graph.dependencyManager
             .numberOfDependencies,
         graph: graph_buildReport,
       };
-      this.editorStore.applicationStore.log.info(
-        LogEvent.create(GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS),
+      ApplicationTelemetry.logEvent_GraphInitializationSucceeded(
+        this.editorStore.applicationStore.telemetryService,
         graphBuilderReportData,
       );
-      GraphManagerTelemetry.logEvent_GraphInitializationSucceeded(
-        this.editorStore.applicationStore.telemetryService,
+
+      this.editorStore.applicationStore.logService.info(
+        LogEvent.create(GRAPH_MANAGER_EVENT.INITIALIZE_GRAPH__SUCCESS),
         graphBuilderReportData,
       );
 
@@ -445,32 +444,32 @@ export class ProjectViewerStore {
       assertErrorThrown(error);
 
       // if graph builder fails, we fall back to text-mode
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
         error,
       );
       if (error instanceof DependencyGraphBuilderError) {
         // no recovery if dependency models cannot be built, this makes assumption that all dependencies models are compiled successfully
         // TODO: we might want to handle this more gracefully when we can show people the dependency model element in the future
-        this.editorStore.applicationStore.notifyError(
+        this.editorStore.applicationStore.notificationService.notifyError(
           `Can't initialize dependency models. Error: ${error.message}`,
         );
-        this.editorStore.applicationStore.setBlockingAlert({
+        this.editorStore.applicationStore.alertService.setBlockingAlert({
           message: `Can't initialize dependencies`,
           prompt: 'Please use editor to better invesigate the issue',
         });
       } else if (error instanceof GraphDataDeserializationError) {
         // if something goes wrong with de-serialization, we can't really do anything but to alert
-        this.editorStore.applicationStore.notifyError(
+        this.editorStore.applicationStore.notificationService.notifyError(
           `Can't deserialize graph. Error: ${error.message}`,
         );
-        this.editorStore.applicationStore.setBlockingAlert({
+        this.editorStore.applicationStore.alertService.setBlockingAlert({
           message: `Can't deserialize graph`,
           prompt: 'Please use editor to better invesigate the issue',
         });
       } else if (error instanceof GraphBuilderError) {
         // TODO: we should split this into 2 notifications when we support multiple notifications
-        this.editorStore.applicationStore.notifyError(
+        this.editorStore.applicationStore.notificationService.notifyError(
           `Can't build graph. Redirected to text mode for debugging. Error: ${error.message}`,
         );
         try {
@@ -485,7 +484,7 @@ export class ProjectViewerStore {
           );
         } catch {
           // nothing we can do here so we will just block the user
-          this.editorStore.applicationStore.setBlockingAlert({
+          this.editorStore.applicationStore.alertService.setBlockingAlert({
             message: `Can't compose Pure code from graph models`,
             prompt: 'Please use editor to better invesigate the issue',
           });
@@ -501,7 +500,9 @@ export class ProjectViewerStore {
           }),
         );
       } else {
-        this.editorStore.applicationStore.notifyError(error);
+        this.editorStore.applicationStore.notificationService.notifyError(
+          error,
+        );
       }
       return false;
     }
@@ -613,11 +614,11 @@ export class ProjectViewerStore {
       onLeave(true);
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
       onLeave(false);
     }
   }

package/src/stores/shared/MockDataUtils.ts

@@ -37,6 +37,9 @@ import {
   getClassPropertyType,
 } from './ModelClassifierUtils.js';
 import type { MappingElementSource } from '../editor-state/element-editor-state/mapping/MappingEditorState.js';
+import { TAB_SIZE } from '@finos/legend-application';
+import { XMLBuilder } from 'fast-xml-parser';
+import { stringify as YAML_stringify } from 'yaml';
 
 export const createMockPrimitiveProperty = (
   primitiveType: PrimitiveType,
@@ -166,22 +169,60 @@ export const createMockDataForClass = (
   return createMockClassInstance(element, true, depth);
 };
 
+export enum CLASS_MOCK_DATA_GENERATION_FORMAT {
+  JSON = 'JSON',
+  XML = 'XML',
+  YAML = 'YAML',
+}
+
+export const createMockDataForClassWithFormat = (
+  element: Class,
+  format: CLASS_MOCK_DATA_GENERATION_FORMAT,
+  maxDepth = 100,
+  depthForCycle = 3,
+): string => {
+  const depth = classHasCycle(element, true, new Set<string>())
+    ? Math.max(depthForCycle, 0)
+    : Math.max(maxDepth, 0);
+  const obj = createMockClassInstance(element, true, depth);
+  switch (format) {
+    case CLASS_MOCK_DATA_GENERATION_FORMAT.JSON:
+      return JSON.stringify(obj, undefined, TAB_SIZE);
+    case CLASS_MOCK_DATA_GENERATION_FORMAT.XML: {
+      return new XMLBuilder({
+        indentBy: ' '.repeat(TAB_SIZE),
+        format: true,
+      }).build(obj);
+    }
+    case CLASS_MOCK_DATA_GENERATION_FORMAT.YAML:
+      return YAML_stringify(obj, { indent: TAB_SIZE });
+    default:
+      throw new UnsupportedOperationError(
+        `Can't create mock data for class with format '${format}'`,
+      );
+  }
+};
+
 export const createMockDataForMappingElementSource = (
   srcElement: MappingElementSource,
   editorStore: EditorStore,
 ): string => {
   if (srcElement instanceof Class) {
     try {
-      return JSON.stringify(createMockDataForClass(srcElement), undefined, 2);
+      return JSON.stringify(
+        createMockDataForClass(srcElement),
+        undefined,
+        TAB_SIZE,
+      );
     } catch (error) {
       assertErrorThrown(error);
-      editorStore.applicationStore.notifyWarning(
+      editorStore.applicationStore.notificationService.notifyWarning(
         `Can't generate test data for class '${srcElement}'. Error:\n${error.message}`,
       );
       return '';
     }
   }
-  editorStore.applicationStore.notifyWarning(
+  editorStore.applicationStore.notificationService.notifyWarning(
     new UnsupportedOperationError(
       `Can't generate test data for mapping source`,
       srcElement,

package/src/stores/shared/modifier/STO_Relational_GraphModifierHelper.ts

@@ -44,6 +44,7 @@ import {
   type TableAlias,
   type Mapper,
   type PostProcessor,
+  type SpannerDatasourceSpecification,
   getRelationalInputType,
   observe_DatasourceSpecification,
   observe_AuthenticationStrategy,
@@ -377,7 +378,31 @@ export const bigQueryDatasourceSpecification_setProxyPort = action(
     spec.proxyPort = val;
   },
 );
-//
+export const spannerDatasourceSpecification_setProjectId = action(
+  (spec: SpannerDatasourceSpecification, val: string): void => {
+    spec.projectId = val;
+  },
+);
+export const spannerDatasourceSpecification_setInstanceId = action(
+  (spec: SpannerDatasourceSpecification, val: string): void => {
+    spec.instanceId = val;
+  },
+);
+export const spannerDatasourceSpecification_setDatabaseId = action(
+  (spec: SpannerDatasourceSpecification, val: string): void => {
+    spec.databaseId = val;
+  },
+);
+export const spannerDatasourceSpecification_setProxyHost = action(
+  (spec: SpannerDatasourceSpecification, val: string | undefined): void => {
+    spec.proxyHost = val;
+  },
+);
+export const spannerDatasourceSpecification_setProxyPort = action(
+  (spec: SpannerDatasourceSpecification, val: string | undefined): void => {
+    spec.proxyPort = val;
+  },
+);
 
 export const relationalInputData_setData = action(
   (input: RelationalInputData, value: string): void => {

package/src/stores/sidebar-state/LocalChangesState.ts

@@ -147,7 +147,7 @@ class PatchLoaderState {
     } catch (error) {
       assertErrorThrown(error);
       this.setIsValidPatch(false);
-      this.editorStore.applicationStore.notifyError(
+      this.editorStore.applicationStore.notificationService.notifyError(
         `Can't load patch: Error: ${error.message}`,
       );
     }
@@ -166,7 +166,7 @@ class PatchLoaderState {
         );
       } catch (error) {
         assertErrorThrown(error);
-        this.editorStore.applicationStore.notifyError(
+        this.editorStore.applicationStore.notificationService.notifyError(
           `Can't apply patch changes: Error: ${error.message}`,
         );
       }
@@ -224,7 +224,7 @@ export abstract class LocalChangesState {
 
   alertUnsavedChanges(onProceed: () => void): void {
     if (this.hasUnpushedChanges) {
-      this.editorStore.applicationStore.setActionAlertInfo({
+      this.editorStore.applicationStore.alertService.setActionAlertInfo({
         message:
           'Unsaved changes to your query will be lost if you continue. Do you still want to proceed?',
         type: ActionAlertType.CAUTION,
@@ -297,7 +297,7 @@ export abstract class LocalChangesState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
         error,
       );
@@ -363,7 +363,7 @@ export abstract class LocalChangesState {
       yield flowResult(
         this.editorStore.changeDetectionState.computeAggregatedWorkspaceRemoteChanges(),
       );
-      this.editorStore.applicationStore.setActionAlertInfo({
+      this.editorStore.applicationStore.alertService.setActionAlertInfo({
         message: 'Local workspace is out-of-sync',
         prompt: 'Please pull remote changes before pushing your local changes',
         type: ActionAlertType.CAUTION,
@@ -418,7 +418,7 @@ export abstract class LocalChangesState {
       this.sdlcState.setWorkspaceLatestRevision(latestRevision);
       const syncFinishedTime = Date.now();
 
-      this.editorStore.applicationStore.log.info(
+      this.editorStore.applicationStore.logService.info(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.PUSH_LOCAL_CHANGES__SUCCESS),
         syncFinishedTime - startTime,
         'ms',
@@ -462,13 +462,13 @@ export abstract class LocalChangesState {
          */
         if (error instanceof NetworkClientError) {
           if (error.response.status === HttpStatus.NOT_FOUND) {
-            this.editorStore.applicationStore.log.error(
+            this.editorStore.applicationStore.logService.error(
               LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
               `Can't fetch entities for the latest workspace revision immediately after syncing`,
               error,
             );
           }
-          this.editorStore.applicationStore.setActionAlertInfo({
+          this.editorStore.applicationStore.alertService.setActionAlertInfo({
             message: `Change detection engine failed to build hashes index for workspace after syncing`,
             prompt:
               'To fix this, you can either try to keep refreshing local changes until success or trust and reuse current workspace hashes index',
@@ -501,7 +501,7 @@ export abstract class LocalChangesState {
         }
       }
       yield flowResult(this.restartChangeDetection());
-      this.editorStore.applicationStore.log.info(
+      this.editorStore.applicationStore.logService.info(
         LogEvent.create(
           CHANGE_DETECTION_EVENT.CHANGE_DETECTION_RESTART__SUCCESS,
         ),
@@ -511,7 +511,7 @@ export abstract class LocalChangesState {
       // ======= FINISHED (RE)START CHANGE DETECTION =======
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
         error,
       );
@@ -521,12 +521,14 @@ export abstract class LocalChangesState {
       ) {
         // NOTE: a confict here indicates that the reference revision ID sent along with update call
         // does not match the HEAD of the workspace, therefore, we need to prompt user to refresh the application
-        this.editorStore.applicationStore.notifyWarning(
+        this.editorStore.applicationStore.notificationService.notifyWarning(
           'Syncing failed. Current workspace revision is not the latest. Please backup your work and refresh the application',
         );
         // TODO: maybe we should do more here, e.g. prompt the user to download the patch, but that is for later
       } else {
-        this.editorStore.applicationStore.notifyError(error);
+        this.editorStore.applicationStore.notificationService.notifyError(
+          error,
+        );
       }
     } finally {
       this.pushChangesState.complete();
@@ -705,7 +707,7 @@ export class FormLocalChangesState extends LocalChangesState {
         this.editorStore.changeDetectionState.preComputeGraphElementHashes(),
       ]);
       this.editorStore.changeDetectionState.start();
-      this.editorStore.applicationStore.log.info(
+      this.editorStore.applicationStore.logService.info(
         LogEvent.create(
           CHANGE_DETECTION_EVENT.CHANGE_DETECTION_RESTART__SUCCESS,
         ),
@@ -715,11 +717,11 @@ export class FormLocalChangesState extends LocalChangesState {
       // ======= FINISHED (RE)START CHANGE DETECTION =======
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
       this.sdlcState.handleChangeDetectionRefreshIssue(error);
     } finally {
       this.refreshLocalChangesDetectorState.complete();
@@ -732,7 +734,7 @@ export class FormLocalChangesState extends LocalChangesState {
         this.sdlcState.checkIfCurrentWorkspaceIsInConflictResolutionMode(),
       )) as boolean;
       if (isInConflictResolutionMode) {
-        this.editorStore.applicationStore.setBlockingAlert({
+        this.editorStore.applicationStore.alertService.setBlockingAlert({
           message: 'Workspace is in conflict resolution mode',
           prompt: 'Please refresh the application',
         });
@@ -740,7 +742,7 @@ export class FormLocalChangesState extends LocalChangesState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyWarning(
+      this.editorStore.applicationStore.notificationService.notifyWarning(
         'Failed to check if current workspace is in conflict resolution mode',
       );
       return;
@@ -797,11 +799,11 @@ export class TextLocalChangesState extends LocalChangesState {
       );
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
       this.sdlcState.handleChangeDetectionRefreshIssue(error);
     } finally {
       this.refreshLocalChangesDetectorState.complete();