Fix after rebase

cookbook/helper/recipe_search.py

@@ -185,15 +185,22 @@ def get_facet(qs, params, space):
     search_foods_or = params.get('foods_or', True)
     search_books_or = params.get('books_or', True)
 
-    # this returns a list of keywords in the queryset and how many times it appears
+    # if using an OR search, will annotate all keywords, otherwise, just those that appear in results
-    keywords = Keyword.objects.filter(recipe__in=qs).annotate(recipe_count=Count('recipe'))
+    if search_keywords_or:
+        keywords = Keyword.objects.filter(space=space).annotate(recipe_count=Count('recipe'))
+    else:
+        keywords = Keyword.objects.filter(recipe__in=qs, space=space).annotate(recipe_count=Count('recipe'))
     # custom django-tree function annotates a queryset to make building a tree easier.
     # see https://django-treebeard.readthedocs.io/en/latest/api.html#treebeard.models.Node.get_annotated_list_qs for details
     kw_a = annotated_qs(keywords, root=True, fill=True)
 
-    # return list of foods in the recipe queryset and how many times they appear
+    # if using an OR search, will annotate all keywords, otherwise, just those that appear in results
-    foods = Food.objects.filter(ingredient__step__recipe__in=list(qs.values_list('id', flat=True))).annotate(recipe_count=Count('ingredient'))
+    if search_keywords_or:
+        foods = Food.objects.filter(ingredient__step__recipe__in=list(qs.values_list('id', flat=True),space=space])).annotate(recipe_count=Count('ingredient'))
+    else:
+        foods = Food.objects.filter(ingredient__step__recipe__in=list(qs.values_list('id', flat=True))).annotate(recipe_count=Count('ingredient'))
     food_a = annotated_qs(foods, root=True, fill=True)
+    
 
     # TODO add rating facet
     facets['Ratings'] = []

cookbook/static/vue/css/keyword_list_view.css

@@ -1 +1 @@
-.shake[data-v-8f249282]{-webkit-animation:shake-data-v-8f249282 .82s cubic-bezier(.36,.07,.19,.97) both;animation:shake-data-v-8f249282 .82s cubic-bezier(.36,.07,.19,.97) both;transform:translateZ(0);-webkit-backface-visibility:hidden;backface-visibility:hidden;perspective:1000px}@-webkit-keyframes shake-data-v-8f249282{10%,90%{transform:translate3d(-1px,0,0)}20%,80%{transform:translate3d(2px,0,0)}30%,50%,70%{transform:translate3d(-4px,0,0)}40%,60%{transform:translate3d(4px,0,0)}}@keyframes shake-data-v-8f249282{10%,90%{transform:translate3d(-1px,0,0)}20%,80%{transform:translate3d(2px,0,0)}30%,50%,70%{transform:translate3d(-4px,0,0)}40%,60%{transform:translate3d(4px,0,0)}}
+.shake[data-v-d5a65348]{-webkit-animation:shake-data-v-d5a65348 .82s cubic-bezier(.36,.07,.19,.97) both;animation:shake-data-v-d5a65348 .82s cubic-bezier(.36,.07,.19,.97) both;transform:translateZ(0);-webkit-backface-visibility:hidden;backface-visibility:hidden;perspective:1000px}@-webkit-keyframes shake-data-v-d5a65348{10%,90%{transform:translate3d(-1px,0,0)}20%,80%{transform:translate3d(2px,0,0)}30%,50%,70%{transform:translate3d(-4px,0,0)}40%,60%{transform:translate3d(4px,0,0)}}@keyframes shake-data-v-d5a65348{10%,90%{transform:translate3d(-1px,0,0)}20%,80%{transform:translate3d(2px,0,0)}30%,50%,70%{transform:translate3d(-4px,0,0)}40%,60%{transform:translate3d(4px,0,0)}}

cookbook/urls.py

