Skip to content

Bugfix: Validation error intermediate message catch event#416

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.

Sign up for GitHub

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

Merged
velkymx merged 4 commits into from
Jun 5, 2019
Merged

Bugfix: Validation error intermediate message catch event #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3421158
Add defaults for message event id and message
tuantruong625 Jun 3, 2019
1de0b0c
Set message event id as required
tuantruong625 Jun 3, 2019
9415290
Update processmaker-bpmn-moddle to 0.4.1
tuantruong625 Jun 3, 2019
98eb2b5
Fix failing tests
tuantruong625 Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 17 additions & 40 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@
},
"devDependencies": {
"@panter/vue-i18next": "^0.15.0",
"@processmaker/processmaker-bpmn-moddle": "^0.4.0",
"@processmaker/processmaker-bpmn-moddle": "^0.4.1",
"@vue/cli-plugin-babel": "^3.0.5",
"@vue/cli-plugin-e2e-cypress": "^3.4.0",
"@vue/cli-plugin-eslint": "^3.0.5",
Expand Down
5 changes: 3 additions & 2 deletions src/components/nodes/intermediateMessageCatchEvent/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,8 @@ export default {
whitelist: '',
eventDefinitions: [
moddle.create('bpmn:MessageEventDefinition', {
id: '',
variableName: '',
id: 'message_event_1',
variableName: 'message',
}),
],
});
Expand DownExpand Up@@ -102,6 +102,7 @@ export default {
label: 'Message Event Identifier',
helper: 'The id field should be unique across all elements in the diagram',
name: 'eventDefinitionId',
validation: 'required',
},
},
{
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/fixtures/parser.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
</bpmn:timerEventDefinition>
</bpmn:startEvent>
<bpmn:intermediateCatchEvent id="node_4" name="Intermediate Message Catch Event" pm:whitelist="">
<bpmn:messageEventDefinition id="" variableName="" />
<bpmn:messageEventDefinition id="" pm:variableName="" />
</bpmn:intermediateCatchEvent>
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/specs/IntermediateMessageCatchEvent.spec.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ describe('Intermediate Message Catch Event', () => {

const validXML =
`<bpmn:intermediateCatchEvent id="node_2" name="${name}" pm:allowedUsers="1,10" pm:allowedGroups="20,30" pm:whitelist="${whiteList}">
<bpmn:messageEventDefinition id="${eventId}" variableName="${variableName}" />
<bpmn:messageEventDefinition id="${eventId}" pm:variableName="${variableName}" />
</bpmn:intermediateCatchEvent>`;

cy.get('[data-test=downloadXMLBtn]').click();
Expand Down