Fixed a bug in the new search logic.

It wasn't searching into elements of arrays
ashleydavis · Aug 4, 2024 · c63ee50 · c63ee50
1 parent c98eba7
commit c63ee50
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/packages/user-interface/src/context/gallery-context.tsx b/packages/user-interface/src/context/gallery-context.tsx
@@ -564,6 +564,23 @@ export function GalleryContextProvider({ children }: IGalleryContextProviderProp
         return items.filter(item => !item.deleted);
     }
 
+    //
+    // Determine if a field value matches the search text.
+    //
+    function valueMatches(fieldValue: any, searchTextLwr: string): boolean {
+        if (Array.isArray(fieldValue)) {
+            for (const elementValue of fieldValue) {
+                if (elementValue.toLowerCase().includes(searchTextLwr)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        else {
+            return fieldValue.toLowerCase().includes(searchTextLwr);
+        }
+    }
+
     //
     // Search for assets based on text input.
     // 
@@ -578,7 +595,7 @@ export function GalleryContextProvider({ children }: IGalleryContextProviderProp
         const searchFields = [ "location", "description", "labels", "origFileName", "origPath", "contentType" ];
         const searchedItems: IGalleryItem[] = [];
 
-        const searchLwr = searchText.toLowerCase();
+        const searchTextLwr = searchText.toLowerCase();
 
         for (const item of items) {
             for (const fieldName of searchFields) {
@@ -587,10 +604,10 @@ export function GalleryContextProvider({ children }: IGalleryContextProviderProp
                     continue;
                 }
 
-                if (fieldValue.toLowerCase().includes(searchLwr)) {
+                if (valueMatches(fieldValue, searchTextLwr)) {
                     searchedItems.push(item);
                     break;
-                }                
+                }
             }
         }