Skip to content

Intermediate Message Catch Event: Change references of dataName to variableName#360

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 3 commits into from
May 1, 2019
Merged

Intermediate Message Catch Event: Change references of dataName to variableName #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c34f56
Change references of dataName to variableName
tuantruong625 Apr 30, 2019
83ad4da
Fix broken test
tuantruong625 Apr 30, 2019
87fc730
Refactor test
tuantruong625 Apr 30, 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
18 changes: 9 additions & 9 deletions src/components/nodes/intermediateMessageCatchEvent/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ export default {
eventDefinitions: [
moddle.create('bpmn:MessageEventDefinition', {
id: '',
dataName: '',
variableName: '',
}),
],
});
Expand All@@ -37,7 +37,7 @@ export default {
return Object.entries(node.definition).reduce((data, [key, value]) => {
if (key === 'eventDefinitions') {
data.eventDefinitionId = value[0].get('id');
data.dataName = value[0].get('dataName');
data.variableName = value[0].get('variableName');
} else {
data[key] = value;
}
Expand All@@ -46,7 +46,7 @@ export default {
}, {});
},
inspectorHandler(value, node, setNodeProp, moddle) {
for (const key in omit(value, ['$type', 'eventDefinitionId', 'dataName'])) {
for (const key in omit(value, ['$type', 'eventDefinitionId', 'variableName'])) {
if (node.definition[key] === value[key]) {
continue;
}
Expand All@@ -55,13 +55,13 @@ export default {
}

if (
node.definition.eventDefinitions[0].get('id') !== value.dataName ||
node.definition.eventDefinitions[0].get('dataName') !== value.eventDefinitionId
node.definition.eventDefinitions[0].get('id') !== value.variableName ||
node.definition.eventDefinitions[0].get('variableName') !== value.eventDefinitionId
) {
setNodeProp(node, 'eventDefinitions', [
moddle.create('bpmn:MessageEventDefinition', {
id: value['eventDefinitionId'],
dataName: value['dataName'],
variableName: value['variableName'],
}),
]);
}
Expand DownExpand Up@@ -114,9 +114,9 @@ export default {
{
component: 'FormInput',
config: {
label: 'Data Name',
helper: 'The Name of the data name',
name: 'dataName',
label: 'Variable Name',
helper: 'The Name of the variable name',
name: 'variableName',
},
},
{
Expand Down
9 changes: 5 additions & 4 deletions tests/e2e/specs/IntermediateMessageCatchEvent.spec.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,18 @@ describe('Intermediate Message Catch Event', () => {
const eventId = '1234';
typeIntoTextInput('[name=eventDefinitionId]', eventId);

const dataName = 'test dataname';
typeIntoTextInput('[name=dataName]', dataName);
const variableName = 'test variablename';
typeIntoTextInput('[name=variableName]', variableName);

cy.get('[name=allowedUsers]').select('1,10');
cy.get('[name=allowedGroups]').select('20,30');

const whiteList = 'example.com';
typeIntoTextInput('[name=whitelist]', whiteList);

const validXML = `<bpmn:intermediateCatchEvent id="node_2" name="${name}" pm:allowedUsers="1,10" pm:allowedGroups="20,30" pm:whitelist="${whiteList}">
<bpmn:messageEventDefinition id="${eventId}" pm:dataName="${dataName}" />
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:intermediateCatchEvent>`;

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