Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
matrix:
integration: [ true ]
integration-deps:
- [email protected] bpmn-js@18.6.3
- [email protected] bpmn-js@11.5
- "@bpmn-io/properties-panel@3"
include:
- integration-deps: "" # as defined in package.json
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `[email protected]`

## 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))
Expand Down
46 changes: 23 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
Expand Down
8 changes: 3 additions & 5 deletions src/provider/bpmn/properties/AdHocCompletionProps.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -33,9 +32,8 @@ export function AdHocCompletionProps(props) {
{
id: 'cancelRemainingInstances',
component: CancelRemainingInstances,

isEdited: isCheckboxEntryEdited
}
isEdited: (node) => node && !node.checked // the default value is true
},
];
}

Expand Down
6 changes: 3 additions & 3 deletions test/spec/provider/bpmn/AdHocCompletionProps.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand All @@ -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;
}));


Expand Down
6 changes: 3 additions & 3 deletions test/spec/provider/zeebe/AdHocCompletionProps.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand All @@ -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;
}));


Expand Down