From b399b0d8779e37b5ab754819916baf51b7863ace Mon Sep 17 00:00:00 2001 From: Maciej Barelkowski Date: Tue, 4 Jun 2024 11:18:10 +0200 Subject: [PATCH] feat: support placeholders in String and Text templates properties deps: update to `@bpmn-io/properties-panel@3.20.0` deps: update to `bpmn-js-element-templates@1.16.0` deps: update to `camunda-bpmn-js@4.10.0` --- CHANGELOG.md | 6 +- client/package.json | 6 +- package-lock.json | 120 ++++++++++-------- .../element-templates/cloud-samples.json | 3 +- 4 files changed, 73 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c56b631a8c..d3202f8724 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,15 +12,17 @@ ___Note:__ Yet to be released changes appear here._ * `DEPS`: update to `electron@30.0.6` * `DEPS`: update to `@camunda/linting@3.21.0` * `DEPS`: update to `bpmn-js@17.8.1` +* `DEPS`: update to `bpmn-js-element-templates@1.16.0` * `DEPS`: update to `bpmn-js-properties-panel@5.17.1` -* `DEPS`: update to `@bpmn-io/properties-panel@3.19.0` -* `DEPS`: update to `camunda-bpmn-js@4.9.0` +* `DEPS`: update to `@bpmn-io/properties-panel@3.20.0` +* `DEPS`: update to `camunda-bpmn-js@4.10.0` * `DEPS`: update to `diagram-js@14.7.1` * `DEPS`: update to `camunda-dmn-js@2.4.0` * `DEPS`: update to `dmn-js@16.4.0` ### BPMN +* `FEAT`: support placeholders on String and Text properties ([bpmn-io/bpmn-js-element-templates#92](https://github.com/bpmn-io/bpmn-js-element-templates/issues/92)) * `FEAT`: warn about missing bpmnDi ([#4277](https://github.com/camunda/camunda-modeler/issues/4277)) * `FEAT`: add hint for the process ID field in Camunda 7 ([bpmn-io/bpmn-js-properties-panel#1038](https://github.com/bpmn-io/bpmn-js-properties-panel/issues/1038)) * `FEAT`: drop alphabetic sorting of list entries in Camunda 7 properties panel ([bpmn-io/bpmn-js-properties-panel##1047](https://github.com/bpmn-io/bpmn-js-properties-panel/pull/1047)) diff --git a/client/package.json b/client/package.json index cda4d68cca..665180061d 100644 --- a/client/package.json +++ b/client/package.json @@ -11,7 +11,7 @@ "@bpmn-io/dmn-migrate": "^0.5.0", "@bpmn-io/extract-process-variables": "^0.8.0", "@bpmn-io/form-js": "^1.8.6", - "@bpmn-io/properties-panel": "^3.19.0", + "@bpmn-io/properties-panel": "^3.20.0", "@bpmn-io/replace-ids": "^0.2.0", "@camunda/execution-platform": "^0.3.2", "@camunda/form-linting": "^0.16.0", @@ -28,11 +28,11 @@ "@sentry/browser": "^8.0.0", "@sentry/integrations": "^7.108.0", "bpmn-js": "^17.8.1", - "bpmn-js-element-templates": "^1.15.3", + "bpmn-js-element-templates": "^1.16.0", "bpmn-js-properties-panel": "^5.17.1", "bpmn-js-tracking": "^0.6.0", "bpmn-moddle": "^9.0.1", - "camunda-bpmn-js": "^4.9.0", + "camunda-bpmn-js": "^4.10.0", "camunda-bpmn-moddle": "^7.0.1", "camunda-cmmn-moddle": "^1.0.0", "camunda-dmn-js": "^2.4.0", diff --git a/package-lock.json b/package-lock.json index 15ae1ac122..e01c52b076 100644 --- a/package-lock.json +++ b/package-lock.json @@ -96,7 +96,7 @@ "@bpmn-io/dmn-migrate": "^0.5.0", "@bpmn-io/extract-process-variables": "^0.8.0", "@bpmn-io/form-js": "^1.8.6", - "@bpmn-io/properties-panel": "^3.19.0", + "@bpmn-io/properties-panel": "^3.20.0", "@bpmn-io/replace-ids": "^0.2.0", "@camunda/execution-platform": "^0.3.2", "@camunda/form-linting": "^0.16.0", @@ -113,11 +113,11 @@ "@sentry/browser": "^8.0.0", "@sentry/integrations": "^7.108.0", "bpmn-js": "^17.8.1", - "bpmn-js-element-templates": "^1.15.3", + "bpmn-js-element-templates": "^1.16.0", "bpmn-js-properties-panel": "^5.17.1", "bpmn-js-tracking": "^0.6.0", "bpmn-moddle": "^9.0.1", - "camunda-bpmn-js": "^4.9.0", + "camunda-bpmn-js": "^4.10.0", "camunda-bpmn-moddle": "^7.0.1", "camunda-cmmn-moddle": "^1.0.0", "camunda-dmn-js": "^2.4.0", @@ -2676,12 +2676,13 @@ "integrity": "sha512-P8T4iwiW1t95vpHVHqrD36Brn7TqFYCPSHIWk9WLJtYK1X4aDd+5cgqcAADIWSjf1/i5idKnpCh9mim8hEdRBg==" }, "node_modules/@bpmn-io/element-templates-validator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-2.0.1.tgz", - "integrity": "sha512-vwQNh2K2qzQPhRF4N4SHsgVCGCo6jsYL0mhanaii7k5XH7gyT+R9822D+lHOyih+Q4ii/KIQusZKSxFfhlLaLQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-2.1.0.tgz", + "integrity": "sha512-e8oYLUaZbL1ZuJjwXFyhhStbg0YgMNosIlzhKWdY7ysPhCFVMJlJ6yNYdaxyqfpPATTKb05uXMAsIgcqTQpoLg==", + "license": "MIT", "dependencies": { - "@camunda/element-templates-json-schema": "^0.17.2", - "@camunda/zeebe-element-templates-json-schema": "^0.19.2", + "@camunda/element-templates-json-schema": "^0.18.0", + "@camunda/zeebe-element-templates-json-schema": "^0.20.0", "json-source-map": "^0.6.1", "min-dash": "^4.1.1" } @@ -2689,7 +2690,8 @@ "node_modules/@bpmn-io/element-templates-validator/node_modules/min-dash": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.2.1.tgz", - "integrity": "sha512-to+unsToePnm7cUeR9TrMzFlETHd/UXmU+ELTRfWZj5XGT41KF6X3L233o3E/GdEs3sk2Tbw/lOLD1avmWkg8A==" + "integrity": "sha512-to+unsToePnm7cUeR9TrMzFlETHd/UXmU+ELTRfWZj5XGT41KF6X3L233o3E/GdEs3sk2Tbw/lOLD1avmWkg8A==", + "license": "MIT" }, "node_modules/@bpmn-io/extract-process-variables": { "version": "0.8.0", @@ -2907,11 +2909,12 @@ "integrity": "sha512-to+unsToePnm7cUeR9TrMzFlETHd/UXmU+ELTRfWZj5XGT41KF6X3L233o3E/GdEs3sk2Tbw/lOLD1avmWkg8A==" }, "node_modules/@bpmn-io/properties-panel": { - "version": "3.19.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-3.19.0.tgz", - "integrity": "sha512-ZVr8LC8ZiMYRkh9Vf4EnuQ7hJIzjBLpLUoex+q5/tGj1I2B/iFAgDUaqnD/yOyBzkRDi1K9IedsUA01XaqG13w==", + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-3.20.0.tgz", + "integrity": "sha512-XjTijxyjJRByZiDHodoXM6x8EcCalbSmBW/yu3c6WZeSsEUO95gFOPu8pTu+fmfGWg3xyD2o7cIs86r8vNe3NA==", + "license": "MIT", "dependencies": { - "@bpmn-io/feel-editor": "^1.3.0", + "@bpmn-io/feel-editor": "^1.5.0", "@codemirror/view": "^6.14.0", "classnames": "^2.3.1", "feelers": "^1.3.0", @@ -2967,9 +2970,10 @@ "integrity": "sha512-to+unsToePnm7cUeR9TrMzFlETHd/UXmU+ELTRfWZj5XGT41KF6X3L233o3E/GdEs3sk2Tbw/lOLD1avmWkg8A==" }, "node_modules/@camunda/element-templates-json-schema": { - "version": "0.17.2", - "resolved": "https://registry.npmjs.org/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.17.2.tgz", - "integrity": "sha512-ZNwvJ6UqhoWK/SZXV+m9c4feer09zt9DpM4Y3jooCKrnTUHNrCEqDF7V8cW7NG2KE8x1k7pCIAyNoy/9i+iwng==" + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.18.0.tgz", + "integrity": "sha512-k2k+1Z7UiW1TSA1oAvDQamgFZljH3hkFjU9VSpjVXnPgcjVxJMLX0mrHjLVtXhEx2tw576FzYGqlfudw6OOMKg==", + "license": "MIT" }, "node_modules/@camunda/example-data-properties-provider": { "version": "1.2.1", @@ -3141,9 +3145,10 @@ } }, "node_modules/@camunda/zeebe-element-templates-json-schema": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.19.2.tgz", - "integrity": "sha512-T0U6Ij3AS191KADumm5rXCVUYtKSFBiipexQL3lJHey1XmADmTGIqhAe8+iCyKqUaxixjv5Q/IkuFD2NqBoIpw==" + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.20.0.tgz", + "integrity": "sha512-7YRN32Nq73H8S1rCOy2/6cfx+fKiTnhveJYfP6aRaIi83ZSlhVomRJ5+pnPmlDJqdFeNcIx1qqQwVFAdgNPFhg==", + "license": "MIT" }, "node_modules/@carbon/grid": { "version": "11.22.0", @@ -9746,11 +9751,12 @@ } }, "node_modules/bpmn-js-element-templates": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/bpmn-js-element-templates/-/bpmn-js-element-templates-1.15.3.tgz", - "integrity": "sha512-12m4W6oKFPpMmATkQijjpkFaiDauWu+gPrSwE4qAYjL95YA8i1+L8nm5Oa4cbcdt1av22geh2KDHeCFBE59PQA==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/bpmn-js-element-templates/-/bpmn-js-element-templates-1.16.0.tgz", + "integrity": "sha512-m556VTAgKun4wLGBfX26dAYJ+j+UkMKeyIHILuRtq1c0lCV++0AuUCBSWGL7hv5Aw96oAEkH2zIOLWc9Qg/gyw==", + "license": "MIT", "dependencies": { - "@bpmn-io/element-templates-validator": "^2.0.1", + "@bpmn-io/element-templates-validator": "^2.1.0", "@bpmn-io/extract-process-variables": "^0.8.0", "bpmnlint": "^10.0.0", "classnames": "^2.3.1", @@ -10594,21 +10600,22 @@ } }, "node_modules/camunda-bpmn-js": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/camunda-bpmn-js/-/camunda-bpmn-js-4.9.0.tgz", - "integrity": "sha512-+g3Sdnwxhdpdb6JNLAFQ8k6eDHFWG5iANWViE5r6RvIfffiiM8KfLhB3UJCBS/445UrXfFRwyfBpwWwt9VhSwg==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/camunda-bpmn-js/-/camunda-bpmn-js-4.10.0.tgz", + "integrity": "sha512-qMRbMv3boHhn1cGIUQ0ndHnqwlH+f8z1aFQPx+D0EPncY+D8/E9DQZOVirIBk+wKQ9lrbPC2ISp+DxXjBoJkpw==", + "license": "MIT", "dependencies": { "@bpmn-io/align-to-origin": "^0.7.0", "@bpmn-io/element-template-chooser": "^1.0.0", "@bpmn-io/element-template-icon-renderer": "^0.5.2", "@bpmn-io/form-variable-provider": "^1.3.0", - "@bpmn-io/properties-panel": "^3.19.0", + "@bpmn-io/properties-panel": "^3.20.0", "@bpmn-io/variable-resolver": "^1.2.2", "@camunda/example-data-properties-provider": "^1.2.1", "bpmn-js": "^17.8.1", "bpmn-js-color-picker": "^0.7.1", "bpmn-js-create-append-anything": "^0.5.1", - "bpmn-js-element-templates": "^1.15.3", + "bpmn-js-element-templates": "^1.16.0", "bpmn-js-executable-fix": "^0.2.1", "camunda-bpmn-js-behaviors": "^1.3.0", "camunda-bpmn-moddle": "^7.0.1", @@ -18293,7 +18300,8 @@ "node_modules/json-source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/json-source-map/-/json-source-map-0.6.1.tgz", - "integrity": "sha512-1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg==" + "integrity": "sha512-1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg==", + "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", @@ -34706,12 +34714,12 @@ } }, "@bpmn-io/element-templates-validator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-2.0.1.tgz", - "integrity": "sha512-vwQNh2K2qzQPhRF4N4SHsgVCGCo6jsYL0mhanaii7k5XH7gyT+R9822D+lHOyih+Q4ii/KIQusZKSxFfhlLaLQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-2.1.0.tgz", + "integrity": "sha512-e8oYLUaZbL1ZuJjwXFyhhStbg0YgMNosIlzhKWdY7ysPhCFVMJlJ6yNYdaxyqfpPATTKb05uXMAsIgcqTQpoLg==", "requires": { - "@camunda/element-templates-json-schema": "^0.17.2", - "@camunda/zeebe-element-templates-json-schema": "^0.19.2", + "@camunda/element-templates-json-schema": "^0.18.0", + "@camunda/zeebe-element-templates-json-schema": "^0.20.0", "json-source-map": "^0.6.1", "min-dash": "^4.1.1" }, @@ -34918,11 +34926,11 @@ } }, "@bpmn-io/properties-panel": { - "version": "3.19.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-3.19.0.tgz", - "integrity": "sha512-ZVr8LC8ZiMYRkh9Vf4EnuQ7hJIzjBLpLUoex+q5/tGj1I2B/iFAgDUaqnD/yOyBzkRDi1K9IedsUA01XaqG13w==", + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-3.20.0.tgz", + "integrity": "sha512-XjTijxyjJRByZiDHodoXM6x8EcCalbSmBW/yu3c6WZeSsEUO95gFOPu8pTu+fmfGWg3xyD2o7cIs86r8vNe3NA==", "requires": { - "@bpmn-io/feel-editor": "^1.3.0", + "@bpmn-io/feel-editor": "^1.5.0", "@codemirror/view": "^6.14.0", "classnames": "^2.3.1", "feelers": "^1.3.0", @@ -34975,9 +34983,9 @@ } }, "@camunda/element-templates-json-schema": { - "version": "0.17.2", - "resolved": "https://registry.npmjs.org/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.17.2.tgz", - "integrity": "sha512-ZNwvJ6UqhoWK/SZXV+m9c4feer09zt9DpM4Y3jooCKrnTUHNrCEqDF7V8cW7NG2KE8x1k7pCIAyNoy/9i+iwng==" + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.18.0.tgz", + "integrity": "sha512-k2k+1Z7UiW1TSA1oAvDQamgFZljH3hkFjU9VSpjVXnPgcjVxJMLX0mrHjLVtXhEx2tw576FzYGqlfudw6OOMKg==" }, "@camunda/example-data-properties-provider": { "version": "1.2.1", @@ -35128,9 +35136,9 @@ } }, "@camunda/zeebe-element-templates-json-schema": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.19.2.tgz", - "integrity": "sha512-T0U6Ij3AS191KADumm5rXCVUYtKSFBiipexQL3lJHey1XmADmTGIqhAe8+iCyKqUaxixjv5Q/IkuFD2NqBoIpw==" + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.20.0.tgz", + "integrity": "sha512-7YRN32Nq73H8S1rCOy2/6cfx+fKiTnhveJYfP6aRaIi83ZSlhVomRJ5+pnPmlDJqdFeNcIx1qqQwVFAdgNPFhg==" }, "@carbon/grid": { "version": "11.22.0", @@ -40052,11 +40060,11 @@ } }, "bpmn-js-element-templates": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/bpmn-js-element-templates/-/bpmn-js-element-templates-1.15.3.tgz", - "integrity": "sha512-12m4W6oKFPpMmATkQijjpkFaiDauWu+gPrSwE4qAYjL95YA8i1+L8nm5Oa4cbcdt1av22geh2KDHeCFBE59PQA==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/bpmn-js-element-templates/-/bpmn-js-element-templates-1.16.0.tgz", + "integrity": "sha512-m556VTAgKun4wLGBfX26dAYJ+j+UkMKeyIHILuRtq1c0lCV++0AuUCBSWGL7hv5Aw96oAEkH2zIOLWc9Qg/gyw==", "requires": { - "@bpmn-io/element-templates-validator": "^2.0.1", + "@bpmn-io/element-templates-validator": "^2.1.0", "@bpmn-io/extract-process-variables": "^0.8.0", "bpmnlint": "^10.0.0", "classnames": "^2.3.1", @@ -40612,21 +40620,21 @@ } }, "camunda-bpmn-js": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/camunda-bpmn-js/-/camunda-bpmn-js-4.9.0.tgz", - "integrity": "sha512-+g3Sdnwxhdpdb6JNLAFQ8k6eDHFWG5iANWViE5r6RvIfffiiM8KfLhB3UJCBS/445UrXfFRwyfBpwWwt9VhSwg==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/camunda-bpmn-js/-/camunda-bpmn-js-4.10.0.tgz", + "integrity": "sha512-qMRbMv3boHhn1cGIUQ0ndHnqwlH+f8z1aFQPx+D0EPncY+D8/E9DQZOVirIBk+wKQ9lrbPC2ISp+DxXjBoJkpw==", "requires": { "@bpmn-io/align-to-origin": "^0.7.0", "@bpmn-io/element-template-chooser": "^1.0.0", "@bpmn-io/element-template-icon-renderer": "^0.5.2", "@bpmn-io/form-variable-provider": "^1.3.0", - "@bpmn-io/properties-panel": "^3.19.0", + "@bpmn-io/properties-panel": "^3.20.0", "@bpmn-io/variable-resolver": "^1.2.2", "@camunda/example-data-properties-provider": "^1.2.1", "bpmn-js": "^17.8.1", "bpmn-js-color-picker": "^0.7.1", "bpmn-js-create-append-anything": "^0.5.1", - "bpmn-js-element-templates": "^1.15.3", + "bpmn-js-element-templates": "^1.16.0", "bpmn-js-executable-fix": "^0.2.1", "camunda-bpmn-js-behaviors": "^1.3.0", "camunda-bpmn-moddle": "^7.0.1", @@ -40746,7 +40754,7 @@ "@bpmn-io/dmn-migrate": "^0.5.0", "@bpmn-io/extract-process-variables": "^0.8.0", "@bpmn-io/form-js": "^1.8.6", - "@bpmn-io/properties-panel": "^3.19.0", + "@bpmn-io/properties-panel": "^3.20.0", "@bpmn-io/replace-ids": "^0.2.0", "@camunda/execution-platform": "^0.3.2", "@camunda/form-linting": "^0.16.0", @@ -40766,12 +40774,12 @@ "babel-loader": "^9.0.0", "babel-plugin-istanbul": "^6.0.0", "bpmn-js": "^17.8.1", - "bpmn-js-element-templates": "^1.15.3", + "bpmn-js-element-templates": "^1.16.0", "bpmn-js-properties-panel": "^5.17.1", "bpmn-js-tracking": "^0.6.0", "bpmn-moddle": "^9.0.1", "bpmnlint-loader": "^0.1.6", - "camunda-bpmn-js": "^4.9.0", + "camunda-bpmn-js": "^4.10.0", "camunda-bpmn-moddle": "^7.0.1", "camunda-cmmn-moddle": "^1.0.0", "camunda-dmn-js": "^2.4.0", diff --git a/resources/element-templates/cloud-samples.json b/resources/element-templates/cloud-samples.json index 7ce674cdd3..0803500694 100644 --- a/resources/element-templates/cloud-samples.json +++ b/resources/element-templates/cloud-samples.json @@ -104,7 +104,8 @@ }, "constraints": { "notEmpty": true - } + }, + "placeholder": "message" } ] },