Skip to content
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

Merged
merged 31 commits into from
Nov 27, 2023

Conversation

matthiaslehnertum
Copy link
Collaborator

@matthiaslehnertum matthiaslehnertum commented Nov 19, 2023

This PR extends Apollon by the ability to select event types more specific than just start, intermediate and end events.

Screenshot 2023-11-23 at 13 52 55

Start Event

Update dialog of the Start Event
Screenshot 2023-11-19 at 17 47 02

All available Start Event types
Screenshot 2023-11-19 at 17 47 57

Intermediate Event

Update dialog of the Intermediate Event
Screenshot 2023-11-19 at 17 50 03

All available Intermediate Event types
Screenshot 2023-11-19 at 17 49 54

End Event
Update dialog of the End Event
Screenshot 2023-11-19 at 17 50 58

All available End Event types
Screenshot 2023-11-19 at 17 51 10

Checklist

  • I documented the TypeScript code using JSDoc style.
  • I added multiple screenshots/screencasts of my UI changes
  • I translated all the newly inserted strings into German and English

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.

matthiaslehnertum and others added 25 commits October 24, 2023 00:07
# 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
@matthiaslehnertum matthiaslehnertum marked this pull request as ready for review November 23, 2023 12:08
@matthiaslehnertum matthiaslehnertum requested review from loreanvictor and AlexanderG2207 and removed request for loreanvictor November 23, 2023 12:08
@loreanvictor
Copy link
Contributor

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):

  • add test coverage report to the PR
  • (might be a follow-up PR) increase test coverage
  • (might be a follow-up PR) the placing of the contextual menu can sometimes be problematic for the new elements, it hides the element which means you can't see the effect of your actions immediately (you need to close the menu to see if you picked the correct type):

ezgif com-video-to-gif-4

loreanvictor
loreanvictor previously approved these changes Nov 27, 2023
@matthiaslehnertum
Copy link
Collaborator Author

@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! :)

@matthiaslehnertum matthiaslehnertum merged commit 717908c into develop Nov 27, 2023
5 checks passed
@matthiaslehnertum matthiaslehnertum deleted the feature/bpmn-2.0-adaptions branch November 27, 2023 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants