Commit Graph

475 Commits

Author SHA1 Message Date
Nico Rehwaldt bc1afe16d6 fix(draw): remove override priority 2015-10-05 15:03:00 +02:00
Ricardo Matias baab4c6039 feat(replace): add titles to activity markers
Closes #372
2015-09-30 11:49:46 +02:00
Ricardo Matias fe7e8fe6d1 feat(replace): add conditional flows
Closes #369
2015-09-30 11:35:44 +02:00
Ricardo Matias 5a60c370a7 feat(replace): add default flows
Closes #272
2015-09-30 11:35:44 +02:00
Ricardo Matias 8a0f566ee3 feat(replace): add cancel events
Closes #337
2015-09-28 11:35:38 +02:00
pedesen 02af025a2e fix(auto-resize): allow concurrent top/bottom or left/right expanding 2015-09-25 11:44:07 +02:00
pedesen dc78909227 chore(auto-resize): change behavior on multi-selection move
Related to #354
2015-09-25 11:44:07 +02:00
pedesen 52cd71287d fix(replace-preview): change type of visualReplacements from array to object
Closes #368
2015-09-24 16:50:34 +02:00
pedesen 629239f93c feat(auto-resize): recursively expand parent elements
Closes #357
2015-09-21 15:17:29 +02:00
pedesen f29793ed9e feat(auto-resize): add expanding of sub processes and transactions
Closes #356
2015-09-21 14:23:08 +02:00
Nico Rehwaldt 4891eb4f84 fix(draw): show labels with text
Closes #362
2015-09-14 16:20:49 +02:00
pedesen 63d0321210 chore(ordering): modify sub process ordering
Closes #358
2015-09-11 14:43:09 +02:00
Ricardo Matias 1295400fe0 test(custom-elements): add integration tests for custom elements
Closes #352
2015-09-09 16:44:10 +02:00
pedesen 857454bbc1 feat(auto-resize): expand participants when moving multiple elements
Closes #353
2015-09-08 12:40:24 +02:00
pedesen 536eb790a0 fix(snapping): boundary event labels snap to siblings
Closes #327
2015-09-07 15:08:59 +02:00
Ricardo Matias 31f0ea1ec0 feat(modeling): add support for custom elements
This commit adds part of the infrastructure that allows
the coexistence between bpmn elements and custom ones.

Closes #348
2015-09-03 09:57:30 +02:00
Nico Rehwaldt e897c6746d chore(palette): restore lanes 2015-09-02 16:23:47 +02:00
Nico Rehwaldt 7ba323b0a1 chore(palette): temporarily remove lanes
Do not confuse people with the unfinished lane support.
Lanes shall be restored once we have layouting + visual feedback in
place.
2015-09-02 16:03:12 +02:00
pedesen 0b8f0465f0 chore(auto-resize): adjust vertical resizing behavior
The parent participant/lane now expands vertically only if the edge of
an element intersects the collaboration edge, or if the element is
is placed beyond the edge.

Closes #347
2015-09-02 11:50:54 +02:00
pedesen ccf21e2f0c fix(replace-preview): rename canExecute.replace -> canExecute.replacements
Closes #346
2015-09-01 18:04:12 +02:00
Nico Rehwaldt 6bed01e023 fix(auto-resize): do not include labels for resize calculation 2015-09-01 16:20:57 +02:00
Nico Rehwaldt ede384b5ac fix(auto-resize): do not resize on lane create / resize lanes, too
Related to #263
2015-08-31 15:35:32 +02:00
Nico Rehwaldt afa72ad5bd fix(modeling): correctly update Lane#flowNodeRefs
Previously, the bpmn:FlowNode <-> bpmn:Lane relationship was not
properly maintained in the BpmnUpdater.

This commit fixes the behavior.

Closes #341
2015-08-31 15:00:27 +02:00
pedesen 39db57987d feat(auto-resize): add ability to automatically expand parent participants
Closes #263
2015-08-31 12:08:21 +02:00
Nico Rehwaldt f8d6658c10 fix(import): import elements with missing #flowNodeRef
We now properly import lane children with missing #flowNodeRef.

