Merge pull request #653 from nextcloud/issues/652nutrition

Fix reindexing and editing nutrition information
nextcloud · Mar 12, 2021 · c2ccb3c · c2ccb3c
2 parents acb59c1 + 7c2cdd9
commit c2ccb3c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+### Fixed
+- Calling reindex
+  [#653](https://github.com/nextcloud/cookbook/pull/653) @seyfeb
+- Setting nutrition information on recipes with an array assigned for nutrition
+  [#653](https://github.com/nextcloud/cookbook/pull/653) @seyfeb
+
 ## 0.8.4 - 2021-03-08
 
 ### Added

diff --git a/src/components/AppSettings.vue b/src/components/AppSettings.vue
@@ -12,7 +12,7 @@
                                     : 'icon-history'
                             "
                             :title="t('cookbook', 'Rescan library')"
-                            @click="emit('reindex')"
+                            @click="$emit('reindex')"
                         />
                     </li>
                     <li>

diff --git a/src/components/EditMultiselectInputGroup.vue b/src/components/EditMultiselectInputGroup.vue
@@ -82,7 +82,7 @@ export default {
         // Value (passed in v-model)
         value: {
             type: Object,
-            default: () => ({}),
+            default: () => {},
             required: true,
         },
     },

diff --git a/src/components/RecipeEdit.vue b/src/components/RecipeEdit.vue
@@ -541,12 +541,6 @@ export default {
                 )
                 .then((response) => {
                     const recipe = response.data
-                    if (
-                        "nutrition" in recipe &&
-                        recipe.nutrition instanceof Array
-                    ) {
-                        recipe.nutrition = {}
-                    }
                     $this.$store.dispatch("setRecipe", { recipe })
                     $this.setup()
                 })

diff --git a/src/store/index.js b/src/store/index.js
@@ -62,7 +62,12 @@ export default new Vuex.Store({
             state.page = p
         },
         setRecipe(state, { r }) {
-            state.recipe = r
+            const rec = JSON.parse(JSON.stringify(r))
+            if ("nutrition" in rec && rec.nutrition instanceof Array) {
+                rec.nutrition = {}
+            }
+            state.recipe = rec
+
             // Setting recipe also means that loading/reloading the recipe has finished
             state.loadingRecipe = 0
             state.reloadingRecipe = 0