Revert "minor improvements (finos#1543)"

This reverts commit a6830b4.
irisyngao · Oct 11, 2022 · f400451 · f400451
1 parent 240875e
commit f400451
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 46 deletions.
diff --git a/packages/legend-application-studio/src/components/editor/edit-panel/FunctionEditor.tsx b/packages/legend-application-studio/src/components/editor/edit-panel/FunctionEditor.tsx
@@ -66,6 +66,7 @@ import {
   MULTIPLICITY_INFINITE,
   Unit,
   Type,
+  Multiplicity,
   Enumeration,
   Class,
   PrimitiveType,
@@ -190,7 +191,7 @@ const ParameterBasicEditor = observer(
       if (!isNaN(lBound) && (uBound === undefined || !isNaN(uBound))) {
         rawVariableExpression_setMultiplicity(
           parameter,
-          editorStore.graphManagerState.graph.getMultiplicity(lBound, uBound),
+          new Multiplicity(lBound, uBound),
         );
       }
     };
@@ -444,7 +445,7 @@ const ReturnTypeEditor = observer(
       if (!isNaN(lBound) && (uBound === undefined || !isNaN(uBound))) {
         function_setReturnMultiplicity(
           functionElement,
-          editorStore.graphManagerState.graph.getMultiplicity(lBound, uBound),
+          new Multiplicity(lBound, uBound),
         );
       }
     };

diff --git a/...gend-application-studio/src/components/editor/edit-panel/uml-editor/AssociationEditor.tsx b/...gend-application-studio/src/components/editor/edit-panel/uml-editor/AssociationEditor.tsx
@@ -64,6 +64,7 @@ import {
   type TaggedValue,
   MULTIPLICITY_INFINITE,
   Profile,
+  Multiplicity,
   Class,
   PrimitiveType,
   Unit,
@@ -165,10 +166,7 @@ const AssociationPropertyBasicEditor = observer(
           ? upper
           : parseInt(upper, 10);
       if (!isNaN(lBound) && (uBound === undefined || !isNaN(uBound))) {
-        property_setMultiplicity(
-          property,
-          editorStore.graphManagerState.graph.getMultiplicity(lBound, uBound),
-        );
+        property_setMultiplicity(property, new Multiplicity(lBound, uBound));
       }
     };
     const changeLowerBound: React.ChangeEventHandler<HTMLInputElement> = (

diff --git a/...ges/legend-application-studio/src/components/editor/edit-panel/uml-editor/ClassEditor.tsx b/...ges/legend-application-studio/src/components/editor/edit-panel/uml-editor/ClassEditor.tsx
@@ -74,6 +74,7 @@ import {
   Class,
   GenericType,
   Profile,
+  Multiplicity,
   Type,
   PrimitiveType,
   Unit,
@@ -207,10 +208,7 @@ const PropertyBasicEditor = observer(
           ? upper
           : parseInt(upper, 10);
       if (!isNaN(lBound) && (uBound === undefined || !isNaN(uBound))) {
-        property_setMultiplicity(
-          property,
-          editorStore.graphManagerState.graph.getMultiplicity(lBound, uBound),
-        );
+        property_setMultiplicity(property, new Multiplicity(lBound, uBound));
       }
     };
     const changeLowerBound: React.ChangeEventHandler<HTMLInputElement> = (
@@ -540,7 +538,7 @@ const DerivedPropertyBasicEditor = observer(
       if (!isNaN(lBound) && (uBound === undefined || !isNaN(uBound))) {
         property_setMultiplicity(
           derivedProperty,
-          editorStore.graphManagerState.graph.getMultiplicity(lBound, uBound),
+          new Multiplicity(lBound, uBound),
         );
       }
     };

diff --git a/packages/legend-extension-dsl-diagram/src/components/studio/DiagramEditor.tsx b/packages/legend-extension-dsl-diagram/src/components/studio/DiagramEditor.tsx
@@ -75,10 +75,10 @@ import {
 } from '@finos/legend-art';
 import {
   type Type,
-  type Multiplicity,
   Class,
   DerivedProperty,
   Property,
+  Multiplicity,
   ELEMENT_PATH_DELIMITER,
   MULTIPLICITY_INFINITE,
   GenericType,
@@ -960,7 +960,6 @@ const DiagramEditorInlinePropertyMultiplicityEditor = observer(
     const [upperBound, setUpperBound] = useState<string | number>(
       value.upperBound ?? MULTIPLICITY_INFINITE,
     );
-    const editorStore = useEditorStore();
     const updateMultiplicity = (
       lower: number | string,
       upper: number | string,
@@ -973,9 +972,7 @@ const DiagramEditorInlinePropertyMultiplicityEditor = observer(
           ? upper
           : parseInt(upper, 10);
       if (!isNaN(lBound) && (uBound === undefined || !isNaN(uBound))) {
-        updateValue(
-          editorStore.graphManagerState.graph.getMultiplicity(lBound, uBound),
-        );
+        updateValue(new Multiplicity(lBound, uBound));
       }
     };
     const changeLowerBound: React.ChangeEventHandler<HTMLInputElement> = (

diff --git a/...vice-store/src/graphManager/protocol/pure/STO_ServiceStore_PureProtocolProcessorPlugin.ts b/...vice-store/src/graphManager/protocol/pure/STO_ServiceStore_PureProtocolProcessorPlugin.ts
@@ -72,6 +72,7 @@ import {
   fromElementPathToMappingElementId,
   InferableMappingElementIdImplicitValue,
   InferableMappingElementRootExplicitValue,
+  Multiplicity,
   V1_ElementBuilder,
   V1_initPackageableElement,
   V1_buildFullPath,
@@ -257,7 +258,7 @@ export class STO_ServiceStore_PureProtocolProcessorPlugin
               const mappingProperty = new LocalMappingProperty();
               mappingProperty.type = localMappingProperty.type;
               mappingProperty.name = localMappingProperty.name;
-              const multiplicity = context.graph.getMultiplicity(
+              const multiplicity = new Multiplicity(
                 localMappingProperty.multiplicity.lowerBound,
                 localMappingProperty.multiplicity.upperBound,
               );

diff --git a/...Manager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_MilestoneBuilderHelper.ts b/...Manager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_MilestoneBuilderHelper.ts
@@ -31,6 +31,7 @@ import { Class } from '../../../../../../../../graph/metamodel/pure/packageableE
 import { DerivedProperty } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/DerivedProperty.js';
 import { GenericType } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/GenericType.js';
 import { GenericTypeExplicitReference } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/GenericTypeReference.js';
+import { Multiplicity } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Multiplicity.js';
 import { Property } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Property.js';
 import { V1_Multiplicity } from '../../../../model/packageableElements/domain/V1_Multiplicity.js';
 import type { V1_ValueSpecification } from '../../../../model/valueSpecification/V1_ValueSpecification.js';
@@ -82,7 +83,7 @@ export const V1_buildMilestoningProperties = (
           ];
           const milestonedAllVersions = new Property(
             `${property.name}${MILESTONING_VERSION_PROPERTY_SUFFIX.ALL_VERSIONS}`,
-            graph.getMultiplicity(property.multiplicity.lowerBound, undefined),
+            new Multiplicity(property.multiplicity.lowerBound, undefined),
             GenericTypeExplicitReference.create(
               new GenericType(property.genericType.value.rawType),
             ),
@@ -125,7 +126,7 @@ export const V1_buildMilestoningProperties = (
           ];
           const milestonedAllVersions = new Property(
             `${property.name}${MILESTONING_VERSION_PROPERTY_SUFFIX.ALL_VERSIONS}`,
-            graph.getMultiplicity(property.multiplicity.lowerBound, undefined),
+            new Multiplicity(property.multiplicity.lowerBound, undefined),
             GenericTypeExplicitReference.create(
               new GenericType(property.genericType.value.rawType),
             ),
@@ -171,7 +172,7 @@ export const V1_buildMilestoningProperties = (
           ];
           const milestonedAllVersions = new Property(
             `${property.name}${MILESTONING_VERSION_PROPERTY_SUFFIX.ALL_VERSIONS}`,
-            graph.getMultiplicity(property.multiplicity.lowerBound, undefined),
+            new Multiplicity(property.multiplicity.lowerBound, undefined),
             GenericTypeExplicitReference.create(
               new GenericType(property.genericType.value.rawType),
             ),

diff --git a/...rotocol/pure/v1/transformation/pureGraph/to/helpers/V1_ValueSpecificationBuilderHelper.ts b/...rotocol/pure/v1/transformation/pureGraph/to/helpers/V1_ValueSpecificationBuilderHelper.ts
@@ -63,7 +63,7 @@ import {
   PureListInstanceValue,
   CollectionInstanceValue,
 } from '../../../../../../../../graph/metamodel/pure/valueSpecification/InstanceValue.js';
-import type { Multiplicity } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Multiplicity.js';
+import { Multiplicity } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Multiplicity.js';
 import type { Type } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Type.js';
 import { PropertyExplicitReference } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/PropertyReference.js';
 import { PackageableElementExplicitReference } from '../../../../../../../../graph/metamodel/pure/packageableElements/PackageableElementReference.js';
@@ -168,7 +168,7 @@ export class V1_ValueSpecificationBuilder
   visit_Variable(variable: V1_Variable): ValueSpecification {
     this.openVariables.push(variable.name);
     if (variable.class && variable.multiplicity) {
-      const multiplicity = this.context.graph.getMultiplicity(
+      const multiplicity = new Multiplicity(
         variable.multiplicity.lowerBound,
         variable.multiplicity.upperBound,
       );
@@ -264,7 +264,7 @@ export class V1_ValueSpecificationBuilder
       ),
     );
     const instance = new CollectionInstanceValue(
-      this.context.graph.getMultiplicity(
+      new Multiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -380,7 +380,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.INTEGER,
       valueSpecification.values,
       this.context,
-      this.context.graph.getMultiplicity(
+      new Multiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -392,7 +392,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.DECIMAL,
       valueSpecification.values,
       this.context,
-      this.context.graph.getMultiplicity(
+      new Multiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -404,7 +404,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.STRING,
       valueSpecification.values,
       this.context,
-      this.context.graph.getMultiplicity(
+      new Multiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -416,7 +416,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.BOOLEAN,
       valueSpecification.values,
       this.context,
-      this.context.graph.getMultiplicity(
+      new Multiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -428,7 +428,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.FLOAT,
       valueSpecification.values,
       this.context,
-      this.context.graph.getMultiplicity(
+      new Multiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -440,7 +440,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.DATETIME,
       valueSpecification.values,
       this.context,
-      this.context.graph.getMultiplicity(
+      new Multiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -452,7 +452,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.STRICTDATE,
       valueSpecification.values,
       this.context,
-      this.context.graph.getMultiplicity(
+      new Multiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -464,7 +464,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.STRICTTIME,
       valueSpecification.values,
       this.context,
-      this.context.graph.getMultiplicity(
+      new Multiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -476,7 +476,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.LATESTDATE,
       [],
       this.context,
-      this.context.graph.getMultiplicity(
+      new Multiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),

diff --git a/packages/legend-query-builder/src/components/QueryBuilderParametersPanel.tsx b/packages/legend-query-builder/src/components/QueryBuilderParametersPanel.tsx
@@ -39,6 +39,7 @@ import {
   MULTIPLICITY_INFINITE,
   PRIMITIVE_TYPE,
   VariableExpression,
+  Multiplicity,
   GenericTypeExplicitReference,
   GenericType,
 } from '@finos/legend-graph';
@@ -346,7 +347,7 @@ export const QueryBuilderParametersPanel = observer(
         const parmaterState = new LambdaParameterState(
           new VariableExpression(
             generateEnumerableNameFromToken(varNames, DEFAULT_VARIABLE_NAME),
-            queryBuilderState.graphManagerState.graph.getMultiplicity(1, 1),
+            new Multiplicity(1, 1),
             GenericTypeExplicitReference.create(
               new GenericType(
                 queryParameterState.queryBuilderState.graphManagerState.graph.getPrimitiveType(

diff --git a/...uery-builder/src/graphManager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts b/...uery-builder/src/graphManager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts
@@ -34,6 +34,7 @@ import {
   extractElementNameFromPath,
   V1_AppliedProperty,
   CollectionInstanceValue,
+  Multiplicity,
   INTERNAL__UnknownValueSpecification,
   V1_Variable,
   V1_serializeValueSpecification,
@@ -390,7 +391,7 @@ export const V1_buildProjectFunctionExpression = (
 
   // build column expressions taking into account of derivation
   const processedColumnExpressions = new CollectionInstanceValue(
-    compileContext.graph.getMultiplicity(
+    new Multiplicity(
       columnExpressions.multiplicity.lowerBound,
       columnExpressions.multiplicity.upperBound,
     ),
@@ -510,7 +511,7 @@ export const V1_buildGroupByFunctionExpression = (
 
   // build column expressions taking into account of derivation
   const processedColumnExpressions = new CollectionInstanceValue(
-    compileContext.graph.getMultiplicity(
+    new Multiplicity(
       columnExpressions.multiplicity.lowerBound,
       columnExpressions.multiplicity.upperBound,
     ),
@@ -532,7 +533,7 @@ export const V1_buildGroupByFunctionExpression = (
 
   // build aggregation expressions taking into account of derivation
   const processedAggregationExpressions = new CollectionInstanceValue(
-    compileContext.graph.getMultiplicity(
+    new Multiplicity(
       aggregationExpressions.multiplicity.lowerBound,
       aggregationExpressions.multiplicity.upperBound,
     ),

diff --git a/.../src/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.ts b/.../src/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.ts
@@ -20,6 +20,7 @@ import {
   extractElementNameFromPath,
   GenericType,
   GenericTypeExplicitReference,
+  Multiplicity,
   PrimitiveInstanceValue,
   PRIMITIVE_TYPE,
   SimpleFunctionExpression,
@@ -125,11 +126,10 @@ const appendResultSetModifier = (
             ),
             multiplicityOne,
           );
-          const multiplicity =
-            resultModifierState.projectionState.queryBuilderState.graphManagerState.graph.getMultiplicity(
-              resultModifierState.sortColumns.length,
-              resultModifierState.sortColumns.length,
-            );
+          const multiplicity = new Multiplicity(
+            resultModifierState.sortColumns.length,
+            resultModifierState.sortColumns.length,
+          );
           const collection = new CollectionInstanceValue(
             multiplicity,
             undefined,
@@ -213,21 +213,21 @@ export const appendProjection = (
     );
 
     const colLambdas = new CollectionInstanceValue(
-      queryBuilderState.graphManagerState.graph.getMultiplicity(
+      new Multiplicity(
         projectionState.columns.length -
           projectionState.aggregationState.columns.length,
         projectionState.columns.length -
           projectionState.aggregationState.columns.length,
       ),
     );
     const aggregateLambdas = new CollectionInstanceValue(
-      queryBuilderState.graphManagerState.graph.getMultiplicity(
+      new Multiplicity(
         projectionState.aggregationState.columns.length,
         projectionState.aggregationState.columns.length,
       ),
     );
     const colAliases = new CollectionInstanceValue(
-      queryBuilderState.graphManagerState.graph.getMultiplicity(
+      new Multiplicity(
         projectionState.columns.length,
         projectionState.columns.length,
       ),
@@ -327,13 +327,13 @@ export const appendProjection = (
       multiplicityOne,
     );
     const colLambdas = new CollectionInstanceValue(
-      queryBuilderState.graphManagerState.graph.getMultiplicity(
+      new Multiplicity(
         projectionState.columns.length,
         projectionState.columns.length,
       ),
     );
     const colAliases = new CollectionInstanceValue(
-      queryBuilderState.graphManagerState.graph.getMultiplicity(
+      new Multiplicity(
         projectionState.columns.length,
         projectionState.columns.length,
       ),