camunda-bpmn-js 0.13.0-alpha.8 → 0.13.1

package/lib/camunda-cloud/NavigatedViewer.js

@@ -0,0 +1,34 @@
+import inherits from 'inherits';
+
+import BaseViewer from '../base/NavigatedViewer';
+
+import { commonModdleExtensions, commonModules } from './util/commonModules';
+
+
+/**
+ *
+ * @param {Object} options
+ */
+export default function NavigatedViewer(options = {}) {
+
+  options = {
+    ...options,
+    moddleExtensions: {
+      ...commonModdleExtensions,
+      ...options.moddleExtensions
+    }
+  };
+
+  BaseViewer.call(this, options);
+}
+
+inherits(NavigatedViewer, BaseViewer);
+
+NavigatedViewer.prototype._camundaCloudModules = [
+  ...commonModules
+];
+
+NavigatedViewer.prototype._modules = [].concat(
+  BaseViewer.prototype._modules,
+  NavigatedViewer.prototype._camundaCloudModules
+);

package/lib/camunda-cloud/Viewer.js

@@ -0,0 +1,34 @@
+import inherits from 'inherits';
+
+import BaseViewer from '../base/Viewer';
+
+import { commonModdleExtensions, commonModules } from './util/commonModules';
+
+
+/**
+ *
+ * @param {Object} options
+ */
+export default function Viewer(options = {}) {
+
+  options = {
+    ...options,
+    moddleExtensions: {
+      ...commonModdleExtensions,
+      ...options.moddleExtensions
+    }
+  };
+
+  BaseViewer.call(this, options);
+}
+
+inherits(Viewer, BaseViewer);
+
+Viewer.prototype._camundaCloudModules = [
+  ...commonModules
+];
+
+Viewer.prototype._modules = [].concat(
+  BaseViewer.prototype._modules,
+  Viewer.prototype._camundaCloudModules
+);

package/lib/camunda-cloud/util/commonModules.js

@@ -0,0 +1,14 @@
+import iconRendererModule from '@bpmn-io/element-templates-icons-renderer';
+
+import drilldownModule from '../features/drilldown';
+
+import zeebeModdle from 'zeebe-bpmn-moddle/resources/zeebe.json';
+
+export const commonModules = [
+  drilldownModule,
+  iconRendererModule
+];
+
+export const commonModdleExtensions = {
+  zeebe: zeebeModdle
+};

package/lib/camunda-platform/Modeler.js

@@ -2,9 +2,7 @@ import inherits from 'inherits';
 
 import BaseModeler from '../base/Modeler';
 
-import modelingModule from './features/modeling';
-
-import camundaModdle from 'camunda-bpmn-moddle/resources/camunda.json';
+import behaviorsModule from 'camunda-bpmn-js-behaviors/lib/camunda-platform';
 
 import camundaModdleExtension from 'camunda-bpmn-moddle/lib';
 
@@ -13,6 +11,8 @@ import {
   ElementTemplatesPropertiesProviderModule
 } from 'bpmn-js-properties-panel';
 
+import { commonModdleExtensions } from './util/commonModules';
+
 
 /**
  *
@@ -23,7 +23,7 @@ export default function Modeler(options = {}) {
   options = {
     ...options,
     moddleExtensions: {
-      camunda: camundaModdle,
+      ...commonModdleExtensions,
       ...options.moddleExtensions
     }
   };
@@ -35,7 +35,7 @@ inherits(Modeler, BaseModeler);
 
 Modeler.prototype._camundaPlatformModules = [
   camundaModdleExtension,
-  modelingModule,
+  behaviorsModule,
   CamundaPlatformPropertiesProviderModule,
   ElementTemplatesPropertiesProviderModule
 ];

package/lib/camunda-platform/NavigatedViewer.js

@@ -0,0 +1,25 @@
+import inherits from 'inherits';
+
+import BaseViewer from '../base/NavigatedViewer';
+
+import { commonModdleExtensions } from './util/commonModules';
+
+
+/**
+ *
+ * @param {Object} options
+ */
+export default function NavigatedViewer(options = {}) {
+
+  options = {
+    ...options,
+    moddleExtensions: {
+      ...commonModdleExtensions,
+      ...options.moddleExtensions
+    }
+  };
+
+  BaseViewer.call(this, options);
+}
+
+inherits(NavigatedViewer, BaseViewer);

package/lib/camunda-platform/Viewer.js

@@ -0,0 +1,24 @@
+import inherits from 'inherits';
+
+import BaseViewer from '../base/Viewer';
+
+import { commonModdleExtensions } from './util/commonModules';
+
+/**
+ *
+ * @param {Object} options
+ */
+export default function Viewer(options = {}) {
+
+  options = {
+    ...options,
+    moddleExtensions: {
+      ...commonModdleExtensions,
+      ...options.moddleExtensions
+    }
+  };
+
+  BaseViewer.call(this, options);
+}
+
+inherits(Viewer, BaseViewer);

package/lib/camunda-platform/util/commonModules.js

@@ -0,0 +1,7 @@
+import camundaModdle from 'camunda-bpmn-moddle/resources/camunda.json';
+
+export const commonModules = [];
+
+export const commonModdleExtensions = {
+  camunda: camundaModdle
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camunda-bpmn-js",
-  "version": "0.13.0-alpha.8",
+  "version": "0.13.1",
   "description": "Embeddable Camunda modeling distributions based on bpmn-js",
   "main": "lib/index.js",
   "scripts": {
@@ -14,6 +14,10 @@
     "start:base": "cross-env SINGLE_START=base-modeler npm run dev",
     "start:platform": "cross-env SINGLE_START=camunda-platform-modeler npm run dev",
     "start:cloud": "cross-env SINGLE_START=camunda-cloud-modeler npm run dev",
+    "start:platform-viewer": "cross-env SINGLE_START=camunda-platform-viewer npm run dev",
+    "start:cloud-viewer": "cross-env SINGLE_START=camunda-cloud-viewer npm run dev",
+    "start:platform-navigated-viewer": "cross-env SINGLE_START=camunda-platform-navigated-viewer npm run dev",
+    "start:cloud-navigated-viewer": "cross-env SINGLE_START=camunda-cloud-navigated-viewer npm run dev",
     "prepublishOnly": "run-s test:distro",
     "prepare": "run-s clean distro"
   },
@@ -44,8 +48,9 @@
     "@bpmn-io/align-to-origin": "^0.7.0",
     "@bpmn-io/element-templates-icons-renderer": "^0.1.2",
     "bpmn-js": "^9.0.3",
-    "bpmn-js-disable-collapsed-subprocess": "^0.1.3",
+    "bpmn-js-disable-collapsed-subprocess": "^0.1.4",
     "bpmn-js-executable-fix": "^0.1.3",
+    "camunda-bpmn-js-behaviors": "^0.1.0",
     "camunda-bpmn-moddle": "^6.1.2",
     "diagram-js": "^8.2.1",
     "diagram-js-minimap": "^2.1.0",
@@ -59,7 +64,7 @@
     "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^11.1.1",
-    "bpmn-js-properties-panel": "^1.0.0-alpha.12",
+    "bpmn-js-properties-panel": "^1.1.0",
     "chai": "^4.2.0",
     "cross-env": "^7.0.3",
     "del-cli": "^4.0.1",
@@ -93,6 +98,6 @@
   },
   "peerDependencies": {
     "@bpmn-io/properties-panel": "0.13.x",
-    "bpmn-js-properties-panel": "1.0.0-alpha.10"
+    "bpmn-js-properties-panel": "1.x"
   }
 }

package/styles/base-navigated-viewer.css

@@ -0,0 +1,2 @@
+@import './diagram-js.css';
+@import './bpmn-js.css';

package/styles/base-viewer.css

@@ -0,0 +1,2 @@
+@import './diagram-js.css';
+@import './bpmn-js.css';

package/styles/camunda-cloud-navigated-viewer.css

@@ -0,0 +1 @@
+@import './base-navigated-viewer.css';

package/styles/camunda-cloud-viewer.css

@@ -0,0 +1 @@
+@import './base-viewer.css';

package/styles/camunda-platform-navigated-viewer.css

@@ -0,0 +1 @@
+@import './base-navigated-viewer.css';

package/styles/camunda-platform-viewer.css

@@ -0,0 +1 @@
+@import './base-viewer.css';

package/util/index.js