Closes #340
2015-08-25 15:49:00 +02:00
Ricardo Matias 34bd632544 fix(modeling): add caveat for message flows layouting
related to bpmn-io/diagram-js#110
2015-08-25 11:04:51 +02:00
Nico Rehwaldt 834f1844ec feat(snapping): snap participant to child lane border 2015-08-24 16:59:13 +02:00
Nico Rehwaldt d9788c7f31 feat(ordering): add sequence flow + association to correct parent
* remove ModelUtil#getSharedParent because we do proper ordering
  via BpmnOrderingProvider now.
* Cherio!

Related to #316
2015-08-21 17:34:41 +02:00
Nico Rehwaldt e66f2d92aa fix(rules): adjust participant size + fix test case 2015-08-21 17:34:41 +02:00
Nico Rehwaldt 711a2df758 feat(modeling): wrap existing elements in new lane
Related to #316
2015-08-21 17:34:41 +02:00
Nico Rehwaldt 42b66b1602 chore(project): move {modeling->}/rules
This syncs the bpmn-js structure with diagram-js.
2015-08-21 17:34:41 +02:00
Nico Rehwaldt 4e33f524c7 feat(modeling): add lane default width
Related to #316
2015-08-21 17:34:41 +02:00
Nico Rehwaldt e9a7bfa986 fix(modeling): make sure lanes get ids assigned 2015-08-21 17:34:41 +02:00
Nico Rehwaldt 4afefcb838 feat(rules): add lane rules
* add create / move rules
* add resize rules

Related to #316
2015-08-21 17:34:41 +02:00
Nico Rehwaldt fe63cb87a4 feat(palette): integrate lane symbol 2015-08-21 17:34:41 +02:00
Nico Rehwaldt d520574d1a feat(modeling): wire lanes in BPMN 2.0 xml
Related to #316
2015-08-21 17:34:41 +02:00
pedesen 1cdce93f5b fix(selection): select element replacements after move
Closes #335
2015-08-21 13:46:21 +02:00
Nico Rehwaldt 966e3aaa34 feat(modeling): define BPMN specific ordering
Closes #336
2015-08-20 14:49:53 +02:00
Nico Rehwaldt fbf82e83e5 chore(modeling/behavior): order behaviors 2015-08-19 17:24:49 +02:00
Nico Rehwaldt 5c629a9889 chore(modeling/behavior): rename Remove{->Participant}Behavior 2015-08-19 17:24:49 +02:00
Nico Rehwaldt 046f962244 fix(modeling/behavior): only replace existing connections 2015-08-19 17:24:49 +02:00
Nico Rehwaldt e237937726 chore(modeling): update BpmnUpdater to hook into element.updateAttachment
BREAKING CHANGE:

* The id of the update attachment command changed from 'shape.attach' to
'element.updateAttachment'
2015-08-19 14:34:07 +02:00
pedesen 4196ae8b00 feat(replace-preview): Add visual feedback during shape movement
Closes #325
2015-08-19 10:52:15 +02:00
pedesen e1876fa3e8 chore(modeling): add non-interrupting start events to ElementFactory 2015-08-18 11:02:43 +02:00
Nico Rehwaldt 3cb1721c89 chore(modeling): rename Modeling#move{Shapes->Elements}
Related to bpmn-io/diagram-js#107

BREAKING CHANGE:

* Modeling#moveShapes got renamed to Modeling#moveElements
* Id of command changed from 'shapes.move' to 'elements.move'
2015-08-13 10:51:52 +02:00
pedesen 5b0029a8fd feat(modeling): define behavior for non-interrupting start events
Related to #302
2015-08-12 09:48:28 +02:00
pedesen 4af603e5be feat(modeling): add expanded event sub processes
Closes #302
2015-08-12 09:47:42 +02:00
Nico Rehwaldt d5dc43ef32 fix(util): ensure ModelUtil#is never fails 2015-08-10 15:44:30 +02:00
Nico Rehwaldt ece7b7d597 feat(snapping): snap boundary events
This adds immediate feedback when creating and moving boundary events.

* During move, boundary events are snapped, if attachment is allowed
* Boundary events snap to their siblings and not to elements inside
the host

Closes #320
2015-08-06 10:58:50 +02:00
pedesen 2c3c422e93 fix(popup-menu): the current event is hidden in the replace menu
Closes #322
2015-08-03 17:18:30 +02:00
pedesen d4bcf68654 chore(replace): fix action names in replace options 2015-08-03 17:18:09 +02:00
Nico Rehwaldt dac5bb397b fix(modeling/rules): correct boundary rules
* clean up boundary related rules
* split boundary tests into separate section
* add boundary message flow tests
* fix boundary message flow behavior

Closes #319
2015-07-30 17:11:19 +02:00
pedesen 02416de290 chore(bpmn-rules): add function to check for same parent 2015-07-30 10:36:07 +02:00
Nico Rehwaldt 8e4f480868 feat(modeling/layout): improve sequence flow layouting behind Gateways
Closes bpmn-io/bpmn-js#227
2015-07-30 10:36:06 +02:00
Nico Rehwaldt 359e0e01f4 chore(modeling): use postExecuted when checking connection rules 2015-07-29 17:56:14 +02:00
pedesen 42c052f7ec feat(replace): morph boundary events
Closes #293
2015-07-27 10:55:29 +02:00
pedesen 0651bf39a8 feat(keyboard): add select all key binding
Closes #184
2015-07-23 15:46:42 +02:00
Nico Rehwaldt 7eb6d7af46 fix(draw): remove inner boundary event fill 2015-07-22 17:23:31 +02:00
Ricardo Matias 75dc681d46 feat(modeling): add boundary events behavior
This commit adds support for modeling boundery events.

Users may pull out the boundary events from the palette.

Closes #292
2015-07-22 17:23:31 +02:00
pedesen d467222025 chore(popup-menu): rename menu entry for collapsed sub process 2015-07-21 17:10:12 +02:00
pedesen 363ce892c9 fix(modeling): sequence flow can be reconnected to participant
Closes #315
2015-07-20 16:48:44 +02:00
pedesen 8c6c920482 fix(modeling): message flow updating correctly after changing source
Closes #267
2015-07-20 16:48:44 +02:00
Ricardo Matias acb2184087 feat(import): attach boundary events
* establish host <> attachers relationship
* clean up import tests (use diagrams in fixtures/bpmn/import)

closes #310
2015-07-20 15:50:31 +02:00
pedesen 31ea6b2f91 feat(modeling): add ad-hoc sub processes
Closes #271
2015-07-14 15:26:43 +02:00
pedesen 367eeb80c7 feat(popup-menu): undo and redo toggling markers is reflected in the popup menu
Closes #308
2015-07-07 14:42:27 +02:00
Ricardo Matias 9a79330d5b fix(attaching): correct api changes from diagram-js 2015-07-03 16:00:41 +02:00
pedesen 88f91d342b feat(replace): model collapsed subprocesses using the replace menu
Closes #303
2015-07-03 15:54:36 +02:00
pedesen af991e89e9 feat(BpmnReplace): morphing between expanded sub processes and transactions
Closes #223
2015-06-26 15:36:33 +02:00
pedesen af5354e337 feat(popup-menu): add toggle buttons for loop and MI markers
Closes #275
2015-06-26 14:13:35 +02:00
pedesen 6da0d166e3 feat(popup-menu): allow morphing a task into a call activity
Closes #304
2015-06-23 17:24:13 +02:00
Nico Rehwaldt 71a5c2e1ed fix(modeling): correctly update extension attributes
Closes #301
2015-06-22 14:35:30 +02:00
Nico Rehwaldt ae962de925 fix(palette): add required modules
This adds space-tool and lasso-tool as required modules to the BPMN
palette. That in term ensures that users can simply reuse the palette
without further configuration.
2015-06-17 12:03:37 +02:00
pedesen 402e898e91 chore(bpmn-replace): use new popup menu api
related to #294
2015-06-11 15:21:21 +02:00
Nico Rehwaldt a04d03da44 chore(snapping): add tests + adjust min participant size
Related to #299
2015-06-10 15:58:52 +02:00
Nico Rehwaldt 749120c4e9 fix(modeling): allow only bpmn:FlowNode(s) to be dropped on flow
Closes #297
2015-06-09 11:04:05 +02:00
Nico Rehwaldt 19673a340c test(snapping): add participant snapping test case
Related to #290
2015-06-03 17:48:40 +02:00
Ricardo Matias cced954f37 fix(snapping): add participant specific min resize bounds
closes #290
2015-06-03 17:47:58 +02:00
Nico Rehwaldt 084d831d9e feat(modeling): add generic create-on-flow
Closes #232
2015-06-02 14:22:58 +02:00
pedesen 58f5965335 feat(modeling): drop new intermediateThrowEvents on sequenceFlows
Related to #232
2015-05-28 17:47:50 +02:00
Nico Rehwaldt 247594dbbf fix(keyboard): use correct lasso key 2015-05-26 14:06:16 +02:00
Mohsen Hariri 206457e764 fix(context-pad): fix context pad positioning in special case
context pad was misplaced when the canvas is placed with a left offset within the parent
2015-05-15 11:11:19 +02:00
Nico Rehwaldt 22536aff50 fix(modeling): rename (multi-select -> lasso)-tool
Key binding (for activation): l
2015-05-13 12:09:08 +02:00
Nico Rehwaldt d3aa1a7667 fix(modeling/rules): allow moving message flows
Closes #276
2015-05-12 18:04:42 +02:00
Nico Rehwaldt 53a701da93 fix(context-pad): use correct icon 2015-05-12 15:25:35 +02:00
Nico Rehwaldt bd2a4dd16b fix(rules): connect message flow to message/untyped events only
Closes #261
2015-05-12 14:35:21 +02:00
Nico Rehwaldt a70778880f chore(palette+context-pad): update tooltips
Related to #259
2015-05-11 17:36:01 +02:00
Nico Rehwaldt 7b712d8428 feat(modeling): add feedback on invalid modeling action
This commit adds the ModelingFeedback component. It hooks into
modeling action rejected events and displays error messages
to the user.

