@finos/legend-query-builder 0.6.31 → 0.6.33

package/src/components/QueryBuilderPropertyExpressionEditor.tsx

@@ -169,7 +169,7 @@ const DerivedPropertyParameterValueEditor = observer(
         isDefaultDatePropagationSupported(nextExpression, queryBuilderState) &&
         nextExpression.func.value.genericType.value.rawType instanceof Class
       ) {
-        queryBuilderState.applicationStore.setActionAlertInfo({
+        queryBuilderState.applicationStore.alertService.setActionAlertInfo({
           message:
             'You have just changed a milestoning date in the property expression chain, this date will be propagated down the rest of the chain. Do you want to proceed? Otherwise, you can choose to propagate the default milestoning dates instead.',
           type: ActionAlertType.CAUTION,

package/src/components/QueryBuilderResultPanel.tsx

@@ -188,7 +188,7 @@ const QueryBuilderGridResultContextMenu = observer(
         );
       } catch (error) {
         assertErrorThrown(error);
-        applicationStore.notifyWarning(error.message);
+        applicationStore.notificationService.notifyWarning(error.message);
         return;
       }
       postFilterState.addNodeFromNode(
@@ -278,11 +278,11 @@ const QueryBuilderGridResultContextMenu = observer(
     };
 
     const handleCopyCellValue = applicationStore.guardUnhandledError(() =>
-      applicationStore.copyTextToClipboard(event?.value),
+      applicationStore.clipboardService.copyTextToClipboard(event?.value),
     );
 
     const handleCopyRowValue = applicationStore.guardUnhandledError(() =>
-      applicationStore.copyTextToClipboard(
+      applicationStore.clipboardService.copyTextToClipboard(
         Object.values(event?.data).toString(),
       ),
     );
@@ -456,7 +456,7 @@ export const QueryBuilderResultPanel = observer(
     };
 
     const confirmExport = (format: EXECUTION_SERIALIZATION_FORMAT): void => {
-      applicationStore.setActionAlertInfo({
+      applicationStore.alertService.setActionAlertInfo({
         message: USER_ATTESTATION_MESSAGE,
         type: ActionAlertType.CAUTION,
         actions: [

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

@@ -22,6 +22,7 @@ import {
   Modal,
   ModalBody,
   ModalFooter,
+  ModalFooterButton,
   ModalFooterStatus,
   ModalHeader,
   PanelLoadingIndicator,
@@ -48,7 +49,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(() => {
@@ -120,13 +121,20 @@ export const QueryBuilderTextEditor = observer(
               .isInProgress && (
               <ModalFooterStatus>Closing Query...</ModalFooterStatus>
             )}
+            {queryBuilderState.queryCompileState.isInProgress && (
+              <ModalFooterStatus>
+                <div className="loading-icon__container--spinning">
+                  <RefreshIcon />
+                </div>
+                Compiling Query...
+              </ModalFooterStatus>
+            )}
             {mode === QueryBuilderTextEditorMode.TEXT && (
-              <button
-                className="btn btn--dark btn--caution"
+              <ModalFooterButton
+                className="btn--caution"
                 onClick={discardChanges}
-              >
-                Discard changes
-              </button>
+                text="Discard Changes"
+              />
             )}
             <button
               className="btn btn--dark"

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/LegendQueryStorage.ts

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export enum LEGEND_QUERY_SETTINGS_KEY {
+  EDITOR_SHOW_POST_FILTER = 'editor.showPostFilter',
+}

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

@@ -109,7 +109,7 @@ export class QueryBuilderTextEditorState extends LambdaEditorState {
           (yield this.queryBuilderState.graphManagerState.graphManager.pureCodeToLambda(
             this.fullLambdaString,
             this.lambdaId,
-            { pruneSourceInformation: true },
+            { pruneSourceInformation: false },
           )) as RawLambda;
         this.setParserError(undefined);
         this.rawLambdaState.setLambda(lambda);
@@ -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 {