chore: persist all entryIds in the report

related to bpmn-io/bpmn-js-element-templates#3 (comment)
camunda · Jul 6, 2023 · 4bec830 · 4bec830
1 parent 8dbcba9
commit 4bec830
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ All notable changes to [@camunda/linting](https://github.com/camunda/linting) ar
 
 ___Note:__ Yet to be released changes appear here._
 
+* `CHORE`: persist all `entryIds` in the report ([#63](https://github.com/camunda/linting/pull/63))
+
 ## 3.0.0
 
 * `FEAT`: rule errors are now reported as `rule-error` category instead of `error` ([#109](https://github.com/bpmn-io/bpmnlint/pull/109))

diff --git a/lib/Linter.js b/lib/Linter.js
@@ -77,7 +77,7 @@ export class Linter {
               this._modeler
             ),
             propertiesPanel: {
-              entryId: entryIds[ Math.max(0, entryIds.length - 1) ]
+              entryIds
             },
             rule
           };

diff --git a/lib/modeler/Linting.js b/lib/modeler/Linting.js
@@ -32,12 +32,12 @@ export default class Linting {
       this._selection.select(element);
     }
 
-    const { entryId } = propertiesPanel;
+    const { entryIds = [] } = propertiesPanel;
 
     // TODO(philippfromme): remove timeout once properties panel is fixed
     setTimeout(() => {
       this._eventBus.fire('propertiesPanel.showEntry', {
-        id: entryId
+        id: entryIds[ Math.max(0, entryIds.length - 1) ]
       });
     });
   }

diff --git a/lib/utils/properties-panel.js b/lib/utils/properties-panel.js
@@ -49,11 +49,11 @@ export function getEntryIds(report) {
     data = {},
     id,
     path,
-    entryIds
+    propertiesPanel = {}
   } = report;
 
-  if (entryIds) {
-    return entryIds;
+  if (propertiesPanel.entryIds) {
+    return propertiesPanel.entryIds;
   }
 
   if (isPropertyError(data, 'isExecutable')) {

diff --git a/test/spec/utils/properties-panel.spec.js b/test/spec/utils/properties-panel.spec.js
@@ -36,7 +36,15 @@ describe('utils/properties-panel', function() {
 
         const rule = () => ({
           check: (node, reporter) => {
-            reporter.report(node.id, 'My Custom Message' , { entryIds: [ 'myCustomEntry' ] });
+            reporter.report(
+              node.id,
+              'My Custom Message',
+              {
+                propertiesPanel: {
+                  entryIds: [ 'myCustomEntry' ]
+                }
+              }
+            );
           }
         });