@finos/legend-query-builder 0.6.31 → 0.6.33

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

@@ -96,6 +96,7 @@ import { QueryBuilderWindowState } from './window/QueryBuilderWindowState.js';
 import type { QueryBuilderTDS_WindowOperator } from './window/operators/QueryBuilderTDS_WindowOperator.js';
 import { getQueryBuilderCoreWindowOperators } from './window/QueryBuilderWindowGroupByOperatorLoader.js';
 import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState.js';
+import { LEGEND_QUERY_SETTINGS_KEY } from '../../LegendQueryStorage.js';
 
 export class QueryBuilderTDSState
   extends QueryBuilderFetchStructureImplementationState
@@ -107,7 +108,7 @@ export class QueryBuilderTDSState
   readonly resultSetModifierState: QueryResultSetModifierState;
   projectionColumns: QueryBuilderProjectionColumnState[] = [];
   isConvertDerivationProjectionObjects = false;
-  showPostFilterPanel = false;
+  showPostFilterPanel: boolean;
   showWindowFuncPanel = false;
 
   postFilterOperators: QueryBuilderPostFilterOperator[] =
@@ -152,6 +153,11 @@ export class QueryBuilderTDSState
       this,
       this.windowFuncOperators,
     );
+    this.showPostFilterPanel =
+      this.queryBuilderState.applicationStore.storageService.settingsStore.getBooleanValue(
+        LEGEND_QUERY_SETTINGS_KEY.EDITOR_SHOW_POST_FILTER,
+        false,
+      );
   }
 
   get type(): string {
@@ -360,7 +366,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 +615,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 +643,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}`,
       );
     }

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts

@@ -215,7 +215,7 @@ class QueryBuilderDerivationProjectionLambdaState 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,
         );
@@ -251,7 +251,7 @@ class QueryBuilderDerivationProjectionLambdaState extends LambdaEditorState {
         this.clearErrors();
       } catch (error) {
         assertErrorThrown(error);
-        this.queryBuilderState.applicationStore.log.error(
+        this.queryBuilderState.applicationStore.logService.error(
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );

package/src/stores/filter/QueryBuilderFilterState.ts

@@ -158,7 +158,9 @@ export class FilterConditionState implements Hashable {
       new FilterConditionState(this.filterState, propertyExpression);
     } catch (error) {
       assertErrorThrown(error);
-      this.filterState.queryBuilderState.applicationStore.notifyError(error);
+      this.filterState.queryBuilderState.applicationStore.notificationService.notifyError(
+        error,
+      );
       return;
     }
 

package/tsconfig.json

@@ -48,6 +48,7 @@
     "./src/graphManager/protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.ts",
     "./src/graphManager/protocol/pure/v1/V1_QueryBuilder_PureGraphManagerExtension.ts",
     "./src/graphManager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts",
+    "./src/stores/LegendQueryStorage.ts",
     "./src/stores/QueryBuilderBootstraper.ts",
     "./src/stores/QueryBuilderChangeDetectionState.ts",
     "./src/stores/QueryBuilderCommand.ts",