@finos/legend-query-builder 0.6.30 → 0.6.32

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();
     }
   }
@@ -254,13 +256,13 @@ export class QueryBuilderResultState {
       if (this.queryRunPromise === promise) {
         this.setExecutionResult(result);
         this.latestRunHashCode = currentHashCode;
-        stopWatch.record();
         this.setExecutionDuration(stopWatch.elapsed);
 
-        report.timings = {
-          ...report.timings,
-          total: stopWatch.elapsed,
-        };
+        report.timings =
+          this.queryBuilderState.applicationStore.timeService.finalizeTimingsRecord(
+            stopWatch,
+            report.timings,
+          );
         QueryBuilderTelemetry.logEvent_QueryRunSucceeded(
           this.queryBuilderState.applicationStore.telemetryService,
           report,
@@ -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();
@@ -350,11 +354,12 @@ export class QueryBuilderResultState {
       }
       stopWatch.record(QUERY_BUILDER_EVENT.BUILD_EXECUTION_PLAN__SUCCESS);
 
-      report.timings = {
-        ...report.timings,
-        ...Object.fromEntries(stopWatch.records),
-        total: stopWatch.elapsed,
-      };
+      // report
+      report.timings =
+        this.queryBuilderState.applicationStore.timeService.finalizeTimingsRecord(
+          stopWatch,
+          report.timings,
+        );
       if (debug) {
         QueryBuilderTelemetry.logEvent_ExecutionPlanDebugSucceeded(
           this.queryBuilderState.applicationStore.telemetryService,
@@ -368,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/QueryBuilderTelemetry.ts

@@ -15,7 +15,7 @@
  */
 
 import type { GraphManagerOperationReport } from '@finos/legend-graph';
-import type { TelemetryService } from '@finos/legend-shared';
+import type { TelemetryService } from '@finos/legend-application';
 import { QUERY_BUILDER_EVENT } from './QueryBuilderEvent.js';
 
 type LaunchQueryExecution_TelemteryData = {

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}`,
       );
     }

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/src/stores/shared/ValueSpecificationEditorHelper.ts

@@ -16,14 +16,11 @@
 
 import {
   type PureModel,
-  type InstanceValue,
   VariableExpression,
   type ValueSpecification,
   type Type,
   type Enum,
   CollectionInstanceValue,
-  DATE_FORMAT,
-  DATE_TIME_FORMAT,
   Enumeration,
   EnumValueExplicitReference,
   EnumValueInstanceValue,
@@ -35,53 +32,73 @@ import {
   PRIMITIVE_TYPE,
   INTERNAL__PropagatedValue,
   SimpleFunctionExpression,
+  SUPPORTED_FUNCTIONS,
 } from '@finos/legend-graph';
-import {
-  addDays,
-  formatDate,
-  Randomizer,
-  UnsupportedOperationError,
-} from '@finos/legend-shared';
+import { Randomizer, UnsupportedOperationError } from '@finos/legend-shared';
 import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationHelper.js';
-import { instanceValue_setValues } from './ValueSpecificationModifierHelper.js';
+import {
+  instanceValue_setValues,
+  valueSpecification_setGenericType,
+} from './ValueSpecificationModifierHelper.js';
+
+const VAR_DEFAULT_NAME = 'var';
+
+export const createSupportedFunctionExpression = (
+  supportedFuncName: SUPPORTED_FUNCTIONS,
+  expectedReturnType: Type,
+): SimpleFunctionExpression => {
+  const funcExpression = new SimpleFunctionExpression(supportedFuncName);
+  valueSpecification_setGenericType(
+    funcExpression,
+    GenericTypeExplicitReference.create(new GenericType(expectedReturnType)),
+  );
+  return funcExpression;
+};
 
-const createMockPrimitiveProperty = (
+const createMockPrimitiveValueSpecification = (
   primitiveType: PrimitiveType,
   propertyName: string,
-): string | number | boolean => {
+): ValueSpecification => {
+  const primitiveTypeName = primitiveType.name;
+  if (
+    primitiveTypeName === PRIMITIVE_TYPE.DATE ||
+    primitiveTypeName === PRIMITIVE_TYPE.DATETIME
+  ) {
+    return createSupportedFunctionExpression(
+      SUPPORTED_FUNCTIONS.NOW,
+      PrimitiveType.DATETIME,
+    );
+  } else if (primitiveTypeName === PRIMITIVE_TYPE.STRICTDATE) {
+    return createSupportedFunctionExpression(
+      SUPPORTED_FUNCTIONS.TODAY,
+      PrimitiveType.STRICTDATE,
+    );
+  }
+  const primitiveInstanceValue = new PrimitiveInstanceValue(
+    GenericTypeExplicitReference.create(new GenericType(primitiveType)),
+  );
   const randomizer = new Randomizer();
+  let value: string | boolean | number;
   switch (primitiveType.name) {
     case PRIMITIVE_TYPE.BOOLEAN:
-      return randomizer.getRandomItemInCollection([true, false]) ?? true;
+      value = randomizer.getRandomItemInCollection([true, false]) ?? true;
+      break;
     case PRIMITIVE_TYPE.FLOAT:
-      return randomizer.getRandomFloat();
+      value = randomizer.getRandomFloat();
+      break;
     case PRIMITIVE_TYPE.DECIMAL:
-      return randomizer.getRandomDouble();
+      value = randomizer.getRandomDouble();
+      break;
     case PRIMITIVE_TYPE.NUMBER:
     case PRIMITIVE_TYPE.INTEGER:
-      return randomizer.getRandomWholeNumber(100);
-    // NOTE that `Date` is the umbrella type that comprises `StrictDate` and `DateTime`, but for simplicity, we will generate `Date` as `StrictDate`
-    case PRIMITIVE_TYPE.DATE:
-    case PRIMITIVE_TYPE.STRICTDATE:
-      return formatDate(
-        randomizer.getRandomDate(
-          new Date(Date.now()),
-          addDays(Date.now(), 100),
-        ),
-        DATE_FORMAT,
-      );
-    case PRIMITIVE_TYPE.DATETIME:
-      return formatDate(
-        randomizer.getRandomDate(
-          new Date(Date.now()),
-          addDays(Date.now(), 100),
-        ),
-        DATE_TIME_FORMAT,
-      );
+      value = randomizer.getRandomWholeNumber(100);
+      break;
     case PRIMITIVE_TYPE.STRING:
     default:
-      return `${propertyName} ${randomizer.getRandomWholeNumber(100)}`;
+      value = `${propertyName} ${randomizer.getRandomWholeNumber(100)}`;
   }
+  instanceValue_setValues(primitiveInstanceValue, [value]);
+  return primitiveInstanceValue;
 };
 
 export const createMockEnumerationProperty = (
@@ -155,7 +172,7 @@ export const buildDefaultInstanceValue = (
 export const generateVariableExpressionMockValue = (
   parameter: VariableExpression,
   graph: PureModel,
-): InstanceValue | undefined => {
+): ValueSpecification | undefined => {
   const varType = parameter.genericType?.value.rawType;
   const multiplicity = parameter.multiplicity;
   if ((!multiplicity.upperBound || multiplicity.upperBound > 1) && varType) {
@@ -165,20 +182,7 @@ export const generateVariableExpressionMockValue = (
     );
   }
   if (varType instanceof PrimitiveType) {
-    const primitiveInstanceValue = new PrimitiveInstanceValue(
-      GenericTypeExplicitReference.create(
-        varType === PrimitiveType.DATE
-          ? new GenericType(PrimitiveType.STRICTDATE)
-          : new GenericType(varType),
-      ),
-    );
-    instanceValue_setValues(primitiveInstanceValue, [
-      createMockPrimitiveProperty(
-        varType,
-        parameter.name === '' ? 'myVar' : parameter.name,
-      ),
-    ]);
-    return primitiveInstanceValue;
+    return createMockPrimitiveValueSpecification(varType, VAR_DEFAULT_NAME);
   } else if (varType instanceof Enumeration) {
     const enumValueInstance = new EnumValueInstanceValue(
       GenericTypeExplicitReference.create(new GenericType(varType)),