@@ -109,9 +109,9 @@ urlpatterns = [
     path('api/ingredient-from-string/', api.ingredient_from_string, name='api_ingredient_from_string'),
     path('api/share-link/<int:pk>', api.share_link, name='api_share_link'),
 
-    path('dal/keyword/', dal.KeywordAutocomplete.as_view(), name='dal_keyword'),  # TODO is this still needed?
+    path('dal/keyword/', dal.KeywordAutocomplete.as_view(), name='dal_keyword'),  # TODO is this deprecated?
-    path('dal/food/', dal.IngredientsAutocomplete.as_view(), name='dal_food'),  # TODO is this still needed?
+    path('dal/food/', dal.IngredientsAutocomplete.as_view(), name='dal_food'),  # TODO is this deprecated?
-    path('dal/unit/', dal.UnitAutocomplete.as_view(), name='dal_unit'),
+    path('dal/unit/', dal.UnitAutocomplete.as_view(), name='dal_unit'),  # TODO is this deprecated?
 
     path('telegram/setup/<int:pk>', telegram.setup_bot, name='telegram_setup'),
     path('telegram/remove/<int:pk>', telegram.remove_bot, name='telegram_remove'),

cookbook/views/api.py

@@ -12,7 +12,7 @@ from django.contrib.auth.models import User
 from django.contrib.postgres.search import TrigramSimilarity
 from django.core.exceptions import FieldError, ValidationError
 from django.core.files import File
-from django.db.models import Q, Value
+from django.db.models import Q
 from django.db.models.fields.related import ForeignObjectRel
 from django.http import FileResponse, HttpResponse, JsonResponse
 from django_scopes import scopes_disabled
@@ -114,9 +114,8 @@ class FuzzyFilterMixin(ViewSetMixin):
                 )
             else:
                 # TODO have this check unaccent search settings or other search preferences?
-                # for some querysets exact matches are sorted beyond pagesize, this ensures exact matches appear first
+                # TODO for some querysets exact matches are sorted beyond pagesize, need to find better solution
-                self.queryset = self.queryset.filter(name__istartswith=query).annotate(order=Value(0)) | self.queryset.filter(name__icontains=query).annotate(order=Value(1))
+                self.queryset = self.queryset.filter(name__istartswith=query) | self.queryset.filter(name__icontains=query)
-                self.queryset = self.queryset.order_by('order')
 
         updated_at = self.request.query_params.get('updated_at', None)
         if updated_at is not None:
@@ -212,7 +211,7 @@ class TreeMixin(MergeMixin, FuzzyFilterMixin):
         elif tree:
             if tree.isnumeric():
                 try:
-                    self.queryset = self.model.objects.get(id=int(tree)).get_descendants_and_self().filter(space=self.request.space)
+                    self.queryset = self.model.objects.get(id=int(tree)).get_descendants_and_self()
                 except self.model.DoesNotExist:
                     self.queryset = self.model.objects.none()
         else:

vue/src/apps/RecipeSearchView/RecipeSearchView.vue

@@ -159,11 +159,6 @@
                   <div class="row">
                     <div class="col-12">
                       <b-input-group class="mt-2">
-                        <!-- <generic-multiselect @change="genericSelectChanged" parent_variable="search_foods"
-                                             :initial_selection="settings.search_foods"
-                                             search_function="listFoods" label="name"
-                                             style="flex-grow: 1; flex-shrink: 1; flex-basis: 0"
-                                             v-bind:placeholder="$t('Ingredients')"></generic-multiselect> -->
                         <treeselect v-model="settings.search_foods" :options="facets.Foods" :flat="true"
                                     searchNested multiple :placeholder="$t('Ingredients')"  :normalizer="normalizer"
                                     @input="refreshData(false)"

vue/vue.config.js

@@ -84,9 +84,8 @@ module.exports = {
                     },
                 },
             },
-        },
+            // TODO make this conditional on .env DEBUG = FALSE
-        // TODO make this conditional on .env DEBUG = TRUE
+            config.optimization.minimize(true)
-        // config.optimization.minimize(false)
         );
 
         //TODO somehow remov them as they are also added to the manifest config of the service worker