mirror of
https://github.com/hay-kot/mealie.git
synced 2025-08-22 06:23:34 -07:00
feat: remove support for ordering of recipes with query parameters
instead always use the local storage
This commit is contained in:
parent
bd5b7762d3
commit
5d47737275
1 changed files with 4 additions and 22 deletions
|
@ -321,6 +321,8 @@ export default defineNuxtComponent({
|
||||||
state.value.search = queryDefaults.search;
|
state.value.search = queryDefaults.search;
|
||||||
state.value.orderBy = queryDefaults.orderBy;
|
state.value.orderBy = queryDefaults.orderBy;
|
||||||
state.value.orderDirection = queryDefaults.orderDirection;
|
state.value.orderDirection = queryDefaults.orderDirection;
|
||||||
|
sortPreferences.value.orderBy = queryDefaults.orderBy;
|
||||||
|
sortPreferences.value.orderDirection = queryDefaults.orderDirection;
|
||||||
state.value.requireAllCategories = queryDefaults.requireAllCategories;
|
state.value.requireAllCategories = queryDefaults.requireAllCategories;
|
||||||
state.value.requireAllTags = queryDefaults.requireAllTags;
|
state.value.requireAllTags = queryDefaults.requireAllTags;
|
||||||
state.value.requireAllTools = queryDefaults.requireAllTools;
|
state.value.requireAllTools = queryDefaults.requireAllTools;
|
||||||
|
@ -371,8 +373,6 @@ export default defineNuxtComponent({
|
||||||
...{
|
...{
|
||||||
auto: state.value.auto ? undefined : "false",
|
auto: state.value.auto ? undefined : "false",
|
||||||
search: passedQuery.value.search === queryDefaults.search ? undefined : passedQuery.value.search,
|
search: passedQuery.value.search === queryDefaults.search ? undefined : passedQuery.value.search,
|
||||||
orderBy: passedQuery.value.orderBy === queryDefaults.orderBy ? undefined : passedQuery.value.orderBy,
|
|
||||||
orderDirection: passedQuery.value.orderDirection === queryDefaults.orderDirection ? undefined : passedQuery.value.orderDirection,
|
|
||||||
households: !passedQuery.value.households?.length || passedQuery.value.households?.length === households.store.value.length ? undefined : passedQuery.value.households,
|
households: !passedQuery.value.households?.length || passedQuery.value.households?.length === households.store.value.length ? undefined : passedQuery.value.households,
|
||||||
requireAllCategories: passedQuery.value.requireAllCategories ? "true" : undefined,
|
requireAllCategories: passedQuery.value.requireAllCategories ? "true" : undefined,
|
||||||
requireAllTags: passedQuery.value.requireAllTags ? "true" : undefined,
|
requireAllTags: passedQuery.value.requireAllTags ? "true" : undefined,
|
||||||
|
@ -489,19 +489,8 @@ export default defineNuxtComponent({
|
||||||
state.value.search = queryDefaults.search;
|
state.value.search = queryDefaults.search;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (query.orderBy?.length) {
|
state.value.orderBy = sortPreferences.value.orderBy;
|
||||||
state.value.orderBy = query.orderBy as string;
|
state.value.orderDirection = sortPreferences.value.orderDirection as "asc" | "desc";
|
||||||
}
|
|
||||||
else {
|
|
||||||
state.value.orderBy = queryDefaults.orderBy;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (query.orderDirection?.length) {
|
|
||||||
state.value.orderDirection = query.orderDirection as "asc" | "desc";
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
state.value.orderDirection = queryDefaults.orderDirection;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (query.requireAllCategories?.length) {
|
if (query.requireAllCategories?.length) {
|
||||||
state.value.requireAllCategories = query.requireAllCategories === "true";
|
state.value.requireAllCategories = query.requireAllCategories === "true";
|
||||||
|
@ -638,13 +627,6 @@ export default defineNuxtComponent({
|
||||||
}
|
}
|
||||||
|
|
||||||
await hydrateSearch();
|
await hydrateSearch();
|
||||||
if (!route.query.orderBy) {
|
|
||||||
state.value.orderBy = sortPreferences.value.orderBy;
|
|
||||||
}
|
|
||||||
if (!route.query.orderDirection) {
|
|
||||||
state.value.orderDirection = sortPreferences.value.orderDirection as "asc" | "desc";
|
|
||||||
}
|
|
||||||
|
|
||||||
await search();
|
await search();
|
||||||
state.value.ready = true;
|
state.value.ready = true;
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue