From 09b0dcb136dc65a038af413a2147915f3a48a839 Mon Sep 17 00:00:00 2001
From: smilerz <smilerz@gmail.com>
Date: Mon, 29 Nov 2021 10:38:13 -0600
Subject: [PATCH] pre-merge

---
 vue/src/components/MealPlanEditModal.vue | 44 +++++++++++++++++++-----
 vue/src/components/RecipeContextMenu.vue | 40 ++++++++-------------
 2 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/vue/src/components/MealPlanEditModal.vue b/vue/src/components/MealPlanEditModal.vue
index 78a391d5b..8103e1c6e 100644
--- a/vue/src/components/MealPlanEditModal.vue
+++ b/vue/src/components/MealPlanEditModal.vue
@@ -5,12 +5,7 @@
                 <div class="row">
                     <div class="col-6 col-lg-9">
                         <b-input-group>
-                            <b-form-input
-                                id="TitleInput"
-                                v-model="entryEditing.title"
-                                :placeholder="entryEditing.title_placeholder"
-                                @change="missing_recipe = false"
-                            ></b-form-input>
+                            <b-form-input id="TitleInput" v-model="entryEditing.title" :placeholder="entryEditing.title_placeholder" @change="missing_recipe = false"></b-form-input>
                             <b-input-group-append class="d-none d-lg-block">
                                 <b-button variant="primary" @click="entryEditing.title = ''"><i class="fa fa-eraser"></i></b-button>
                             </b-input-group-append>
@@ -63,6 +58,21 @@
                             <b-form-input id="ServingsInput" v-model="entryEditing.servings" :placeholder="$t('Servings')"></b-form-input>
                         </b-input-group>
                         <small tabindex="-1" class="form-text text-muted">{{ $t("Servings") }}</small>
+                        <b-form-group class="mt-3">
+                            <generic-multiselect
+                                required
+                                @change="entryEditing.shared = $event.val"
+                                parent_variable="entryEditing.shared"
+                                :label="'username'"
+                                :model="Models.USER_NAME"
+                                style="flex-grow: 1; flex-shrink: 1; flex-basis: 0"
+                                v-bind:placeholder="$t('Share')"
+                                :limit="10"
+                                :multiple="true"
+                                :initial_selection="entryEditing.shared"
+                            ></generic-multiselect>
+                            <small tabindex="-1" class="form-text text-muted">{{ $t("Share") }}</small>
+                        </b-form-group>
                         <!-- TODO: hide this checkbox if autoadding menuplans, but allow editing on-hand -->
                         <b-input-group v-if="!autoMealPlan">
                             <b-form-checkbox id="AddToShopping" v-model="entryEditing.addshopping" />
@@ -123,6 +133,7 @@ export default {
             entryEditing: {},
             missing_recipe: false,
             missing_meal_type: false,
+            default_plan_share: [],
         }
     },
     watch: {
@@ -136,13 +147,23 @@ export default {
             deep: true,
         },
     },
