@finos/legend-extension-dsl-diagram 1.0.26 → 1.0.29

package/src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { observable, action, makeObservable } from 'mobx';
+import { observable, makeObservable } from 'mobx';
 import { hashArray, type Hashable } from '@finos/legend-shared';
 import { Point } from './DSLDiagram_Point';
 import { Rectangle } from './DSLDiagram_Rectangle';
@@ -28,28 +28,12 @@ export class PositionedRectangle implements Hashable {
   constructor(position: Point, rectangle: Rectangle) {
     makeObservable(this, {
       dummyObservable: observable,
-      forceRefreshHash: action,
     });
 
     this.position = position;
     this.rectangle = rectangle;
   }
 
-  setRectangle(value: Rectangle): void {
-    this.rectangle = value;
-  }
-  setPosition(value: Point): void {
-    this.position = value;
-  }
-  /**
-   * NOTE: Having `position` and `rectangle` as observables compromises the performance of diagram
-   * so we want to have a way to refresh the hash for change detection to pick up new hash when we resize
-   * the class view box or move it.
-   */
-  forceRefreshHash(): void {
-    this.dummyObservable = {};
-  }
-
   edgePoint = (): Point =>
     new Point(
       this.position.x + this.rectangle.width,

package/src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.ts

@@ -36,6 +36,7 @@ import type { V1_Rectangle } from '../../model/packageableElements/diagram/geome
 import type { V1_PropertyView } from '../../model/packageableElements/diagram/V1_DSLDiagram_PropertyView';
 import type { V1_GeneralizationView } from '../../model/packageableElements/diagram/V1_DSLDiagram_GeneralizationView';
 import { getClassView } from '../../../../../../helpers/DiagramHelper';
+import { _relationView_possiblyFlattenPath } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper';
 
 const buildPoint = (point: V1_Point): Point => {
   const x = guaranteeNonNullable(point.x, `Point 'x' coordinate is missing`);
@@ -115,7 +116,7 @@ export const V1_buildPropertyView = (
     targetClassView,
   );
   view.path = propertyView.line.points.map((point) => buildPoint(point));
-  view.possiblyFlattenPath(); // transform the line because we store only 2 end points that are inside points and we will calculate the offset
+  _relationView_possiblyFlattenPath(view); // transform the line because we store only 2 end points that are inside points and we will calculate the offset
   return view;
 };
 
@@ -141,7 +142,7 @@ export const V1_buildGeneralizationView = (
     targetClassView,
   );
   view.path = generalizationView.line.points.map((point) => buildPoint(point));
-  view.possiblyFlattenPath(); // transform the line because we store only 2 end points that are inside points and we will calculate the offset
+  _relationView_possiblyFlattenPath(view); // transform the line because we store only 2 end points that are inside points and we will calculate the offset
   return view;
 };
 

package/src/stores/studio/DSLDiagram_ModifierHelper.ts

@@ -0,0 +1,148 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { addUniqueEntry, changeEntry, deleteEntry } from '@finos/legend-shared';
+import { action } from 'mobx';
+import type { AssociationView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_AssociationView';
+import type { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
+import type { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
+import type { GeneralizationView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
+import {
+  _findOrBuildPoint,
+  _relationView_possiblyFlattenPath,
+  _relationView_setPath,
+} from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper';
+import type { PropertyView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView';
+import type { RelationShipEdgeView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView';
+import type { RelationshipView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView';
+import type { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
+import type { PositionedRectangle } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle';
+import type { Rectangle } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle';
+
+export const diagram_setClassViews = action(
+  (diagram: Diagram, val: ClassView[]): void => {
+    diagram.classViews = val;
+  },
+);
+export const diagram_addClassView = action(
+  (diagram: Diagram, val: ClassView): void => {
+    addUniqueEntry(diagram.classViews, val);
+  },
+);
+export const diagram_deleteClassView = action(
+  (diagram: Diagram, val: ClassView): void => {
+    deleteEntry(diagram.classViews, val);
+  },
+);
+export const diagram_setAssociationViews = action(
+  (diagram: Diagram, val: AssociationView[]): void => {
+    diagram.associationViews = val;
+  },
+);
+export const diagram_deleteAssociationView = action(
+  (diagram: Diagram, val: AssociationView): void => {
+    deleteEntry(diagram.associationViews, val);
+  },
+);
+export const diagram_setGeneralizationViews = action(
+  (diagram: Diagram, val: GeneralizationView[]): void => {
+    diagram.generalizationViews = val;
+  },
+);
+export const diagram_addGeneralizationView = action(
+  (diagram: Diagram, val: GeneralizationView): void => {
+    addUniqueEntry(diagram.generalizationViews, val);
+  },
+);
+export const diagram_deleteGeneralizationView = action(
+  (diagram: Diagram, val: GeneralizationView): void => {
+    deleteEntry(diagram.generalizationViews, val);
+  },
+);
+export const diagram_setPropertyViews = action(
+  (diagram: Diagram, val: PropertyView[]): void => {
+    diagram.propertyViews = val;
+  },
+);
+export const diagram_addPropertyView = action(
+  (diagram: Diagram, val: PropertyView): void => {
+    addUniqueEntry(diagram.propertyViews, val);
+  },
+);
+export const diagram_deletePropertyView = action(
+  (diagram: Diagram, val: PropertyView): void => {
+    deleteEntry(diagram.propertyViews, val);
+  },
+);
+
+export const classView_setHideProperties = action(
+  (cv: ClassView, val: boolean): void => {
+    cv.hideProperties = val;
+  },
+);
+export const classView_setHideStereotypes = action(
+  (cv: ClassView, val: boolean): void => {
+    cv.hideStereotypes = val;
+  },
+);
+export const classView_setHideTaggedValues = action(
+  (cv: ClassView, val: boolean): void => {
+    cv.hideTaggedValues = val;
+  },
+);
+export const relationShipEdgeView_setOffsetX = action(
+  (r: RelationShipEdgeView, val: number): void => {
+    r.offsetX = val;
+  },
+);
+export const relationShipEdgeView_setOffsetY = action(
+  (r: RelationShipEdgeView, val: number): void => {
+    r.offsetY = val;
+  },
+);
+
+export const relationshipView_changePoint = action(
+  (v: RelationshipView, val: Point, newVal: Point): void => {
+    changeEntry(v.path, val, newVal);
+  },
+);
+export const relationView_possiblyFlattenPath = action(
+  _relationView_possiblyFlattenPath,
+);
+
+export const findOrBuildPoint = action(_findOrBuildPoint);
+export const relationView_setPath = action(_relationView_setPath);
+
+export const positionedRectangle_setRectangle = action(
+  (pR: PositionedRectangle, value: Rectangle): void => {
+    pR.rectangle = value;
+  },
+);
+export const positionedRectangle_setPosition = action(
+  (pR: PositionedRectangle, value: Point): void => {
+    pR.position = value;
+  },
+);
+/**
+ * NOTE: Having `position` and `rectangle` as observables compromises the performance of diagram
+ * so we want to have a way to refresh the hash for change detection to pick up new hash when we resize
+ * the class view box or move it.
+ */
+export const positionedRectangle_forceRefreshHash = action(
+  (pR: PositionedRectangle): void => {
+    pR.dummyObservable = {};
+  },
+);

package/src/stores/studio/DiagramEditorState.ts

@@ -35,12 +35,12 @@ import {
   Property,
   GenericType,
   PropertyExplicitReference,
-  addClassProperty,
 } from '@finos/legend-graph';
 import {
   type EditorStore,
   ClassEditorState,
   ElementEditorState,
+  class_addProperty,
 } from '@finos/legend-studio';
 import type { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
 import type { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
@@ -402,7 +402,7 @@ export class DiagramEditorState extends ElementEditorState {
     this.renderer.handleAddSimpleProperty = (classView: ClassView): void => {
       if (!this.isReadOnly && !classView.class.value.isReadOnly) {
         const _class = classView.class.value;
-        addClassProperty(
+        class_addProperty(
           _class,
           new Property(
             `property_${_class.properties.length + 1}`,

package/tsconfig.json

@@ -51,6 +51,7 @@
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.ts",
+    "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView.ts",
@@ -73,6 +74,7 @@
     "./src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.ts",
     "./src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.ts",
     "./src/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDiagram_ProtocolHelper.ts",
+    "./src/stores/studio/DSLDiagram_ModifierHelper.ts",
     "./src/stores/studio/DiagramEditorState.ts",
     "./src/components/studio/ClassDiagramPreview.tsx",
     "./src/components/studio/DSLDiagram_LegendStudioPlugin.tsx",