fix: display multi-instance configuration in properties panel

Related to camunda/camunda-modeler#3396
bpmn-io · Oct 20, 2023 · ca7330c · ca7330c
1 parent 5816951
commit ca7330c
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ All notable changes to [bpmn-js-element-templates](https://github.com/bpmn-io/bp
 
 ___Note:__ Yet to be released changes appear here._
 
+* `FIX`: display multi-instance configuration in properties panel
+
 ## 1.6.0
 
 * `FEAT`: add `zeebe:subscription` in single command ([#21](https://github.com/bpmn-io/bpmn-js-element-templates/issues/21))

diff --git a/src/cloud-element-templates/ElementTemplatesPropertiesProvider.js b/src/cloud-element-templates/ElementTemplatesPropertiesProvider.js
@@ -15,6 +15,11 @@ import { getPropertyValue } from './util/propertyUtil';
 
 const LOWER_PRIORITY = 300;
 
+const ALWAYS_DISPLAYED_GROUPS = [
+  'general',
+  'multiInstance'
+];
+
 
 export default class ElementTemplatesPropertiesProvider {
 
@@ -48,7 +53,7 @@ export default class ElementTemplatesPropertiesProvider {
       };
 
       // (1) Add templates group
-      addGroupsAfter('documentation', groups, [ templatesGroup ]);
+      addGroupsAfter(ALWAYS_DISPLAYED_GROUPS, groups, [ templatesGroup ]);
 
       let elementTemplate = this._elementTemplates.get(element);
 
@@ -111,12 +116,20 @@ function overrideGenericEntries(oldEntries, newEntries) {
 
 /**
  *
- * @param {string} id
+ * @param {string|string[]} idOrIds
  * @param {Array<{ id: string }} groups
  * @param {Array<{ id: string }>} groupsToAdd
  */
-function addGroupsAfter(id, groups, groupsToAdd) {
-  const index = groups.findIndex(group => group.id === id);
+function addGroupsAfter(idOrIds, groups, groupsToAdd) {
+  let ids = idOrIds;
+  if (!Array.isArray(idOrIds)) {
+    ids = [ idOrIds ];
+  }
+
+  // find index of last group with provided id
+  const index = groups.reduce((acc, group, index) => {
+    return ids.includes(group.id) ? index : acc;
+  }, -1);
 
   if (index !== -1) {
     groups.splice(index + 1, 0, ...groupsToAdd);
@@ -131,7 +144,7 @@ function filterWithEntriesVisible(template, groups) {
   if (!template.entriesVisible) {
     return groups.filter(group => {
       return (
-        group.id === 'general' ||
+        ALWAYS_DISPLAYED_GROUPS.includes(group.id) ||
         group.id.startsWith('ElementTemplates__')
       );
     });

diff --git a/test/spec/cloud-element-templates/ElementTemplatesPropertiesProvider.spec.js b/test/spec/cloud-element-templates/ElementTemplatesPropertiesProvider.spec.js
@@ -714,6 +714,30 @@ describe('provider/cloud-element-templates - ElementTemplates', function() {
     }));
 
   });
+
+
+  describe('multiinstance characteristics', function() {
+
+    it('should display multi-instance configuration', inject(
+      async function(elementRegistry, selection, modeling, bpmnFactory) {
+
+        // given
+        const element = elementRegistry.get('Task_1'),
+              loopCharacteristics = bpmnFactory.create('bpmn:MultiInstanceLoopCharacteristics');
+
+        // when
+        modeling.updateProperties(element, { loopCharacteristics });
+        await act(() => {
+          selection.select(element);
+        });
+
+        // then
+        const group = domQuery('[data-group-id="group-multiInstance"]', container);
+
+        expect(group).to.exist;
+      })
+    );
+  });
 });