Skip to content

Commit 11cbd71

Browse files
Buckwichbarmac
andcommitted
feat: set parser dialect to camunda
Related to camunda/camunda-modeler#4809 Co-authored-by: Maciej Barelkowski <[email protected]>
1 parent ac35776 commit 11cbd71

24 files changed

+78
-72
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ All notable changes to [bpmn-js-properties-panel](https://github.com/bpmn-io/bpm
66

77
___Note:__ Yet to be released changes appear here._
88

9+
* `FEAT`: set FEEL parser dialect to Camunda by default ([#1128](https://github.com/bpmn-io/bpmn-js-properties-panel/pull/1128))
910
* `FEAT`: allow to provide custom FEEL popup
1011
* `FEAT`: make list headers sticky ([bpmn-io/properties-panel#397](https://github.com/bpmn-io/properties-panel/pull/397))
1112
* `DEPS`: update to `@bpmn-io/[email protected]`

src/entries/BpmnFeelEntry.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { FeelEntry } from '@bpmn-io/properties-panel';
2+
import { withTooltipContainer, withVariableContext } from '../provider/HOCs';
3+
4+
export const BpmnFeelEntry = withVariableContext(withTooltipContainer(FeelEntry));
5+

src/entries/FeelEntryWithContext.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/provider/HOCs/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export { withProps } from './withProps';
22
export { withVariableContext } from './withVariableContext';
3-
export { withTooltipContainer } from './withTooltipContainer';
3+
export { withTooltipContainer } from './withTooltipContainer';

src/provider/zeebe/properties/ActiveElementsProps.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { isFeelEntryEdited } from '@bpmn-io/properties-panel';
77

88
import { useService } from '../../../hooks';
99

10-
import { FeelEntryWithVariableContext } from '../../../entries/FeelEntryWithContext';
10+
import { BpmnFeelEntry } from '../../../entries/BpmnFeelEntry';
1111

1212
import {
1313
getExtensionElementsList,
@@ -54,7 +54,7 @@ function ActiveElementsCollection(props) {
5454
return setProperty(element, value, commandStack, bpmnFactory);
5555
};
5656

57-
return FeelEntryWithVariableContext({
57+
return BpmnFeelEntry({
5858
element,
5959
id: 'activeElements-activeElementsCollection',
6060
label: translate('Active elements collection'),

src/provider/zeebe/properties/AdHocCompletionProps.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
} from '@bpmn-io/properties-panel';
66

77
import { useService } from '../../../hooks';
8-
import { FeelEntryWithVariableContext } from '../../../entries/FeelEntryWithContext';
8+
import { BpmnFeelEntry } from '../../../entries/BpmnFeelEntry';
99
import { createOrUpdateFormalExpression } from '../../../utils/FormalExpressionUtil';
1010

1111
/**
@@ -55,7 +55,7 @@ function CompletionCondition(props) {
5555
);
5656
};
5757

58-
return FeelEntryWithVariableContext({
58+
return BpmnFeelEntry({
5959
element,
6060
id: 'completionCondition',
6161
label: translate('Completion condition'),

src/provider/zeebe/properties/AssignmentDefinitionProps.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
useService
1818
} from '../../../hooks';
1919

20-
import { FeelEntryWithVariableContext } from '../../../entries/FeelEntryWithContext';
20+
import { BpmnFeelEntry } from '../../../entries/BpmnFeelEntry';
2121

2222

2323
export function AssignmentDefinitionProps(props) {
@@ -125,7 +125,7 @@ function Assignee(props) {
125125
commandStack.execute('properties-panel.multi-command-executor', commands);
126126
};
127127

128-
return FeelEntryWithVariableContext({
128+
return BpmnFeelEntry({
129129
element,
130130
id: 'assignmentDefinitionAssignee',
131131
label: translate('Assignee'),
@@ -212,7 +212,7 @@ function CandidateGroups(props) {
212212
commandStack.execute('properties-panel.multi-command-executor', commands);
213213
};
214214

215-
return FeelEntryWithVariableContext({
215+
return BpmnFeelEntry({
216216
element,
217217
id: 'assignmentDefinitionCandidateGroups',
218218
label: translate('Candidate groups'),
@@ -299,7 +299,7 @@ function CandidateUsers(props) {
299299
commandStack.execute('properties-panel.multi-command-executor', commands);
300300
};
301301

302-
return FeelEntryWithVariableContext({
302+
return BpmnFeelEntry({
303303
element,
304304
id: 'assignmentDefinitionCandidateUsers',
305305
label: translate('Candidate users'),

src/provider/zeebe/properties/CalledDecisionProps.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323

2424
import { useService } from '../../../hooks';
2525

26-
import { FeelEntryWithVariableContext } from '../../../entries/FeelEntryWithContext';
26+
import { BpmnFeelEntry } from '../../../entries/BpmnFeelEntry';
2727

2828
import { withProps } from '../../HOCs/withProps.js';
2929

@@ -148,7 +148,7 @@ function DecisionID(props) {
148148
commandStack.execute('properties-panel.multi-command-executor', commands);
149149
};
150150

151-
return FeelEntryWithVariableContext({
151+
return BpmnFeelEntry({
152152
element,
153153
id,
154154
label: translate('Decision ID'),

src/provider/zeebe/properties/ConditionProps.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717

1818
import { isFeelEntryEdited } from '@bpmn-io/properties-panel';
1919

20-
import { FeelEntryWithVariableContext } from '../../../entries/FeelEntryWithContext';
20+
import { BpmnFeelEntry } from '../../../entries/BpmnFeelEntry';
2121

2222

2323
export function ConditionProps(props) {
@@ -102,7 +102,7 @@ function ConditionExpression(props) {
102102
commandStack.execute('properties-panel.multi-command-executor', commands);
103103
};
104104

105-
return FeelEntryWithVariableContext({
105+
return BpmnFeelEntry({
106106
element,
107107
id: 'conditionExpression',
108108
label: translate('Condition expression'),

src/provider/zeebe/properties/ErrorProps.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
getError
1414
} from '../../bpmn/utils/EventDefinitionUtil';
1515

16-
import { FeelEntryWithVariableContext } from '../../../entries/FeelEntryWithContext';
16+
import { BpmnFeelEntry } from '../../../entries/BpmnFeelEntry';
1717

1818

1919
export function ErrorProps(props) {
@@ -65,7 +65,7 @@ function ErrorCode(props) {
6565
);
6666
};
6767

68-
return FeelEntryWithVariableContext({
68+
return BpmnFeelEntry({
6969
element,
7070
id: 'errorCode',
7171
label: translate('Code'),

0 commit comments

Comments
 (0)