fix: fix properties panel entry ID for user task Priority

Related to camunda/camunda-modeler#4504
camunda · Sep 9, 2024 · 5fd8b81 · 5fd8b81
1 parent caf1f36
commit 5fd8b81
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/lib/utils/properties-panel.js b/lib/utils/properties-panel.js
@@ -303,14 +303,11 @@ export function getEntryIds(report) {
     return ids;
   }
 
-  if (isExpressionValueNotAllowedError(data, 'priority', 'zeebe:PriorityDefinition')) {
+  if (isExpressionValueNotAllowedError(data, 'priority', 'zeebe:PriorityDefinition')
+    || isExtensionElementNotAllowedError(data, 'zeebe:PriorityDefinition', 'bpmn:UserTask')) {
     return [ 'priorityDefinitionPriority' ];
   }
 
-  if (isExtensionElementNotAllowedError(data, 'zeebe:PriorityDefinition', 'bpmn:UserTask')) {
-    return [ 'priorityDefinition' ];
-  }
-
   if (isPropertyError(data, 'propagateAllParentVariables', 'zeebe:CalledElement')) {
     return [ 'propagateAllParentVariables' ];
   }

diff --git a/test/spec/utils/properties-panel.spec.js b/test/spec/utils/properties-panel.spec.js
@@ -1722,7 +1722,32 @@ describe('utils/properties-panel', function() {
       });
 
 
-      it('user task - Priority', async function() {
+      it('user task - Priority not supported', async function() {
+
+        // given
+        const node = createElement('bpmn:UserTask', {
+          extensionElements: createElement('bpmn:ExtensionElements', {
+            values: [
+              createElement('zeebe:PriorityDefinition')
+            ]
+          })
+        });
+
+        const { default: rule } = await import('bpmnlint-plugin-camunda-compat/rules/camunda-cloud/no-priority-definition');
+
+        const report = await getLintError(node, rule, { version: '8.5' });
+
+        // when
+        const entryIds = getEntryIds(report);
+
+        // then
+        expect(entryIds).to.eql([ 'priorityDefinitionPriority' ]);
+
+        expectErrorMessage(entryIds[ 0 ], 'Only supported by Camunda 8.6 or newer.', report);
+      });
+
+
+      it('user task - Priority value not supported', async function() {
 
         // given
         const node = createElement('bpmn:UserTask', {
@@ -1737,7 +1762,7 @@ describe('utils/properties-panel', function() {
 
         const { default: rule } = await import('bpmnlint-plugin-camunda-compat/rules/camunda-cloud/priority-definition');
 
-        const report = await getLintError(node, rule);
+        const report = await getLintError(node, rule, { version: '8.6' });
 
         // when
         const entryIds = getEntryIds(report);