@@ -0,0 +1,39 @@
+/**
+ * Generates all possible combinations of the items in the given arrays.
+ *
+ * @param {...Array} - arrays with options to combine
+ * @returns {Array<Array>} array with all posible combinations of items
+ */
+function getAllCombinations() {
+  const [ first, ...rest ] = arguments;
+
+  if (!first) {
+    return;
+  }
+
+  const combinations = getAllCombinations(...rest);
+
+  return first.reduce((acc, cur) => {
+
+    const newCombination = combinations ? combinations.map(combination => [ cur, ...combination ]) : [ [ cur ] ];
+
+    return acc.concat(
+      newCombination
+    );
+  }, []);
+}
+
+function capitalize(string) {
+  return string.charAt(0).toUpperCase() + string.slice(1);
+}
+
+function toKebabCase(string) {
+  return string.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+}
+
+
+module.exports = {
+  getAllCombinations,
+  capitalize,
+  toKebabCase
+};

package/lib/camunda-cloud/features/modeling/behavior/CleanUpBusinessRuleTaskBehavior.js

@@ -1,115 +0,0 @@
-import {
-  getBusinessObject,
-  is
-} from 'bpmn-js/lib/util/ModelUtil';
-
-import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
-
-import { without } from 'min-dash';
-
-import { getExtensionElementsList } from '../../../../util/ExtensionElementsUtil';
-
-const HIGH_PRIORITY = 5000;
-
-
-/**
- * Zeebe BPMN behavior ensuring that bpmn:BusinessRuleTask only has one of the following:
- *
- * (1) zeebe:CalledDecision
- * (2) zeebe:TaskDefinition and zeebe:TaskHeaders
- */
-export default class CleanUpBusinessRuleTaskBehavior extends CommandInterceptor {
-  constructor(commandStack, eventBus) {
-    super(eventBus);
-
-    /**
-     * Remove zeebe:CalledDecision if zeebe:TaskDefinition is about to be added.
-     */
-    this.preExecute('element.updateModdleProperties' , HIGH_PRIORITY, function(context) {
-      const {
-        element,
-        moddleElement,
-        properties
-      } = context;
-
-      if (
-        !is(element, 'bpmn:BusinessRuleTask')
-        || !is(moddleElement, 'bpmn:ExtensionElements')
-        || !properties.values
-      ) {
-        return;
-      }
-
-      const calledDecision = getCalledDecision(element),
-            taskDefinition = getTaskDefinition(element);
-
-      if (
-        calledDecision
-        && !taskDefinition
-        && properties.values.find(value => is(value, 'zeebe:CalledDecision'))
-        && properties.values.find(value => is(value, 'zeebe:TaskDefinition'))
-      ) {
-        properties.values = without(properties.values, calledDecision);
-      }
-    }, true);
-
-    /**
-     * Remove zeebe:TaskDefinition and zeebe:TaskHeaders if zeebe:CalledDecision is about to be added.
-     */
-    this.preExecute('element.updateModdleProperties', HIGH_PRIORITY, function(context) {
-      const {
-        element,
-        moddleElement,
-        properties
-      } = context;
-
-      if (
-        !is(element, 'bpmn:BusinessRuleTask')
-        || !is(moddleElement, 'bpmn:ExtensionElements')
-        || !properties.values
-      ) {
-        return;
-      }
-
-      const calledDecision = getCalledDecision(element),
-            taskDefinition = getTaskDefinition(element),
-            taskHeaders = getTaskHeaders(element);
-
-      if (
-        !calledDecision
-        && (taskDefinition || taskHeaders)
-        && properties.values.find(value => is(value, 'zeebe:CalledDecision'))
-        && properties.values.find(value => is(value, 'zeebe:TaskDefinition') || is(value, 'zeebe:TaskHeaders'))
-      ) {
-        properties.values = without(properties.values, (value) => value === taskDefinition || value === taskHeaders);
-      }
-    }, true);
-
-  }
-}
-
-CleanUpBusinessRuleTaskBehavior.$inject = [
-  'commandStack',
-  'eventBus'
-];
-
-
-// helpers //////////
-
-function getCalledDecision(element) {
-  const businessObject = getBusinessObject(element);
-
-  return getExtensionElementsList(businessObject, 'zeebe:CalledDecision')[ 0 ];
-}
-
-function getTaskDefinition(element) {
-  const businessObject = getBusinessObject(element);
-
-  return getExtensionElementsList(businessObject, 'zeebe:TaskDefinition')[ 0 ];
-}
-
-function getTaskHeaders(element) {
-  const businessObject = getBusinessObject(element);
-
-  return getExtensionElementsList(businessObject, 'zeebe:TaskHeaders')[ 0 ];
-}

package/lib/camunda-cloud/features/modeling/behavior/CreateZeebeBoundaryEventBehavior.js

