wbrawner/mealie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: additional recipe sort behavior (#1858)

Browse source 
* changed default sort direction for certain attrs

* added workaround for filtering out null datetimes

* filtered out null-valued results for certain sorts

* removed unecessary parse

* used minyear instead of 1900
This commit is contained in:
Michael Genson 2022-11-30 23:59:30 -06:00 committed by GitHub
parent 33dffccaa5
commit 1b9ff454fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
frontend/components/Domain/Recipe/RecipeCardSection.vue
View file

@ -243,7 +243,10 @@ export default defineComponent({
cookbook.value,
category.value,
tag.value,
tool.value
tool.value,
// filter out recipes that have a null value for the property we're sorting by
preferences.value.filterNull && preferences.value.orderBy ? `${preferences.value.orderBy} <> null` : null
);
// since we doubled the first call, we also need to advance the page
@ -270,7 +273,10 @@ export default defineComponent({
cookbook.value,
category.value,
tag.value,
tool.value
tool.value,
// filter out recipes that have a null value for the property we're sorting by
preferences.value.filterNull && preferences.value.orderBy ? `${preferences.value.orderBy} <> null` : null
);
if (!newRecipes.length) {
hasMore.value = false;
@ -287,10 +293,11 @@ export default defineComponent({
return;
}
function setter(orderBy: string, ascIcon: string, descIcon: string) {
function setter(orderBy: string, ascIcon: string, descIcon: string, defaultOrderDirection = "asc", filterNull = false) {
if (preferences.value.orderBy !== orderBy) {
preferences.value.orderBy = orderBy;
preferences.value.orderDirection = "asc";
preferences.value.orderDirection = defaultOrderDirection;
preferences.value.filterNull = filterNull;
} else {
preferences.value.orderDirection = preferences.value.orderDirection === "asc" ? "desc" : "asc";
}
@ -299,19 +306,19 @@ export default defineComponent({
switch (sortType) {
case EVENTS.az:
setter("name", $globals.icons.sortAlphabeticalAscending, $globals.icons.sortAlphabeticalDescending);
setter("name", $globals.icons.sortAlphabeticalAscending, $globals.icons.sortAlphabeticalDescending, "asc", false);
break;
case EVENTS.rating:
setter("rating", $globals.icons.sortAscending, $globals.icons.sortDescending);
setter("rating", $globals.icons.sortAscending, $globals.icons.sortDescending, "desc", true);
break;
case EVENTS.created:
setter("created_at", $globals.icons.sortCalendarAscending, $globals.icons.sortCalendarDescending);
setter("created_at", $globals.icons.sortCalendarAscending, $globals.icons.sortCalendarDescending, "desc", false);
break;
case EVENTS.updated:
setter("update_at", $globals.icons.sortClockAscending, $globals.icons.sortClockDescending);
setter("update_at", $globals.icons.sortClockAscending, $globals.icons.sortClockDescending, "desc", false);
break;
case EVENTS.lastMade:
setter("last_made", $globals.icons.sortCalendarAscending, $globals.icons.sortCalendarDescending);
setter("last_made", $globals.icons.sortCalendarAscending, $globals.icons.sortCalendarDescending, "desc", true);
break;
default:
console.log("Unknown Event", sortType);
@ -335,7 +342,10 @@ export default defineComponent({
cookbook.value,
category.value,
tag.value,
tool.value
tool.value,
// filter out recipes that have a null value for the property we're sorting by
preferences.value.filterNull && preferences.value.orderBy ? `${preferences.value.orderBy} <> null` : null
);
context.emit(REPLACE_RECIPES_EVENT, newRecipes);

4
frontend/composables/recipes/use-recipes.ts
View file

@ -19,7 +19,8 @@ export const useLazyRecipes = function () {
cookbook: string | null = null,
category: string | null = null,
tag: string | null = null,
tool: string | null = null
tool: string | null = null,
queryFilter: string | null = null,
) {
const { data } = await api.recipes.getAll(page, perPage, {
orderBy,
@ -28,6 +29,7 @@ export const useLazyRecipes = function () {
categories: category,
tags: tag,
tools: tool,
queryFilter,
});
return data ? data.items : [];
}

2
frontend/composables/use-users/preferences.ts
View file

@ -4,6 +4,7 @@ import { useLocalStorage } from "@vueuse/core";
export interface UserRecipePreferences {
orderBy: string;
orderDirection: string;
filterNull: boolean;
sortIcon: string;
useMobileCards: boolean;
}
@ -16,6 +17,7 @@ export function useUserSortPreferences(): Ref<UserRecipePreferences> {
{
orderBy: "name",
orderDirection: "asc",
filterNull: false,
sortIcon: $globals.icons.sortAlphabeticalAscending,
useMobileCards: false,
},

20
mealie/schema/response/query_filter.py
View file

@ -1,5 +1,6 @@
from __future__ import annotations
import datetime
import re
from enum import Enum
from typing import Any, TypeVar, cast
@ -96,13 +97,20 @@ class QueryFilter:
value: Any = component.value
if isinstance(attr.type, (sqltypes.Date, sqltypes.DateTime)):
try:
value = date_parser.parse(component.value)
# TODO: add support for IS NULL and IS NOT NULL
# in the meantime, this will work for the specific usecase of non-null dates/datetimes
if value in ["none", "null"] and component.relational_operator == RelationalOperator.NOTEQ:
component.relational_operator = RelationalOperator.GTE
value = datetime.datetime(datetime.MINYEAR, 1, 1)
except ParserError as e:
raise ValueError(
f"invalid query string: unknown date or datetime format '{component.value}'"
) from e
else:
try:
value = date_parser.parse(component.value)
except ParserError as e:
raise ValueError(
f"invalid query string: unknown date or datetime format '{component.value}'"
) from e
if isinstance(attr.type, sqltypes.Boolean):
try: