@finos/legend-application-studio 18.0.1 → 18.1.0

package/src/stores/LegendStudioRouter.ts

@@ -17,7 +17,7 @@
 import { generateGAVCoordinates } from '@finos/legend-storage';
 import { WorkspaceType } from '@finos/legend-server-sdlc';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { generatePath } from 'react-router';
+import { generatePath } from '@finos/legend-application';
 
 export enum LEGEND_STUDIO_PATH_PARAM_TOKEN {
   PROJECT_ID = 'projectId',

package/src/stores/editor/NewElementState.ts

@@ -80,18 +80,18 @@ import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../DSL
 import {
   packageableConnection_setConnectionValue,
   runtime_addMapping,
-} from '../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 import {
   fileGeneration_setScopeElements,
   fileGeneration_setType,
   generationSpecification_addGenerationElement,
-} from '../graphModifier/DSL_Generation_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 import {
   service_initNewService,
   service_setExecution,
-} from '../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Service_GraphModifierHelper.js';
 import type { EmbeddedDataTypeOption } from '../editor-state/element-editor-state/data/DataEditorState.js';
-import { dataElement_setEmbeddedData } from '../graphModifier/DSL_Data_GraphModifierHelper.js';
+import { dataElement_setEmbeddedData } from '../shared/modifier/DSL_Data_GraphModifierHelper.js';
 import { PACKAGEABLE_ELEMENT_TYPE } from '../shared/ModelClassifierUtils.js';
 import {
   buildElementOption,

package/src/stores/editor-state/FileGenerationState.ts

@@ -54,7 +54,7 @@ import {
   fileGeneration_addConfigurationProperty,
   fileGeneration_addScopeElement,
   fileGeneration_deleteScopeElement,
-} from '../graphModifier/DSL_Generation_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 
 export class FileGenerationState {
   editorStore: EditorStore;

package/src/stores/editor-state/GenerationSpecificationEditorState.ts

@@ -32,7 +32,7 @@ import {
 import {
   generationSpecification_addNode,
   generationSpecification_deleteGenerationNode,
-} from '../graphModifier/DSL_Generation_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 
 export interface GenerationSpecNodeDragSource {
   nodeState: GenerationTreeNodeState;

package/src/stores/editor-state/GraphGenerationState.ts

@@ -66,7 +66,7 @@ import { ExternalFormatState } from './ExternalFormatState.js';
 import {
   generationSpecification_addFileGeneration,
   generationSpecification_addGenerationElement,
-} from '../graphModifier/DSL_Generation_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 
 export const DEFAULT_GENERATION_SPECIFICATION_NAME =
   'MyGenerationSpecification';

package/src/stores/editor-state/ModelImporterState.ts

@@ -49,7 +49,7 @@ import {
 import {
   externalFormat_schemaSet_setFormat,
   externalFormat_schemaSet_setSchemas,
-} from '../graphModifier/DSL_ExternalFormat_GraphModifierHelper.js';
+} from '../shared/modifier/DSL_ExternalFormat_GraphModifierHelper.js';
 import { InnerSchemaSetEditorState } from './element-editor-state/external-format/DSL_ExternalFormat_SchemaSetEditorState.js';
 
 export enum MODEL_IMPORT_NATIVE_INPUT_TYPE {
@@ -67,7 +67,7 @@ export enum MODEL_IMPORT_TYPE {
 export abstract class ModelImporterEditorState {
   readonly editorStore: EditorStore;
   readonly modelImporterState: ModelImporterState;
-  loadModelActionState = ActionState.create();
+  readonly loadModelActionState = ActionState.create();
 
   constructor(modelImporterState: ModelImporterState) {
     this.editorStore = modelImporterState.editorStore;
@@ -80,7 +80,7 @@ export abstract class ModelImporterEditorState {
 
   abstract get isLoadingDisabled(): boolean;
 
-  abstract loadModel(): GeneratorFn<void>;
+  abstract loadModel(): Promise<void>;
 }
 
 export class NativeModelImporterEditorState extends ModelImporterEditorState {
@@ -235,7 +235,7 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
     return `###Pure\n Class model::A\n {\n\n}`;
   }
 
-  *loadModel(): GeneratorFn<void> {
+  async loadModel(): Promise<void> {
     try {
       this.loadModelActionState.inProgress();
       this.editorStore.setBlockingAlert({
@@ -243,17 +243,18 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
         prompt: 'Please do not close the application',
         showLoading: true,
       });
-      const entities = (yield this.loadEntites()) as Entity[];
+      const entities = await this.loadEntites();
       const message = `loading entities from ${
         this.editorStore.applicationStore.config.appName
       } [${this.modelImporterState.replace ? `potentially affected ` : ''} ${
         entities.length
       } entities]`;
-      yield this.editorStore.sdlcServerClient.updateEntities(
+      await this.editorStore.sdlcServerClient.updateEntities(
         this.editorStore.sdlcState.activeProject.projectId,
         this.editorStore.sdlcState.activeWorkspace,
         { replace: this.modelImporterState.replace, entities, message },
       );
+      this.editorStore.setIgnoreNavigationBlocking(true);
       this.editorStore.applicationStore.navigator.reload();
     } catch (error) {
       assertErrorThrown(error);
@@ -317,8 +318,8 @@ export class ExtensionModelImporterEditorState extends ModelImporterEditorState
     this.config = extensionConfiguration;
   }
 
-  *loadModel(): GeneratorFn<void> {
-    flowResult(this.config.loadModel(this.rendererState));
+  async loadModel(): Promise<void> {
+    await this.config.loadModel(this.rendererState);
   }
 }
 
@@ -393,7 +394,7 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
     }
   }
 
-  *loadModel(): GeneratorFn<void> {
+  async loadModel(): Promise<void> {
     this.loadModelActionState.inProgress();
     try {
       this.loadModelActionState.inProgress();
@@ -404,15 +405,14 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
       });
       const modelgenerationstate =
         this.schemaSetEditorState.schemaSetModelGenerationState;
-      const entities = (yield flowResult(
+      const entities = await flowResult(
         modelgenerationstate.getImportEntities(),
-      )) as Entity[];
+      );
       if (modelgenerationstate.targetBinding) {
-        const schemaEntity = (yield flowResult(
+        const schemaEntity =
           this.editorStore.graphManagerState.graphManager.elementToEntity(
             this.schemaSet,
-          ),
-        )) as Entity;
+          );
         entities.push(schemaEntity);
       }
       assertTrue(Boolean(entities.length), 'No entities to load');
@@ -421,11 +421,12 @@ export class ExternalFormatModelImporterState extends ModelImporterEditorState {
       } [${this.modelImporterState.replace ? `potentially affected ` : ''} ${
         entities.length
       } entities]`;
-      yield this.editorStore.sdlcServerClient.updateEntities(
+      await this.editorStore.sdlcServerClient.updateEntities(
         this.editorStore.sdlcState.activeProject.projectId,
         this.editorStore.sdlcState.activeWorkspace,
         { replace: this.modelImporterState.replace, entities, message },
       );
+      this.editorStore.setIgnoreNavigationBlocking(true);
       this.editorStore.applicationStore.navigator.reload();
     } catch (error) {
       assertErrorThrown(error);

package/src/stores/editor-state/ProjectConfigurationEditorState.ts

@@ -30,12 +30,14 @@ import {
   LogEvent,
   assertErrorThrown,
   guaranteeNonNullable,
+  hashArray,
 } from '@finos/legend-shared';
 import type { EditorSDLCState } from '../EditorSDLCState.js';
 import {
   type ProjectConfiguration,
   ProjectStructureVersion,
   UpdateProjectConfigurationCommand,
+  UpdatePlatformConfigurationsCommand,
 } from '@finos/legend-server-sdlc';
 import { LEGEND_STUDIO_APP_EVENT } from '../LegendStudioAppEvent.js';
 import {
@@ -51,10 +53,11 @@ import { generateGAVCoordinates } from '@finos/legend-storage';
 export enum CONFIGURATION_EDITOR_TAB {
   PROJECT_STRUCTURE = 'PROJECT_STRUCTURE',
   PROJECT_DEPENDENCIES = 'PROJECT_DEPENDENCIES',
+  PLATFORM_CONFIGURATIONS = 'PLATFORM_CONFIGURATIONS',
 }
 
 export enum DEPENDENCY_INFO_TYPE {
-  TREE = 'tree',
+  DEPENDENCY_TREE = 'dependency tree',
   CONFLICTS = 'conflicts',
 }
 
@@ -356,6 +359,17 @@ export class ProjectConfigurationEditorState extends EditorState {
           this.currentProjectConfiguration.projectStructureVersion,
           `update project configuration from ${this.editorStore.applicationStore.config.appName}`,
         );
+
+      if (
+        hashArray(this.originalConfig.platformConfigurations ?? []) !==
+        hashArray(this.currentProjectConfiguration.platformConfigurations ?? [])
+      ) {
+        updateProjectConfigurationCommand.platformConfigurations =
+          new UpdatePlatformConfigurationsCommand(
+            this.currentProjectConfiguration.platformConfigurations,
+          );
+      }
+
       updateProjectConfigurationCommand.projectDependenciesToAdd =
         this.currentProjectConfiguration.projectDependencies.filter(
           (dep) =>

package/src/stores/editor-state/element-editor-state/ClassState.ts

@@ -36,12 +36,12 @@ import {
   getAllClassConstraints,
   getAllClassDerivedProperties,
 } from '@finos/legend-graph';
-import { LambdaEditorState } from '@finos/legend-application';
 import {
   constraint_setFunctionDefinition,
   derivedProperty_setBody,
   derivedProperty_setParameters,
-} from '../../graphModifier/DomainGraphModifierHelper.js';
+} from '../../shared/modifier/DomainGraphModifierHelper.js';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export const CONSTRAINT_SOURCE_ID_LABEL = 'constraint';
 export const DERIVED_PROPERTY_SOURCE_ID_LABEL = 'derivedProperty';

package/src/stores/editor-state/element-editor-state/ElementFileGenerationState.ts

@@ -26,7 +26,7 @@ import {
 import {
   createObservableFileGeneration,
   fileGeneration_setType,
-} from '../../graphModifier/DSL_Generation_GraphModifierHelper.js';
+} from '../../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 import { handlePostCreateAction } from '../../editor/NewElementState.js';
 
 export class ElementFileGenerationState {

package/src/stores/editor-state/element-editor-state/FunctionEditorState.ts

@@ -35,7 +35,7 @@ import {
   buildSourceInformationSourceId,
   isStubbed_PackageableElement,
 } from '@finos/legend-graph';
-import { LambdaEditorState } from '@finos/legend-application';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export enum FUNCTION_SPEC_TAB {
   GENERAL = 'GENERAL',

package/src/stores/editor-state/element-editor-state/RuntimeEditorState.ts

@@ -67,14 +67,14 @@ import {
   generateIdentifiedConnectionId,
 } from '@finos/legend-graph';
 import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../../DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
-import { packageableElementReference_setValue } from '../../graphModifier/DomainGraphModifierHelper.js';
+import { packageableElementReference_setValue } from '../../shared/modifier/DomainGraphModifierHelper.js';
 import {
   runtime_addIdentifiedConnection,
   runtime_addMapping,
   runtime_addUniqueStoreConnectionsForStore,
   runtime_deleteIdentifiedConnection,
   runtime_deleteMapping,
-} from '../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+} from '../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 
 export const getClassMappingStore = (
   setImplementation: SetImplementation,

package/src/stores/editor-state/element-editor-state/connection/ConnectionEditorState.ts

@@ -59,7 +59,7 @@ import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../../
 import {
   relationDbConnection_setNewAuthenticationStrategy,
   relationDbConnection_setDatasourceSpecification,
-} from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
+} from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
 import {
   MapperPostProcessorEditorState,
   type PostProcessorEditorState,

package/src/stores/editor-state/element-editor-state/connection/DatabaseBuilderState.ts

@@ -49,7 +49,7 @@ import {
   getNullableSchema,
   getNullableTable,
 } from '@finos/legend-graph';
-import { connection_setStore } from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+import { connection_setStore } from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 
 export abstract class DatabaseBuilderTreeNodeData implements TreeNodeData {
   isOpen?: boolean | undefined;

package/src/stores/editor-state/element-editor-state/data/EmbeddedDataState.ts

@@ -42,7 +42,7 @@ import {
   relationalData_setTableName,
   relationalData_setTableSchemaName,
   relationalData_setTableValues,
-} from '../../../graphModifier/DSL_Data_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Data_GraphModifierHelper.js';
 import { EmbeddedDataType } from '../../ExternalFormatState.js';
 
 export const createEmbeddedData = (

package/src/stores/editor-state/element-editor-state/external-format/DSL_ExternalFormat_SchemaSetEditorState.ts

@@ -55,7 +55,7 @@ import { type EntityChange, EntityChangeType } from '@finos/legend-server-sdlc';
 import type { EditorStore } from '../../../EditorStore.js';
 import { ElementEditorState } from '../ElementEditorState.js';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../LegendStudioAppEvent.js';
-import { configurationProperty_setValue } from '../../../graphModifier/DSL_Generation_GraphModifierHelper.js';
+import { configurationProperty_setValue } from '../../../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 
 export enum SCHEMA_SET_TAB_TYPE {
   SCHEMAS = 'SCHEMAS',

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

@@ -99,13 +99,12 @@ import {
   stub_Class,
   findPropertyMapping,
 } from '@finos/legend-graph';
-import { LambdaEditorState } from '@finos/legend-application';
 import type {
   DSL_Mapping_LegendStudioApplicationPlugin_Extension,
   MappingElementLabel,
 } from '../../../DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
 import type { LegendStudioApplicationPlugin } from '../../../LegendStudioApplicationPlugin.js';
-import { flatData_setSourceRootRecordType } from '../../../graphModifier/STO_FlatData_GraphModifierHelper.js';
+import { flatData_setSourceRootRecordType } from '../../../shared/modifier/STO_FlatData_GraphModifierHelper.js';
 import {
   pureInstanceSetImpl_setSrcClass,
   mapping_addClassMapping,
@@ -117,9 +116,10 @@ import {
   mapping_deleteTest,
   setImpl_updateRootOnCreate,
   setImpl_updateRootOnDelete,
-} from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 import { BASIC_SET_IMPLEMENTATION_TYPE } from '../../../shared/ModelClassifierUtils.js';
-import { rootRelationalSetImp_setMainTableAlias } from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
+import { rootRelationalSetImp_setMainTableAlias } from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export interface MappingExplorerTreeNodeData extends TreeNodeData {
   mappingElement: MappingElement;

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

@@ -67,15 +67,15 @@ import {
 } from '@finos/legend-graph';
 import type { EditorStore } from '../../../EditorStore.js';
 import {
-  enumMapping_setEnumValueMappings,
+  enumerationMapping_setEnumValueMappings,
   enumValueMapping_addSourceValue,
   enumValueMapping_setSourceValues,
-  instanceSetImpl_setPropertyMappings,
+  instanceSetImplementation_setPropertyMappings,
   operationMapping_setParameters,
   pureInstanceSetImpl_setPropertyMappings,
   purePropertyMapping_setTransformer,
-} from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
-import { rootRelationalSetImp_setPropertyMappings } from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+import { rootRelationalSetImp_setPropertyMappings } from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
 import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../../../DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
 
 /**
@@ -157,7 +157,7 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
       }
     });
     if (enumValueMappingsToAdd.length) {
-      enumMapping_setEnumValueMappings(
+      enumerationMapping_setEnumValueMappings(
         enumerationMapping,
         enumerationMapping.enumValueMappings.concat(enumValueMappingsToAdd),
       );
@@ -311,6 +311,8 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
     pureInstanceSetImpl_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
+        // NOTE: here, we remove some low-quality property mappings
+        // i.e. stubbed property mappings from before adding new decorated property mappings
         propertyMappingsBeforeDecoration
           .filter(
             (propertyMapping) =>
@@ -426,9 +428,12 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         setImplementation,
         decoratePropertyMapping,
       );
-    instanceSetImpl_setPropertyMappings(
+    instanceSetImplementation_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
+        // NOTE: here, we remove some low-quality property mappings
+        // i.e. stubbed property mappings, incompatible property mappings
+        // from before adding new decorated property mappings
         propertyMappingsBeforeDecoration
           .filter(
             (propertyMapping) =>
@@ -595,9 +600,12 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         setImplementation,
         decoratePropertyMapping,
       );
-    instanceSetImpl_setPropertyMappings(
+    instanceSetImplementation_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
+        // NOTE: here, we remove some low-quality property mappings
+        // i.e. stubbed property mappings, incompatible property mappings
+        // from before adding new decorated property mappings
         propertyMappingsBeforeDecoration
           .filter(
             (propertyMapping) =>
@@ -669,7 +677,7 @@ export class MappingElementDecorationCleaner
         enumValueMapping.sourceValues.filter(isNonNullable),
       );
     });
-    enumMapping_setEnumValueMappings(
+    enumerationMapping_setEnumValueMappings(
       enumerationMapping,
       nonEmptyEnumValueMappings,
     );
@@ -700,7 +708,7 @@ export class MappingElementDecorationCleaner
   visit_PureInstanceSetImplementation(
     setImplementation: PureInstanceSetImplementation,
   ): void {
-    instanceSetImpl_setPropertyMappings(
+    instanceSetImplementation_setPropertyMappings(
       setImplementation,
       setImplementation.propertyMappings.filter(
         (propertyMapping) => !isStubbed_RawLambda(propertyMapping.transform),
@@ -714,7 +722,7 @@ export class MappingElementDecorationCleaner
       | FlatDataInstanceSetImplementation
       | EmbeddedFlatDataPropertyMapping,
   ): void {
-    instanceSetImpl_setPropertyMappings(
+    instanceSetImplementation_setPropertyMappings(
       setImplementation,
       setImplementation.propertyMappings.filter(
         (propertyMapping) =>

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

@@ -24,7 +24,7 @@ import type {
   SetImplementation,
   Type,
 } from '@finos/legend-graph';
-import { LambdaEditorState } from '@finos/legend-application';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export class MappingElementState {
   readonly uuid = uuid();

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

@@ -104,30 +104,30 @@ import {
   ActionAlertActionType,
   ActionAlertType,
   ExecutionPlanState,
-  LambdaEditorState,
   TAB_SIZE,
 } from '@finos/legend-application';
 import {
   objectInputData_setData,
   runtime_addIdentifiedConnection,
   runtime_addMapping,
-} from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
-import { flatData_setData } from '../../../graphModifier/STO_FlatData_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+import { flatData_setData } from '../../../shared/modifier/STO_FlatData_GraphModifierHelper.js';
 import {
   service_addTestSuite,
   service_initNewService,
   service_setExecution,
-} from '../../../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Service_GraphModifierHelper.js';
 import {
   localH2DatasourceSpecification_setTestDataSetupCsv,
   localH2DatasourceSpecification_setTestDataSetupSqls,
   relationalInputData_setData,
-} from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
+} from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
 import {
   createEmptyEqualToJsonAssertion,
   createBareExternalFormat,
 } from '../../../shared/testable/TestableUtils.js';
 import { SERIALIZATION_FORMAT } from '../service/testable/ServiceTestEditorState.js';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export class MappingExecutionQueryState extends LambdaEditorState {
   editorStore: EditorStore;

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

@@ -84,12 +84,8 @@ import {
   generateIdentifiedConnectionId,
   DEPRECATED__validate_MappingTest,
 } from '@finos/legend-graph';
-import {
-  ExecutionPlanState,
-  LambdaEditorState,
-  TAB_SIZE,
-} from '@finos/legend-application';
-import { flatData_setData } from '../../../graphModifier/STO_FlatData_GraphModifierHelper.js';
+import { ExecutionPlanState, TAB_SIZE } from '@finos/legend-application';
+import { flatData_setData } from '../../../shared/modifier/STO_FlatData_GraphModifierHelper.js';
 import {
   expectedOutputMappingTestAssert_setExpectedOutput,
   mappingTest_setAssert,
@@ -97,12 +93,13 @@ import {
   objectInputData_setData,
   runtime_addIdentifiedConnection,
   runtime_addMapping,
-} from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 import {
   localH2DatasourceSpecification_setTestDataSetupCsv,
   localH2DatasourceSpecification_setTestDataSetupSqls,
   relationalInputData_setData,
-} from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
+} from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export enum TEST_RESULT {
   NONE = 'NONE', // test has not run yet

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

@@ -39,8 +39,8 @@ import {
   stub_RawLambda,
   isStubbed_RawLambda,
 } from '@finos/legend-graph';
-import { LambdaEditorState } from '@finos/legend-application';
-import { pureInstanceSetImpl_setMappingFilter } from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+import { pureInstanceSetImpl_setMappingFilter } from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export class PurePropertyMappingState extends PropertyMappingState {
   editorStore: EditorStore;

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

@@ -30,14 +30,9 @@ import {
   RuntimeEditorState,
 } from '../../../editor-state/element-editor-state/RuntimeEditorState.js';
 import {
-  buildParametersLetLambdaFunc,
   DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
   DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
   ExecutionPlanState,
-  LambdaEditorState,
-  LambdaParametersState,
-  LambdaParameterState,
-  PARAMETER_SUBMIT_ACTION,
   TAB_SIZE,
 } from '@finos/legend-application';
 import {
@@ -70,7 +65,7 @@ import {
   stub_Mapping,
 } from '@finos/legend-graph';
 import { type Entity, parseGACoordinates } from '@finos/legend-storage';
-import { runtime_addMapping } from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+import { runtime_addMapping } from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 import type { EditorStore } from '../../../EditorStore.js';
 import {
   keyedExecutionParameter_setKey,
@@ -81,7 +76,14 @@ import {
   pureSingleExecution_setMapping,
   pureSingleExecution_setRuntime,
   service_setExecution,
-} from '../../../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Service_GraphModifierHelper.js';
+import {
+  buildParametersLetLambdaFunc,
+  LambdaEditorState,
+  LambdaParametersState,
+  LambdaParameterState,
+  PARAMETER_SUBMIT_ACTION,
+} from '@finos/legend-query-builder';
 
 export class ServiceExecutionParameterState extends LambdaParametersState {
   executionState: ServicePureExecutionState;

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

@@ -268,7 +268,7 @@ export class ServiceRegistrationState {
             label: 'Launch Service',
             type: ActionAlertActionType.PROCEED,
             handler: (): void => {
-              this.editorStore.applicationStore.navigator.openNewWindow(
+              this.editorStore.applicationStore.navigator.visitAddress(
                 generateServiceManagementUrl(
                   config.managementUrl,
                   serviceRegistrationResult.pattern,

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

@@ -51,7 +51,7 @@ import type { EditorStore } from '../../../../EditorStore.js';
 import {
   service_addConnectionTestData,
   service_setConnectionTestDataEmbeddedData,
-} from '../../../../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../../../../shared/modifier/DSL_Service_GraphModifierHelper.js';
 import {
   createMockEnumerationProperty,
   createMockPrimitiveProperty,

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

@@ -23,7 +23,6 @@ import {
   ParameterValue,
   buildLambdaVariableExpressions,
   VariableExpression,
-  generateVariableExpressionMockValue,
 } from '@finos/legend-graph';
 import { action, flow, makeObservable, observable } from 'mobx';
 import { TestableTestEditorState } from '../../testable/TestableEditorState.js';
@@ -35,7 +34,7 @@ import {
   service_setParameterValues,
   service_setParameterValueSpec,
   service_setSerializationFormat,
-} from '../../../../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../../../../shared/modifier/DSL_Service_GraphModifierHelper.js';
 import {
   assertErrorThrown,
   deleteEntry,
@@ -46,6 +45,7 @@ import {
   uuid,
 } from '@finos/legend-shared';
 import type { EditorStore } from '../../../../EditorStore.js';
+import { generateVariableExpressionMockValue } from '@finos/legend-query-builder';
 
 export enum SERIALIZATION_FORMAT {
   PURE = 'PURE',

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

@@ -46,7 +46,7 @@ import {
   service_addTest,
   service_addTestSuite,
   service_deleteTestSuite,
-} from '../../../../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../../../../shared/modifier/DSL_Service_GraphModifierHelper.js';
 import { createEmptyEqualToJsonAssertion } from '../../../../shared/testable/TestableUtils.js';
 import type { ServiceEditorState } from '../ServiceEditorState.js';
 import { ServiceTestDataState } from './ServiceTestDataState.js';

package/src/stores/editor-state/element-editor-state/testable/TestAssertionState.ts

@@ -36,7 +36,7 @@ import {
 } from '@finos/legend-shared';
 import { action, flow, makeObservable, observable } from 'mobx';
 import type { EditorStore } from '../../../EditorStore.js';
-import { externalFormatData_setData } from '../../../graphModifier/DSL_Data_GraphModifierHelper.js';
+import { externalFormatData_setData } from '../../../shared/modifier/DSL_Data_GraphModifierHelper.js';
 import {
   getTestableResultFromAssertionStatus,
   TESTABLE_RESULT,

package/src/stores/editor-state/element-editor-state/testable/TestableEditorState.ts

@@ -35,7 +35,7 @@ import {
 } from '@finos/legend-shared';
 import { action, makeObservable, observable } from 'mobx';
 import type { EditorStore } from '../../../EditorStore.js';
-import { atomicTest_addAssertion } from '../../../graphModifier/Testable_GraphModifierHelper.js';
+import { atomicTest_addAssertion } from '../../../shared/modifier/Testable_GraphModifierHelper.js';
 import { createEmptyEqualToJsonAssertion } from '../../../shared/testable/TestableUtils.js';
 import { TESTABLE_RESULT } from '../../../sidebar-state/testable/GlobalTestRunnerState.js';
 import {