From 342115802f895ed1dd2c35632f78cf7ca39f3799 Mon Sep 17 00:00:00 2001 From: "Tuan N. Truong" Date: Mon, 3 Jun 2019 15:37:20 -0400 Subject: [PATCH 1/4] Add defaults for message event id and message --- src/components/nodes/intermediateMessageCatchEvent/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/nodes/intermediateMessageCatchEvent/index.js b/src/components/nodes/intermediateMessageCatchEvent/index.js index aae5e4671..12eb1bf52 100644 --- a/src/components/nodes/intermediateMessageCatchEvent/index.js +++ b/src/components/nodes/intermediateMessageCatchEvent/index.js @@ -17,8 +17,8 @@ export default { whitelist: '', eventDefinitions: [ moddle.create('bpmn:MessageEventDefinition', { - id: '', - variableName: '', + id: 'message_event_1', + variableName: 'message', }), ], }); From 1de0b0c5b2dd253471433614181633d35a089d5f Mon Sep 17 00:00:00 2001 From: "Tuan N. Truong" Date: Mon, 3 Jun 2019 15:37:48 -0400 Subject: [PATCH 2/4] Set message event id as required --- src/components/nodes/intermediateMessageCatchEvent/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/nodes/intermediateMessageCatchEvent/index.js b/src/components/nodes/intermediateMessageCatchEvent/index.js index 12eb1bf52..2e7a04afc 100644 --- a/src/components/nodes/intermediateMessageCatchEvent/index.js +++ b/src/components/nodes/intermediateMessageCatchEvent/index.js @@ -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', }, }, { From 9415290f145fc8be6e30ceb2286effc0dbebeef4 Mon Sep 17 00:00:00 2001 From: "Tuan N. Truong" Date: Mon, 3 Jun 2019 16:24:22 -0400 Subject: [PATCH 3/4] Update processmaker-bpmn-moddle to 0.4.1 --- package-lock.json | 57 ++++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 18 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 46e99b4d9..2b11b431d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1212,9 +1212,9 @@ } }, "@processmaker/processmaker-bpmn-moddle": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@processmaker/processmaker-bpmn-moddle/-/processmaker-bpmn-moddle-0.4.0.tgz", - "integrity": "sha512-oz6Zl3OBvJ4DhsQYEf1p9z1HDZrAEBopAKJSoYIpvU5WhKjnJNl7gmFPuCT2NZwUN+dqSSAOB7cusum7YamH/g==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@processmaker/processmaker-bpmn-moddle/-/processmaker-bpmn-moddle-0.4.1.tgz", + "integrity": "sha512-zWA41KwxDcKG/8mQ5RKpA2QPIoATMTZp9IU0ewx7Z2QwPmTugSkK8ZPdfvSK46DqX39ejZI4EFo+PTTGfZDiuw==", "dev": true, "requires": { "min-dash": "^3.0.0" @@ -7418,8 +7418,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -7440,14 +7439,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7462,20 +7459,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -7592,8 +7586,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -7605,7 +7598,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7620,7 +7612,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7628,14 +7619,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7654,7 +7643,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7735,8 +7723,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -7748,7 +7735,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7834,8 +7820,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -7871,7 +7856,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7891,7 +7875,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7935,14 +7918,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -8933,8 +8914,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true, - "optional": true + "dev": true }, "ansi-styles": { "version": "3.2.1", @@ -8991,7 +8971,6 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, - "optional": true, "requires": { "ansi-regex": "^3.0.0" } @@ -18153,8 +18132,7 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true, - "optional": true + "dev": true }, "rx-lite-aggregates": { "version": "4.0.8", @@ -19699,8 +19677,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "optional": true + "dev": true }, "json-schema-traverse": { "version": "0.3.1", diff --git a/package.json b/package.json index c790d5fd5..b9b00f713 100644 --- a/package.json +++ b/package.json @@ -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", From 98eb2b537ad3e2d98294e975071abeb643b70f27 Mon Sep 17 00:00:00 2001 From: "Tuan N. Truong" Date: Tue, 4 Jun 2019 10:02:47 -0400 Subject: [PATCH 4/4] Fix failing tests --- tests/e2e/fixtures/parser.xml | 2 +- tests/e2e/specs/IntermediateMessageCatchEvent.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/fixtures/parser.xml b/tests/e2e/fixtures/parser.xml index e15b2ff74..c96c68bc9 100644 --- a/tests/e2e/fixtures/parser.xml +++ b/tests/e2e/fixtures/parser.xml @@ -13,7 +13,7 @@ - + diff --git a/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js b/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js index 7455f21ff..b9088a2f5 100644 --- a/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js +++ b/tests/e2e/specs/IntermediateMessageCatchEvent.spec.js @@ -35,7 +35,7 @@ describe('Intermediate Message Catch Event', () => { const validXML = ` - + `; cy.get('[data-test=downloadXMLBtn]').click();