1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-02 20:15:24 +02:00

feat: server side search (#2112) (#2117)

* feat: server side search API (#2112)

* refactor repository_recipes filter building

* add food filter to recipe repository page_all

* fix query type annotations

* working search

* add tests and make sure title matches are ordered correctly

* remove instruction matching again

* fix formatting and small issues

* fix another linting error

* make search test no rely on actual words

* fix failing postgres compiled query

* revise incorrectly ordered migration

* automatically extract latest migration version

* test migration orderes

* run type generators

* new search function

* wip: new search page

* sortable field options

* fix virtual scroll issue

* fix search casing bug

* finalize search filters/sorts

* remove old composable

* fix type errors

---------

Co-authored-by: Sören <fleshgolem@gmx.net>
This commit is contained in:
Hayden 2023-02-11 21:26:10 -09:00 committed by GitHub
parent fc105dcebc
commit 71f8c1066a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 1057 additions and 822 deletions

View file

@ -2,6 +2,5 @@ export { useFraction } from "./use-fraction";
export { useRecipe } from "./use-recipe";
export { useRecipes, recentRecipes, allRecipes, useLazyRecipes } from "./use-recipes";
export { parseIngredientText } from "./use-recipe-ingredients";
export { useRecipeSearch } from "./use-recipe-search";
export { useTools } from "./use-recipe-tools";
export { useRecipeMeta } from "./use-recipe-meta";

View file

@ -1,48 +0,0 @@
import { computed, reactive, ref, Ref } from "@nuxtjs/composition-api";
import Fuse from "fuse.js";
import { Recipe } from "~/lib/api/types/recipe";
export const useRecipeSearch = (recipes: Ref<Recipe[] | null>) => {
const localState = reactive({
options: {
ignoreLocation: true,
shouldSort: true,
threshold: 0.6,
location: 0,
distance: 100,
findAllMatches: true,
maxPatternLength: 32,
minMatchCharLength: 2,
ignoreFieldNorm: true,
keys: [{ name: "name", weight: 1.3 }, { name: "description", weight: 1.2 }, "recipeIngredient.note", "recipeIngredient.food.name"],
},
});
const search = ref("");
const fuse = computed(() => {
return new Fuse(recipes.value || [], localState.options);
});
const fuzzyRecipes = computed(() => {
if (search.value.trim() === "") {
return recipes.value;
}
const result = fuse.value.search(search.value.trim());
return result.map((x) => x.item);
});
const results = computed(() => {
if (!fuzzyRecipes.value) {
return [];
}
if (fuzzyRecipes.value.length > 0 && search.value.length != null && search.value.length >= 1) {
return fuzzyRecipes.value;
} else {
return recipes.value;
}
});
return { results, search };
};

View file

@ -3,12 +3,12 @@ export const LOCALES = [
{
name: "繁體中文 (Chinese traditional)",
value: "zh-TW",
progress: 68,
progress: 50,
},
{
name: "简体中文 (Chinese simplified)",
value: "zh-CN",
progress: 56,
progress: 41,
},
{
name: "Tiếng Việt (Vietnamese)",
@ -18,72 +18,72 @@ export const LOCALES = [
{
name: "Українська (Ukrainian)",
value: "uk-UA",
progress: 99,
progress: 88,
},
{
name: "Türkçe (Turkish)",
value: "tr-TR",
progress: 47,
progress: 41,
},
{
name: "Svenska (Swedish)",
value: "sv-SE",
progress: 91,
progress: 66,
},
{
name: "српски (Serbian)",
value: "sr-SP",
progress: 11,
progress: 8,
},
{
name: "Slovenian",
value: "sl-SI",
progress: 94,
progress: 73,
},
{
name: "Slovak",
value: "sk-SK",
progress: 85,
progress: 78,
},
{
name: "Pусский (Russian)",
value: "ru-RU",
progress: 57,
progress: 49,
},
{
name: "Română (Romanian)",
value: "ro-RO",
progress: 3,
progress: 7,
},
{
name: "Português (Portuguese)",
value: "pt-PT",
progress: 9,
progress: 27,
},
{
name: "Português do Brasil (Brazilian Portuguese)",
value: "pt-BR",
progress: 40,
progress: 31,
},
{
name: "Polski (Polish)",
value: "pl-PL",
progress: 89,
progress: 69,
},
{
name: "Norsk (Norwegian)",
value: "no-NO",
progress: 87,
progress: 73,
},
{
name: "Nederlands (Dutch)",
value: "nl-NL",
progress: 97,
progress: 81,
},
{
name: "Lithuanian",
value: "lt-LT",
progress: 64,
progress: 65,
},
{
name: "한국어 (Korean)",
@ -98,37 +98,37 @@ export const LOCALES = [
{
name: "Italiano (Italian)",
value: "it-IT",
progress: 82,
progress: 81,
},
{
name: "Magyar (Hungarian)",
value: "hu-HU",
progress: 77,
progress: 60,
},
{
name: "עברית (Hebrew)",
value: "he-IL",
progress: 33,
progress: 24,
},
{
name: "Français (French)",
value: "fr-FR",
progress: 99,
progress: 100,
},
{
name: "French, Canada",
value: "fr-CA",
progress: 84,
progress: 61,
},
{
name: "Suomi (Finnish)",
value: "fi-FI",
progress: 22,
progress: 45,
},
{
name: "Español (Spanish)",
value: "es-ES",
progress: 94,
progress: 70,
},
{
name: "American English",
@ -138,12 +138,12 @@ export const LOCALES = [
{
name: "British English",
value: "en-GB",
progress: 31,
progress: 23,
},
{
name: "Ελληνικά (Greek)",
value: "el-GR",
progress: 70,
progress: 51,
},
{
name: "Deutsch (German)",
@ -153,31 +153,31 @@ export const LOCALES = [
{
name: "Dansk (Danish)",
value: "da-DK",
progress: 99,
progress: 76,
},
{
name: "Čeština (Czech)",
value: "cs-CZ",
progress: 89,
progress: 75,
},
{
name: "Català (Catalan)",
value: "ca-ES",
progress: 95,
progress: 69,
},
{
name: "Bulgarian",
value: "bg-BG",
progress: 0,
progress: 25,
},
{
name: "العربية (Arabic)",
value: "ar-SA",
progress: 24,
progress: 18,
},
{
name: "Afrikaans (Afrikaans)",
value: "af-ZA",
progress: 9,
progress: 6,
},
]