@finos/legend-application-studio 22.4.8 → 22.6.0

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

@@ -45,6 +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';
 
 const getGrammarElementTypeLabelRegexString = (
   typeLabel: string,
@@ -68,7 +69,7 @@ export class GrammarTextEditorState {
 
   graphGrammarText = '';
   currentElementLabelRegexString?: string | undefined;
-  wrapText = true;
+  wrapText: boolean;
   forcedCursorPosition?: TextEditorPosition | undefined;
 
   constructor(editorStore: EditorStore) {
@@ -85,6 +86,11 @@ export class GrammarTextEditorState {
     });
 
     this.editorStore = editorStore;
+    this.wrapText =
+      this.editorStore.applicationStore.storageService.settingsStore.getBooleanValue(
+        LEGEND_STUDIO_SETTINGS_KEY.EDITOR_WRAP_TEXT,
+        true,
+      );
   }
 
   get currentTextGraphHash(): string {

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

@@ -205,11 +205,11 @@ export class GraphGenerationState {
         );
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.GENERATION_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     }
   }
 
@@ -229,11 +229,11 @@ export class GraphGenerationState {
       yield flowResult(this.generateFiles());
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.GENERATION_FAILURE),
         error,
       );
-      this.editorStore.graphState.editorStore.applicationStore.notifyError(
+      this.editorStore.graphState.editorStore.applicationStore.notificationService.notifyError(
         `${error.message}`,
       );
     } finally {
@@ -284,11 +284,11 @@ export class GraphGenerationState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.GENERATION_FAILURE),
         error,
       );
-      this.editorStore.graphState.editorStore.applicationStore.notifyError(
+      this.editorStore.graphState.editorStore.applicationStore.notificationService.notifyError(
         `${error.message}`,
       );
     }
@@ -338,11 +338,11 @@ export class GraphGenerationState {
       this.processGenerationResult(generationOutputIndex);
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.GENERATION_FAILURE),
         error,
       );
-      this.editorStore.graphState.editorStore.applicationStore.notifyError(
+      this.editorStore.graphState.editorStore.applicationStore.notificationService.notifyError(
         `${error.message}`,
       );
     }
