Merge pull request #1272 from girder/fix-multi-clause-filter

Fix filtering item lists in Girder by multiple phrases
girder · Aug 22, 2023 · ec430e3 · ec430e3
2 parents 4b156d0 + c19097b
commit ec430e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Bug Fixes
 - Allow users with only annotation access to edit annotations ([#1267](../../pull/1267))
+- Fix filtering item lists in Girder by multiple phrases ([#1272](../../pull/1272))
 
 ## 1.23.3
 

diff --git a/girder/girder_large_image/web_client/views/itemList.js b/girder/girder_large_image/web_client/views/itemList.js
@@ -263,7 +263,7 @@ wrap(ItemListWidget, 'render', function (render) {
                         }
                     });
                 }
-                const key = `${coltag}:` + phrases.join('|||');
+                const key = `${coltag || ''}:` + phrases.map((p) => p.phrase + (p.exact ? '__exact__' : '')).join('|||');
                 if (!phrases.length || usedPhrases[key]) {
                     return;
                 }
@@ -301,12 +301,12 @@ wrap(ItemListWidget, 'render', function (render) {
                         if (key && exact) {
                             clause.push({[key]: {$regex: '^' + phrase + '$', $options: 'i'}});
                             if (!_.isNaN(numval)) {
-                                clause.push({[key]: {$eq: numval}});
+                                clause.push({[key]: numval});
                             }
                         } else if (key) {
                             clause.push({[key]: {$regex: phrase, $options: 'i'}});
                             if (!_.isNaN(numval)) {
-                                clause.push({[key]: {$eq: numval}});
+                                clause.push({[key]: numval});
                                 if (numval > 0 && delta) {
                                     clause.push({[key]: {$gte: numval, $lt: numval + delta}});
                                 } else if (numval < 0 && delta) {