The current behavior is to show an error message when dropping
a flow node outside a participant in a collaboration.

Related to #203
2015-05-11 17:01:48 +02:00
Nico Rehwaldt 07c35ce9a9 chore(draw): adjust message flow start 2015-05-06 22:28:28 +02:00
Nico Rehwaldt bacd2b4322 feat(keyboard): add direct editing -> e binding
Related to #243
2015-05-06 18:09:13 +02:00
Nico Rehwaldt d54ee97aa1 feat(keyboard): add tooling specific key bindings
* space tool -> [s]
* multi select -> [m]

related to bpmn-io/bpmn-js#244
2015-05-06 17:36:46 +02:00
Nico Rehwaldt 2ef5342571 chore(draw): slightly adjust message flow thickness 2015-05-06 16:52:33 +02:00
Nico Rehwaldt f0f475dad5 feat(palette): integrate multi selection + space tool
related to #244
2015-05-06 16:52:33 +02:00
Nico Rehwaldt 4f236382a0 fix(modeling): adjust default size for participants
From 600x300 -> 600x250.

Closes #262
2015-05-06 16:51:01 +02:00
Nico Rehwaldt e912e1f89c fix(draw): give participants a white background 2015-05-06 15:54:43 +02:00
Nico Rehwaldt c294e0fadf fix(draw): no expand markers for CallActivities 2015-05-05 12:01:53 +02:00
Ricardo Matias 6fc512b477 feat(resize): snap to minimum bounds during resize
closes #252
2015-05-04 15:32:36 +02:00
Ricardo Matias 6f8999b8ae fix(modeling/BpmnUpdater): restore children di when changing diagram type
closes #253
2015-05-04 15:08:32 +02:00
Nico Rehwaldt 6b23d181d5 docs(Modeler): document extensibility
Related to #258
2015-05-04 14:58:27 +02:00
Nico Rehwaldt 800f0a3a5a docs(Viewer): document extensibility
Related to #258
2015-05-04 14:58:03 +02:00
Nico Rehwaldt 7a54267536 fix(replace): remove unused modeling dependency
The modeling module should be provided by components explicitly.

This allows users to replace it for customization.
2015-04-30 11:40:05 +02:00
Nico Rehwaldt cb52a479e0 fix(palette): add missing create feature 2015-04-30 11:33:27 +02:00
Nico Rehwaldt af9ce652e2 feat(snapping): snap to source element
This ensures we snap to a source element if one is provided, i.e. during
shape.append.
2015-04-29 15:04:54 +02:00
Nico Rehwaldt b233ab957c feat(snapping): add bpmn-specific move snapping
This commit adds message flow + collaboration specific snapping by
subclassing the diagram-js provided default Snapping implementation.