@@ -432,7 +432,7 @@ export class GraphGenerationState {
       generationOutputs.forEach((genOutput) => {
         genOutput.cleanFileName(rootFolder);
         if (generationResultIndex.has(genOutput.fileName)) {
-          this.editorStore.applicationStore.log.warn(
+          this.editorStore.applicationStore.logService.warn(
             LogEvent.create(LEGEND_STUDIO_APP_EVENT.GENERATION_FAILURE),
             `Found 2 generation outputs with same path '${genOutput.fileName}'`,
           );

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

@@ -239,7 +239,7 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
   async loadModel(): Promise<void> {
     try {
       this.loadModelActionState.inProgress();
-      this.editorStore.applicationStore.setBlockingAlert({
+      this.editorStore.applicationStore.alertService.setBlockingAlert({
         message: 'Loading model...',
         prompt: 'Please do not close the application',
         showLoading: true,
@@ -255,19 +255,21 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
         this.editorStore.sdlcState.activeWorkspace,
         { replace: this.modelImporterState.replace, entities, message },
       );
-      this.editorStore.applicationStore.navigator.reload({
+      this.editorStore.applicationStore.navigationService.navigator.reload({
         ignoreBlocking: true,
       });
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.MODEL_LOADER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.loadModelActionState.complete();
-      this.editorStore.applicationStore.setBlockingAlert(undefined);
+      this.editorStore.applicationStore.alertService.setBlockingAlert(
+        undefined,
+      );
     }
   }
 }
@@ -403,7 +405,7 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
     this.loadModelActionState.inProgress();
     try {
       this.loadModelActionState.inProgress();
-      this.editorStore.applicationStore.setBlockingAlert({
+      this.editorStore.applicationStore.alertService.setBlockingAlert({
         message: 'Loading model...',
         prompt: 'Please do not close the application',
         showLoading: true,
@@ -431,15 +433,17 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
         this.editorStore.sdlcState.activeWorkspace,
         { replace: this.modelImporterState.replace, entities, message },
       );
-      this.editorStore.applicationStore.navigator.reload({
+      this.editorStore.applicationStore.navigationService.navigator.reload({
         ignoreBlocking: true,
       });
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.loadModelActionState.complete();
-      this.editorStore.applicationStore.setBlockingAlert(undefined);
+      this.editorStore.applicationStore.alertService.setBlockingAlert(
+        undefined,
+      );
     }
   }
 }

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

@@ -99,7 +99,7 @@ export class ClassEditorState extends UMLEditorState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.warn(
+      this.editorStore.applicationStore.logService.warn(
         LogEvent.create(GRAPH_MANAGER_EVENT.COMPILATION_FAILURE),
         `Can't locate error`,
         error,

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

@@ -93,7 +93,7 @@ export class DerivedPropertyState extends LambdaEditorState {
         if (error instanceof ParserError) {
           this.setParserError(error);
         }
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -129,7 +129,7 @@ export class DerivedPropertyState extends LambdaEditorState {
         this.clearErrors();
       } catch (error) {
         assertErrorThrown(error);
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -182,7 +182,7 @@ export class ConstraintState extends LambdaEditorState {
         if (error instanceof ParserError) {
           this.setParserError(error);
         }
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -215,7 +215,7 @@ export class ConstraintState extends LambdaEditorState {
         this.clearErrors();
       } catch (error) {
         assertErrorThrown(error);
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -354,7 +354,7 @@ export class ClassState {
         });
       } catch (error) {
         assertErrorThrown(error);
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -392,7 +392,7 @@ export class ClassState {
         });
       } catch (error) {
         assertErrorThrown(error);
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );

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

@@ -203,7 +203,7 @@ export abstract class ElementEditorState extends EditorState {
           error,
         ),
       );
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
         error,
       );
@@ -229,7 +229,7 @@ export abstract class ElementEditorState extends EditorState {
           error,
         ),
       );
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
         error,
       );

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

@@ -126,11 +126,11 @@ export class XTGenerationState extends GeneratedFileStructureState {
       assertErrorThrown(error);
       this.fileSystemState.selectedNode = undefined;
       this.processGenerationResult([]);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.GENERATION_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.generatingAction.complete();
     }

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

@@ -82,7 +82,7 @@ export class FunctionBodyEditorState extends LambdaEditorState {
         if (error instanceof ParserError) {
           this.setParserError(error);
         }
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -139,7 +139,7 @@ export class FunctionBodyEditorState extends LambdaEditorState {
         this.isConvertingFunctionBodyToString = false;
       } catch (error) {
         assertErrorThrown(error);
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -199,7 +199,7 @@ export class FunctionEditorState extends ElementEditorState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.warn(
+      this.editorStore.applicationStore.logService.warn(
         LogEvent.create(GRAPH_MANAGER_EVENT.COMPILATION_FAILURE),
         `Can't locate error`,
         error,

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

@@ -412,7 +412,9 @@ export abstract class IdentifiedConnectionsEditorTabState extends RuntimeEditorT
         newConnection = this.createDefaultConnection();
       } catch (error) {
         assertErrorThrown(error);
-        this.editorStore.applicationStore.notifyWarning(error.message);
+        this.editorStore.applicationStore.notificationService.notifyWarning(
+          error.message,
+        );
         return;
       }
     }

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

@@ -50,6 +50,7 @@ import {
   BigQueryDatasourceSpecification,
   StaticDatasourceSpecification,
   RedshiftDatasourceSpecification,
+  SpannerDatasourceSpecification,
   createValidationError,
   isStubbed_PackageableElement,
   type PostProcessor,
@@ -91,6 +92,7 @@ export enum CORE_DATASOURCE_SPEC_TYPE {
   SNOWFLAKE = 'SNOWFLAKE',
   REDSHIFT = 'REDSHIFT',
   BIGQUERY = 'BIGQUERY',
+  SPANNER = 'SPANNER',
 }
 
 export enum POST_PROCESSOR_TYPE {
@@ -195,6 +197,8 @@ export class RelationalDatabaseConnectionValueState extends ConnectionValueState
       return CORE_DATASOURCE_SPEC_TYPE.H2_LOCAL;
     } else if (spec instanceof RedshiftDatasourceSpecification) {
       return CORE_DATASOURCE_SPEC_TYPE.REDSHIFT;
+    } else if (spec instanceof SpannerDatasourceSpecification) {
+      return CORE_DATASOURCE_SPEC_TYPE.SPANNER;
     }
     const extraDatasourceSpecificationClassifiers =
       this.editorStore.pluginManager
@@ -257,6 +261,10 @@ export class RelationalDatabaseConnectionValueState extends ConnectionValueState
         dataSpec = new BigQueryDatasourceSpecification('', '');
         break;
       }
+      case CORE_DATASOURCE_SPEC_TYPE.SPANNER: {
+        dataSpec = new SpannerDatasourceSpecification('', '', '', '', '');
+        break;
+      }
       default: {
         const extraDatasourceSpecificationCreators =
           this.editorStore.pluginManager

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

@@ -259,11 +259,11 @@ export class DatabaseBuilderState {
       this.setTreeData(treeData);
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.DATABASE_BUILDER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.isBuildingDatabase = false;
     }
@@ -318,11 +318,11 @@ export class DatabaseBuilderState {
       this.setTreeData({ ...treeData });
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.DATABASE_BUILDER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.isBuildingDatabase = false;
     }
@@ -359,11 +359,11 @@ export class DatabaseBuilderState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.DATABASE_BUILDER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.isBuildingDatabase = false;
     }
@@ -481,11 +481,11 @@ export class DatabaseBuilderState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.DATABASE_BUILDER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.isBuildingDatabase = false;
     }
@@ -572,7 +572,7 @@ export class DatabaseBuilderState {
       if (this.treeData) {
         const schemas = this.getSchemasFromTreeNode(this.treeData);
         this.updateDatabase(currentDatabase, database, schemas);
-        this.editorStore.applicationStore.notifySuccess(
+        this.editorStore.applicationStore.notificationService.notifySuccess(
           `Database successfully '${isUpdating ? 'updated' : 'created'}. ${
             !isUpdating ? 'Recompiling...' : ''
           }`,
@@ -588,11 +588,11 @@ export class DatabaseBuilderState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.DATABASE_BUILDER_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.isSavingDatabase = false;
     }

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

@@ -264,7 +264,9 @@ export class SchemaSetModelGenerationState {
 
   *generate(): GeneratorFn<boolean> {
     this.generatingModelsState.inProgress();
-    this.editorStore.applicationStore.setNotification(undefined);
+    this.editorStore.applicationStore.notificationService.setNotification(
+      undefined,
+    );
     try {
       const properties = [...this.configurationProperties];
       this.addInferredConfigurationProperties(properties);
@@ -279,11 +281,11 @@ export class SchemaSetModelGenerationState {
       return true;
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.EXTERNAL_FORMAT_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
       this.setGenerationValue('');
       return false;
     } finally {
@@ -306,16 +308,16 @@ export class SchemaSetModelGenerationState {
           undefined,
         ),
       );
-      this.editorStore.applicationStore.notifySuccess(
+      this.editorStore.applicationStore.notificationService.notifySuccess(
         'Generated elements imported into project',
       );
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.EXTERNAL_FORMAT_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.importGeneratedElementsState.complete();
     }
@@ -331,11 +333,11 @@ export class SchemaSetModelGenerationState {
       return entities;
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.EXTERNAL_FORMAT_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
       throw error;
     } finally {
       this.importGeneratedElementsState.complete();
@@ -409,7 +411,7 @@ export class ImportSchemaContentState {
       this.closeModal();
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(
+      this.editorStore.applicationStore.notificationService.notifyError(
         `Can't load patch: Error: ${error.message}`,
       );
       this.loadingSchemaContentState.fail();
@@ -571,7 +573,7 @@ export class SchemaSetEditorState extends ElementEditorState {
       );
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(LEGEND_STUDIO_APP_EVENT.EXTERNAL_FORMAT_FAILURE),
         error,
       );

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

@@ -96,7 +96,7 @@ export class FlatDataPropertyMappingState extends PropertyMappingState {
         if (error instanceof ParserError) {
           this.setParserError(error);
         }
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -129,7 +129,7 @@ export class FlatDataPropertyMappingState extends PropertyMappingState {
           this.clearErrors();
         } catch (error) {
           assertErrorThrown(error);
-          this.editorStore.applicationStore.log.error(
+          this.editorStore.applicationStore.logService.error(
             LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
             error,
           );
@@ -234,7 +234,7 @@ export abstract class FlatDataInstanceSetImplementationState extends InstanceSet
         });
       } catch (error) {
         assertErrorThrown(error);
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );

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

@@ -835,7 +835,7 @@ export class MappingEditorState extends ElementEditorState {
     openInAdjacentTab: boolean,
   ): void {
     if (mappingElement instanceof AssociationImplementation) {
-      this.editorStore.applicationStore.notifyUnsupportedFeature(
+      this.editorStore.applicationStore.notificationService.notifyUnsupportedFeature(
         'Association mapping editor',
       );
       return;
@@ -1298,7 +1298,7 @@ export class MappingEditorState extends ElementEditorState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.warn(
+      this.editorStore.applicationStore.logService.warn(
         LogEvent.create(GRAPH_MANAGER_EVENT.COMPILATION_FAILURE),
         `Can't locate error, redirecting to text mode`,
         error,
@@ -1462,7 +1462,7 @@ export class MappingEditorState extends ElementEditorState {
       this.editorStore.pluginManager.getApplicationPlugins(),
     );
     if (setImplementation instanceof OperationSetImplementation) {
-      this.editorStore.applicationStore.notifyWarning(
+      this.editorStore.applicationStore.notificationService.notifyWarning(
         `Can't auto-generate input data for operation class mapping. Please pick a concrete class mapping instead`,
       );
     }

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

@@ -188,7 +188,7 @@ export class MappingExecutionQueryState extends LambdaEditorState {
         this.clearErrors();
       } catch (error) {
         assertErrorThrown(error);
-        this.editorStore.applicationStore.log.error(
+        this.editorStore.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -636,7 +636,7 @@ export class MappingExecutionState extends MappingEditorTabState {
         ),
       );
     } else {
-      this.editorStore.applicationStore.notifyWarning(
+      this.editorStore.applicationStore.notificationService.notifyWarning(
         new UnsupportedOperationError(
           `Can't build input data for the specified source`,
           source,
@@ -669,11 +669,11 @@ export class MappingExecutionState extends MappingEditorTabState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.EXECUTION_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     }
   }
 
@@ -748,11 +748,11 @@ export class MappingExecutionState extends MappingEditorTabState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.EXECUTION_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     }
   }
 
@@ -813,11 +813,11 @@ export class MappingExecutionState extends MappingEditorTabState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.EXECUTION_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
       this.setExecutionResultText('');
     } finally {
       this.isExecuting = false;
@@ -912,11 +912,11 @@ export class MappingExecutionState extends MappingEditorTabState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.log.error(
+      this.editorStore.applicationStore.logService.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.EXECUTION_FAILURE),
         error,
       );
-      this.editorStore.applicationStore.notifyError(error);
+      this.editorStore.applicationStore.notificationService.notifyError(error);
     } finally {
       this.isGeneratingPlan = false;
     }
@@ -946,7 +946,7 @@ export class MappingExecutionState extends MappingEditorTabState {
     if (setImplementation) {
       if (this.inputDataState instanceof MappingExecutionEmptyInputDataState) {
         if (setImplementation instanceof OperationSetImplementation) {
-          this.editorStore.applicationStore.notifyWarning(
+          this.editorStore.applicationStore.notificationService.notifyWarning(
             `Can't auto-generate input data for operation class mapping. Please pick a concrete class mapping instead`,
           );
         } else {
@@ -959,7 +959,7 @@ export class MappingExecutionState extends MappingEditorTabState {
           );
         }
       } else {
-        this.editorStore.applicationStore.setActionAlertInfo({
+        this.editorStore.applicationStore.alertService.setActionAlertInfo({
           message: 'Mapping execution input data is already set',
           prompt: 'Do you want to regenerate the input data?',
           type: ActionAlertType.CAUTION,