From 1907223a8ad7ab5feb95941354aeefb014155d2a Mon Sep 17 00:00:00 2001
From: Kaibu <notkaibu@gmail.com>
Date: Thu, 25 Nov 2021 12:51:55 +0100
Subject: [PATCH] reduced api calls

---
 cookbook/serializer.py                     |  1 +
 vue/src/apps/MealPlanView/MealPlanView.vue | 12 ++++++------
 vue/src/components/MealPlanEditModal.vue   | 12 ++----------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index 7ed8cc490..c7405faed 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -137,6 +137,7 @@ class UserNameSerializer(WritableNestedModelSerializer):
 
 
 class UserPreferenceSerializer(serializers.ModelSerializer):
+    plan_share = UserNameSerializer(many=True)
 
     def create(self, validated_data):
         if validated_data['user'] != self.context['request'].user:
diff --git a/vue/src/apps/MealPlanView/MealPlanView.vue b/vue/src/apps/MealPlanView/MealPlanView.vue
index 77366783a..7d451edf4 100644
--- a/vue/src/apps/MealPlanView/MealPlanView.vue
+++ b/vue/src/apps/MealPlanView/MealPlanView.vue
@@ -136,22 +136,22 @@
     <ContextMenu ref="menu">
       <template #menu="{ contextData }">
         <ContextMenuItem @click="$refs.menu.close();openEntryEdit(contextData.originalItem.entry)">
-          <a class="dropdown-item p-2" href="#"><i class="fas fa-pen"></i> {{ $t("Edit") }}</a>
+          <a class="dropdown-item p-2" href="javascript:void(0)"><i class="fas fa-pen"></i> {{ $t("Edit") }}</a>
         </ContextMenuItem>
         <ContextMenuItem @click="$refs.menu.close();moveEntryLeft(contextData)">
-          <a class="dropdown-item p-2" href="#"><i class="fas fa-arrow-left"></i> {{ $t("Move") }}</a>
+          <a class="dropdown-item p-2" href="javascript:void(0)"><i class="fas fa-arrow-left"></i> {{ $t("Move") }}</a>
         </ContextMenuItem>
         <ContextMenuItem @click="$refs.menu.close();moveEntryRight(contextData)">
-          <a class="dropdown-item p-2" href="#"><i class="fas fa-arrow-right"></i> {{ $t("Move") }}</a>
+          <a class="dropdown-item p-2" href="javascript:void(0)"><i class="fas fa-arrow-right"></i> {{ $t("Move") }}</a>
         </ContextMenuItem>
         <ContextMenuItem @click="$refs.menu.close();createEntry(contextData.originalItem.entry)">
-          <a class="dropdown-item p-2" href="#"><i class="fas fa-copy"></i> {{ $t("Clone") }}</a>
+          <a class="dropdown-item p-2" href="javascript:void(0)"><i class="fas fa-copy"></i> {{ $t("Clone") }}</a>
         </ContextMenuItem>
         <ContextMenuItem @click="$refs.menu.close();addToShopping(contextData)">
-          <a class="dropdown-item p-2" href="#"><i class="fas fa-shopping-cart"></i> {{ $t("Add_to_Shopping") }}</a>
+          <a class="dropdown-item p-2" href="javascript:void(0)"><i class="fas fa-shopping-cart"></i> {{ $t("Add_to_Shopping") }}</a>
         </ContextMenuItem>
         <ContextMenuItem @click="$refs.menu.close();deleteEntry(contextData)">
-          <a class="dropdown-item p-2 text-danger" href="#"><i class="fas fa-trash"></i> {{ $t("Delete") }}</a>
+          <a class="dropdown-item p-2 text-danger" href="javascript:void(0)"><i class="fas fa-trash"></i> {{ $t("Delete") }}</a>
         </ContextMenuItem>
       </template>
     </ContextMenu>
diff --git a/vue/src/components/MealPlanEditModal.vue b/vue/src/components/MealPlanEditModal.vue
index 2ef8153eb..ee74b80c7 100644
--- a/vue/src/components/MealPlanEditModal.vue
+++ b/vue/src/components/MealPlanEditModal.vue
@@ -143,16 +143,8 @@ export default {
       let apiClient = new ApiApiFactory()
 
       apiClient.listUserPreferences().then(result => {
-        let default_share = result.data[0].plan_share;
-
-        if (default_share !== []) {
-          let apiClient = new ApiApiFactory()
-
-          apiClient.listUsers(default_share).then(result => {
-            if (this.entry.id === -1) {
-              this.entryEditing.shared = result.data
-            }
-          })
+        if (this.entry.id === -1) {
+          this.entryEditing.shared = result.data[0].plan_share
         }
       })
     },