@@ -1,76 +0,0 @@
-import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
-
-import {
-  getBusinessObject,
-  is
-} from 'bpmn-js/lib/util/ModelUtil';
-
-const HIGH_PRIORITY = 5000;
-
-
-/**
- * Zeebe BPMN specific behavior for creating boundary events.
- */
-export default class CreateZeebeBoundaryEventBehavior extends CommandInterceptor {
-  constructor(bpmnFactory, elementFactory, eventBus) {
-    super(eventBus);
-
-    /**
-     * Replace intermediate catch event with boundary event when attaching it to a shape.
-     */
-    this.preExecute('shape.create', HIGH_PRIORITY, function(context) {
-      const {
-        shape,
-        host
-      } = context;
-
-      const businessObject = getBusinessObject(shape);
-
-      let attrs = {
-        cancelActivity: true
-      };
-
-      let newBusinessObject,
-          hostBusinessObject,
-          boundaryEvent,
-          eventDefinitions;
-
-      if (!host || !is(shape, 'bpmn:IntermediateCatchEvent')) {
-        return;
-      }
-
-      hostBusinessObject = getBusinessObject(host);
-
-      attrs = {
-        ...attrs,
-        attachedToRef: hostBusinessObject
-      };
-
-      eventDefinitions = businessObject.eventDefinitions;
-
-      newBusinessObject = bpmnFactory.create('bpmn:BoundaryEvent', attrs);
-
-      boundaryEvent = {
-        type: 'bpmn:BoundaryEvent',
-        businessObject: newBusinessObject,
-      };
-
-      if (eventDefinitions && eventDefinitions[0]) {
-        boundaryEvent = {
-          ...boundaryEvent,
-          eventDefinitionType: eventDefinitions[0].$type
-        };
-      }
-
-      context.shape = elementFactory.createShape(boundaryEvent);
-
-    }, true);
-
-  }
-}
-
-CreateZeebeBoundaryEventBehavior.$inject = [
-  'bpmnFactory',
-  'elementFactory',
-  'eventBus'
-];

package/lib/camunda-cloud/features/modeling/behavior/CreateZeebeCallActivityBehavior.js

@@ -1,86 +0,0 @@
-import { has } from 'min-dash';
-
-import { createElement } from '../../../helper/ElementHelper';
-
-import { getCalledElement } from '../../../helper/CalledElementHelper';
-
-import {
-  getBusinessObject,
-  is
-} from 'bpmn-js/lib/util/ModelUtil';
-
-import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
-
-const HIGH_PRIORITY = 5000;
-
-
-/**
- * Zeebe BPMN specific behavior for creating call activities.
- */
-export default class CreateZeebeCallActivityBehavior extends CommandInterceptor {
-  constructor(bpmnFactory, eventBus, modeling) {
-    super(eventBus);
-
-    /**
-     * Add zeebe:CalledElement extension element with zeebe:propagateAllChildVariables attribute = false
-     * when creating bpmn:CallActivity.
-     */
-    this.postExecuted('shape.create', HIGH_PRIORITY, function(context) {
-      const { shape } = context;
-
-      if (!is(shape, 'bpmn:CallActivity')) {
-        return;
-      }
-
-      const businessObject = getBusinessObject(shape);
-
-      let calledElement = getCalledElement(businessObject);
-
-      if (!calledElement) {
-        let extensionElements = businessObject.get('extensionElements');
-
-        if (!extensionElements) {
-          extensionElements = createElement(
-            'bpmn:ExtensionElements',
-            {
-              values: []
-            },
-            businessObject,
-            bpmnFactory
-          );
-
-          modeling.updateProperties(shape, { extensionElements });
-        }
-
-        calledElement = createElement(
-          'zeebe:CalledElement',
-          {
-            propagateAllChildVariables: false
-          },
-          extensionElements,
-          bpmnFactory
-        );
-
-        modeling.updateModdleProperties(shape, extensionElements, {
-          values: [
-            ...(extensionElements.values || []),
-            calledElement
-          ]
-        });
-      } else if (!has(calledElement, 'propagateAllChildVariables')) {
-
-        // set zeebe:propagateAllChildVariables to false if zeebe:CalledElement exists
-        modeling.updateModdleProperties(shape, calledElement, {
-          propagateAllChildVariables: false
-        });
-      }
-    }, true);
-
-  }
-}
-
-CreateZeebeCallActivityBehavior.$inject = [
-  'bpmnFactory',
-  'eventBus',
-  'modeling'
-];