@eclipse-glsp-examples/workflow-server-bundled 2.2.0-next.92 → 2.2.0-next.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp-examples/workflow-server-bundled",
-  "version": "2.2.0-next.92+7823455",
+  "version": "2.2.0-next.93+f3f5d02",
   "description": "GLSP node server for the workflow example (bundled)",
   "keywords": [
     "eclipse",
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "782345583727f36fe83eed55419052f2f879d9ac"
+  "gitHead": "f3f5d02d9ec73d6b0338ecc71b0c118f468267f6"
 }

package/wf-glsp-server-node.js

@@ -1945,32 +1945,25 @@ let WorkflowDiagramConfiguration = class WorkflowDiagramConfiguration {
         return [
             createDefaultShapeTypeHint(model_types_1.ModelTypes.MANUAL_TASK),
             createDefaultShapeTypeHint(model_types_1.ModelTypes.AUTOMATED_TASK),
-            createDefaultShapeTypeHint(model_types_1.ModelTypes.FORK_NODE),
-            createDefaultShapeTypeHint(model_types_1.ModelTypes.JOIN_NODE),
+            createDefaultShapeTypeHint({ elementTypeId: model_types_1.ModelTypes.FORK_NODE, resizable: false }),
+            createDefaultShapeTypeHint({ elementTypeId: model_types_1.ModelTypes.JOIN_NODE, resizable: false }),
             createDefaultShapeTypeHint(model_types_1.ModelTypes.DECISION_NODE),
             createDefaultShapeTypeHint(model_types_1.ModelTypes.MERGE_NODE),
-            {
+            createDefaultShapeTypeHint({
                 elementTypeId: model_types_1.ModelTypes.CATEGORY,
-                repositionable: true,
-                deletable: true,
-                resizable: true,
-                reparentable: true,
                 containableElementTypeIds: [model_types_1.ModelTypes.TASK, model_types_1.ModelTypes.ACTIVITY_NODE, model_types_1.ModelTypes.CATEGORY]
-            }
+            })
         ];
     }
     get edgeTypeHints() {
         return [
             createDefaultEdgeTypeHint(protocol_1.DefaultTypes.EDGE),
-            {
-                elementTypeId: model_types_1.ModelTypes.WEIGHTED_EDGE,
-                repositionable: true,
-                deletable: true,
-                routable: true,
+            createDefaultEdgeTypeHint({
+                elementTypeId: protocol_1.DefaultTypes.EDGE,
                 dynamic: true,
                 sourceElementTypeIds: [model_types_1.ModelTypes.ACTIVITY_NODE],
                 targetElementTypeIds: [model_types_1.ModelTypes.TASK, model_types_1.ModelTypes.ACTIVITY_NODE]
-            }
+            })
         ];
     }
 };
@@ -1978,17 +1971,14 @@ exports.WorkflowDiagramConfiguration = WorkflowDiagramConfiguration;
 exports.WorkflowDiagramConfiguration = WorkflowDiagramConfiguration = __decorate([
     (0, inversify_1.injectable)()
 ], WorkflowDiagramConfiguration);
-function createDefaultShapeTypeHint(elementId) {
-    return { elementTypeId: elementId, repositionable: true, deletable: true, resizable: true, reparentable: true };
+function createDefaultShapeTypeHint(elementIdOrTemplate) {
+    const template = typeof elementIdOrTemplate === 'string' ? { elementTypeId: elementIdOrTemplate } : elementIdOrTemplate;
+    return Object.assign({ repositionable: true, deletable: true, resizable: true, reparentable: true }, template);
 }
 exports.createDefaultShapeTypeHint = createDefaultShapeTypeHint;
-function createDefaultEdgeTypeHint(elementId) {
-    return {
-        elementTypeId: elementId,
-        repositionable: true,
-        deletable: true,
-        routable: true,
-        sourceElementTypeIds: [
+function createDefaultEdgeTypeHint(elementIdOrTemplate) {
+    const template = typeof elementIdOrTemplate === 'string' ? { elementTypeId: elementIdOrTemplate } : elementIdOrTemplate;
+    return Object.assign({ repositionable: true, deletable: true, routable: true, sourceElementTypeIds: [
             model_types_1.ModelTypes.MANUAL_TASK,
             model_types_1.ModelTypes.AUTOMATED_TASK,
             model_types_1.ModelTypes.DECISION_NODE,
@@ -1996,8 +1986,7 @@ function createDefaultEdgeTypeHint(elementId) {
             model_types_1.ModelTypes.FORK_NODE,
             model_types_1.ModelTypes.JOIN_NODE,
             model_types_1.ModelTypes.CATEGORY
-        ],
-        targetElementTypeIds: [
+        ], targetElementTypeIds: [
             model_types_1.ModelTypes.MANUAL_TASK,
             model_types_1.ModelTypes.AUTOMATED_TASK,
             model_types_1.ModelTypes.DECISION_NODE,
@@ -2005,8 +1994,7 @@ function createDefaultEdgeTypeHint(elementId) {
             model_types_1.ModelTypes.FORK_NODE,
             model_types_1.ModelTypes.JOIN_NODE,
             model_types_1.ModelTypes.CATEGORY
-        ]
-    };
+        ] }, template);
 }
 exports.createDefaultEdgeTypeHint = createDefaultEdgeTypeHint;
 
@@ -2172,7 +2160,7 @@ const graph_extension_1 = __webpack_require__(/*! ./graph-extension */ "./lib/co
 const model_types_1 = __webpack_require__(/*! ./util/model-types */ "./lib/common/util/model-types.js");
 let WorkflowEdgeCreationChecker = class WorkflowEdgeCreationChecker {
     isValidSource(edgeType, sourceElement) {
-        return edgeType !== model_types_1.ModelTypes.WEIGHTED_EDGE || sourceElement.type === model_types_1.ModelTypes.DECISION_NODE;
+        return edgeType !== model_types_1.ModelTypes.WEIGHTED_EDGE && sourceElement.type === model_types_1.ModelTypes.DECISION_NODE;
     }
     isValidTarget(edgeType, sourceElement, targetElement) {
         return (targetElement instanceof graph_extension_1.TaskNode || targetElement.type === model_types_1.ModelTypes.FORK_NODE || targetElement.type === model_types_1.ModelTypes.JOIN_NODE);