* Add collaboration snapping
* Rename lib/util/{Name}.js -> lib/util/{Name}Util.js

Closes #255
2015-04-29 15:04:54 +02:00
Nico Rehwaldt d8ef4772cd chore(modeling): make append behavior a CommandInterceptor
Append behavior inherits from CommandInterceptor now.

Connection type inference related code is reused from Modeling#connect.
2015-04-28 14:13:54 +02:00
Nico Rehwaldt 183a41cf26 fix(modeling): convert to process when deleting last participant only
Related to #128
2015-04-28 14:13:54 +02:00
Nico Rehwaldt 6eceb0926b feat(layout): add straight layouting for message flows
This commit adds a straight layouting strategy for message flows.
Other than that it makes sure connection attachments are being
remembered during reconnection / shape move.

Closes #249
Closes #179
2015-04-22 16:19:26 +02:00
Nico Rehwaldt 087506cc9a feat(modeling): transform message <> sequence flows
Closes #199
2015-04-22 16:12:58 +02:00
Nico Rehwaldt c14a87e5ad feat(modeling): add message flow modeling
Related to #199
Closes #201
2015-04-22 16:12:58 +02:00
Ricardo Matias 6011de1c4a fix(resize): correctly compute cropping box after resize
closes #236
2015-04-22 09:20:07 +02:00
Nico Rehwaldt de648520d5 feat(modeling): snap initial participant to diagram contents
Closes #241
2015-04-16 18:30:04 +02:00
Ricardo Matias 0381811d03 feat(space-tool): add create/remove space behaviour
closes #132
2015-04-16 10:00:18 +02:00
Nico Rehwaldt 0a03e59866 feat(modeling): add participant modeling behavior
This commit adds the ability to model participants from the palette.

* Empty diagrams can be used as a start for participant _AND_ process diagram
* Process diagrams can be converted to collaboration diagrams by dropping
  a participant onto them

Closes #128
2015-04-14 15:23:16 +02:00
Nico Rehwaldt 2e73f5ab85 fix(modeling): update id property in diagram-js, too
This fixes a bug where updating the id property of an element
was not propagated to the diagram. Thus, retrieving the element
based on the new id from diagram-js did not work.

Closes #238
2015-04-13 10:55:17 +02:00
jdotzki 8cd3c78d5e fix(rule): allow drop of associations
close #202
2015-03-25 13:45:54 +01:00
Nico Rehwaldt e7bbb5d6bf chore(project): use inherits util 2015-03-23 15:15:32 +01:00
Nico Rehwaldt 695a973e92 chore(modeling): renamve behaviors for clarity 2015-03-23 15:14:54 +01:00
Nico Rehwaldt e06fb32ad2 fix(style): remove trailing comma 2015-03-13 10:39:22 +01:00
Nico Rehwaldt 397a4aeea5 fix(replace): keep associations during replace
Closes #226
2015-03-12 14:03:28 +01:00
Nico Rehwaldt ae8e6146d1 chore(project): fix whitespace character 2015-03-11 17:42:56 +01:00
Nico Rehwaldt 1c0ade9d51 feat(replace): focus element after replace
Related to #192
2015-03-11 16:31:42 +01:00
Nico Rehwaldt 67d81c346c fix(replace): pre-build BPMN elements
This simplifies the ways we work with replacements.

Instead of monkey-patching the original replace functionality we

* create the business object / target object
* pass it to replace

A simple way that works well with our existing infrastructure.

Other changes:

* fixes redo / undo issues.
* splits context-pad + replace

