From 4b2f488a4ba5ecadc55a33dcd6eaf5c7e1ee5a1f Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 4 Apr 2022 17:20:00 +0200 Subject: [PATCH 1/5] fix: do not attempt to select element if no element --- client/src/app/tabs/cloud-bpmn/BpmnEditor.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/src/app/tabs/cloud-bpmn/BpmnEditor.js b/client/src/app/tabs/cloud-bpmn/BpmnEditor.js index 5e70f16196..1900687eb8 100644 --- a/client/src/app/tabs/cloud-bpmn/BpmnEditor.js +++ b/client/src/app/tabs/cloud-bpmn/BpmnEditor.js @@ -854,6 +854,10 @@ function showLintError(modeler, error) { const element = elementRegistry.get(id); + if (!element) { + return; + } + if (element !== canvas.getRootElement()) { canvas.scrollToElement(element); } From 2273287bf0069c475e18702ea0b214e36d36da60 Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 5 Apr 2022 14:15:34 +0200 Subject: [PATCH 2/5] feat(FormLinter): update to Camunda Platform 8 * add versions * adjust error message to BPMN error message --- .../linting/__tests__/CloudBpmnLinterSpec.js | 28 +++++----- .../src/app/tabs/form/linting/FormLinter.js | 31 +++++++++-- .../form/linting/__tests__/FormLinterSpec.js | 14 ++--- .../linting/__tests__/camunda-cloud-8.json | 52 +++++++++++++++++++ 4 files changed, 103 insertions(+), 22 deletions(-) create mode 100644 client/src/app/tabs/form/linting/__tests__/camunda-cloud-8.json diff --git a/client/src/app/tabs/cloud-bpmn/linting/__tests__/CloudBpmnLinterSpec.js b/client/src/app/tabs/cloud-bpmn/linting/__tests__/CloudBpmnLinterSpec.js index 9a00ece2bd..a62679a109 100644 --- a/client/src/app/tabs/cloud-bpmn/linting/__tests__/CloudBpmnLinterSpec.js +++ b/client/src/app/tabs/cloud-bpmn/linting/__tests__/CloudBpmnLinterSpec.js @@ -62,11 +62,11 @@ describe('CloudBpmnLinter', function() { [ - [ 'Zeebe 1.0', camundaCloud10XML, camundaCloud10ErrorsXML ], - [ 'Zeebe 1.1', camundaCloud11XML ], - [ 'Zeebe 1.2', camundaCloud12XML ], - [ 'Zeebe 1.3', camundaCloud13XML ], - [ 'Camunda Platform 8.0', camundaCloud80XML ] + [ 'Camunda Platform 8 (Zeebe 1.0)', camundaCloud10XML, camundaCloud10ErrorsXML ], + [ 'Camunda Platform 8 (Zeebe 1.1)', camundaCloud11XML ], + [ 'Camunda Platform 8 (Zeebe 1.2)', camundaCloud12XML ], + [ 'Camunda Platform 8 (Zeebe 1.3)', camundaCloud13XML ], + [ 'Camunda Platform 8', camundaCloud80XML ] ].forEach(([ engineProfile, noErrorsXML, errorsXML ]) => { describe(engineProfile, function() { @@ -89,13 +89,17 @@ describe('CloudBpmnLinter', function() { // then expect(results).to.exist; - expect(results).to.eql([ - { - id: 'Activity_1', - message: `Element of type not supported by ${ engineProfile }`, - category: 'error' - } - ]); + expect(results).to.have.length(1); + expect(results[ 0 ]).to.eql({ + id: 'Activity_1', + label: 'Task', + message: `A is not supported by ${ engineProfile }`, + error: { + type: 'elementType', + element: 'bpmn:BusinessRuleTask' + }, + category: 'error' + }); }); }); diff --git a/client/src/app/tabs/form/linting/FormLinter.js b/client/src/app/tabs/form/linting/FormLinter.js index 0e42242afa..ebf359151c 100644 --- a/client/src/app/tabs/form/linting/FormLinter.js +++ b/client/src/app/tabs/form/linting/FormLinter.js @@ -25,14 +25,25 @@ const formJSVersions = { '1.0': '0.0.1', '1.1': '0.1.0', '1.2': '0.1.0', - '1.3': '0.1.0' + '1.3': '0.1.0', + '8.0': '0.2.0' }, 'Camunda Platform': { '7.15': '0.0.1', - '7.16': '0.1.0' + '7.16': '0.1.0', + '7.17': '0.2.0' } }; +const executionPlatformLabels = { + 'Camunda Cloud': { + '1.0': 'Camunda Platform 8 (Zeebe 1.0)', + '1.1': 'Camunda Platform 8 (Zeebe 1.1)', + '1.2': 'Camunda Platform 8 (Zeebe 1.2)', + '1.3': 'Camunda Platform 8 (Zeebe 1.3)', + '8.0': 'Camunda Platform 8' + } +}; export default class FormLinter { static lint(contents) { @@ -86,8 +97,8 @@ export default class FormLinter { if (!types.includes(type)) { results.push({ id, - label: label || textToLabel(text), - message: `Form field of type <${ type }> not supported by ${ executionPlatform } ${ executionPlatformVersion }`, + label: label || (text && textToLabel(text)) || id, + message: `A <${ capitalize(type) }> is not supported by ${ getExecutionPlatformLabel(executionPlatform, executionPlatformVersion) }`, category: 'error' }); } @@ -114,3 +125,15 @@ function getFormJSVersion(executionPlatform, executionPlatformVersion) { return formJSVersions[ executionPlatform ][ executionPlatformVersion ]; } + +function getExecutionPlatformLabel(executionPlatform, executionPlatformVersion) { + if (executionPlatformLabels[ executionPlatform ] && executionPlatformLabels[ executionPlatform ][ executionPlatformVersion ]) { + return executionPlatformLabels[ executionPlatform ][ executionPlatformVersion ]; + } + + return `${ executionPlatform } ${ executionPlatformVersion }`; +} + +function capitalize(string) { + return `${ string.slice(0, 1).toUpperCase()}${ string.slice(1) }`; +} \ No newline at end of file diff --git a/client/src/app/tabs/form/linting/__tests__/FormLinterSpec.js b/client/src/app/tabs/form/linting/__tests__/FormLinterSpec.js index c9bb831fd8..4507085dc7 100644 --- a/client/src/app/tabs/form/linting/__tests__/FormLinterSpec.js +++ b/client/src/app/tabs/form/linting/__tests__/FormLinterSpec.js @@ -16,6 +16,7 @@ import camundaCloud11 from './camunda-cloud-1-1.json'; import camundaCloud12 from './camunda-cloud-1-2.json'; import camundaCloud120 from './camunda-cloud-1-2-0.json'; import camundaCloud13 from './camunda-cloud-1-3.json'; +import camundaCloud8 from './camunda-cloud-8.json'; import camundaPlatform715 from './camunda-platform-7-15.json'; import camundaPlatform715Errors from './camunda-platform-7-15-errors.json'; import camundaPlatform716 from './camunda-platform-7-16.json'; @@ -62,11 +63,12 @@ describe('FormLinter', function() { [ 'Camunda Platform 7.15', camundaPlatform715, camundaPlatform715Errors ], [ 'Camunda Platform 7.16', camundaPlatform716 ], [ 'Camunda Platform 7.16.0', camundaPlatform7160 ], - [ 'Camunda Cloud 1.0', camundaCloud10, camundaCloud10Errors ], - [ 'Camunda Cloud 1.1', camundaCloud11 ], - [ 'Camunda Cloud 1.2', camundaCloud12 ], - [ 'Camunda Cloud 1.2', camundaCloud120 ], - [ 'Camunda Cloud 1.3', camundaCloud13 ] + [ 'Camunda Platform 8 (Zeebe 1.0)', camundaCloud10, camundaCloud10Errors ], + [ 'Camunda Platform 8 (Zeebe 1.1)', camundaCloud11 ], + [ 'Camunda Platform 8 (Zeebe 1.2)', camundaCloud12 ], + [ 'Camunda Platform 8 (Zeebe 1.2)', camundaCloud120 ], + [ 'Camunda Platform 8 (Zeebe 1.3)', camundaCloud13 ], + [ 'Camunda Platform 8', camundaCloud8 ] ].forEach(([ engineProfile, noErrorsSchema, errorsSchema ]) => { describe(engineProfile, function() { @@ -93,7 +95,7 @@ describe('FormLinter', function() { { id: 'Field_3', label: 'Approved', - message: `Form field of type not supported by ${ engineProfile }`, + message: `A is not supported by ${ engineProfile }`, category: 'error' } ]); diff --git a/client/src/app/tabs/form/linting/__tests__/camunda-cloud-8.json b/client/src/app/tabs/form/linting/__tests__/camunda-cloud-8.json new file mode 100644 index 0000000000..baee070c61 --- /dev/null +++ b/client/src/app/tabs/form/linting/__tests__/camunda-cloud-8.json @@ -0,0 +1,52 @@ +{ + "components": [ + { + "id": "Field_1", + "key": "creditor", + "label": "Creditor", + "type": "textfield", + "validate": { + "required": true + } + }, + { + "description": "An invoice number in the format: C-123.", + "id": "Field_2", + "key": "invoiceNumber", + "label": "Invoice Number", + "type": "textfield", + "validate": { + "pattern": "^C-[0-9]+$" + } + }, + { + "id": "Field_3", + "key": "approved", + "label": "Approved", + "type": "checkbox" + }, + { + "id": "Field_4", + "key": "approvedBy", + "label": "Approved By", + "type": "textfield" + }, + { + "id": "Field_5", + "key": "submit", + "label": "Submit", + "type": "button" + }, + { + "id": "Field_6", + "action": "reset", + "key": "reset", + "label": "Reset", + "type": "button" + } + ], + "executionPlatform": "Camunda Cloud", + "executionPlatformVersion": "8.0.0", + "id": "Form_1", + "type": "default" +} From f3718e15ae1a15de4c090c12a382d5654e0e4dd8 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 6 Apr 2022 11:05:07 +0200 Subject: [PATCH 3/5] feat(client): sort lint errors alphabetically --- client/src/app/tabs/panel/tabs/LintingTab.js | 16 +++++++-- .../panel/tabs/__tests__/LintingTabSpec.js | 36 +++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/client/src/app/tabs/panel/tabs/LintingTab.js b/client/src/app/tabs/panel/tabs/LintingTab.js index 948f278ee1..984b718eda 100644 --- a/client/src/app/tabs/panel/tabs/LintingTab.js +++ b/client/src/app/tabs/panel/tabs/LintingTab.js @@ -31,6 +31,8 @@ export default function LintingTab(props) { onAction('showLintError', issue); }; + console.log('sorted', JSON.stringify(sortIssues(linting), null, 2)); + return { linting.length ? null : No errors. } { - linting.map((issue => { + sortIssues(linting).map((issue => { const { id, message @@ -70,7 +72,17 @@ function LintingIssue(props) { return
- Error : {label || id} - {message} + Error : { label || id } - {message}
; +} + +function sortIssues(issues) { + return issues.sort((a, b) => { + if ((a.label || a.id).toLowerCase() <= (b.label || b.id).toLowerCase()) { + return -1; + } else { + return 1; + } + }); } \ No newline at end of file diff --git a/client/src/app/tabs/panel/tabs/__tests__/LintingTabSpec.js b/client/src/app/tabs/panel/tabs/__tests__/LintingTabSpec.js index 2da5d44947..8746bc8ee9 100644 --- a/client/src/app/tabs/panel/tabs/__tests__/LintingTabSpec.js +++ b/client/src/app/tabs/panel/tabs/__tests__/LintingTabSpec.js @@ -67,6 +67,42 @@ describe('', function() { }); + it('should sort', function() { + + // when + const wrapper = renderLintingTab({ + linting: [ + { + category: 'error', + id: 'foo', + label: 'Foo', + path: [], + message: 'foo error' + }, + { + category: 'error', + id: 'bar', + label: 'Bar', + path: [], + message: 'bar error' + }, + { + category: 'error', + id: 'baz', + path: [], + message: 'baz error' + } + ] + }); + + // then + expect(wrapper.find('.linting-issue__text')).to.have.length(3); + expect(wrapper.find('.linting-issue__text').at(0).text()).to.equal('Error : Bar - bar error'); + expect(wrapper.find('.linting-issue__text').at(1).text()).to.equal('Error : baz - baz error'); + expect(wrapper.find('.linting-issue__text').at(2).text()).to.equal('Error : Foo - foo error'); + }); + + it('should show lint error on click', function() { // when From 4e1b54c0cdec74a522eaf64637f06c446e239e40 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 6 Apr 2022 11:15:39 +0200 Subject: [PATCH 4/5] deps: bump client dependencies --- client/package-lock.json | 327 ++++++++++++++++++++++++++++++++++----- client/package.json | 12 +- 2 files changed, 296 insertions(+), 43 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 62f2ae4dbb..abdb92818f 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1081,13 +1081,62 @@ } } }, + "@bpmn-io/element-templates-icons-renderer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-icons-renderer/-/element-templates-icons-renderer-0.1.2.tgz", + "integrity": "sha512-HMcjVGPfCrkkMKy6N6seQlh0R6F0YfXUJvflPTLgo6Kbv/k0/f0RUuicke2JW0How7uQrANp+ryn5j+c6W6ilg==", + "requires": { + "bpmn-js": "^9.0.3", + "diagram-js": "^8.2.1", + "inherits": "^2.0.4", + "tiny-svg": "^2.2.3" + }, + "dependencies": { + "diagram-js": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-8.2.1.tgz", + "integrity": "sha512-R9D4CtRPCXFllGE4P/UTcK3fgYG/0WQfb87Pl7frdfnAbCbjZAM2vU0qgZaBhfU0cmW2OhdDPmEtz89brrOZDA==", + "requires": { + "css.escape": "^1.5.1", + "didi": "^5.2.1", + "hammerjs": "^2.0.1", + "inherits": "^2.0.4", + "min-dash": "^3.5.2", + "min-dom": "^3.1.3", + "object-refs": "^0.3.0", + "path-intersection": "^2.2.1", + "tiny-svg": "^2.2.2" + } + }, + "didi": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/didi/-/didi-5.2.1.tgz", + "integrity": "sha512-IKNnajUlD4lWMy/Q9Emkk7H1qnzREgY4UyE3IhmOi/9IKua0JYtYldk928bOdt1yNxN8EiOy1sqtSozEYsmjCg==" + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "path-intersection": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/path-intersection/-/path-intersection-2.2.1.tgz", + "integrity": "sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==" + }, + "tiny-svg": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-2.2.3.tgz", + "integrity": "sha512-u5KGg889pD1W2c9GlLrTnAGzIkAO00/VXZGyzeiGHw+b9er8McLO0SnhxPQQDwDqFO0MrJ825AEsRUoTiDZFuQ==" + } + } + }, "@bpmn-io/element-templates-validator": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-0.6.0.tgz", - "integrity": "sha512-GAs/04pjQGJKn02PwSpbmQ83pRBaOobpzVJwnv6dGQ9eg7mI0buBK27SOTNLexWyH+8Cm4NI32piLmkzx2IGVg==", + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-0.8.1.tgz", + "integrity": "sha512-cJMVYXxQAkntBZ2Brr76AI8D8xXWNS9GI8YM0h5kjkTihfYC+7FfN744RM1RVx8zJqTzOMf8nkS37t95Re4wvA==", "requires": { - "@camunda/element-templates-json-schema": "^0.8.0", - "@camunda/zeebe-element-templates-json-schema": "^0.2.0", + "@camunda/element-templates-json-schema": "^0.9.1", + "@camunda/zeebe-element-templates-json-schema": "^0.4.1", "json-source-map": "^0.6.1", "min-dash": "^3.8.1" } @@ -1208,9 +1257,9 @@ "integrity": "sha512-OWe9YQx3Vtnopz0trJCJVI3y7k2EfeR4QkKHfRhukcB7yxG4PD1FGaB5LAxc1wxp66V1S3LU4bqUpJdVhQhIww==" }, "@camunda/element-templates-json-schema": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.8.0.tgz", - "integrity": "sha512-A9VgfJCr9GbDBbws48Ef7zv93pNy1EsjV/ijY0o0R4vUdbzMFbVvTIA+ypAlQC8xmAW1Sj/Gev8ocBM95djnpw==" + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.9.1.tgz", + "integrity": "sha512-hqAOdwf0EdEDughDAfsOWtQQaKx/7m3srVbrUfVZy2Nh2mUc3hyBbkODO4tkMjTKv6I4bw36cyMchzjIEaz4CA==" }, "@camunda/execution-platform": { "version": "0.3.2", @@ -1218,9 +1267,9 @@ "integrity": "sha512-IPdFmeFnxxX5NHV6wmHN+ScX6EEXMHkTnYOoLQzF+3NwvkubzTG6r5NeVdJzmekFvDXhko4Pl8Q/KUAj3hitEA==" }, "@camunda/zeebe-element-templates-json-schema": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.2.0.tgz", - "integrity": "sha512-2HF/kpcazyxzUBO5gKrhpQ5jvqrqW0wVAAf9ybbOOGhy/uXL+UG749R4OCUstwo1vpoOz5pDTrqOeUJEf7iQ0g==" + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.4.1.tgz", + "integrity": "sha512-FAe7auxm+IJiRB0W68VOjBxih6aOJB/0K3nvjO0TtRdyS+a2X1DIDBDtsQO6g+pJDtW6oij0kC1LiBUvm6FmLw==" }, "@colors/colors": { "version": "1.5.0", @@ -2549,11 +2598,11 @@ "integrity": "sha512-dXvRIUD+NuB/fByFP8r4/Vr8L9Buv/hdRQt0g5wzCHAoF+nW0C/Uv+EjRjwqqFr7AQr1XR+L1ADL3BDyKgeuWw==" }, "bpmn-js-properties-panel": { - "version": "1.0.0-alpha.10", - "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-1.0.0-alpha.10.tgz", - "integrity": "sha512-1JCNaIioNP9s5LwZqfIkTGrWzICH3nPxU+cfEIfj87Nc5XOzgz7PCJZpHLgvTsKhbPt/7EnTCCVXGLG8mTX/4A==", + "version": "1.0.0-alpha.12", + "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-1.0.0-alpha.12.tgz", + "integrity": "sha512-Pp57+ojlLQIbiX7uQMSX3lYrGj2hChsEtej33RM9iARAqsJIT56NRjxX93LhYwkzZnMjjSLcorFqRara23xmhA==", "requires": { - "@bpmn-io/element-templates-validator": "^0.6.0", + "@bpmn-io/element-templates-validator": "^0.8.1", "@bpmn-io/extract-process-variables": "^0.4.5", "@philippfromme/moddle-helpers": "^0.4.1", "array-move": "^3.0.1", @@ -2654,9 +2703,9 @@ "dev": true }, "bpmnlint-plugin-camunda-compat": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/bpmnlint-plugin-camunda-compat/-/bpmnlint-plugin-camunda-compat-0.5.0.tgz", - "integrity": "sha512-UBl6P85Ymh7gnz8bUj9c9bjKN2bJmaPiopsST2dSsH3TbrhjSEpGFVFXIL5Qfzy1+rINVu+sVQ5icR2IJ5ThQw==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/bpmnlint-plugin-camunda-compat/-/bpmnlint-plugin-camunda-compat-0.6.1.tgz", + "integrity": "sha512-SzmdjK1TiFqMWFY1V3Q3lMX/8QUKx5YOcwlR+WvLSIV7McjLPOu8nc12brhmKoYcN/wSPkEZbiZ4xxKuzkE5kw==", "requires": { "@philippfromme/moddle-helpers": "^0.1.0", "bpmnlint-utils": "^1.0.2", @@ -2908,23 +2957,32 @@ } }, "camunda-bpmn-js": { - "version": "0.13.0-alpha.7", - "resolved": "https://registry.npmjs.org/camunda-bpmn-js/-/camunda-bpmn-js-0.13.0-alpha.7.tgz", - "integrity": "sha512-3lwHMtiYH//syO5GgdUdflJDXCli3nuo17/2E9CBWE60IhC4cLghyhk6zb8uMhZs/7HePf8TH33TdId8CPtpfw==", + "version": "0.13.0-alpha.8", + "resolved": "https://registry.npmjs.org/camunda-bpmn-js/-/camunda-bpmn-js-0.13.0-alpha.8.tgz", + "integrity": "sha512-faPIBQLaQHQup4YoBcXSJ0gZIXSp+tJwhKRbsRuJ8v7C6pmgBKam0uIcRtmNcuNwlzb5cneG9wceRG+L2QMocw==", "requires": { "@bpmn-io/align-to-origin": "^0.7.0", + "@bpmn-io/element-templates-icons-renderer": "^0.1.2", "bpmn-js": "^9.0.3", "bpmn-js-disable-collapsed-subprocess": "^0.1.3", "bpmn-js-executable-fix": "^0.1.3", - "camunda-bpmn-moddle": "^6.1.1", - "diagram-js": "^8.1.1", + "camunda-bpmn-moddle": "^6.1.2", + "diagram-js": "^8.2.1", "diagram-js-minimap": "^2.1.0", "diagram-js-origin": "^1.3.2", "inherits": "^2.0.4", "min-dash": "^3.8.1", - "zeebe-bpmn-moddle": "^0.11.0" + "zeebe-bpmn-moddle": "^0.12.1" }, "dependencies": { + "camunda-bpmn-moddle": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/camunda-bpmn-moddle/-/camunda-bpmn-moddle-6.1.2.tgz", + "integrity": "sha512-DfhOTeq8oN01cB5sLE6Rq34/9xGD15/Y14pEM+YBIjgvV6Rclh+BgIa/2aRMm8An4Kc/itm2tECYiDr8p/FyTQ==", + "requires": { + "min-dash": "^3.8.1" + } + }, "diagram-js": { "version": "8.2.1", "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-8.2.1.tgz", @@ -2960,15 +3018,20 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-2.2.3.tgz", "integrity": "sha512-u5KGg889pD1W2c9GlLrTnAGzIkAO00/VXZGyzeiGHw+b9er8McLO0SnhxPQQDwDqFO0MrJ825AEsRUoTiDZFuQ==" + }, + "zeebe-bpmn-moddle": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-0.12.1.tgz", + "integrity": "sha512-rnUoK+A/gzinOGUlmJKeXmnjorgEm4yf7qgeaowXGZOFtFqtM2lvJ7XYTJNsKClaNfFG245JtKHH3G/caJxE6g==" } } }, "camunda-bpmn-moddle": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/camunda-bpmn-moddle/-/camunda-bpmn-moddle-6.1.1.tgz", - "integrity": "sha512-HbYXm9lNPVnGfq4jRRtvR4YgRgw6hGwJ2wFIBghyOQ8fYsqUAPAZ4MJ1pQASZM+XpxmEyRTowc4SiHcAcFbDYw==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/camunda-bpmn-moddle/-/camunda-bpmn-moddle-6.1.2.tgz", + "integrity": "sha512-DfhOTeq8oN01cB5sLE6Rq34/9xGD15/Y14pEM+YBIjgvV6Rclh+BgIa/2aRMm8An4Kc/itm2tECYiDr8p/FyTQ==", "requires": { - "min-dash": "^3.5.2" + "min-dash": "^3.8.1" } }, "camunda-cmmn-moddle": { @@ -2986,6 +3049,44 @@ "diagram-js": "^7.8.2", "diagram-js-origin": "^1.3.2", "min-dash": "^3.8.1" + }, + "dependencies": { + "diagram-js": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-7.8.3.tgz", + "integrity": "sha512-FSuLbHgBJ6HrXDUd0jzZpUw857sdhxOgtl8PLpdf5bZK2p0VLWXDa+XUZ3voVYd5dw0HBx/ka+1JBKO5yTbSKg==", + "requires": { + "css.escape": "^1.5.1", + "didi": "^5.2.1", + "hammerjs": "^2.0.1", + "inherits": "^2.0.4", + "min-dash": "^3.5.2", + "min-dom": "^3.1.3", + "object-refs": "^0.3.0", + "path-intersection": "^2.2.1", + "tiny-svg": "^2.2.2" + } + }, + "didi": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/didi/-/didi-5.2.1.tgz", + "integrity": "sha512-IKNnajUlD4lWMy/Q9Emkk7H1qnzREgY4UyE3IhmOi/9IKua0JYtYldk928bOdt1yNxN8EiOy1sqtSozEYsmjCg==" + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "path-intersection": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/path-intersection/-/path-intersection-2.2.1.tgz", + "integrity": "sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==" + }, + "tiny-svg": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-2.2.3.tgz", + "integrity": "sha512-u5KGg889pD1W2c9GlLrTnAGzIkAO00/VXZGyzeiGHw+b9er8McLO0SnhxPQQDwDqFO0MrJ825AEsRUoTiDZFuQ==" + } } }, "camunda-dmn-moddle": { @@ -4265,9 +4366,9 @@ "dev": true }, "diagram-js": { - "version": "7.8.2", - "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-7.8.2.tgz", - "integrity": "sha512-+lzXUccgEYf9T5/1t2Y4MZyYirw47x8VEPyQ2RmDcZKO3m2iwEgyyFTOR7u6RuiVjusq7AnzgS+MVW0FhLd68A==", + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-8.2.1.tgz", + "integrity": "sha512-R9D4CtRPCXFllGE4P/UTcK3fgYG/0WQfb87Pl7frdfnAbCbjZAM2vU0qgZaBhfU0cmW2OhdDPmEtz89brrOZDA==", "requires": { "css.escape": "^1.5.1", "didi": "^5.2.1", @@ -4296,9 +4397,9 @@ "integrity": "sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==" }, "tiny-svg": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-2.2.2.tgz", - "integrity": "sha512-u6zCuMkDR/3VAh83X7hDRn/pi0XhwG2ycuNS0cTFtQjGdOG2tSvEb8ds65VeGWc3H6PUjJKeunueXqgkZqtMsg==" + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-2.2.3.tgz", + "integrity": "sha512-u5KGg889pD1W2c9GlLrTnAGzIkAO00/VXZGyzeiGHw+b9er8McLO0SnhxPQQDwDqFO0MrJ825AEsRUoTiDZFuQ==" } } }, @@ -4399,6 +4500,44 @@ "min-dom": "^3.1.3", "selection-ranges": "^3.0.2", "table-js": "^7.2.0" + }, + "dependencies": { + "diagram-js": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-7.8.3.tgz", + "integrity": "sha512-FSuLbHgBJ6HrXDUd0jzZpUw857sdhxOgtl8PLpdf5bZK2p0VLWXDa+XUZ3voVYd5dw0HBx/ka+1JBKO5yTbSKg==", + "requires": { + "css.escape": "^1.5.1", + "didi": "^5.2.1", + "hammerjs": "^2.0.1", + "inherits": "^2.0.4", + "min-dash": "^3.5.2", + "min-dom": "^3.1.3", + "object-refs": "^0.3.0", + "path-intersection": "^2.2.1", + "tiny-svg": "^2.2.2" + } + }, + "didi": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/didi/-/didi-5.2.1.tgz", + "integrity": "sha512-IKNnajUlD4lWMy/Q9Emkk7H1qnzREgY4UyE3IhmOi/9IKua0JYtYldk928bOdt1yNxN8EiOy1sqtSozEYsmjCg==" + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "path-intersection": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/path-intersection/-/path-intersection-2.2.1.tgz", + "integrity": "sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==" + }, + "tiny-svg": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-2.2.3.tgz", + "integrity": "sha512-u5KGg889pD1W2c9GlLrTnAGzIkAO00/VXZGyzeiGHw+b9er8McLO0SnhxPQQDwDqFO0MrJ825AEsRUoTiDZFuQ==" + } } }, "dmn-js-drd": { @@ -4414,6 +4553,46 @@ "min-dom": "^3.1.3", "object-refs": "^0.3.0", "tiny-svg": "^2.2.1" + }, + "dependencies": { + "diagram-js": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-7.8.3.tgz", + "integrity": "sha512-FSuLbHgBJ6HrXDUd0jzZpUw857sdhxOgtl8PLpdf5bZK2p0VLWXDa+XUZ3voVYd5dw0HBx/ka+1JBKO5yTbSKg==", + "requires": { + "css.escape": "^1.5.1", + "didi": "^5.2.1", + "hammerjs": "^2.0.1", + "inherits": "^2.0.4", + "min-dash": "^3.5.2", + "min-dom": "^3.1.3", + "object-refs": "^0.3.0", + "path-intersection": "^2.2.1", + "tiny-svg": "^2.2.2" + }, + "dependencies": { + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "tiny-svg": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-2.2.3.tgz", + "integrity": "sha512-u5KGg889pD1W2c9GlLrTnAGzIkAO00/VXZGyzeiGHw+b9er8McLO0SnhxPQQDwDqFO0MrJ825AEsRUoTiDZFuQ==" + } + } + }, + "didi": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/didi/-/didi-5.2.1.tgz", + "integrity": "sha512-IKNnajUlD4lWMy/Q9Emkk7H1qnzREgY4UyE3IhmOi/9IKua0JYtYldk928bOdt1yNxN8EiOy1sqtSozEYsmjCg==" + }, + "path-intersection": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/path-intersection/-/path-intersection-2.2.1.tgz", + "integrity": "sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==" + } } }, "dmn-js-literal-expression": { @@ -4428,6 +4607,44 @@ "min-dash": "^3.5.2", "min-dom": "^3.1.3", "table-js": "^7.2.0" + }, + "dependencies": { + "diagram-js": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-7.8.3.tgz", + "integrity": "sha512-FSuLbHgBJ6HrXDUd0jzZpUw857sdhxOgtl8PLpdf5bZK2p0VLWXDa+XUZ3voVYd5dw0HBx/ka+1JBKO5yTbSKg==", + "requires": { + "css.escape": "^1.5.1", + "didi": "^5.2.1", + "hammerjs": "^2.0.1", + "inherits": "^2.0.4", + "min-dash": "^3.5.2", + "min-dom": "^3.1.3", + "object-refs": "^0.3.0", + "path-intersection": "^2.2.1", + "tiny-svg": "^2.2.2" + } + }, + "didi": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/didi/-/didi-5.2.1.tgz", + "integrity": "sha512-IKNnajUlD4lWMy/Q9Emkk7H1qnzREgY4UyE3IhmOi/9IKua0JYtYldk928bOdt1yNxN8EiOy1sqtSozEYsmjCg==" + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "path-intersection": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/path-intersection/-/path-intersection-2.2.1.tgz", + "integrity": "sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==" + }, + "tiny-svg": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-2.2.3.tgz", + "integrity": "sha512-u5KGg889pD1W2c9GlLrTnAGzIkAO00/VXZGyzeiGHw+b9er8McLO0SnhxPQQDwDqFO0MrJ825AEsRUoTiDZFuQ==" + } } }, "dmn-js-properties-panel": { @@ -4455,6 +4672,27 @@ "table-js": "^7.2.0" }, "dependencies": { + "diagram-js": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-7.8.3.tgz", + "integrity": "sha512-FSuLbHgBJ6HrXDUd0jzZpUw857sdhxOgtl8PLpdf5bZK2p0VLWXDa+XUZ3voVYd5dw0HBx/ka+1JBKO5yTbSKg==", + "requires": { + "css.escape": "^1.5.1", + "didi": "^5.2.1", + "hammerjs": "^2.0.1", + "inherits": "^2.0.4", + "min-dash": "^3.5.2", + "min-dom": "^3.1.3", + "object-refs": "^0.3.0", + "path-intersection": "^2.2.1", + "tiny-svg": "^2.2.2" + } + }, + "didi": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/didi/-/didi-5.2.1.tgz", + "integrity": "sha512-IKNnajUlD4lWMy/Q9Emkk7H1qnzREgY4UyE3IhmOi/9IKua0JYtYldk928bOdt1yNxN8EiOy1sqtSozEYsmjCg==" + }, "dmn-moddle": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/dmn-moddle/-/dmn-moddle-10.0.0.tgz", @@ -4473,6 +4711,11 @@ "hat": "^0.0.3" } }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, "moddle": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/moddle/-/moddle-5.0.3.tgz", @@ -4491,10 +4734,20 @@ "saxen": "^8.1.2" } }, + "path-intersection": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/path-intersection/-/path-intersection-2.2.1.tgz", + "integrity": "sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==" + }, "saxen": { "version": "8.1.2", "resolved": "https://registry.npmjs.org/saxen/-/saxen-8.1.2.tgz", "integrity": "sha512-xUOiiFbc3Ow7p8KMxwsGICPx46ZQvy3+qfNVhrkwfz3Vvq45eGt98Ft5IQaA1R/7Tb5B5MKh9fUR9x3c3nDTxw==" + }, + "tiny-svg": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-2.2.3.tgz", + "integrity": "sha512-u5KGg889pD1W2c9GlLrTnAGzIkAO00/VXZGyzeiGHw+b9er8McLO0SnhxPQQDwDqFO0MrJ825AEsRUoTiDZFuQ==" } } }, @@ -12054,9 +12307,9 @@ } }, "zeebe-bpmn-moddle": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-0.11.0.tgz", - "integrity": "sha512-ehNQa2Kt9B1bwWJCF8Fs4SkroaSe+VH5Y4ql4T1hHuOSMJiwuMekFIs3UAJyS0ZyBhcJbUW1C1NPwXcD8u5IRA==" + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-0.12.1.tgz", + "integrity": "sha512-rnUoK+A/gzinOGUlmJKeXmnjorgEm4yf7qgeaowXGZOFtFqtM2lvJ7XYTJNsKClaNfFG245JtKHH3G/caJxE6g==" } } } diff --git a/client/package.json b/client/package.json index ab1a15758a..dc57fdd82b 100644 --- a/client/package.json +++ b/client/package.json @@ -17,12 +17,12 @@ "@ibm/plex": "^6.0.0", "@sentry/browser": "^6.3.6", "bpmn-js": "^9.0.3", - "bpmn-js-properties-panel": "^1.0.0-alpha.10", + "bpmn-js-properties-panel": "^1.0.0-alpha.12", "bpmn-moddle": "^7.1.2", "bpmnlint": "^7.6.0", - "bpmnlint-plugin-camunda-compat": "^0.5.0", - "camunda-bpmn-js": "^0.13.0-alpha.7", - "camunda-bpmn-moddle": "^6.1.1", + "bpmnlint-plugin-camunda-compat": "^0.6.1", + "camunda-bpmn-js": "^0.13.0-alpha.8", + "camunda-bpmn-moddle": "^6.1.2", "camunda-cmmn-moddle": "^1.0.0", "camunda-dmn-js": "^0.2.2", "camunda-dmn-moddle": "^1.1.0", @@ -32,7 +32,7 @@ "cmmn-js-properties-panel": "^0.8.3", "codemirror": "^5.65.2", "debug": "^4.1.1", - "diagram-js": "^7.8.2", + "diagram-js": "^8.2.1", "diagram-js-direct-editing": "^1.6.3", "diagram-js-origin": "^1.3.2", "dmn-js": "^12.1.0", @@ -52,7 +52,7 @@ "semver-compare": "^1.0.0", "sourcemapped-stacktrace": "^1.1.9", "ua-parser-js": "^0.7.28", - "zeebe-bpmn-moddle": "^0.11.0" + "zeebe-bpmn-moddle": "^0.12.1" }, "homepage": ".", "devDependencies": { From 57f6bafa70faa83a39f4920c42b5aa690825ec33 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 6 Apr 2022 13:45:50 +0200 Subject: [PATCH 5/5] chore: remove console log --- client/src/app/tabs/panel/tabs/LintingTab.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/src/app/tabs/panel/tabs/LintingTab.js b/client/src/app/tabs/panel/tabs/LintingTab.js index 984b718eda..13b5f28165 100644 --- a/client/src/app/tabs/panel/tabs/LintingTab.js +++ b/client/src/app/tabs/panel/tabs/LintingTab.js @@ -31,8 +31,6 @@ export default function LintingTab(props) { onAction('showLintError', issue); }; - console.log('sorted', JSON.stringify(sortIssues(linting), null, 2)); - return