@finos/legend-application-studio 17.0.0 → 18.0.1

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

@@ -70,13 +70,13 @@ import {
   enumMapping_setEnumValueMappings,
   enumValueMapping_addSourceValue,
   enumValueMapping_setSourceValues,
-  mapping_setPropertyMappings,
+  instanceSetImpl_setPropertyMappings,
   operationMapping_setParameters,
   pureInstanceSetImpl_setPropertyMappings,
   purePropertyMapping_setTransformer,
-} from '../../../graphModifier/DSLMapping_GraphModifierHelper.js';
-import { rootRelationalSetImp_setPropertyMappings } from '../../../graphModifier/StoreRelational_GraphModifierHelper.js';
-import type { DSLMapping_LegendStudioApplicationPlugin_Extension } from '../../../DSLMapping_LegendStudioApplicationPlugin_Extension.js';
+} from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+import { rootRelationalSetImp_setPropertyMappings } from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
+import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../../../DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
 
 /**
  * Iterate through all properties (including supertypes' properties) of the set implementation
@@ -208,14 +208,8 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         propertyType instanceof Unit ||
         propertyType instanceof Measure
       ) {
-        // only allow one property mapping per primitive property
-        assertTrue(
-          !existingPropertyMappings.length ||
-            existingPropertyMappings.length === 1,
-          'Only one property mapping should exist per simple type (e.g. primitive, measure, unit) property',
-        );
         return existingPropertyMappings.length
-          ? [existingPropertyMappings[0] as PurePropertyMapping]
+          ? existingPropertyMappings
           : [
               new PurePropertyMapping(
                 setImplementation,
@@ -226,14 +220,8 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
               ),
             ];
       } else if (propertyType instanceof Enumeration) {
-        // only allow one property mapping per enumeration property
-        assertTrue(
-          !existingPropertyMappings.length ||
-            existingPropertyMappings.length === 1,
-          'Only one property mapping should exist per enumeration type property',
-        );
         const enumerationPropertyMapping = existingPropertyMappings.length
-          ? [existingPropertyMappings[0] as PurePropertyMapping]
+          ? existingPropertyMappings
           : [
               new PurePropertyMapping(
                 setImplementation,
@@ -323,10 +311,15 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
     pureInstanceSetImpl_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
-        propertyMappingsBeforeDecoration.filter(
-          (propertyMapping) =>
-            !decoratedPropertyMappings.includes(propertyMapping),
-        ),
+        propertyMappingsBeforeDecoration
+          .filter(
+            (propertyMapping) =>
+              !isStubbed_RawLambda(propertyMapping.transform),
+          )
+          .filter(
+            (propertyMapping) =>
+              !decoratedPropertyMappings.includes(propertyMapping),
+          ),
       ),
       this.editorStore.changeDetectionState.observerContext,
     );
@@ -355,14 +348,8 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         propertyType instanceof Unit ||
         propertyType instanceof Measure
       ) {
-        // only allow one property mapping per primitive property
-        assertTrue(
-          !existingPropertyMappings.length ||
-            existingPropertyMappings.length === 1,
-          'Only one property mapping should exist per simple type (e.g. primitive, measure, unit) property',
-        );
         return existingPropertyMappings.length
-          ? [existingPropertyMappings[0] as FlatDataPropertyMapping]
+          ? existingPropertyMappings
           : [
               new FlatDataPropertyMapping(
                 setImplementation,
@@ -439,13 +426,20 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         setImplementation,
         decoratePropertyMapping,
       );
-    mapping_setPropertyMappings(
+    instanceSetImpl_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
-        propertyMappingsBeforeDecoration.filter(
-          (propertyMapping) =>
-            !decoratedPropertyMappings.includes(propertyMapping),
-        ),
+        propertyMappingsBeforeDecoration
+          .filter(
+            (propertyMapping) =>
+              (propertyMapping instanceof FlatDataPropertyMapping &&
+                !isStubbed_RawLambda(propertyMapping.transform)) ||
+              propertyMapping instanceof EmbeddedFlatDataPropertyMapping,
+          )
+          .filter(
+            (propertyMapping) =>
+              !decoratedPropertyMappings.includes(propertyMapping),
+          ),
       ),
       this.editorStore.changeDetectionState.observerContext,
     );
@@ -486,15 +480,9 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         propertyType instanceof Unit ||
         propertyType instanceof Measure
       ) {
-        // only allow one property mapping per primitive property
-        assertTrue(
-          !existingPropertyMappings.length ||
-            existingPropertyMappings.length === 1,
-          'Only one property mapping should exist per simple type (e.g. primitive, measure, unit) property',
-        );
         if (existingPropertyMappings.length) {
           // TODO?: do we want to check the type of the property mapping here?
-          return [existingPropertyMappings[0] as PropertyMapping];
+          return existingPropertyMappings;
         }
         const newPropertyMapping = new RelationalPropertyMapping(
           setImplementation,
@@ -506,16 +494,10 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
           stub_RawRelationalOperationElement();
         return [newPropertyMapping];
       } else if (propertyType instanceof Enumeration) {
-        // only allow one property mapping per enumeration property
-        assertTrue(
-          !existingPropertyMappings.length ||
-            existingPropertyMappings.length === 1,
-          'Only one property mapping should exist per enumeration type property',
-        );
         let ePropertyMapping: PropertyMapping[] = [];
         if (existingPropertyMappings.length) {
           // TODO?: do we want to check the type of the property mapping here?
-          ePropertyMapping = [existingPropertyMappings[0] as PropertyMapping];
+          ePropertyMapping = existingPropertyMappings;
         } else {
           const newPropertyMapping = new RelationalPropertyMapping(
             setImplementation,
@@ -613,13 +595,23 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         setImplementation,
         decoratePropertyMapping,
       );
-    mapping_setPropertyMappings(
+    instanceSetImpl_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
-        propertyMappingsBeforeDecoration.filter(
-          (propertyMapping) =>
-            !decoratedPropertyMappings.includes(propertyMapping),
-        ),
+        propertyMappingsBeforeDecoration
+          .filter(
+            (propertyMapping) =>
+              (propertyMapping instanceof RelationalPropertyMapping &&
+                !isStubbed_RawRelationalOperationElement(
+                  propertyMapping.relationalOperation,
+                )) ||
+              propertyMapping instanceof
+                EmbeddedRelationalInstanceSetImplementation,
+          )
+          .filter(
+            (propertyMapping) =>
+              !decoratedPropertyMappings.includes(propertyMapping),
+          ),
       ),
       this.editorStore.changeDetectionState.observerContext,
     );
@@ -637,7 +629,7 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
       .flatMap(
         (plugin) =>
           (
-            plugin as DSLMapping_LegendStudioApplicationPlugin_Extension
+            plugin as DSL_Mapping_LegendStudioApplicationPlugin_Extension
           ).getExtraSetImplementationDecorators?.() ?? [],
       );
     for (const decorator of extraSetImplementationDecorators) {
@@ -708,7 +700,7 @@ export class MappingElementDecorationCleaner
   visit_PureInstanceSetImplementation(
     setImplementation: PureInstanceSetImplementation,
   ): void {
-    mapping_setPropertyMappings(
+    instanceSetImpl_setPropertyMappings(
       setImplementation,
       setImplementation.propertyMappings.filter(
         (propertyMapping) => !isStubbed_RawLambda(propertyMapping.transform),
@@ -722,7 +714,7 @@ export class MappingElementDecorationCleaner
       | FlatDataInstanceSetImplementation
       | EmbeddedFlatDataPropertyMapping,
   ): void {
-    mapping_setPropertyMappings(
+    instanceSetImpl_setPropertyMappings(
       setImplementation,
       setImplementation.propertyMappings.filter(
         (propertyMapping) =>
@@ -778,7 +770,7 @@ export class MappingElementDecorationCleaner
         .flatMap(
           (plugin) =>
             (
-              plugin as DSLMapping_LegendStudioApplicationPlugin_Extension
+              plugin as DSL_Mapping_LegendStudioApplicationPlugin_Extension
             ).getExtraSetImplementationDecorationCleaners?.() ?? [],
         );
     for (const decorationCleaner of extraSetImplementationDecorationCleaners) {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { observable, computed, makeObservable, action, flow } from 'mobx';
+import { observable, makeObservable, action, flow } from 'mobx';
 import { type GeneratorFn, uuid } from '@finos/legend-shared';
 import type { EditorStore } from '../../../EditorStore.js';
 import type { MappingElement } from './MappingEditorState.js';
@@ -43,20 +43,6 @@ export class MappingElementState {
 
 export abstract class SetImplementationState extends MappingElementState {
   declare mappingElement: SetImplementation;
-
-  constructor(editorStore: EditorStore, setImplementation: SetImplementation) {
-    super(editorStore, setImplementation);
-
-    makeObservable(this, {
-      setImplementation: computed,
-    });
-
-    this.mappingElement = setImplementation;
-  }
-
-  get setImplementation(): SetImplementation {
-    return this.mappingElement;
-  }
 }
 
 export abstract class InstanceSetImplementationState extends SetImplementationState {
@@ -77,8 +63,6 @@ export abstract class InstanceSetImplementationState extends SetImplementationSt
       decorate: action,
       convertPropertyMappingTransformObjects: flow,
     });
-
-    this.mappingElement = setImplementation;
   }
 
   setSelectedType(type: Type | undefined): void {

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

@@ -43,7 +43,7 @@ import {
   toGrammarString,
   isValidJSONString,
   createUrlStringFromData,
-  losslessStringify,
+  stringifyLosslessJSON,
   guaranteeType,
   ContentType,
   generateEnumerableNameFromToken,
@@ -111,18 +111,18 @@ import {
   objectInputData_setData,
   runtime_addIdentifiedConnection,
   runtime_addMapping,
-} from '../../../graphModifier/DSLMapping_GraphModifierHelper.js';
-import { flatData_setData } from '../../../graphModifier/StoreFlatData_GraphModifierHelper.js';
+} from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+import { flatData_setData } from '../../../graphModifier/STO_FlatData_GraphModifierHelper.js';
 import {
   service_addTestSuite,
   service_initNewService,
   service_setExecution,
-} from '../../../graphModifier/DSLService_GraphModifierHelper.js';
+} from '../../../graphModifier/DSL_Service_GraphModifierHelper.js';
 import {
   localH2DatasourceSpecification_setTestDataSetupCsv,
   localH2DatasourceSpecification_setTestDataSetupSqls,
   relationalInputData_setData,
-} from '../../../graphModifier/StoreRelational_GraphModifierHelper.js';
+} from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
 import {
   createEmptyEqualToJsonAssertion,
   createBareExternalFormat,
@@ -752,7 +752,7 @@ export class MappingExecutionState {
             },
           )) as ExecutionResult;
         this.setExecutionResultText(
-          losslessStringify(
+          stringifyLosslessJSON(
             extractExecutionResultValues(result),
             undefined,
             TAB_SIZE,

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

@@ -31,8 +31,8 @@ import {
   fromGrammarString,
   toGrammarString,
   createUrlStringFromData,
-  losslessParse,
-  losslessStringify,
+  parseLosslessJSON,
+  stringifyLosslessJSON,
   tryToMinifyLosslessJSONString,
   tryToFormatLosslessJSONString,
   tryToMinifyJSONString,
@@ -89,7 +89,7 @@ import {
   LambdaEditorState,
   TAB_SIZE,
 } from '@finos/legend-application';
-import { flatData_setData } from '../../../graphModifier/StoreFlatData_GraphModifierHelper.js';
+import { flatData_setData } from '../../../graphModifier/STO_FlatData_GraphModifierHelper.js';
 import {
   expectedOutputMappingTestAssert_setExpectedOutput,
   mappingTest_setAssert,
@@ -97,12 +97,12 @@ import {
   objectInputData_setData,
   runtime_addIdentifiedConnection,
   runtime_addMapping,
-} from '../../../graphModifier/DSLMapping_GraphModifierHelper.js';
+} from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
 import {
   localH2DatasourceSpecification_setTestDataSetupCsv,
   localH2DatasourceSpecification_setTestDataSetupSqls,
   relationalInputData_setData,
-} from '../../../graphModifier/StoreRelational_GraphModifierHelper.js';
+} from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
 
 export enum TEST_RESULT {
   NONE = 'NONE', // test has not run yet
@@ -641,7 +641,7 @@ export class MappingTestState {
         this.assertionState instanceof MappingTestExpectedOutputAssertionState
       ) {
         this.assertionState.setExpectedResult(
-          losslessStringify(
+          stringifyLosslessJSON(
             extractExecutionResultValues(result),
             undefined,
             TAB_SIZE,
@@ -700,7 +700,7 @@ export class MappingTestState {
       this.setTestRunPromise(promise);
       const result = (yield promise) as ExecutionResult;
       if (this.testRunPromise === promise) {
-        this.testExecutionResultText = losslessStringify(
+        this.testExecutionResultText = stringifyLosslessJSON(
           extractExecutionResultValues(result),
           undefined,
           TAB_SIZE,
@@ -712,7 +712,7 @@ export class MappingTestState {
           // TODO: this logic should probably be better handled in by engine mapping test runner
           assertionMatched =
             hashObject(extractExecutionResultValues(result)) ===
-            hashObject(losslessParse(this.assertionState.expectedResult));
+            hashObject(parseLosslessJSON(this.assertionState.expectedResult));
         } else {
           throw new UnsupportedOperationError();
         }

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

@@ -40,7 +40,7 @@ import {
   isStubbed_RawLambda,
 } from '@finos/legend-graph';
 import { LambdaEditorState } from '@finos/legend-application';
-import { pureInstanceSetImpl_setMappingFilter } from '../../../graphModifier/DSLMapping_GraphModifierHelper.js';
+import { pureInstanceSetImpl_setMappingFilter } from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
 
 export class PurePropertyMappingState extends PropertyMappingState {
   editorStore: EditorStore;
@@ -178,7 +178,6 @@ export class PureInstanceSetImplementationFilterState extends LambdaEditorState
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
-        GRAPH_MANAGER_EVENT;
       }
     } else {
       this.clearErrors();
@@ -207,7 +206,6 @@ export class PureInstanceSetImplementationFilterState extends LambdaEditorState
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
-        GRAPH_MANAGER_EVENT;
       }
     } else {
       this.clearErrors();
@@ -315,7 +313,6 @@ export class PureInstanceSetImplementationState extends InstanceSetImplementatio
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
-        GRAPH_MANAGER_EVENT;
       } finally {
         this.isConvertingTransformLambdaObjects = false;
       }
@@ -340,7 +337,6 @@ export class PureInstanceSetImplementationState extends InstanceSetImplementatio
           LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
           error,
         );
-        GRAPH_MANAGER_EVENT;
       } finally {
         this.isConvertingTransformLambdaObjects = false;
       }

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

@@ -20,7 +20,7 @@ import {
   ActionState,
   assertErrorThrown,
   LogEvent,
-  losslessStringify,
+  stringifyLosslessJSON,
   UnsupportedOperationError,
   filterByType,
 } from '@finos/legend-shared';
@@ -31,6 +31,8 @@ import {
 } from '../../../editor-state/element-editor-state/RuntimeEditorState.js';
 import {
   buildParametersLetLambdaFunc,
+  DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
+  DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
   ExecutionPlanState,
   LambdaEditorState,
   LambdaParametersState,
@@ -40,17 +42,18 @@ import {
 } from '@finos/legend-application';
 import {
   type ServiceExecution,
-  KeyedExecutionParameter,
   type PureExecution,
   type Mapping,
   type Runtime,
   type ExecutionResult,
   type LightQuery,
   type PackageableRuntime,
-  PureSingleExecution,
-  PureMultiExecution,
   type RawExecutionPlan,
   type PackageableElementReference,
+  type QueryInfo,
+  PureSingleExecution,
+  PureMultiExecution,
+  KeyedExecutionParameter,
   GRAPH_MANAGER_EVENT,
   RawLambda,
   EngineRuntime,
@@ -67,7 +70,7 @@ import {
   stub_Mapping,
 } from '@finos/legend-graph';
 import { type Entity, parseGACoordinates } from '@finos/legend-storage';
-import { runtime_addMapping } from '../../../graphModifier/DSLMapping_GraphModifierHelper.js';
+import { runtime_addMapping } from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
 import type { EditorStore } from '../../../EditorStore.js';
 import {
   keyedExecutionParameter_setKey,
@@ -78,7 +81,7 @@ import {
   pureSingleExecution_setMapping,
   pureSingleExecution_setRuntime,
   service_setExecution,
-} from '../../../graphModifier/DSLService_GraphModifierHelper.js';
+} from '../../../graphModifier/DSL_Service_GraphModifierHelper.js';
 
 export class ServiceExecutionParameterState extends LambdaParametersState {
   executionState: ServicePureExecutionState;
@@ -232,9 +235,11 @@ export class ServicePureExecutionQueryState extends LambdaEditorState {
         const content =
           (yield this.editorStore.graphManagerState.graphManager.lambdaToPureCode(
             (yield this.editorStore.graphManagerState.graphManager.pureCodeToLambda(
-              (yield this.editorStore.graphManagerState.graphManager.getQueryContent(
-                query.id,
-              )) as string,
+              (
+                (yield this.editorStore.graphManagerState.graphManager.getQueryInfo(
+                  query.id,
+                )) as QueryInfo
+              ).content,
             )) as RawLambda,
             true,
           )) as string;
@@ -273,7 +278,8 @@ export class ServicePureExecutionQueryState extends LambdaEditorState {
   }
 
   *loadQueries(searchText: string): GeneratorFn<void> {
-    const isValidSearchString = searchText.length >= 3;
+    const isValidSearchString =
+      searchText.length >= DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH;
     this.loadQueriesState.inProgress();
     try {
       const searchSpecification = new QuerySearchSpecification();
@@ -285,7 +291,7 @@ export class ServicePureExecutionQueryState extends LambdaEditorState {
       searchSpecification.searchTerm = isValidSearchString
         ? searchText
         : undefined;
-      searchSpecification.limit = 10;
+      searchSpecification.limit = DEFAULT_TYPEAHEAD_SEARCH_LIMIT;
       searchSpecification.projectCoordinates = [
         // either get queries for the current project
         currentProjectCoordinates,
@@ -584,7 +590,7 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
       const result = (yield promise) as ExecutionResult;
       if (this.queryRunPromise === promise) {
         this.setExecutionResultText(
-          losslessStringify(result, undefined, TAB_SIZE),
+          stringifyLosslessJSON(result, undefined, TAB_SIZE),
         );
         this.parameterState.setParameters([]);
       }

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

@@ -29,13 +29,20 @@ import {
   getNullableFirstElement,
   assertTrue,
   URL_SEPARATOR,
+  filterByType,
 } from '@finos/legend-shared';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../LegendStudioAppEvent.js';
 import { Version } from '@finos/legend-server-sdlc';
 import {
   type Service,
   type ServiceRegistrationResult,
+  type PureExecution,
   ServiceExecutionMode,
+  buildLambdaVariableExpressions,
+  VariableExpression,
+  TYPICAL_MULTIPLICITY_TYPE,
+  generateMultiplicityString,
+  multiplicityComparator,
 } from '@finos/legend-graph';
 import { ServiceRegistrationEnvironmentConfig } from '../../../../application/LegendStudioApplicationConfig.js';
 import {
@@ -186,7 +193,7 @@ export class ServiceRegistrationState {
   get versionOptions(): ServiceVersionOption[] | undefined {
     if (
       this.enableModesWithVersioning &&
-      !(this.serviceExecutionMode === ServiceExecutionMode.FULL_INTERACTIVE)
+      this.serviceExecutionMode !== ServiceExecutionMode.FULL_INTERACTIVE
     ) {
       const options: ServiceVersionOption[] =
         this.editorStore.sdlcState.projectVersions.map((version) => ({
@@ -314,5 +321,37 @@ export class ServiceRegistrationState {
         'Service version can not be empty in Semi-interactive and Prod service type',
       );
     }
+
+    // validate service parameter multiplicities
+    const supportedServiceParamMultiplicties = [
+      TYPICAL_MULTIPLICITY_TYPE.ONE,
+      TYPICAL_MULTIPLICITY_TYPE.ZEROMANY,
+      TYPICAL_MULTIPLICITY_TYPE.ZEROONE,
+    ].map((p) =>
+      this.editorStore.graphManagerState.graph.getTypicalMultiplicity(p),
+    );
+    const invalidParams = buildLambdaVariableExpressions(
+      (this.service.execution as PureExecution).func,
+      this.editorStore.graphManagerState,
+    )
+      .filter(filterByType(VariableExpression))
+      .filter(
+        (p) =>
+          !supportedServiceParamMultiplicties.some((m) =>
+            multiplicityComparator(m, p.multiplicity),
+          ),
+      );
+    assertTrue(
+      invalidParams.length === 0,
+      `Parameter(s)${invalidParams.map(
+        (p) =>
+          ` ${p.name}: [${generateMultiplicityString(
+            p.multiplicity.lowerBound,
+            p.multiplicity.upperBound,
+          )}]`,
+      )} has/have unsupported multiplicity. Supported multiplicities include ${supportedServiceParamMultiplicties.map(
+        (m) => ` [${generateMultiplicityString(m.lowerBound, m.upperBound)}]`,
+      )}.`,
+    );
   }
 }

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/DSLService_GraphModifierHelper.js';
+} from '../../../../graphModifier/DSL_Service_GraphModifierHelper.js';
 import {
   createMockEnumerationProperty,
   createMockPrimitiveProperty,

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

@@ -35,7 +35,7 @@ import {
   service_setParameterValues,
   service_setParameterValueSpec,
   service_setSerializationFormat,
-} from '../../../../graphModifier/DSLService_GraphModifierHelper.js';
+} from '../../../../graphModifier/DSL_Service_GraphModifierHelper.js';
 import {
   assertErrorThrown,
   deleteEntry,

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/DSLService_GraphModifierHelper.js';
+} from '../../../../graphModifier/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/DSLData_GraphModifierHelper.js';
+import { externalFormatData_setData } from '../../../graphModifier/DSL_Data_GraphModifierHelper.js';
 import {
   getTestableResultFromAssertionStatus,
   TESTABLE_RESULT,

package/src/stores/graphModifier/{DSLMapping_GraphModifierHelper.ts → DSL_Mapping_GraphModifierHelper.ts}

@@ -86,7 +86,7 @@ import {
 } from '@finos/legend-shared';
 import { action } from 'mobx';
 
-export const mapping_setPropertyMappings = action(
+export const instanceSetImpl_setPropertyMappings = action(
   (
     si: InstanceSetImplementation,
     pm: PropertyMapping[],
@@ -97,6 +97,17 @@ export const mapping_setPropertyMappings = action(
     );
   },
 );
+
+export const instanceSetImpl_deletePropertyMapping = action(
+  (si: InstanceSetImplementation, pm: PropertyMapping): void => {
+    deleteEntry(
+      si.propertyMappings,
+      pm,
+      (p1, p2) => p1.property._UUID === p2.property._UUID,
+    );
+  },
+);
+
 export const setImpl_setRoot = action(
   (owner: SetImplementation, val: boolean): void => {
     owner.root.value = val;

package/src/stores/project-viewer/ProjectViewerStore.ts

@@ -202,7 +202,7 @@ export class ProjectViewerStore {
     // fetch entities
     stopWatch.record();
     this.editorStore.initState.setMessage(`Fetching entities...`);
-    if (versionId) {
+    if (versionId && !revisionId) {
       // get version info if a version is specified
       this.version =
         versionId !== this.latestVersion.id.id
@@ -223,7 +223,7 @@ export class ProjectViewerStore {
           versionId,
         ),
       ])) as [Entity[], PlainObject<ProjectConfiguration>];
-    } else if (revisionId) {
+    } else if (revisionId && !versionId) {
       // get revision info if a revision is specified
       this.revision =
         revisionId !== this.currentRevision.id