@finos/legend-extension-dsl-diagram 1.0.27 → 1.0.30

package/src/DiagramRenderer.ts

@@ -36,8 +36,6 @@ import {
   GenericType,
   Property,
   Multiplicity,
-  addClassProperty,
-  addClassSuperType,
 } from '@finos/legend-graph';
 import { action, makeObservable, observable } from 'mobx';
 import type { Diagram } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
@@ -47,13 +45,36 @@ import { PositionedRectangle } from './models/metamodels/pure/packageableElement
 import { ClassView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
 import type { PropertyHolderView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView';
 import { GeneralizationView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
-import {
-  type RelationshipView,
-  manageInsidePointsDynamically,
-} from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView';
+import { RelationshipView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView';
 import { PropertyView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView';
 import { getElementPosition } from './helpers/DiagramHelper';
 import { AssociationView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_AssociationView';
+import { class_addProperty, class_addSuperType } from '@finos/legend-studio';
+import {
+  classView_setHideProperties,
+  classView_setHideStereotypes,
+  classView_setHideTaggedValues,
+  diagram_addClassView,
+  diagram_addGeneralizationView,
+  diagram_addPropertyView,
+  diagram_deleteAssociationView,
+  diagram_deleteClassView,
+  diagram_deleteGeneralizationView,
+  diagram_deletePropertyView,
+  diagram_setAssociationViews,
+  diagram_setClassViews,
+  diagram_setGeneralizationViews,
+  diagram_setPropertyViews,
+  findOrBuildPoint,
+  positionedRectangle_forceRefreshHash,
+  positionedRectangle_setPosition,
+  positionedRectangle_setRectangle,
+  relationshipEdgeView_setOffsetX,
+  relationshipEdgeView_setOffsetY,
+  relationshipView_changePoint,
+  relationshipView_simplifyPath,
+  relationshipView_setPath,
+} from './stores/studio/DSLDiagram_GraphModifierHelper';
 
 export enum DIAGRAM_INTERACTION_MODE {
   LAYOUT,
@@ -582,7 +603,7 @@ export class DiagramRenderer {
                 startClassView.class.value,
               )
             ) {
-              addClassSuperType(
+              class_addSuperType(
                 startClassView.class.value,
                 GenericTypeExplicitReference.create(
                   new GenericType(targetClassView.class.value),
@@ -602,7 +623,7 @@ export class DiagramRenderer {
                 startClassView,
                 targetClassView,
               );
-              this.diagram.addGeneralizationView(gview);
+              diagram_addGeneralizationView(this.diagram, gview);
               return gview;
             }
             return undefined;
@@ -622,7 +643,7 @@ export class DiagramRenderer {
               ),
               startClassView.class.value,
             );
-            addClassProperty(startClassView.class.value, property);
+            class_addProperty(startClassView.class.value, property);
             // only create property view if the classviews are different
             // else we end up with a weird rendering where the property view
             // is not targetable
@@ -633,7 +654,7 @@ export class DiagramRenderer {
                 startClassView,
                 targetClassView,
               );
-              this.diagram.addPropertyView(pView);
+              diagram_addPropertyView(this.diagram, pView);
               return pView;
             }
             return undefined;
@@ -724,9 +745,8 @@ export class DiagramRenderer {
         .concat(this.diagram.generalizationViews)
         .concat(this.diagram.propertyViews);
       for (const relationshipView of relationshipViews) {
-        let fullPath = relationshipView.buildFullPath();
-        fullPath = manageInsidePointsDynamically(
-          fullPath,
+        const fullPath = RelationshipView.pruneUnnecessaryInsidePoints(
+          relationshipView.buildFullPath(),
           relationshipView.from.classView.value,
           relationshipView.to.classView.value,
         );
@@ -861,7 +881,8 @@ export class DiagramRenderer {
         id,
         PackageableElementExplicitReference.create(addedClass),
       );
-      newClassView.setPosition(
+      positionedRectangle_setPosition(
+        newClassView,
         classViewModelCoordinate ??
           this.canvasCoordinateToModelCoordinate(
             new Point(
@@ -872,10 +893,10 @@ export class DiagramRenderer {
             ),
           ),
       );
-      this.diagram.addClassView(newClassView);
+      diagram_addClassView(this.diagram, newClassView);
       // Refresh hash since ClassView position is not observable
       // NOTE: here we refresh after adding the class view to the diagram, that way the diagram hash is refreshed
-      newClassView.forceRefreshHash();
+      positionedRectangle_forceRefreshHash(newClassView);
       this.diagram.classViews
         .filter((classView) => classView.class.value !== addedClass)
         .forEach((classView) => {
@@ -886,7 +907,8 @@ export class DiagramRenderer {
               .map((generalization) => generalization.value.rawType)
               .includes(_class)
           ) {
-            this.diagram.addGeneralizationView(
+            diagram_addGeneralizationView(
+              this.diagram,
               new GeneralizationView(this.diagram, newClassView, classView),
             );
           }
@@ -895,14 +917,18 @@ export class DiagramRenderer {
               .map((generalization) => generalization.value.rawType)
               .includes(addedClass)
           ) {
-            this.diagram.addGeneralizationView(
+            diagram_addGeneralizationView(
+              this.diagram,
+
               new GeneralizationView(this.diagram, classView, newClassView),
             );
           }
           // Add property view
           addedClass.getAllOwnedProperties().forEach((property) => {
             if (property.genericType.value.rawType === _class) {
-              this.diagram.addPropertyView(
+              diagram_addPropertyView(
+                this.diagram,
+
                 new PropertyView(
                   this.diagram,
                   PropertyExplicitReference.create(property),
@@ -914,7 +940,8 @@ export class DiagramRenderer {
           });
           _class.getAllOwnedProperties().forEach((property) => {
             if (property.genericType.value.rawType === addedClass) {
-              this.diagram.addPropertyView(
+              diagram_addPropertyView(
+                this.diagram,
                 new PropertyView(
                   this.diagram,
                   PropertyExplicitReference.create(property),
@@ -1453,7 +1480,7 @@ export class DiagramRenderer {
         classView.rectangle.height > classMinHeight
           ? classView.rectangle.height
           : classMinHeight;
-      classView.setRectangle(new Rectangle(width, height));
+      positionedRectangle_setRectangle(classView, new Rectangle(width, height));
     }
   }
 
@@ -1631,7 +1658,7 @@ export class DiagramRenderer {
     // NOTE: force hash reload when we redraw class view; this would help with cases where
     // we auto add new properties to the class view, causing the box to expand, hence we need
     // to recompute hash
-    classView.forceRefreshHash();
+    positionedRectangle_forceRefreshHash(classView);
   }
 
   private drawLinePropertyNameAndMultiplicity(
@@ -1794,9 +1821,8 @@ export class DiagramRenderer {
   }
 
   private drawPropertyOrAssociation(propertyView: PropertyView): void {
-    let fullPath = propertyView.buildFullPath();
-    fullPath = manageInsidePointsDynamically(
-      fullPath,
+    const fullPath = RelationshipView.pruneUnnecessaryInsidePoints(
+      propertyView.buildFullPath(),
       propertyView.from.classView.value,
       propertyView.to.classView.value,
     );
@@ -1885,9 +1911,8 @@ export class DiagramRenderer {
 
   private drawInheritance(inheritance: GeneralizationView): void {
     const rect = inheritance.to.classView.value.rectangle;
-    let fullPath = inheritance.buildFullPath();
-    fullPath = manageInsidePointsDynamically(
-      fullPath,
+    const fullPath = RelationshipView.pruneUnnecessaryInsidePoints(
+      inheritance.buildFullPath(),
       inheritance.from.classView.value,
       inheritance.to.classView.value,
     );
@@ -2032,20 +2057,23 @@ export class DiagramRenderer {
     return newClasses;
   }
 
-  // TODO: add doc
+  /**
+   * Shift relationship views if both ends' classviews are moved.
+   */
   private potentiallyShiftRelationships(
-    assoViews: RelationshipView[],
+    relationshipViews: RelationshipView[],
     selectedClasses: ClassView[],
     newMovingDeltaX: number,
     newMovingDeltaY: number,
   ): void {
-    assoViews.forEach((assoView) => {
+    relationshipViews.forEach((view) => {
       if (
-        selectedClasses.indexOf(assoView.from.classView.value) !== -1 &&
-        selectedClasses.indexOf(assoView.to.classView.value) !== -1
+        selectedClasses.indexOf(view.from.classView.value) !== -1 &&
+        selectedClasses.indexOf(view.to.classView.value) !== -1
       ) {
-        assoView.setPath(
-          assoView.path.map(
+        relationshipView_setPath(
+          view,
+          view.path.map(
             (point) =>
               new Point(point.x - newMovingDeltaX, point.y - newMovingDeltaY),
           ),
@@ -2059,8 +2087,10 @@ export class DiagramRenderer {
     if ('Delete' === e.key) {
       if (!this.isReadOnly) {
         this.selectedClasses.forEach((classView) => {
-          this.diagram.deleteClassView(classView);
-          this.diagram.setAssociationViews(
+          diagram_deleteClassView(this.diagram, classView);
+          diagram_setAssociationViews(
+            this.diagram,
+
             this.diagram.associationViews.filter(
               (associationView) =>
                 !(
@@ -2069,7 +2099,9 @@ export class DiagramRenderer {
                 ),
             ),
           );
-          this.diagram.setGeneralizationViews(
+          diagram_setGeneralizationViews(
+            this.diagram,
+
             this.diagram.generalizationViews.filter(
               (generalizationView) =>
                 !(
@@ -2078,7 +2110,9 @@ export class DiagramRenderer {
                 ),
             ),
           );
-          this.diagram.setPropertyViews(
+          diagram_setPropertyViews(
+            this.diagram,
+
             this.diagram.propertyViews.filter(
               (propertyView) =>
                 !(
@@ -2089,11 +2123,16 @@ export class DiagramRenderer {
           );
         });
         if (this.selectedPropertyOrAssociation instanceof AssociationView) {
-          this.diagram.deleteAssociationView(
+          diagram_deleteAssociationView(
+            this.diagram,
+
             this.selectedPropertyOrAssociation,
           );
         } else if (this.selectedPropertyOrAssociation instanceof PropertyView) {
-          this.diagram.deletePropertyView(this.selectedPropertyOrAssociation);
+          diagram_deletePropertyView(
+            this.diagram,
+            this.selectedPropertyOrAssociation,
+          );
         }
         if (this.selectedInheritance) {
           if (
@@ -2102,7 +2141,10 @@ export class DiagramRenderer {
                 generalizationView === this.selectedInheritance,
             )
           ) {
-            this.diagram.deleteGeneralizationView(this.selectedInheritance);
+            diagram_deleteGeneralizationView(
+              this.diagram,
+              this.selectedInheritance,
+            );
           }
         }
         this.selectedClasses = [];
@@ -2209,7 +2251,7 @@ export class DiagramRenderer {
       if (!this.isReadOnly) {
         if (this.selectedClasses.length !== 0) {
           this.selectedClasses.forEach((classView) => {
-            classView.setHideProperties(!classView.hideProperties);
+            classView_setHideProperties(classView, !classView.hideProperties);
           });
           this.drawScreen();
         }
@@ -2220,7 +2262,7 @@ export class DiagramRenderer {
       if (!this.isReadOnly) {
         if (this.selectedClasses.length !== 0) {
           this.selectedClasses.forEach((classView) => {
-            classView.setHideStereotypes(!classView.hideStereotypes);
+            classView_setHideStereotypes(classView, !classView.hideStereotypes);
           });
           this.drawScreen();
         }
@@ -2231,7 +2273,10 @@ export class DiagramRenderer {
       if (!this.isReadOnly) {
         if (this.selectedClasses.length !== 0) {
           this.selectedClasses.forEach((classView) => {
-            classView.setHideTaggedValues(!classView.hideTaggedValues);
+            classView_setHideTaggedValues(
+              classView,
+              !classView.hideTaggedValues,
+            );
           });
           this.drawScreen();
         }
@@ -2286,8 +2331,8 @@ export class DiagramRenderer {
         1,
       );
       const res = this.layoutTaxonomy(views, this.diagram, false, true);
-      res[0].forEach((cv) => this.diagram.addClassView(cv));
-      res[1].forEach((gv) => this.diagram.addGeneralizationView(gv));
+      res[0].forEach((cv) => diagram_addClassView(this.diagram, cv));
+      res[1].forEach((gv) => diagram_addGeneralizationView(this.diagram, gv));
 
       this.drawScreen();
     }
@@ -2319,8 +2364,8 @@ export class DiagramRenderer {
           false,
           false,
         );
-        res[0].forEach((cv) => this.diagram.addClassView(cv));
-        res[1].forEach((gv) => this.diagram.addGeneralizationView(gv));
+        res[0].forEach((cv) => diagram_addClassView(this.diagram, cv));
+        res[1].forEach((gv) => diagram_addGeneralizationView(this.diagram, gv));
       }
 
       this.drawScreen();
@@ -2332,13 +2377,13 @@ export class DiagramRenderer {
       switch (this.interactionMode) {
         case DIAGRAM_INTERACTION_MODE.LAYOUT: {
           this.diagram.generalizationViews.forEach((generalizationView) =>
-            generalizationView.possiblyFlattenPath(),
+            relationshipView_simplifyPath(generalizationView),
           );
           this.diagram.associationViews.forEach((associationView) =>
-            associationView.possiblyFlattenPath(),
+            relationshipView_simplifyPath(associationView),
           );
           this.diagram.propertyViews.forEach((propertyView) =>
-            propertyView.possiblyFlattenPath(),
+            relationshipView_simplifyPath(propertyView),
           );
           break;
         }
@@ -2426,28 +2471,32 @@ export class DiagramRenderer {
                 );
 
                 if (gview) {
-                  gview.from.setOffsetX(
+                  relationshipEdgeView_setOffsetX(
+                    gview.from,
                     -(
                       this.startClassView.position.x +
                       this.startClassView.rectangle.width / 2 -
                       this.selectionStart.x
                     ),
                   );
-                  gview.from.setOffsetY(
+                  relationshipEdgeView_setOffsetY(
+                    gview.from,
                     -(
                       this.startClassView.position.y +
                       this.startClassView.rectangle.height / 2 -
                       this.selectionStart.y
                     ),
                   );
-                  gview.to.setOffsetX(
+                  relationshipEdgeView_setOffsetX(
+                    gview.to,
                     -(
                       targetClassView.position.x +
                       targetClassView.rectangle.width / 2 -
                       eventPointInModelCoordinate.x
                     ),
                   );
-                  gview.to.setOffsetY(
+                  relationshipEdgeView_setOffsetY(
+                    gview.to,
                     -(
                       targetClassView.position.y +
                       targetClassView.rectangle.height / 2 -
@@ -2592,7 +2641,8 @@ export class DiagramRenderer {
               this.setSelectedClassCorner(this.diagram.classViews[i]);
               if (!this.isReadOnly) {
                 // Bring the class view to front
-                this.diagram.setClassViews(
+                diagram_setClassViews(
+                  this.diagram,
                   this.reorderDiagramDomain(
                     guaranteeNonNullable(this.selectedClassCorner),
                     this.diagram,
@@ -2632,7 +2682,9 @@ export class DiagramRenderer {
                   }
                   if (!this.isReadOnly) {
                     // Bring the class view to front
-                    this.diagram.setClassViews(
+                    diagram_setClassViews(
+                      this.diagram,
+
                       this.reorderDiagramDomain(
                         this.selectedClasses[0] as ClassView,
                         this.diagram,
@@ -2670,7 +2722,8 @@ export class DiagramRenderer {
                 // check for selection of inheritance view
                 for (const generalizationView of this.diagram
                   .generalizationViews) {
-                  const val = generalizationView.findOrBuildPoint(
+                  const val = findOrBuildPoint(
+                    generalizationView,
                     eventPointInModelCoordinate.x,
                     eventPointInModelCoordinate.y,
                     this.zoom,
@@ -2686,7 +2739,8 @@ export class DiagramRenderer {
                 // check for selection of association view
                 if (!this.selectedPoint) {
                   for (const associationView of this.diagram.associationViews) {
-                    const val = associationView.findOrBuildPoint(
+                    const val = findOrBuildPoint(
+                      associationView,
                       eventPointInModelCoordinate.x,
                       eventPointInModelCoordinate.y,
                       this.zoom,
@@ -2703,7 +2757,8 @@ export class DiagramRenderer {
                 // check for selection of property view
                 if (!this.selectedPoint) {
                   for (const propertyView of this.diagram.propertyViews) {
-                    const val = propertyView.findOrBuildPoint(
+                    const val = findOrBuildPoint(
+                      propertyView,
                       eventPointInModelCoordinate.x,
                       eventPointInModelCoordinate.y,
                       this.zoom,
@@ -2811,7 +2866,8 @@ export class DiagramRenderer {
           // Resize class view
           if (this.selectedClassCorner) {
             // Make sure width and height are in range!
-            this.selectedClassCorner.setRectangle(
+            positionedRectangle_setRectangle(
+              this.selectedClassCorner,
               new Rectangle(
                 eventPointInModelCoordinate.x -
                   this.selectedClassCorner.position.x,
@@ -2820,7 +2876,7 @@ export class DiagramRenderer {
               ),
             );
             // Refresh hash since ClassView rectangle is not observable
-            this.selectedClassCorner.forceRefreshHash();
+            positionedRectangle_forceRefreshHash(this.selectedClassCorner);
             this.drawClassView(this.selectedClassCorner);
             this.drawScreen();
           }
@@ -2847,9 +2903,12 @@ export class DiagramRenderer {
                     (this.clickY - selectedClassOldPosition.oldPos.y);
                   newMovingDeltaX = selectedClass.position.x - newMovingX;
                   newMovingDeltaY = selectedClass.position.y - newMovingY;
-                  selectedClass.setPosition(new Point(newMovingX, newMovingY));
+                  positionedRectangle_setPosition(
+                    selectedClass,
+                    new Point(newMovingX, newMovingY),
+                  );
                   // Refresh hash since ClassView position is not observable
-                  selectedClass.forceRefreshHash();
+                  positionedRectangle_forceRefreshHash(selectedClass);
                 }
               });
               this.potentiallyShiftRelationships(
@@ -2877,12 +2936,14 @@ export class DiagramRenderer {
           // Change line (add a new point to the line)
           if (this.selectedPoint) {
             if (this.selectedPropertyOrAssociation) {
-              this.selectedPropertyOrAssociation.changePoint(
+              relationshipView_changePoint(
+                this.selectedPropertyOrAssociation,
                 this.selectedPoint,
                 eventPointInModelCoordinate,
               );
             } else if (this.selectedInheritance) {
-              this.selectedInheritance.changePoint(
+              relationshipView_changePoint(
+                this.selectedInheritance,
                 this.selectedPoint,
                 eventPointInModelCoordinate,
               );
@@ -3101,9 +3162,8 @@ export class DiagramRenderer {
         ...this.diagram.associationViews,
       ];
       for (const propertyHolderView of propertyHolderViews) {
-        let fullPath = propertyHolderView.buildFullPath();
-        fullPath = manageInsidePointsDynamically(
-          fullPath,
+        const fullPath = RelationshipView.pruneUnnecessaryInsidePoints(
+          propertyHolderView.buildFullPath(),
           propertyHolderView.from.classView.value,
           propertyHolderView.to.classView.value,
         );
@@ -3234,11 +3294,15 @@ export class DiagramRenderer {
 
       // Set layout of current level
       if (positionInitialClass || currentLevelIndex > 0) {
-        (levels[0] as ClassView).setPosition(new Point(startX, currentLevelY));
+        positionedRectangle_setPosition(
+          levels[0] as ClassView,
+          new Point(startX, currentLevelY),
+        );
         levels.forEach((view, idx) => {
           if (idx > 0) {
             const precedent = levels[idx - 1] as ClassView;
-            view.setPosition(
+            positionedRectangle_setPosition(
+              view,
               new Point(
                 precedent.position.x + precedent.rectangle.width + spaceX,
                 currentLevelY,

package/src/components/studio/ClassDiagramPreview.tsx

@@ -21,11 +21,13 @@ import { useApplicationStore } from '@finos/legend-application';
 import type { Class } from '@finos/legend-graph';
 import { InheritanceDiagramRenderer } from './InheritanceDiagramRenderer';
 import { DSL_DIAGRAM_TEST_ID } from './DSLDiagram_TestID';
+import { useEditorStore } from '@finos/legend-studio';
 
 export const ClassDiagramPreview = observer((props: { _class: Class }) => {
   const { _class } = props;
   const applicationStore = useApplicationStore();
-  const classHash = _class.isReadOnly
+  const editorStore = useEditorStore();
+  const classHash = editorStore.graphManagerState.isElementReadOnly(_class)
     ? undefined
     : applicationStore.notifyAndReturnAlternativeOnError(
         () => _class.hashCode,

package/src/components/studio/DiagramEditor.tsx

@@ -84,10 +84,6 @@ import {
   isValidFullPath,
   isValidPathIdentifier,
   resolvePackagePathAndElementName,
-  setPropertyName,
-  setPropertyGenericType,
-  setPropertyMultiplicity,
-  addPackageElement,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -104,10 +100,19 @@ import {
   CORE_DND_TYPE,
   ElementDragSource,
   useEditorStore,
+  property_setName,
+  property_setGenericType,
+  property_setMultiplicity,
+  package_addElement,
 } from '@finos/legend-studio';
 import { cleanUpDeadReferencesInDiagram } from '../../helpers/DiagramHelper';
 import { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
 import type { DSLDiagram_LegendStudioPlugin_Extension } from './DSLDiagram_LegendStudioPlugin_Extension';
+import {
+  classView_setHideProperties,
+  classView_setHideStereotypes,
+  classView_setHideTaggedValues,
+} from '../../stores/studio/DSLDiagram_GraphModifierHelper';
 
 const DiagramEditorContextMenu = observer(
   forwardRef<
@@ -519,21 +524,21 @@ const DiagramEditorClassViewEditor = observer(
       if (isReadOnly) {
         return;
       }
-      classView.setHideProperties(!classView.hideProperties);
+      classView_setHideProperties(classView, !classView.hideProperties);
       diagramEditorState.renderer.render();
     };
     const toggleHideTaggedValues = (): void => {
       if (isReadOnly) {
         return;
       }
-      classView.setHideTaggedValues(!classView.hideTaggedValues);
+      classView_setHideTaggedValues(classView, !classView.hideTaggedValues);
       diagramEditorState.renderer.render();
     };
     const toggleHideStereotypes = (): void => {
       if (isReadOnly) {
         return;
       }
-      classView.setHideStereotypes(!classView.hideStereotypes);
+      classView_setHideStereotypes(classView, !classView.hideStereotypes);
       diagramEditorState.renderer.render();
     };
 
@@ -857,9 +862,10 @@ const DiagramEditorInlineClassCreatorInner = observer(
         diagramEditorState.setInlineClassCreatorState(undefined);
         const [packagePath, name] = resolvePackagePathAndElementName(path);
         const _class = new Class(name);
-        addPackageElement(
+        package_addElement(
           editorStore.graphManagerState.graph.getOrCreatePackage(packagePath),
           _class,
+          editorStore.changeDetectionState.observerContext,
         );
         editorStore.graphManagerState.graph.addElement(_class);
         editorStore.explorerTreeState.reprocess();
@@ -1032,14 +1038,14 @@ const DiagramEditorInlinePropertyEditorInner = observer(
       event,
     ) => {
       if (property instanceof DerivedProperty || property instanceof Property) {
-        setPropertyName(property, event.target.value);
+        property_setName(property, event.target.value);
         diagramEditorState.renderer.render();
       }
     };
 
     const changeMultiplicity = (val: Multiplicity): void => {
       if (property instanceof DerivedProperty || property instanceof Property) {
-        setPropertyMultiplicity(property, val);
+        property_setMultiplicity(property, val);
         diagramEditorState.renderer.render();
       }
     };
@@ -1059,7 +1065,7 @@ const DiagramEditorInlinePropertyEditorInner = observer(
     };
     const changePropertyType = (val: PackageableElementOption<Type>): void => {
       if (property instanceof Property || property instanceof DerivedProperty) {
-        setPropertyGenericType(property, new GenericType(val.value));
+        property_setGenericType(property, new GenericType(val.value));
       }
     };
 

package/src/graphManager/DSLDiagram_PureGraphManagerPlugin.ts

@@ -17,10 +17,13 @@
 import packageJson from '../../package.json';
 import {
   PureGraphManagerPlugin,
+  type ObserverContext,
+  type ElementObserver,
   type PackageableElement,
   type PureGrammarElementLabeler,
 } from '@finos/legend-graph';
 import { Diagram } from '../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
+import { observe_Diagram } from './action/changeDetection/DSLDiagram_ObserverHelper';
 
 const PURE_GRAMMAR_DIAGRAM_PARSER_NAME = 'Diagram';
 const PURE_GRAMMAR_DIAGRAM_ELEMENT_TYPE_LABEL = 'Diagram';
@@ -48,4 +51,18 @@ export class DSLDiagram_PureGraphManagerPlugin extends PureGraphManagerPlugin {
       },
     ];
   }
+
+  override getExtraElementObservers(): ElementObserver[] {
+    return [
+      (
+        element: PackageableElement,
+        context: ObserverContext,
+      ): PackageableElement | undefined => {
+        if (element instanceof Diagram) {
+          return observe_Diagram(element);
+        }
+        return undefined;
+      },
+    ];
+  }
 }