fix(popup-menu): do not search by entry id

Related to camunda/camunda-modeler#3347
bpmn-io · Dec 8, 2022 · 8d03192 · 8d03192
1 parent f0ea636
commit 8d03192
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 5 deletions.
diff --git a/lib/features/popup-menu/PopupMenuComponent.js b/lib/features/popup-menu/PopupMenuComponent.js
@@ -82,10 +82,8 @@ export default function PopupMenuComponent(props) {
       }
 
       const search = [
-        entry.name,
         entry.description || '',
-        entry.label || '',
-        entry.id || ''
+        entry.label || ''
       ]
         .join('---')
         .toLowerCase();

diff --git a/test/spec/features/popup-menu/PopupMenuComponentSpec.js b/test/spec/features/popup-menu/PopupMenuComponentSpec.js
@@ -440,12 +440,12 @@ describe('features/popup-menu - <PopupMenu>', function() {
   describe('search', function() {
 
     const entries = [
-      { id: '1', label: 'Entry 1' },
+      { id: '1', label: 'Entry 1', description: 'Entry 1 description' },
       { id: '2', label: 'Entry 2' },
       { id: '3', label: 'Entry 3' },
       { id: '4', label: 'Entry 4' },
       { id: '5', label: 'Entry 5' },
-      { id: '6', label: 'Last' }
+      { id: 'some_entry_id', label: 'Last' }
     ];
 
 
@@ -510,6 +510,45 @@ describe('features/popup-menu - <PopupMenu>', function() {
     }));
 
 
+    it('should search description', async function() {
+
+      // given
+      createPopupMenu({ container, entries, search: true });
+
+      var searchInput = domQuery('.djs-popup-search input', container);
+      searchInput.value = entries[0].description;
+
+      // when
+      searchInput.dispatchEvent(keyDown('ArrowUp'));
+      searchInput.dispatchEvent(keyUp('ArrowUp'));
+
+      await whenStable();
+
+      // then
+      expect(domQueryAll('.entry', container)).to.have.length(1);
+      expect(domQuery('.entry .djs-popup-label', container).textContent).to.eql('Entry 1');
+    });
+
+
+    it('should not search id', async function() {
+
+      // given
+      createPopupMenu({ container, entries, search: true });
+
+      var searchInput = domQuery('.djs-popup-search input', container);
+      searchInput.value = entries[5].id;
+
+      // when
+      searchInput.dispatchEvent(keyDown('ArrowUp'));
+      searchInput.dispatchEvent(keyUp('ArrowUp'));
+
+      await whenStable();
+
+      // then
+      expect(domQueryAll('.entry', container)).to.have.length(0);
+    });
+
+
     describe('render', function() {
 
       const otherEntries = [