Merge branch 'inventory-search' into qa/monkey

Author: CuriousMagpie

Diff for: website/client/src/components/inventory/equipment/index.vue

@@ -410,7 +410,8 @@ export default {
           const ownedItem = this.flatGear[gearKey];
 
           const isSearched = !searchText
-            || ownedItem.text().toLowerCase().indexOf(searchText) !== -1;
+            || ownedItem.text().toLowerCase().indexOf(searchText) !== -1
+            || ownedItem.notes().toLowerCase().indexOf(searchText) !== -1;
 
           if (ownedItem.klass !== 'base' && isSearched) {
             const { type } = ownedItem;

Diff for: website/client/src/components/inventory/items/index.vue

@@ -338,9 +338,10 @@ export default {
           if (itemQuantity > 0 && isAllowed) {
             const item = contentItems[itemKey];
 
-            const isSearched = !searchText || item.text()
-              .toLowerCase()
-              .indexOf(searchText) !== -1;
+            const isSearched = !searchText
+            || item.text().toLowerCase().indexOf(searchText) !== -1
+            || item.notes().toLowerCase().indexOf(searchText) !== -1;
+
             if (isSearched && item) {
               itemsArray.push({
                 ...item,

Diff for: website/client/src/components/inventory/stable/index.vue

@@ -627,6 +627,7 @@ export default {
             animals.push({
               key: specialKey,
               eggKey,
+              eggName: text(),
               potionKey,
               name: text(),
               canFind,
@@ -657,7 +658,6 @@ export default {
       }
 
       this.cachedAnimalList[key] = animals;
-
       return animals;
     },
     listAnimals (animalGroup, type, hideMissing, sort, searchText) {
@@ -669,8 +669,12 @@ export default {
         animals = _filter(animals, a => a.isOwned());
       }
 
+      // this does not return the yarn pet if user searches for flying carpet
+      // if yarn is searched, both items appear
       if (searchText && searchText !== '') {
-        animals = _filter(animals, a => a.name.toLowerCase().indexOf(searchText) !== -1);
+        animals = _filter(animals, a => a.name.toLowerCase().indexOf(searchText) !== -1
+        || a.eggKey.toLowerCase().indexOf(searchText) !== -1
+        || a.eggName.toLowerCase().indexOf(searchText) !== -1);
       }
 
       // 2. Sort
@@ -693,7 +697,6 @@ export default {
       }
 
       this.viewOptions[animalGroup.key].animalCount = animals.length;
-
       return animals;
     },
     countOwnedAnimals (animalGroup, type) {