@finos/legend-application-studio 26.1.0 → 26.1.2

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

@@ -35,7 +35,7 @@ import {
   type AggregationAwareSetImplementation,
   type PropertyMapping,
   type InstanceSetImplementation,
-  type TEMPORARY__UnresolvedSetImplementation,
+  type INTERNAL__UnresolvedSetImplementation,
   type Mapping,
   getAllClassMappings,
   PurePropertyMapping,
@@ -652,8 +652,8 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
     }
   }
 
-  visit_TEMPORARY__UnresolvedSetImplementation(
-    setImplementation: TEMPORARY__UnresolvedSetImplementation,
+  visit_INTERNAL__UnresolvedSetImplementation(
+    setImplementation: INTERNAL__UnresolvedSetImplementation,
   ): void {
     return;
   }
@@ -799,8 +799,8 @@ export class MappingElementDecorationCleaner
     }
   }
 
-  visit_TEMPORARY__UnresolvedSetImplementation(
-    setImplementation: TEMPORARY__UnresolvedSetImplementation,
+  visit_INTERNAL__UnresolvedSetImplementation(
+    setImplementation: INTERNAL__UnresolvedSetImplementation,
   ): void {
     return;
   }

package/src/stores/editor/editor-state/element-editor-state/service/ServiceExecutionState.ts

@@ -110,7 +110,7 @@ const QUERY_ROUTE_PATTERN = Object.freeze({
   UPDATE_PROJECT_SERVICE_QUERY: `/update-project-service-query/:${DSL_SERVICE_PATH_PARAM_TOKEN.PROJECT_ID}/:${DSL_SERVICE_PATH_PARAM_TOKEN.GROUP_WORKSPACE_ID}/:${DSL_SERVICE_PATH_PARAM_TOKEN.SERVICE_PATH}`,
 });
 
-export class ServiceExecutionParameterState extends LambdaParametersState {
+export class ServiceExecutionParametersState extends LambdaParametersState {
   executionState: ServicePureExecutionState;
 
   constructor(executionState: ServicePureExecutionState) {
@@ -164,9 +164,10 @@ export class ServiceExecutionParameterState extends LambdaParametersState {
 }
 
 export abstract class ServiceExecutionState {
-  editorStore: EditorStore;
-  serviceEditorState: ServiceEditorState;
-  execution: ServiceExecution;
+  readonly editorStore: EditorStore;
+  readonly serviceEditorState: ServiceEditorState;
+  readonly execution: ServiceExecution;
+
   constructor(
     editorStore: EditorStore,
     serviceEditorState: ServiceEditorState,
@@ -180,6 +181,7 @@ export abstract class ServiceExecutionState {
     this.execution = execution;
     this.serviceEditorState = serviceEditorState;
   }
+
   abstract get serviceExecutionParameters():
     | { query: RawLambda; mapping: Mapping; runtime: Runtime }
     | undefined;
@@ -447,17 +449,17 @@ export class KeyedExecutionContextState extends ServiceExecutionContextState {
 }
 
 export abstract class ServicePureExecutionState extends ServiceExecutionState {
-  queryState: ServicePureExecutionQueryState;
   declare execution: PureExecution;
+  queryState: ServicePureExecutionQueryState;
   selectedExecutionContextState: ServiceExecutionContextState | undefined;
   runtimeEditorState?: RuntimeEditorState | undefined;
+  isOpeningQueryEditor = false;
+  showChangeExecModal = false;
   isRunningQuery = false;
   isGeneratingPlan = false;
-  isOpeningQueryEditor = false;
   executionResultText?: string | undefined; // NOTE: stored as lossless JSON string
   executionPlanState: ExecutionPlanState;
-  parameterState: ServiceExecutionParameterState;
-  showChangeExecModal = false;
+  readonly parametersState: ServiceExecutionParametersState;
   queryRunPromise: Promise<ExecutionResult> | undefined = undefined;
 
   constructor(
@@ -479,7 +481,7 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
       this.editorStore.applicationStore,
       this.editorStore.graphManagerState,
     );
-    this.parameterState = new ServiceExecutionParameterState(this);
+    this.parametersState = new ServiceExecutionParametersState(this);
   }
 
   abstract changeExecution(): void;
@@ -606,7 +608,7 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
     const query = this.queryState.query;
     const parameters = (query.parameters ?? []) as object[];
     if (parameters.length) {
-      this.parameterState.openModal(query);
+      this.parametersState.openModal(query);
     } else {
       this.runQuery();
     }
@@ -629,14 +631,18 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
         this.editorStore.graphManagerState.graph,
       );
       promise = this.editorStore.graphManagerState.graphManager.runQuery(
-        this.getExecutionQuery(),
+        getExecutionQueryFromRawLambda(
+          this.queryState.query,
+          this.parametersState.parameterStates,
+          this.editorStore.graphManagerState,
+        ),
         this.selectedExecutionContextState?.executionContext.mapping.value,
         this.selectedExecutionContextState?.executionContext.runtime,
         this.editorStore.graphManagerState.graph,
         {
           useLosslessParse: true,
           parameterValues: buildExecutionParameterValues(
-            this.parameterState.parameterStates,
+            this.parametersState.parameterStates,
             this.editorStore.graphManagerState,
           ),
         },
@@ -648,7 +654,7 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
         this.setExecutionResultText(
           stringifyLosslessJSON(result, undefined, DEFAULT_TAB_SIZE),
         );
-        this.parameterState.setParameters([]);
+        this.parametersState.setParameters([]);
         // report
         report.timings =
           this.editorStore.applicationStore.timeService.finalizeTimingsRecord(
@@ -695,14 +701,6 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
     }
   }
 
-  getExecutionQuery(): RawLambda {
-    return getExecutionQueryFromRawLambda(
-      this.queryState.query,
-      this.parameterState.parameterStates,
-      this.editorStore.graphManagerState,
-    );
-  }
-
   get serviceExecutionParameters():
     | { query: RawLambda; mapping: Mapping; runtime: Runtime }
     | undefined {
@@ -832,7 +830,6 @@ export class InlineServicePureExecutionState extends ServicePureExecutionState {
       executionResultText: observable,
       executionPlanState: observable,
       showChangeExecModal: observable,
-      parameterState: observable,
       setExecutionResultText: action,
       setQueryState: action,
       updateExecutionQuery: action,
@@ -879,7 +876,6 @@ export class SingleServicePureExecutionState extends ServicePureExecutionState {
       executionResultText: observable,
       executionPlanState: observable,
       showChangeExecModal: observable,
-      parameterState: observable,
       multiExecutionKey: observable,
       setExecutionResultText: action,
       closeRuntimeEditor: action,

package/src/stores/editor/editor-state/element-editor-state/service/testable/ServiceTestDataState.ts

@@ -34,8 +34,6 @@ import {
   ConnectionPointer,
   reportGraphAnalytics,
   observe_ValueSpecification,
-  Enumeration,
-  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type GeneratorFn,
@@ -47,7 +45,6 @@ import {
   returnUndefOnError,
   getNullableFirstEntry,
   uniq,
-  isNonNullable,
 } from '@finos/legend-shared';
 import { action, flow, flowResult, makeObservable, observable } from 'mobx';
 import type { EditorStore } from '../../../../EditorStore.js';
@@ -74,31 +71,10 @@ import {
   LambdaParametersState,
   PARAMETER_SUBMIT_ACTION,
   buildExecutionParameterValues,
-  createMockEnumerationProperty,
   getExecutionQueryFromRawLambda,
 } from '@finos/legend-query-builder';
-import { createMockPrimitiveProperty } from '../../../../utils/MockDataUtils.js';
 
-const buildTestDataParameters = (
-  rawLambda: RawLambda,
-  editorStore: EditorStore,
-): (string | number | boolean)[] =>
-  buildLambdaVariableExpressions(rawLambda, editorStore.graphManagerState)
-    .filter(filterByType(VariableExpression))
-    .map((varExpression) => {
-      if (varExpression.multiplicity.lowerBound !== 0) {
-        const type = varExpression.genericType?.value.rawType;
-        if (type instanceof PrimitiveType) {
-          return createMockPrimitiveProperty(type, varExpression.name);
-        } else if (type instanceof Enumeration) {
-          return createMockEnumerationProperty(type);
-        }
-      }
-      return undefined;
-    })
-    .filter(isNonNullable);
-
-export class ServiceTestDataParameterState extends LambdaParametersState {
+export class ServiceTestDataParametersState extends LambdaParametersState {
   connectionTestDataState: ConnectionTestDataState;
 
   constructor(connectionTestDataState: ConnectionTestDataState) {
@@ -161,10 +137,11 @@ export class ServiceTestDataParameterState extends LambdaParametersState {
 export class ConnectionTestDataState {
   readonly editorStore: EditorStore;
   readonly testDataState: ServiceTestDataState;
-  connectionData: ConnectionTestData;
-  parameterState: ServiceTestDataParameterState;
+  readonly connectionData: ConnectionTestData;
+  readonly parametersState: ServiceTestDataParametersState;
+  readonly generatingTestDataState = ActionState.create();
+
   embeddedEditorState: EmbeddedDataEditorState;
-  generatingTestDataState = ActionState.create();
   anonymizeGeneratedData = true;
 
   constructor(
@@ -173,7 +150,6 @@ export class ConnectionTestDataState {
   ) {
     makeObservable(this, {
       generatingTestDataState: observable,
-      parameterState: observable,
       embeddedEditorState: observable,
       anonymizeGeneratedData: observable,
       setAnonymizeGeneratedData: action,
@@ -187,7 +163,7 @@ export class ConnectionTestDataState {
       this.testDataState.editorStore,
       connectionData.testData,
     );
-    this.parameterState = new ServiceTestDataParameterState(this);
+    this.parametersState = new ServiceTestDataParametersState(this);
   }
   get identifiedConnection(): IdentifiedConnection | undefined {
     return this.getAllIdentifiedConnections().find(
@@ -215,49 +191,27 @@ export class ConnectionTestDataState {
       const report = reportGraphAnalytics(
         this.editorStore.graphManagerState.graph,
       );
-      let value;
-      if (
-        this.editorStore.applicationStore.config.options
-          .TEMPORARY__enableTestDataGenerationNewFlow
-      ) {
-        value =
-          (yield this.editorStore.graphManagerState.graphManager.generateExecuteTestData(
-            getExecutionQueryFromRawLambda(
-              serviceExecutionParameters.query,
-              this.parameterState.parameterStates,
-              this.editorStore.graphManagerState,
-            ),
-            [],
-            serviceExecutionParameters.mapping,
-            serviceExecutionParameters.runtime,
-            this.editorStore.graphManagerState.graph,
-            {
-              anonymizeGeneratedData: this.anonymizeGeneratedData,
-              parameterValues: buildExecutionParameterValues(
-                this.parameterState.parameterStates,
-                this.editorStore.graphManagerState,
-              ),
-            },
-            report,
-          )) as string;
-      } else {
-        // TODO: delete this once the backend code is in place
-        value =
-          (yield this.editorStore.graphManagerState.graphManager.generateExecuteTestData(
+      const value =
+        (yield this.editorStore.graphManagerState.graphManager.generateExecuteTestData(
+          getExecutionQueryFromRawLambda(
             serviceExecutionParameters.query,
-            buildTestDataParameters(
-              serviceExecutionParameters.query,
-              this.editorStore,
+            this.parametersState.parameterStates,
+            this.editorStore.graphManagerState,
+          ),
+          [],
+          serviceExecutionParameters.mapping,
+          serviceExecutionParameters.runtime,
+          this.editorStore.graphManagerState.graph,
+          {
+            anonymizeGeneratedData: this.anonymizeGeneratedData,
+            parameterValues: buildExecutionParameterValues(
+              this.parametersState.parameterStates,
+              this.editorStore.graphManagerState,
             ),
-            serviceExecutionParameters.mapping,
-            serviceExecutionParameters.runtime,
-            this.editorStore.graphManagerState.graph,
-            {
-              anonymizeGeneratedData: this.anonymizeGeneratedData,
-            },
-            report,
-          )) as string;
-      }
+          },
+          report,
+        )) as string;
+
       // NOTE: since we don't have a generic mechanism for test-data generation
       // we will only report metrics around API usage, when we genericize, we will
       // move this out
@@ -298,22 +252,11 @@ export class ConnectionTestDataState {
           this.testDataState.testSuiteState.testableState.serviceEditorState
             .executionState.serviceExecutionParameters,
         );
-        if (
-          this.editorStore.applicationStore.config.options
-            .TEMPORARY__enableTestDataGenerationNewFlow
-        ) {
-          const parameters = (serviceExecutionParameters.query.parameters ??
-            []) as object[];
-          if (parameters.length > 0) {
-            this.parameterState.openModal(serviceExecutionParameters);
-            return;
-          } else {
-            yield flowResult(
-              this.generateTestDataForDatabaseConnection(
-                serviceExecutionParameters,
-              ),
-            );
-          }
+        const parameters = (serviceExecutionParameters.query.parameters ??
+          []) as object[];
+        if (parameters.length > 0) {
+          this.parametersState.openModal(serviceExecutionParameters);
+          return;
         } else {
           yield flowResult(
             this.generateTestDataForDatabaseConnection(

package/src/stores/editor/editor-state/element-editor-state/service/testable/ServiceTestableState.ts

@@ -76,7 +76,7 @@ export class ServiceTestSuiteState {
   readonly editorStore: EditorStore;
   readonly testableState: ServiceTestableState;
   suite: ServiceTestSuite;
-  testDataState: ServiceTestDataState;
+  testDataState: ServiceTestDataState | undefined;
   selectedTestState: ServiceTestState | undefined;
   testStates: ServiceTestState[] = [];
   testToRename: ServiceTest | undefined;
@@ -102,7 +102,9 @@ export class ServiceTestSuiteState {
       .filter(filterByType(ServiceTest))
       .map((test) => new ServiceTestState(this, test));
     this.selectedTestState = this.testStates[0];
-    this.testDataState = new ServiceTestDataState(this.suite.testData, this);
+    this.testDataState = this.suite.testData
+      ? new ServiceTestDataState(this.suite.testData, this)
+      : undefined;
   }
 
   setTestToRename(test: ServiceTest | undefined): void {