diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f6bda5822..ce65d1188 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -8,7 +8,7 @@ jobs: matrix: integration: [ true ] integration-deps: - - diagram-js@11.9 bpmn-js@18.6.3 + - diagram-js@11.9 bpmn-js@11.5 - "@bpmn-io/properties-panel@3" include: - integration-deps: "" # as defined in package.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b683b775..7d60b79c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ All notable changes to [bpmn-js-properties-panel](https://github.com/bpmn-io/bpm ___Note:__ Yet to be released changes appear here._ +## 5.42.1 + +* `FIX`: use default value for `cancelRemainingInstances` for edit marker +* `FIX`: undo breaking change in peer dependencies ([#1149](https://github.com/bpmn-io/bpmn-js-properties-panel/issues/1149)) +* `DEPS`: update to `bpmn-js@18.6.4` + ## 5.42.0 * `FEAT`: support multiline feel strings in `camunda` dialect ([@bpmn-io/lezer-feel#2](https://github.com/bpmn-io/lezer-feel/pull/2)) diff --git a/package-lock.json b/package-lock.json index a7073be59..76517ad4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,10 +30,10 @@ "axe-core": "^4.10.3", "babel-loader": "^10.0.0", "babel-plugin-istanbul": "^7.0.0", - "bpmn-js": "^18.6.3", + "bpmn-js": "^18.6.4", "bpmn-js-create-append-anything": "^1.0.1", "bpmn-moddle": "^9.0.3", - "camunda-bpmn-js-behaviors": "^1.11.1", + "camunda-bpmn-js-behaviors": "^1.11.2", "camunda-bpmn-moddle": "^7.0.1", "chai": "^4.5.0", "cross-env": "^10.0.0", @@ -71,7 +71,7 @@ }, "peerDependencies": { "@bpmn-io/properties-panel": ">= 3.7", - "bpmn-js": ">= 18.6.3", + "bpmn-js": ">= 11.5", "camunda-bpmn-js-behaviors": ">= 0.4", "diagram-js": ">= 11.9" } @@ -2940,13 +2940,13 @@ "dev": true }, "node_modules/bpmn-js": { - "version": "18.6.3", - "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.6.3.tgz", - "integrity": "sha512-dNVZhzdxA6q9GFlc5UE691gBGSiGYjLcXbohQ65/P0ZUERgJi7z8Kgnu2f/rrizfE/jray+hAjMfZdFfOG/B+w==", + "version": "18.6.4", + "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.6.4.tgz", + "integrity": "sha512-8hvS+MD34ol1WYUqygY+OMDurD/pLt+ok7LC9lmQHqcQe21BDRXjDZpoNGZf/dwcth6Rec1zVAOhT8Um9Wk8FQ==", "dev": true, "license": "SEE LICENSE IN LICENSE", "dependencies": { - "bpmn-moddle": "^9.0.3", + "bpmn-moddle": "^9.0.4", "diagram-js": "^15.3.0", "diagram-js-direct-editing": "^3.2.0", "ids": "^1.0.5", @@ -2992,9 +2992,9 @@ } }, "node_modules/bpmn-moddle": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-9.0.3.tgz", - "integrity": "sha512-Mv9KKKSaH5PsN5b1j7GoLfsQ9Ortm5o9Rj7Xy9hnsOhUSUJWIvlch//qYPUvaE6CS4uR6dtujOPum7mLIhl6xQ==", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-9.0.4.tgz", + "integrity": "sha512-dr5s3vtOG8NkVSwa8CC55XBIKKwajomSZRb0RiMOOOF6TpqZBZvtbDjpzWICvdd/plDF6uOtaRfSgblPQLAioQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3201,9 +3201,9 @@ } }, "node_modules/camunda-bpmn-js-behaviors": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/camunda-bpmn-js-behaviors/-/camunda-bpmn-js-behaviors-1.11.1.tgz", - "integrity": "sha512-It6OLShW7wuMC12Vc6OZPxbtRKX8j5AvqnBktXs5jyfUndqcRNHRkZ7wSEiTqAkHyl6ATNuYmfNUQzqxFyNmKg==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/camunda-bpmn-js-behaviors/-/camunda-bpmn-js-behaviors-1.11.2.tgz", + "integrity": "sha512-NI0BhaEWePZgAemPOII8r88UQ+56uhOh07YokfOQTyAhv3PiBsdqDMEYuexB380qphYAOP4irH6extxQE2DBLw==", "dev": true, "license": "MIT", "dependencies": { @@ -12720,12 +12720,12 @@ "dev": true }, "bpmn-js": { - "version": "18.6.3", - "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.6.3.tgz", - "integrity": "sha512-dNVZhzdxA6q9GFlc5UE691gBGSiGYjLcXbohQ65/P0ZUERgJi7z8Kgnu2f/rrizfE/jray+hAjMfZdFfOG/B+w==", + "version": "18.6.4", + "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.6.4.tgz", + "integrity": "sha512-8hvS+MD34ol1WYUqygY+OMDurD/pLt+ok7LC9lmQHqcQe21BDRXjDZpoNGZf/dwcth6Rec1zVAOhT8Um9Wk8FQ==", "dev": true, "requires": { - "bpmn-moddle": "^9.0.3", + "bpmn-moddle": "^9.0.4", "diagram-js": "^15.3.0", "diagram-js-direct-editing": "^3.2.0", "ids": "^1.0.5", @@ -12762,9 +12762,9 @@ "requires": {} }, "bpmn-moddle": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-9.0.3.tgz", - "integrity": "sha512-Mv9KKKSaH5PsN5b1j7GoLfsQ9Ortm5o9Rj7Xy9hnsOhUSUJWIvlch//qYPUvaE6CS4uR6dtujOPum7mLIhl6xQ==", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-9.0.4.tgz", + "integrity": "sha512-dr5s3vtOG8NkVSwa8CC55XBIKKwajomSZRb0RiMOOOF6TpqZBZvtbDjpzWICvdd/plDF6uOtaRfSgblPQLAioQ==", "dev": true, "requires": { "min-dash": "^4.2.1", @@ -12899,9 +12899,9 @@ "dev": true }, "camunda-bpmn-js-behaviors": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/camunda-bpmn-js-behaviors/-/camunda-bpmn-js-behaviors-1.11.1.tgz", - "integrity": "sha512-It6OLShW7wuMC12Vc6OZPxbtRKX8j5AvqnBktXs5jyfUndqcRNHRkZ7wSEiTqAkHyl6ATNuYmfNUQzqxFyNmKg==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/camunda-bpmn-js-behaviors/-/camunda-bpmn-js-behaviors-1.11.2.tgz", + "integrity": "sha512-NI0BhaEWePZgAemPOII8r88UQ+56uhOh07YokfOQTyAhv3PiBsdqDMEYuexB380qphYAOP4irH6extxQE2DBLw==", "dev": true, "requires": { "ids": "^1.0.0", diff --git a/package.json b/package.json index 31e5d5641..526514710 100644 --- a/package.json +++ b/package.json @@ -71,10 +71,10 @@ "axe-core": "^4.10.3", "babel-loader": "^10.0.0", "babel-plugin-istanbul": "^7.0.0", - "bpmn-js": "^18.6.3", + "bpmn-js": "^18.6.4", "bpmn-js-create-append-anything": "^1.0.1", "bpmn-moddle": "^9.0.3", - "camunda-bpmn-js-behaviors": "^1.11.1", + "camunda-bpmn-js-behaviors": "^1.11.2", "camunda-bpmn-moddle": "^7.0.1", "chai": "^4.5.0", "cross-env": "^10.0.0", @@ -109,7 +109,7 @@ }, "peerDependencies": { "@bpmn-io/properties-panel": ">= 3.7", - "bpmn-js": ">= 18.6.3", + "bpmn-js": ">= 11.5", "camunda-bpmn-js-behaviors": ">= 0.4", "diagram-js": ">= 11.9" } diff --git a/src/provider/bpmn/properties/AdHocCompletionProps.js b/src/provider/bpmn/properties/AdHocCompletionProps.js index abe4a2726..9db8aa34a 100644 --- a/src/provider/bpmn/properties/AdHocCompletionProps.js +++ b/src/provider/bpmn/properties/AdHocCompletionProps.js @@ -2,9 +2,8 @@ import { is, getBusinessObject } from 'bpmn-js/lib/util/ModelUtil'; import { CheckboxEntry, - isCheckboxEntryEdited, isTextFieldEntryEdited, - TextFieldEntry + TextFieldEntry, } from '@bpmn-io/properties-panel'; import { useService } from '../../../hooks'; @@ -33,9 +32,8 @@ export function AdHocCompletionProps(props) { { id: 'cancelRemainingInstances', component: CancelRemainingInstances, - - isEdited: isCheckboxEntryEdited - } + isEdited: (node) => node && !node.checked // the default value is true + }, ]; } diff --git a/test/spec/provider/bpmn/AdHocCompletionProps.spec.js b/test/spec/provider/bpmn/AdHocCompletionProps.spec.js index 5a45473b3..c31ddf3c0 100644 --- a/test/spec/provider/bpmn/AdHocCompletionProps.spec.js +++ b/test/spec/provider/bpmn/AdHocCompletionProps.spec.js @@ -204,11 +204,11 @@ describe('provider/bpmn - AdHocCompletion', function() { describe('#cancelRemainingInstances', function() { - it('should not be checked when not explicitely configured on the process', inject(async function(elementRegistry, selection) { + it('should be checked when not explicitely configured on the process', inject(async function(elementRegistry, selection) { // given const subprocess = elementRegistry.get('Subprocess_2'); - expect(getCancelRemainingInstancesValue(subprocess)).not.to.exist; + expect(getCancelRemainingInstancesValue(subprocess)).to.be.true; // when await act(() => { @@ -218,7 +218,7 @@ describe('provider/bpmn - AdHocCompletion', function() { // then const cancelRemainingInstancesCheckbox = getCancelRemainingInstancesCheckbox(container); expect(cancelRemainingInstancesCheckbox).to.exist; - expect(cancelRemainingInstancesCheckbox.checked).to.be.false; + expect(cancelRemainingInstancesCheckbox.checked).be.true; })); diff --git a/test/spec/provider/zeebe/AdHocCompletionProps.spec.js b/test/spec/provider/zeebe/AdHocCompletionProps.spec.js index 13b707a8c..745605474 100644 --- a/test/spec/provider/zeebe/AdHocCompletionProps.spec.js +++ b/test/spec/provider/zeebe/AdHocCompletionProps.spec.js @@ -264,13 +264,13 @@ describe('provider/zeebe - AdHocCompletion', function() { describe('#cancelRemainingInstances', function() { - it('should not be checked when not explicitely configured on the process', inject(async function( + it('should be checked when not explicitely configured on the process', inject(async function( elementRegistry, selection ) { // given const subprocess = elementRegistry.get('Subprocess_2'); - expect(getCancelRemainingInstancesValue(subprocess)).not.to.exist; + expect(getCancelRemainingInstancesValue(subprocess)).to.be.true; // when await act(() => { @@ -280,7 +280,7 @@ describe('provider/zeebe - AdHocCompletion', function() { // then const cancelRemainingInstancesCheckbox = getCancelRemainingInstancesCheckbox(container); expect(cancelRemainingInstancesCheckbox).to.exist; - expect(cancelRemainingInstancesCheckbox.checked).to.be.false; + expect(cancelRemainingInstancesCheckbox.checked).be.true; }));