-    mounted: function() {},
+    mounted: function () {},
     computed: {
-        autoMealPlan: function() {
+        autoMealPlan: function () {
             return getUserPreference("mealplan_autoadd_shopping")
         },
     },
     methods: {
+        showModal() {
+            let apiClient = new ApiApiFactory()
+
+            apiClient.listUserPreferences().then((result) => {
+                if (this.entry.id === -1) {
+                    this.entryEditing.shared = result.data[0].plan_share
+                }
+            })
+        },
+
         editEntry() {
             this.missing_meal_type = false
             this.missing_recipe = false
@@ -172,6 +193,13 @@ export default {
                 this.entryEditing.meal_type = null
             }
         },
+        selectShared(event) {
+            if (event.val != null) {
+                this.entryEditing.shared = event.val
+            } else {
+                this.entryEditing.meal_type = null
+            }
+        },
         createMealType(event) {
             if (event != "") {
                 let apiClient = new ApiApiFactory()
diff --git a/vue/src/components/RecipeContextMenu.vue b/vue/src/components/RecipeContextMenu.vue
index c2df13043..57aad04f3 100644
--- a/vue/src/components/RecipeContextMenu.vue
+++ b/vue/src/components/RecipeContextMenu.vue
@@ -1,28 +1,20 @@
 <template>
     <div>
         <div class="dropdown d-print-none">
-            <a class="btn shadow-none" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <a class="btn shadow-none" href="javascript:void(0);" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <i class="fas fa-ellipsis-v fa-lg"></i>
             </a>
 
             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">
-                <a class="dropdown-item" :href="resolveDjangoUrl('edit_recipe', recipe.id)"><i class="fas fa-pencil-alt fa-fw"></i> {{ $t("Edit") }}</a>
+                <a class="dropdown-item" :href="resolveDjangoUrl('edit_recipe', recipe.id)"> <i class="fas fa-pencil-alt fa-fw"></i> {{ $t("Edit") }}</a>
 
-                <a class="dropdown-item" :href="resolveDjangoUrl('edit_convert_recipe', recipe.id)" v-if="!recipe.internal"
-                    ><i class="fas fa-exchange-alt fa-fw"></i> {{ $t("convert_internal") }}</a
-                >
+                <a class="dropdown-item" :href="resolveDjangoUrl('edit_convert_recipe', recipe.id)" v-if="!recipe.internal"><i class="fas fa-exchange-alt fa-fw"></i> {{ $t("convert_internal") }}</a>
 
-                <a href="#">
+                <a href="javascript:void(0);">
                     <button class="dropdown-item" @click="$bvModal.show(`id_modal_add_book_${modal_id}`)"><i class="fas fa-bookmark fa-fw"></i> {{ $t("Manage_Books") }}</button>
                 </a>
 
-                <a
-                    class="dropdown-item"
-                    :href="`${resolveDjangoUrl('view_shopping')}?r=[${recipe.id},${servings_value}]`"
-                    v-if="recipe.internal"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                >
+                <a class="dropdown-item" :href="`${resolveDjangoUrl('view_shopping')}?r=[${recipe.id},${servings_value}]`" v-if="recipe.internal" target="_blank" rel="noopener noreferrer">
                     <i class="fas fa-shopping-cart fa-fw"></i> {{ $t("Add_to_Shopping") }}
                 </a>
 
@@ -30,21 +22,17 @@
 
                 <a class="dropdown-item" @click="createMealPlan" href="#"><i class="fas fa-calendar fa-fw"></i> {{ $t("Add_to_Plan") }} </a>
 
-                <a href="#">
-                    <button class="dropdown-item" @click="$bvModal.show(`id_modal_cook_log_${modal_id}`)">
-                        <i class="fas fa-clipboard-list fa-fw"></i> {{ $t("Log_Cooking") }}
-                    </button>
+                <a href="javascript:void(0);">
+                    <button class="dropdown-item" @click="$bvModal.show(`id_modal_cook_log_${modal_id}`)"><i class="fas fa-clipboard-list fa-fw"></i> {{ $t("Log_Cooking") }}</button>
                 </a>
 
-                <a href="#">
+                <a href="javascript:void(0);">
                     <button class="dropdown-item" onclick="window.print()"><i class="fas fa-print fa-fw"></i> {{ $t("Print") }}</button>
                 </a>
 
-                <a class="dropdown-item" :href="resolveDjangoUrl('view_export') + '?r=' + recipe.id" target="_blank" rel="noopener noreferrer"
-                    ><i class="fas fa-file-export fa-fw"></i> {{ $t("Export") }}</a
-                >
+                <a class="dropdown-item" :href="resolveDjangoUrl('view_export') + '?r=' + recipe.id" target="_blank" rel="noopener noreferrer"><i class="fas fa-file-export fa-fw"></i> {{ $t("Export") }}</a>
 
-                <a href="#">
+                <a href="javascript:void(0);">
                     <button class="dropdown-item" @click="createShareLink()" v-if="recipe.internal"><i class="fas fa-share-alt fa-fw"></i> {{ $t("Share") }}</button>
                 </a>
             </div>
@@ -134,7 +122,7 @@ export default {
         this.servings_value = this.servings === -1 ? this.recipe.servings : this.servings
     },
     methods: {
-        saveMealPlan: function(entry) {
+        saveMealPlan: function (entry) {
             entry.date = moment(entry.date).format("YYYY-MM-DD")
 
             let apiClient = new ApiApiFactory()
@@ -155,7 +143,7 @@ export default {
             this.entryEditing.date = moment(new Date()).format("YYYY-MM-DD")
             this.$bvModal.show(`modal-meal-plan_${this.modal_id}`)
         },
-        createShareLink: function() {
+        createShareLink: function () {
             axios
                 .get(resolveDjangoUrl("api_share_link", this.recipe.id))
                 .then((result) => {
@@ -168,12 +156,12 @@ export default {
                     }
                 })
         },
-        copyShareLink: function() {
+        copyShareLink: function () {
             let share_input = this.$refs.share_link_ref
             share_input.select()
             document.execCommand("copy")
         },
-        shareIntend: function() {
+        shareIntend: function () {
             let shareData = {
                 title: this.recipe.name,
                 text: `${this.$t("Check out this recipe: ")} ${this.recipe.name}`,