@finos/legend-query-builder 0.6.31 → 0.6.32

package/src/components/QueryBuilderSideBar.tsx

@@ -179,10 +179,14 @@ export const QueryBuilderClassSelector = observer(
               options={classOptions}
               onChange={changeClass}
               value={selectedClassOption}
-              darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+              darkMode={
+                !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+              }
               filterOption={elementFilterOption}
               formatOptionLabel={getPackageableElementOptionFormatter({
-                darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled,
+                darkMode:
+                  !applicationStore.layoutService
+                    .TEMPORARY__isLightThemeEnabled,
                 graph: queryBuilderState.graphManagerState.graph,
               })}
             />
@@ -337,10 +341,14 @@ const BasicQueryBuilderSetup = observer(
                 options={mappingOptions}
                 onChange={changeMapping}
                 value={selectedMappingOption}
-                darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+                darkMode={
+                  !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+                }
                 filterOption={mappingFilterOption}
                 formatOptionLabel={getPackageableElementOptionFormatter({
-                  darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled,
+                  darkMode:
+                    !applicationStore.layoutService
+                      .TEMPORARY__isLightThemeEnabled,
                   graph: queryBuilderState.graphManagerState.graph,
                 })}
               />
@@ -367,10 +375,14 @@ const BasicQueryBuilderSetup = observer(
                 options={runtimeOptions}
                 onChange={changeRuntime}
                 value={selectedRuntimeOption}
-                darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+                darkMode={
+                  !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+                }
                 filterOption={runtimeFilterOption}
                 formatOptionLabel={getRuntimeOptionFormatter({
-                  darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled,
+                  darkMode:
+                    !applicationStore.layoutService
+                      .TEMPORARY__isLightThemeEnabled,
                   pureModel: queryBuilderState.graphManagerState.graph,
                 })}
               />

package/src/components/QueryBuilderTextEditor.tsx

@@ -48,7 +48,7 @@ export const QueryBuilderTextEditor = observer(
     const discardChanges = (): void => {
       queryBuilderState.textEditorState.setMode(undefined);
       // force close the backdrop just in case changes are discarded when there are grammar issues
-      applicationStore.setShowBackdrop(false);
+      applicationStore.layoutService.setShowBackdrop(false);
     };
     const mode = queryTextEditorState.mode;
     useEffect(() => {

package/src/components/explorer/QueryBuilderExplorerPanel.tsx

@@ -488,7 +488,7 @@ const QueryBuilderExplorerTreeNodeContainer = observer(
           !(
             node instanceof QueryBuilderExplorerTreePropertyNodeData ||
             node instanceof QueryBuilderExplorerTreeRootNodeData
-          ) || applicationStore.showBackdrop
+          ) || applicationStore.layoutService.showBackdrop
         }
         menuProps={{ elevation: 7 }}
         onOpen={onContextMenuOpen}
@@ -852,7 +852,7 @@ export const QueryBuilderExplorerPanel = observer(
       <div
         data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_EXPLORER}
         className={clsx('panel query-builder__explorer', {
-          backdrop__element: applicationStore.showBackdrop,
+          backdrop__element: applicationStore.layoutService.showBackdrop,
         })}
       >
         <div className="panel__header">

package/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx

@@ -308,7 +308,7 @@ const QueryBuilderPostFilterConditionEditor = observer(
         ) {
           node.condition.setValue(item.variable);
         } else {
-          applicationStore.notifyWarning(
+          applicationStore.notificationService.notifyWarning(
             `Incompatible parameter type ${parameterType?.name}. ${parameterType?.name} is not compatible with type ${conditionValueType?.name}.`,
           );
         }
@@ -508,7 +508,7 @@ const QueryBuilderPostFilterTreeNodeContainer = observer(
             );
           } catch (error) {
             assertErrorThrown(error);
-            applicationStore.notifyWarning(error.message);
+            applicationStore.notificationService.notifyWarning(error.message);
             return;
           }
           if (node instanceof QueryBuilderPostFilterTreeGroupNodeData) {
@@ -842,7 +842,7 @@ const QueryBuilderPostFilterPanelContent = observer(
           );
         } catch (error) {
           assertErrorThrown(error);
-          applicationStore.notifyError(error.message);
+          applicationStore.notificationService.notifyError(error.message);
           return;
         }
         // NOTE: unfocus the current node when DnD a new node to the tree

package/src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx

@@ -84,7 +84,9 @@ const ColumnSortEditor = observer(
           }
           onChange={onChange}
           value={value}
-          darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+          darkMode={
+            !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+          }
         />
         <div className="query-builder__projection__options__sort__sortby">
           {sortType.toLowerCase()}

package/src/components/fetch-structure/QueryBuilderTDSWindowPanel.tsx

@@ -160,7 +160,9 @@ const TDSColumnSelectorEditor = observer(
           disabled={options.length < 1}
           onChange={onChange}
           value={value}
-          darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+          darkMode={
+            !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+          }
         />
         <button
           className="query-builder__olap__tds__column__remove-btn btn--dark btn--caution"
@@ -269,7 +271,7 @@ const QueryBuilderWindowColumnModalEditor = observer(
             'query-builder__olap__modal',
             {
               'query-editor--light':
-                applicationStore.TEMPORARY__isLightThemeEnabled,
+                applicationStore.layoutService.TEMPORARY__isLightThemeEnabled,
             },
           ])}
         >
@@ -315,7 +317,8 @@ const QueryBuilderWindowColumnModalEditor = observer(
                             label: windowOpColumn.columnName,
                           }}
                           darkMode={
-                            !applicationStore.TEMPORARY__isLightThemeEnabled
+                            !applicationStore.layoutService
+                              .TEMPORARY__isLightThemeEnabled
                           }
                         />
                       </div>
@@ -430,7 +433,8 @@ const QueryBuilderWindowColumnModalEditor = observer(
                           label: sortByState.columnState.columnName,
                         }}
                         darkMode={
-                          !applicationStore.TEMPORARY__isLightThemeEnabled
+                          !applicationStore.layoutService
+                            .TEMPORARY__isLightThemeEnabled
                         }
                       />
                     </div>
@@ -639,7 +643,10 @@ const TDSColumnReferenceEditor = observer(
                   disabled={options.length < 1}
                   onChange={onChange}
                   value={value}
-                  darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+                  darkMode={
+                    !applicationStore.layoutService
+                      .TEMPORARY__isLightThemeEnabled
+                  }
                 />
               </div>
             </div>
@@ -1131,7 +1138,7 @@ export const QueryBuilderTDSWindowPanel = observer(
           tdsWindowState.addWindowColumn(newWindowState);
         } catch (error) {
           assertErrorThrown(error);
-          applicationStore.notifyError(error.message);
+          applicationStore.notificationService.notifyError(error.message);
           return;
         }
       },

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -162,7 +162,7 @@ const QueryBuilderFilterConditionEditor = observer(
         if (isTypeCompatibleForAssignment(parameterType, conditionValueType)) {
           node.condition.setValue(item.variable);
         } else {
-          applicationStore.notifyWarning(
+          applicationStore.notificationService.notifyWarning(
             `Incompatible parameter type ${parameterType?.name}. ${parameterType?.name} is not compatible with type ${conditionValueType.name}.`,
           );
         }
@@ -423,7 +423,7 @@ const QueryBuilderFilterTreeNodeContainer = observer(
             );
           } catch (error) {
             assertErrorThrown(error);
-            applicationStore.notifyWarning(error.message);
+            applicationStore.notificationService.notifyWarning(error.message);
             return;
           }
           if (node instanceof QueryBuilderFilterTreeGroupNodeData) {
@@ -759,7 +759,7 @@ export const QueryBuilderFilterPanel = observer(
           );
         } catch (error) {
           assertErrorThrown(error);
-          applicationStore.notifyWarning(error.message);
+          applicationStore.notificationService.notifyWarning(error.message);
           return;
         }
         // NOTE: unfocus the current node when DnD a new node to the tree

package/src/components/shared/BasicValueSpecificationEditor.tsx

@@ -278,7 +278,9 @@ const StringPrimitiveInstanceValueEditor = observer(
             value={selectedValue}
             inputValue={value}
             onInputChange={handleInputChange}
-            darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+            darkMode={
+              !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+            }
             isLoading={isLoading}
             allowCreateWhileLoading={true}
             noOptionsMessage={noOptionsMessage}

package/src/components/shared/LambdaEditor.tsx

@@ -185,7 +185,7 @@ const LambdaEditorInline = observer(
         const _editor = monacoEditorAPI.create(element, {
           ...getBaseTextEditorOptions(),
           language: EDITOR_LANGUAGE.PURE,
-          theme: applicationStore.TEMPORARY__isLightThemeEnabled
+          theme: applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
             ? EDITOR_THEME.TEMPORARY__VSCODE_LIGHT
             : EDITOR_THEME.LEGEND,
           ...lambdaEditorOptions,
@@ -464,7 +464,7 @@ const LambdaEditorPopUp = observer(
         const _editor = monacoEditorAPI.create(element, {
           ...getBaseTextEditorOptions(),
           language: EDITOR_LANGUAGE.PURE,
-          theme: applicationStore.TEMPORARY__isLightThemeEnabled
+          theme: applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
             ? EDITOR_THEME.TEMPORARY__VSCODE_LIGHT
             : EDITOR_THEME.LEGEND,
         });
@@ -595,7 +595,7 @@ const LambdaEditorPopUp = observer(
             },
             {
               'lambda-editor--light':
-                applicationStore.TEMPORARY__isLightThemeEnabled,
+                applicationStore.layoutService.TEMPORARY__isLightThemeEnabled,
             },
           )}
         >

package/src/components/workflows/ClassQueryBuilder.tsx

@@ -153,10 +153,14 @@ const ClassQueryBuilderSetupPanelContent = observer(
                 options={mappingOptions}
                 onChange={changeMapping}
                 value={selectedMappingOption}
-                darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+                darkMode={
+                  !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+                }
                 filterOption={mappingFilterOption}
                 formatOptionLabel={getPackageableElementOptionFormatter({
-                  darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled,
+                  darkMode:
+                    !applicationStore.layoutService
+                      .TEMPORARY__isLightThemeEnabled,
                   graph: queryBuilderState.graphManagerState.graph,
                 })}
               />
@@ -178,10 +182,14 @@ const ClassQueryBuilderSetupPanelContent = observer(
                 options={runtimeOptions}
                 onChange={changeRuntime}
                 value={selectedRuntimeOption}
-                darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+                darkMode={
+                  !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+                }
                 filterOption={runtimeFilterOption}
                 formatOptionLabel={getRuntimeOptionFormatter({
-                  darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled,
+                  darkMode:
+                    !applicationStore.layoutService
+                      .TEMPORARY__isLightThemeEnabled,
                   pureModel: queryBuilderState.graphManagerState.graph,
                 })}
               />

package/src/components/workflows/MappingQueryBuilder.tsx

@@ -147,10 +147,14 @@ const MappingQueryBuilderSetupPanelContent = observer(
                 options={mappingOptions}
                 onChange={changeMapping}
                 value={selectedMappingOption}
-                darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+                darkMode={
+                  !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+                }
                 filterOption={mappingFilterOption}
                 formatOptionLabel={getPackageableElementOptionFormatter({
-                  darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled,
+                  darkMode:
+                    !applicationStore.layoutService
+                      .TEMPORARY__isLightThemeEnabled,
                   graph: queryBuilderState.graphManagerState.graph,
                 })}
               />
@@ -170,10 +174,14 @@ const MappingQueryBuilderSetupPanelContent = observer(
                 options={runtimeOptions}
                 onChange={changeRuntime}
                 value={selectedRuntimeOption}
-                darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+                darkMode={
+                  !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+                }
                 filterOption={runtimeFilterOption}
                 formatOptionLabel={getRuntimeOptionFormatter({
-                  darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled,
+                  darkMode:
+                    !applicationStore.layoutService
+                      .TEMPORARY__isLightThemeEnabled,
                   pureModel: queryBuilderState.graphManagerState.graph,
                 })}
               />

package/src/components/workflows/ServiceQueryBuilder.tsx

@@ -121,7 +121,9 @@ const ServiceQueryBuilderSetupPanelContent = observer(
                 }
                 onChange={onServiceOptionChange}
                 value={selectedServiceOption}
-                darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+                darkMode={
+                  !applicationStore.layoutService.TEMPORARY__isLightThemeEnabled
+                }
               />
             </div>
             {/* We will display mapping and runtime selector for single-execution and execution context for multi-execution */}
@@ -145,7 +147,10 @@ const ServiceQueryBuilderSetupPanelContent = observer(
                     }
                     onChange={onExecutionContextOptionChange}
                     value={selectedExecutionContextOption}
-                    darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+                    darkMode={
+                      !applicationStore.layoutService
+                        .TEMPORARY__isLightThemeEnabled
+                    }
                   />
                 </div>
               </>

package/src/graphManager/protocol/pure/v1/V1_QueryBuilder_PureGraphManagerExtension.ts

@@ -87,7 +87,7 @@ export class V1_QueryBuilder_PureGraphManagerExtension extends QueryBuilder_Pure
         graph,
         graph,
         this.graphManager.graphBuilderExtensions,
-        this.graphManager.log,
+        this.graphManager.logService,
       ).build();
       // build include index for compatible runtime analysis
       v1Mappings.forEach((element) => {
@@ -185,7 +185,7 @@ export class V1_QueryBuilder_PureGraphManagerExtension extends QueryBuilder_Pure
       graph,
       graph,
       this.graphManager.graphBuilderExtensions,
-      this.graphManager.log,
+      this.graphManager.logService,
     ).build();
 
     graphBuilderInput

package/src/stores/QueryBuilderChangeDetectionState.ts

@@ -143,7 +143,7 @@ export class QueryBuilderChangeDetectionState {
 
   alertUnsavedChanges(onProceed: () => void): void {
     if (this.hasChanged) {
-      this.querybuilderState.applicationStore.setActionAlertInfo({
+      this.querybuilderState.applicationStore.alertService.setActionAlertInfo({
         message:
           'Unsaved changes to your query will be lost if you continue. Do you still want to proceed?',
         type: ActionAlertType.CAUTION,

package/src/stores/QueryBuilderConstantsState.ts

@@ -77,7 +77,9 @@ export class QueryBuilderConstantExpressionState implements Hashable {
         this.setValueSpec(valSpec);
       } catch (error) {
         assertErrorThrown(error);
-        this.queryBuilderState.applicationStore.notifyError(error.message);
+        this.queryBuilderState.applicationStore.notificationService.notifyError(
+          error.message,
+        );
       }
     }
   }

package/src/stores/QueryBuilderResultState.ts

@@ -197,11 +197,13 @@ export class QueryBuilderResultState {
       this.exportDataState.pass();
     } catch (error) {
       assertErrorThrown(error);
-      this.queryBuilderState.applicationStore.log.error(
+      this.queryBuilderState.applicationStore.logService.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.EXECUTION_FAILURE),
         error,
       );
-      this.queryBuilderState.applicationStore.notifyError(error);
+      this.queryBuilderState.applicationStore.notificationService.notifyError(
+        error,
+      );
       this.exportDataState.fail();
     }
   }
@@ -268,11 +270,13 @@ export class QueryBuilderResultState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.queryBuilderState.applicationStore.log.error(
+      this.queryBuilderState.applicationStore.logService.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.EXECUTION_FAILURE),
         error,
       );
-      this.queryBuilderState.applicationStore.notifyError(error);
+      this.queryBuilderState.applicationStore.notificationService.notifyError(
+        error,
+      );
     } finally {
       this.setIsRunningQuery(false);
       this.pressedRunQuery.complete();
@@ -369,11 +373,13 @@ export class QueryBuilderResultState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.queryBuilderState.applicationStore.log.error(
+      this.queryBuilderState.applicationStore.logService.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.EXECUTION_FAILURE),
         error,
       );
-      this.queryBuilderState.applicationStore.notifyError(error);
+      this.queryBuilderState.applicationStore.notificationService.notifyError(
+        error,
+      );
     } finally {
       this.isGeneratingPlan = false;
     }

package/src/stores/QueryBuilderState.ts

@@ -268,7 +268,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
   }
 
   registerCommands(): void {
-    this.applicationStore.commandCenter.registerCommand({
+    this.applicationStore.commandService.registerCommand({
       key: QUERY_BUILDER_COMMAND_KEY.COMPILE,
       action: () => {
         flowResult(this.compileQuery()).catch(
@@ -291,7 +291,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
 
   deregisterCommands(): void {
     [QUERY_BUILDER_COMMAND_KEY.COMPILE].forEach((key) =>
-      this.applicationStore.commandCenter.deregisterCommand(key),
+      this.applicationStore.commandService.deregisterCommand(key),
     );
   }
 
@@ -439,7 +439,9 @@ export abstract class QueryBuilderState implements CommandRegistrar {
       await onSaveQuery(query);
     } catch (error) {
       assertErrorThrown(error);
-      this.applicationStore.notifyError(`Can't save query: ${error.message}`);
+      this.applicationStore.notificationService.notifyError(
+        `Can't save query: ${error.message}`,
+      );
     }
   }
 
@@ -457,10 +459,12 @@ export abstract class QueryBuilderState implements CommandRegistrar {
           this.graphManagerState.graph,
           { keepSourceInformation: true },
         )) as string;
-        this.applicationStore.notifySuccess('Compiled successfully');
+        this.applicationStore.notificationService.notifySuccess(
+          'Compiled successfully',
+        );
       } catch (error) {
         assertErrorThrown(error);
-        this.applicationStore.log.error(
+        this.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.COMPILATION_FAILURE),
           error,
         );
@@ -476,7 +480,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
 
         // decide if we need to fall back to text mode for debugging
         if (fallbackToTextModeForDebugging) {
-          this.applicationStore.notifyWarning(
+          this.applicationStore.notificationService.notifyWarning(
             'Compilation failed and error cannot be located in form mode. Redirected to text mode for debugging.',
           );
           this.textEditorState.openModal(QueryBuilderTextEditorMode.TEXT);
@@ -487,7 +491,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
           // of query builder text-mode
           // See https://github.com/finos/legend-studio/issues/319
         } else {
-          this.applicationStore.notifyWarning(
+          this.applicationStore.notificationService.notifyWarning(
             `Compilation failed: ${error.message}`,
           );
         }
@@ -503,15 +507,17 @@ export abstract class QueryBuilderState implements CommandRegistrar {
           this.graphManagerState.graph,
           { keepSourceInformation: true },
         )) as string;
-        this.applicationStore.notifySuccess('Compiled successfully');
+        this.applicationStore.notificationService.notifySuccess(
+          'Compiled successfully',
+        );
       } catch (error) {
         assertErrorThrown(error);
         if (error instanceof CompilationError) {
-          this.applicationStore.log.error(
+          this.applicationStore.logService.error(
             LogEvent.create(GRAPH_MANAGER_EVENT.COMPILATION_FAILURE),
             error,
           );
-          this.applicationStore.notifyWarning(
+          this.applicationStore.notificationService.notifyWarning(
             `Compilation failed: ${error.message}`,
           );
           const errorElementCoordinates = extractSourceInformationCoordinates(

package/src/stores/QueryBuilderTextEditorState.ts

@@ -118,7 +118,7 @@ export class QueryBuilderTextEditorState extends LambdaEditorState {
         if (error instanceof ParserError) {
           this.setParserError(error);
         }
-        this.queryBuilderState.applicationStore.log.error(
+        this.queryBuilderState.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -156,7 +156,7 @@ export class QueryBuilderTextEditorState extends LambdaEditorState {
         this.isConvertingLambdaToString = false;
       } catch (error) {
         assertErrorThrown(error);
-        this.queryBuilderState.applicationStore.log.error(
+        this.queryBuilderState.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -194,7 +194,7 @@ export class QueryBuilderTextEditorState extends LambdaEditorState {
     if (this.mode === QueryBuilderTextEditorMode.TEXT) {
       yield flowResult(this.convertLambdaGrammarStringToObject());
       if (this.parserError) {
-        this.queryBuilderState.applicationStore.notifyError(
+        this.queryBuilderState.applicationStore.notificationService.notifyError(
           `Can't parse query. Please fix error before closing: ${this.parserError.message}`,
         );
       } else {

package/src/stores/explorer/QueryBuilderExplorerState.ts

@@ -679,7 +679,9 @@ export class QueryBuilderExplorerState {
         this.refreshTreeData();
       } catch (error) {
         assertErrorThrown(error);
-        this.queryBuilderState.applicationStore.notifyError(error.message);
+        this.queryBuilderState.applicationStore.notificationService.notifyError(
+          error.message,
+        );
       } finally {
         this.mappingModelCoverageAnalysisState.complete();
       }
@@ -691,7 +693,7 @@ export class QueryBuilderExplorerState {
   ): GeneratorFn<void> {
     const runtime = this.queryBuilderState.runtimeValue;
     if (!runtime) {
-      this.queryBuilderState.applicationStore.notifyWarning(
+      this.queryBuilderState.applicationStore.notificationService.notifyWarning(
         `Can't preview data for property '${node.property.name}': runtime is not specified`,
       );
       return;
@@ -704,7 +706,7 @@ export class QueryBuilderExplorerState {
       return;
     }
     if (this.previewDataState.isGeneratingPreviewData) {
-      this.queryBuilderState.applicationStore.notifyWarning(
+      this.queryBuilderState.applicationStore.notificationService.notifyWarning(
         `Can't preview data for property '${node.property.name}': another preview request is being executed`,
       );
       return;
@@ -786,7 +788,7 @@ export class QueryBuilderExplorerState {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.queryBuilderState.applicationStore.notifyWarning(
+      this.queryBuilderState.applicationStore.notificationService.notifyWarning(
         `Can't preview data for property '${node.property.name}'. Error: ${error.message}`,
       );
       this.previewDataState.setPreviewData(undefined);

package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.ts

@@ -181,7 +181,7 @@ export class QueryBuilderGraphFetchTreeState
     },
   ): void {
     if (!this.treeData) {
-      this.queryBuilderState.applicationStore.notifyWarning(
+      this.queryBuilderState.applicationStore.notificationService.notifyWarning(
         `Can't add property: graph-fetch tree has not been properly initialized`,
       );
       return;
@@ -211,7 +211,7 @@ export class QueryBuilderGraphFetchTreeState
 
   fetchProperties(nodes: QueryBuilderExplorerTreePropertyNodeData[]): void {
     if (!this.treeData) {
-      this.queryBuilderState.applicationStore.notifyWarning(
+      this.queryBuilderState.applicationStore.notificationService.notifyWarning(
         `Can't add property: graph-fetch tree has not been properly initialized`,
       );
       return;
@@ -224,7 +224,7 @@ export class QueryBuilderGraphFetchTreeState
 
   checkBeforeChangingImplementation(onChange: () => void): void {
     if (this.treeData?.rootIds.length) {
-      this.queryBuilderState.applicationStore.setActionAlertInfo({
+      this.queryBuilderState.applicationStore.alertService.setActionAlertInfo({
         message:
           'Current graph-fetch will be lost when switching to projection mode. Do you still want to proceed?',
         type: ActionAlertType.CAUTION,

package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts

@@ -253,7 +253,7 @@ export const addQueryBuilderPropertyNode = (
         parentExplorerTreeNode.parentId,
       );
     } else {
-      queryBuilderState.applicationStore.notifyError(
+      queryBuilderState.applicationStore.notificationService.notifyError(
         `Can't cast the root class of graph fetch structure to its subtype`,
       );
       return;

package/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts

@@ -360,7 +360,7 @@ export class QueryBuilderTDSState
         });
       } catch (error) {
         assertErrorThrown(error);
-        this.queryBuilderState.applicationStore.log.error(
+        this.queryBuilderState.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
@@ -609,7 +609,7 @@ export class QueryBuilderTDSState
   }
 
   checkBeforeClearingColumns(onChange: () => void): void {
-    this.queryBuilderState.applicationStore.setActionAlertInfo({
+    this.queryBuilderState.applicationStore.alertService.setActionAlertInfo({
       message:
         'You will be clearing all projection columns. Do you still want to proceed?',
       type: ActionAlertType.CAUTION,
@@ -637,7 +637,7 @@ export class QueryBuilderTDSState
       // but we make the assumption that if there is no projection column, there should
       // not be any post-filter at all
     ) {
-      this.queryBuilderState.applicationStore.setActionAlertInfo({
+      this.queryBuilderState.applicationStore.alertService.setActionAlertInfo({
         message:
           this.showPostFilterPanel && this.postFilterState.nodes.size > 0
             ? 'With graph-fetch mode, post filter is not supported. Current projection columns and post filters will be lost when switching to the graph-fetch mode. Do you still want to proceed?'

package/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.ts

@@ -452,7 +452,7 @@ export class PostFilterConditionState implements Hashable {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.postFilterState.tdsState.queryBuilderState.applicationStore.notifyError(
+      this.postFilterState.tdsState.queryBuilderState.applicationStore.notificationService.notifyError(
         `Can't drag column '${columnState.columnName}' due to: ${error.message}`,
       );
     }