Closes #180
2015-03-11 16:19:09 +01:00
Nico Rehwaldt d1d42f3713 chore(project): upgrade to latest bpmn-font 2015-03-10 16:07:58 +01:00
jdotzki 2b8d8110fd fix(contextpad): prevent replace menu from opening multiple instances 2015-03-08 11:51:38 +01:00
jdotzki 2321caecd7 improve(contextpad): remove modeling options behind throwing link events
related #219
2015-03-07 12:59:22 +01:00
jdotzki 6aceab9dbf feature(contextpad): add catch events to pad for event based gateways
close #206
2015-03-06 09:27:18 +01:00
jdotzki e665895448 improve(font): update to latest font
#186
2015-03-05 18:04:57 +01:00
jdotzki 89a3a6bcd8 feature(modeling): set di.isMarkerVisible for exclusive gateway as default
close #221
2015-03-05 14:19:47 +01:00
jdotzki c5af54c1e3 feature(rules): add rule for link events
close #219
2015-03-05 13:57:32 +01:00
jdotzki 6f85d3081f improve(contextpad): use receive-task icon instead just receive
close #214
2015-03-04 15:50:06 +01:00
jdotzki 7676b9f244 fix(context pad): correct position of replace menu
close #210
2015-03-04 15:27:13 +01:00
jdotzki 88eb0cb442 fix(bpmnrenderer): correct rendering of intermediate link throw event
close #216
2015-03-04 13:29:46 +01:00
jdotzki 1c45d98f9a fix(contextpad): add missing events to replace menu
close #209
close #217
2015-03-04 12:28:18 +01:00
jdotzki 225cbb914c fix(rules): fix modeling rules for event based gateways
Allow  condition and signal catching events after event based gateways.

close #213
2015-03-04 10:20:37 +01:00
jdotzki f527096ac2 fix(contextpad): add signal event to end event replace menu
close #211 #218
2015-03-03 17:09:54 +01:00
jdotzki 5604e13468 fix(contextpad): remove incorrect replace targets
close #207
2015-03-03 15:58:59 +01:00
jdotzki 73c6c883c5 fix(replace): run model updates on 'execute'
close bpmn-io/bpmn-js#213
2015-03-03 15:52:40 +01:00
jdotzki 22c0065d5d fix(context pad): remove instantiating gateways from replace menu
close #212
2015-03-03 15:15:00 +01:00
jdotzki 7207d010db feat(contextpad): add event to replace-menu
See #192
2015-03-02 13:43:06 +01:00
jdotzki 66801df111 feature(rules): add modeling rules for event based gateways
closes #193
2015-03-02 13:43:06 +01:00
jdotzki 18c2b0552e feat(contextpad): add replace-menu to context pad
Support for Gateways and Task Types was added.

See #130
2015-03-02 13:43:06 +01:00
jdotzki 3873709141 feat(replace): add service that allows to replace elements
API
- BpmnReplace#replaceElement

see bpmn-io/bpmn-js#130
2015-03-02 13:43:06 +01:00
Nico Rehwaldt 4fa01649b5 fix(draw/BpmnRenderer): only display message flow marker if messageRef
Closes #205
2015-02-25 18:30:16 +01:00
Nico Rehwaldt 788b143f27 fix(Viewer): do not cache moddle
This may have unwanted side-effects, i.e. when using id
validation and caching.

We must ensure the meta-model element is actually instance stateless in
order to safely cache it.
2015-02-17 12:04:03 +01:00
Nico Rehwaldt 4854c96067 fix(import): correctly dispatch parse warnings
Fixes our bpmn-moddle integration to correctly dispatch parse warnings
from bpmn-moddle to the client.

Related to bpmn-io/moddle-xml#5

Closes #58
2015-02-17 11:00:00 +01:00
Nico Rehwaldt 8c61906469 feat(bpmn-js): allow custom model extensions to be passed
Related to bpmn-io/bpmn-moddle#15
2015-02-12 15:50:23 +01:00
Nico Rehwaldt 04437a8354 chore(project): remove jquery
Related to bpmn-io/bpmn-js#189
2015-02-06 15:26:41 +01:00
Nico Rehwaldt 9272547af2 fix(draw): consistently use custom snapsvg 2015-02-06 09:55:23 +01:00
Nico Rehwaldt 3996408404 chore(project): migrate to modularized lodash@3
* use specialized lodash utilities
* consistently apply 'use strict'

Related to #185
2015-02-02 14:46:21 +01:00
Nico Rehwaldt a899df2a12 chore(modeling/rules): reduce complexity
Related to #176
2015-01-29 14:03:17 +01:00
jdotzki d8057a2acc fix(rules): disallow circular connection
This temporarily disallows connections from and to the same element
because it rendered the connection unusable..

This change can be reverted once proper auto layout for circular connections is implemented.

Closes #176
2015-01-29 13:26:32 +01:00