From fd70adf19d18ebe164346780bdf39e9bfdadad2f Mon Sep 17 00:00:00 2001
From: smilerz <smilerz@gmail.com>
Date: Fri, 27 Oct 2023 14:43:48 -0500
Subject: [PATCH] fixes recipe export

---
 cookbook/forms.py                                  |  4 ++--
 cookbook/templates/export.html                     | 11 +++++------
 cookbook/templates/export_response.html            |  9 +++++----
 .../apps/ExportResponseView/ExportResponseView.vue | 14 +++++++-------
 vue/src/apps/ExportView/ExportView.vue             |  8 +++-----
 5 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/cookbook/forms.py b/cookbook/forms.py
index fb557dd9..36b35ed5 100644
--- a/cookbook/forms.py
+++ b/cookbook/forms.py
@@ -9,8 +9,8 @@ from django_scopes import scopes_disabled
 from django_scopes.forms import SafeModelChoiceField, SafeModelMultipleChoiceField
 from hcaptcha.fields import hCaptchaField
 
-from .models import (Comment, Food, InviteLink, Keyword, MealPlan, MealType, Recipe, RecipeBook,
-                     RecipeBookEntry, SearchPreference, Space, Storage, Sync, User, UserPreference)
+from .models import (Comment, Food, InviteLink, Keyword, Recipe, RecipeBook, RecipeBookEntry,
+                     SearchPreference, Space, Storage, Sync, User, UserPreference)
 
 
 class SelectWidget(widgets.Select):
diff --git a/cookbook/templates/export.html b/cookbook/templates/export.html
index 787fc81c..74ee70e0 100644
--- a/cookbook/templates/export.html
+++ b/cookbook/templates/export.html
@@ -4,17 +4,14 @@
 {% load i18n %}
 {% load l10n %}
 
-
 {% block title %}{% trans 'Export Recipes' %}{% endblock %}
 
-
 {% block content %}
     <div id="app">
         <export-view></export-view>
     </div>
 {% endblock %}
 
-
 {% block script %}
     {% if debug %}
         <script src="{% url 'js_reverse' %}"></script>
@@ -23,11 +20,13 @@
     {% endif %}
 
     <script type="application/javascript">
-        window.EXPORT_ID = {{pk}};
+    {% if pk %}
+        window.EXPORT_ID = {{ pk }}
+    {% else %}
+        window.EXPORT_ID = null
+    {% endif %}
         window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}';
     </script>
 
     {% render_bundle 'export_view' %}
 {% endblock %}
-
-
diff --git a/cookbook/templates/export_response.html b/cookbook/templates/export_response.html
index 1f438632..ac198a17 100644
--- a/cookbook/templates/export_response.html
+++ b/cookbook/templates/export_response.html
@@ -7,15 +7,12 @@
 {% block title %}{% trans 'Export' %}{% endblock %}
 
 {% block content %}
-
     <div id="app">
         <export-response-view></export-response-view>
     </div>
 
-
 {% endblock %}
 
-
 {% block script %}
     {% if debug %}
         <script src="{% url 'js_reverse' %}"></script>
@@ -24,7 +21,11 @@
     {% endif %}
 
     <script type="application/javascript">
-        window.EXPORT_ID = {{pk}};
+    {% if pk %}
+        window.EXPORT_ID = {{ pk }}
+    {% else %}
+        window.EXPORT_ID = null
+    {% endif %}
         window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}'
     </script>
 
diff --git a/vue/src/apps/ExportResponseView/ExportResponseView.vue b/vue/src/apps/ExportResponseView/ExportResponseView.vue
index 7daec281..9e2f4474 100644
--- a/vue/src/apps/ExportResponseView/ExportResponseView.vue
+++ b/vue/src/apps/ExportResponseView/ExportResponseView.vue
@@ -20,9 +20,9 @@
                     {{ $t("If download did not start automatically: ") }}
 
                     <template v-if="export_info.expired">
-                        <a disabled
-                            ><del>{{ $t("Download") }}</del></a
-                        >
+                        <a disabled ref="downloadAnchor">
+                            <del>{{ $t("Download") }}</del>
+                        </a>
                         ({{ $t("Expired") }})
                     </template>
                     <a v-else :href="`${resolveDjangoUrl('view_export_file', export_id)}`" ref="downloadAnchor">{{ $t("Download") }}</a>
@@ -53,20 +53,20 @@
 </template>
 
 <script>
-import Vue from "vue"
 import { BootstrapVue } from "bootstrap-vue"
+import Vue from "vue"
 
 import "bootstrap-vue/dist/bootstrap-vue.css"
 
-import { ResolveUrlMixin, makeToast, ToastMixin } from "@/utils/utils"
+import { ResolveUrlMixin, ToastMixin, makeToast } from "@/utils/utils"
 
 import LoadingSpinner from "@/components/LoadingSpinner"
 
 import { ApiApiFactory } from "@/utils/openapi/api.ts"
+import VueSanitize from "vue-sanitize"
 
 Vue.use(BootstrapVue)
-import VueSanitize from "vue-sanitize";
-Vue.use(VueSanitize);
+Vue.use(VueSanitize)
 export default {
     name: "ExportResponseView",
     mixins: [ResolveUrlMixin, ToastMixin],
diff --git a/vue/src/apps/ExportView/ExportView.vue b/vue/src/apps/ExportView/ExportView.vue
index d951e423..791813c1 100644
--- a/vue/src/apps/ExportView/ExportView.vue
+++ b/vue/src/apps/ExportView/ExportView.vue
@@ -45,14 +45,12 @@
 </template>
 
 <script>
-import Vue from "vue"
 import { BootstrapVue } from "bootstrap-vue"
+import Vue from "vue"
 
 import "bootstrap-vue/dist/bootstrap-vue.css"
 
-import LoadingSpinner from "@/components/LoadingSpinner"
-
-import { StandardToasts, makeToast, resolveDjangoUrl, ApiMixin } from "@/utils/utils"
+import { ApiMixin, StandardToasts, makeToast, resolveDjangoUrl } from "@/utils/utils"
 // import Multiselect from "vue-multiselect"
 import GenericMultiselect from "@/components/GenericMultiselect"
 import { ApiApiFactory } from "@/utils/openapi/api.ts"
@@ -108,7 +106,7 @@ export default {
             let formData = new FormData()
             formData.append("type", this.recipe_app)
             formData.append("all", this.export_all)
-            formData.append("custom_filter", this.filter?.id ?? null)
+            formData.append("custom_filter", this.filter?.id ?? "")
 
             for (var i = 0; i < this.recipe_list.length; i++) {
                 formData.append("recipes", this.recipe_list[i].id)