-
Notifications
You must be signed in to change notification settings - Fork 25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature
: Event and Task Type Selection
#321
Conversation
# Conflicts: # src/main/i18n/de.json # src/main/i18n/en.json # src/main/packages/bpmn/bpmn-diagram-preview.ts # src/main/packages/bpmn/index.ts # src/main/packages/components.ts # src/main/packages/popups.ts # src/main/packages/uml-elements.ts # src/tests/unit/packages/bpmn/bpmn-annotation/bpmn-annotation-component-test.tsx # src/tests/unit/packages/bpmn/bpmn-call-activity/bpmn-call-activity-component-test.tsx # src/tests/unit/packages/bpmn/bpmn-conversation/bpmn-conversation-component-test.tsx # src/tests/unit/packages/bpmn/bpmn-end-event/bpmn-end-event-component-test.tsx # src/tests/unit/packages/bpmn/bpmn-flow/bpmn-flow-component-test.tsx # src/tests/unit/packages/bpmn/bpmn-gateway/bpmn-gateway-component-test.tsx # src/tests/unit/packages/bpmn/bpmn-intermediate-event/bpmn-intermediate-event-component-test.tsx # src/tests/unit/packages/bpmn/bpmn-start-event/bpmn-start-event-component-test.tsx # src/tests/unit/packages/bpmn/bpmn-subprocess/bpmn-subprocess-component-test.tsx # src/tests/unit/packages/bpmn/bpmn-task/bpmn-task-component-test.tsx # src/tests/unit/packages/bpmn/bpmn-transaction/bpmn-transaction-component-test.tsx
# Conflicts: # src/main/i18n/de.json # src/main/i18n/en.json # src/main/packages/bpmn/bpmn-diagram-preview.ts # src/main/packages/bpmn/index.ts # src/main/packages/components.ts # src/main/packages/uml-elements.ts
# Conflicts: # src/main/packages/bpmn/bpmn-end-event/bpmn-end-event.ts # src/main/packages/bpmn/bpmn-gateway/bpmn-gateway-component.tsx # src/main/packages/bpmn/bpmn-gateway/bpmn-gateway-update.tsx # src/main/packages/bpmn/bpmn-gateway/bpmn-gateway.ts # src/main/packages/bpmn/bpmn-pool/bpmn-pool-update.tsx # src/main/packages/bpmn/bpmn-start-event/bpmn-start-event.ts # src/main/packages/popups.ts
…tum/Apollon into feature/bpmn-2.0-adaptions
ok the functionality seems to work as intended, saving / loading state works, exporting works fine for the new elements and tests are passing. I would have a few small suggestions (some of these can also be added on a follow up PR I suppose):
|
@loreanvictor I increased the test coverage, thank you for the remark! The incorrect positioning of the update dialog seems to be a general issue not directly related to this PR. I will try to fix that one in another PR! :) |
This PR extends Apollon by the ability to select event types more specific than just start, intermediate and end events.
Start Event
Update dialog of the Start Event
![Screenshot 2023-11-19 at 17 47 02](https://private-user-images.githubusercontent.com/143808484/284076292-dbd8d138-c554-4d07-860f-2182ab6175bb.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5ODQ1NjUsIm5iZiI6MTczODk4NDI2NSwicGF0aCI6Ii8xNDM4MDg0ODQvMjg0MDc2MjkyLWRiZDhkMTM4LWM1NTQtNGQwNy04NjBmLTIxODJhYjYxNzViYi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjA4JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIwOFQwMzExMDVaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0xMTI4NDJlZWMxZTc2OTdmZTUxMDVmZGFlY2JjZWE4NzE5MWNhMDFiYzY2ZjUwNDg1YjVkZWI4MDY4MmQyYzc3JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.RO7vsJGw0fAzttZC7uH0Q-nbNytFK7agw4x4lxNpf5s)
All available Start Event types
![Screenshot 2023-11-19 at 17 47 57](https://private-user-images.githubusercontent.com/143808484/284076229-6d42624b-bfcd-4940-9f4f-a51d08abf513.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5ODQ1NjUsIm5iZiI6MTczODk4NDI2NSwicGF0aCI6Ii8xNDM4MDg0ODQvMjg0MDc2MjI5LTZkNDI2MjRiLWJmY2QtNDk0MC05ZjRmLWE1MWQwOGFiZjUxMy5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjA4JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIwOFQwMzExMDVaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT03OWI1ZjBkMTZkNTRhNzI0ZTBhMjFhMTVhMWRjYmI0YzQxMWNiMTdjODBmOTNkM2MxODI1ZWFiMmRkNjFiNWEzJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.f7mrBXWPAtanRfKlyoIQTK-bTuSKbArQt7W_x6_FTxE)
Intermediate Event
Update dialog of the Intermediate Event
![Screenshot 2023-11-19 at 17 50 03](https://private-user-images.githubusercontent.com/143808484/284076282-b8afd2c1-9513-48d4-99ad-91002ee84d8b.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5ODQ1NjUsIm5iZiI6MTczODk4NDI2NSwicGF0aCI6Ii8xNDM4MDg0ODQvMjg0MDc2MjgyLWI4YWZkMmMxLTk1MTMtNDhkNC05OWFkLTkxMDAyZWU4NGQ4Yi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjA4JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIwOFQwMzExMDVaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT04ZjA3OTBkYmRhNTQyZThlMGNjMmY2Y2ZkYzdkYzhlYjUyMWI2OGYyNTU0OTY1M2Y5ZDA5M2U2YmFjZTdmNDA4JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.7Fy5W4r1UA2SNPEwjkK5_XIaS6jSBUK0QE_KeRPTDNs)
All available Intermediate Event types
![Screenshot 2023-11-19 at 17 49 54](https://private-user-images.githubusercontent.com/143808484/284076235-79421172-5d29-4d35-bdab-a5cb447aa9e9.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5ODQ1NjUsIm5iZiI6MTczODk4NDI2NSwicGF0aCI6Ii8xNDM4MDg0ODQvMjg0MDc2MjM1LTc5NDIxMTcyLTVkMjktNGQzNS1iZGFiLWE1Y2I0NDdhYTllOS5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjA4JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIwOFQwMzExMDVaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT02NzM2MGVjMWRlMDZlZTUzM2RlM2RjOTQ4MmM1OGMzZGRiOWFmMDlkMWE1MzBkYzA1ZmNhMGYzMzJkNmRmOTExJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.o5Acgw6MTpJR3B1cYvyXjX1AF6k9oEKjY-6QgXbMe6s)
End Event
![Screenshot 2023-11-19 at 17 50 58](https://private-user-images.githubusercontent.com/143808484/284076273-3ef7fc83-f278-4c74-b870-3db6d11128be.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5ODQ1NjUsIm5iZiI6MTczODk4NDI2NSwicGF0aCI6Ii8xNDM4MDg0ODQvMjg0MDc2MjczLTNlZjdmYzgzLWYyNzgtNGM3NC1iODcwLTNkYjZkMTExMjhiZS5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjA4JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIwOFQwMzExMDVaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT04Y2E5YjdmYjIyNGYzNWIyZTU3YmE5Mzc1ZGVlZjdiMTNkOWY1ZmIyOTEyOWZhMjIwOTE5NWZiYTA4ZDM4NDNkJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.DXD8UlkINS7jE8k9xSy6lqLWQ5sZRryEfgMXW6y5Jno)
Update dialog of the End Event
All available End Event types
![Screenshot 2023-11-19 at 17 51 10](https://private-user-images.githubusercontent.com/143808484/284076244-f43a30c4-3ffe-4a3a-b775-e29816415b22.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5ODQ1NjUsIm5iZiI6MTczODk4NDI2NSwicGF0aCI6Ii8xNDM4MDg0ODQvMjg0MDc2MjQ0LWY0M2EzMGM0LTNmZmUtNGEzYS1iNzc1LWUyOTgxNjQxNWIyMi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjA4JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIwOFQwMzExMDVaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT05MmMzZGM3MzYwYTA3OGI0MDZmNWI1M2EwZWNmMmQ3MWUwNmRjY2E0ZmZmMWY0YTUwM2Y1YjFhZWM2NzNlODI0JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.gjAvlzEvOPSpsJYbaBfXN2SOUDq6pTXKjHt1-KxouoU)
Checklist
Motivation and Context
To fully comply with the BPMN 2.0 standard, events and tasks need to allow for specifying specialisations.
Steps for Testing
For Events
Drag any event onto the canvas, double click it and select an event type.
For Tasks
Drag any task onto the canvas, double click and select a task type.