From 7c51b0791e5e83f8b68a70ed8c2dd3de7acc2716 Mon Sep 17 00:00:00 2001
From: Christian Wolf <git@christianwolf.email>
Date: Wed, 15 Mar 2023 19:34:17 +0100
Subject: [PATCH 01/14] Make app compatible with NC 27

Signed-off-by: Christian Wolf <git@christianwolf.email>
---
 .github/actions/deploy/appinfo/info.xml.dist | 2 +-
 appinfo/info.xml                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/deploy/appinfo/info.xml.dist b/.github/actions/deploy/appinfo/info.xml.dist
index f6a4c23c7..9d63263d7 100755
--- a/.github/actions/deploy/appinfo/info.xml.dist
+++ b/.github/actions/deploy/appinfo/info.xml.dist
@@ -20,7 +20,7 @@
     <screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
     <dependencies>
         <php min-version="7.4"/>
-        <nextcloud min-version="25" max-version="26"/>
+        <nextcloud min-version="25" max-version="27"/>
     </dependencies>
     <navigations>
         <navigation>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index c55368d0a..e1e347ed8 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -20,7 +20,7 @@
     <screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
     <dependencies>
         <php min-version="7.4"/>
-        <nextcloud min-version="25" max-version="26"/>
+        <nextcloud min-version="25" max-version="27"/>
     </dependencies>
     <navigations>
         <navigation>

From fdf2b1e53cec5377ad4fb54ec93eefb9cb5f19e9 Mon Sep 17 00:00:00 2001
From: Marcel Robitaille <mail@marcelrobitaille.me>
Date: Thu, 29 Dec 2022 10:38:58 -0400
Subject: [PATCH 02/14] Add checkboxes to hide info blocks

Signed-off-by: Marcel Robitaille <mail@marcelrobitaille.me>
---
 src/components/SettingsDialog.vue | 67 +++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/src/components/SettingsDialog.vue b/src/components/SettingsDialog.vue
index 3c7482dee..2b62fc422 100644
--- a/src/components/SettingsDialog.vue
+++ b/src/components/SettingsDialog.vue
@@ -81,6 +81,69 @@
                 </ul>
             </fieldset>
         </NcAppSettingsSection>
+        <NcAppSettingsSection
+            id="settings-info-blocks"
+            :title="t('cookbook', 'Info blocks')"
+            class="app-settings-section"
+        >
+            <fieldset>
+                <legend class="settings-info-blocks__legend">
+                    Control which blocks of information are shown in the recipe view. If you do not use some features and find them distracting, you may hide them.
+                </legend>
+                <ul>
+                    <li>
+                        <input
+                            id="info-blocks-checkbox-preparation-time"
+                            type="checkbox"
+                            class="checkbox"
+                        />
+                        <label for="info-blocks-checkbox-preparation-time">
+                            {{ t("cookbook", "Preparation time") }}
+                        </label>
+                    </li>
+                    <li>
+                        <input
+                            id="info-blocks-checkbox-cooking-time"
+                            type="checkbox"
+                            class="checkbox"
+                        />
+                        <label for="info-blocks-checkbox-cooking-time">
+                            {{ t("cookbook", "Cooking time") }}
+                        </label>
+                    </li>
+                    <li>
+                        <input
+                            id="info-blocks-checkbox-total-time"
+                            type="checkbox"
+                            class="checkbox"
+                        />
+                        <label for="info-blocks-checkbox-total-time">
+                            {{ t("cookbook", "Total time") }}
+                        </label>
+                    </li>
+                    <li>
+                        <input
+                            id="info-blocks-checkbox-nutrition-information"
+                            type="checkbox"
+                            class="checkbox"
+                        />
+                        <label for="info-blocks-checkbox-nutrition-information">
+                            {{ t("cookbook", "Nutrition information") }}
+                        </label>
+                    </li>
+                    <li>
+                        <input
+                            id="info-blocks-checkbox-tools"
+                            type="checkbox"
+                            class="checkbox"
+                        />
+                        <label for="info-blocks-checkbox-tools">
+                            {{ t("cookbook", "Tools") }}
+                        </label>
+                    </li>
+                </ul>
+            </fieldset>
+        </NcAppSettingsSection>
     </NcAppSettingsDialog>
 </template>
 
@@ -284,6 +347,10 @@ export default {
     animation: rotate var(--animation-duration, 0.8s) linear infinite;
     color: var(--color-loading-dark);
 }
+
+.settings-info-blocks__legend {
+    margin-bottom: 10px;
+}
 </style>
 
 <style>

From a12586047cfa134ba83555e2f821784855644875 Mon Sep 17 00:00:00 2001
From: Marcel Robitaille <mail@marcelrobitaille.me>
Date: Thu, 29 Dec 2022 12:02:33 -0400
Subject: [PATCH 03/14] Save visible info blocks to database

And connect to UI elements

Signed-off-by: Marcel Robitaille <mail@marcelrobitaille.me>
---
 .../Implementation/ConfigImplementation.php   |  7 +++
 lib/Helper/UserConfigHelper.php               | 33 +++++++++++
 lib/Service/RecipeService.php                 | 16 ++++++
 src/components/SettingsDialog.vue             | 56 ++++++++++++++++++-
 src/js/api-interface.js                       |  7 +++
 5 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/Implementation/ConfigImplementation.php b/lib/Controller/Implementation/ConfigImplementation.php
index 25dbb1cf1..d9da0b617 100644
--- a/lib/Controller/Implementation/ConfigImplementation.php
+++ b/lib/Controller/Implementation/ConfigImplementation.php
@@ -31,6 +31,8 @@ public function __construct(
 		$this->userFolder = $userFolder;
 	}
 
+	protected const KEY_VISIBLE_INFO_BLOCKS = 'visibleInfoBlocks';
+
 	/**
 	 * Get the current configuration of the app
 	 *
@@ -43,6 +45,7 @@ public function list() {
 			'folder' => $this->userFolder->getPath(),
 			'update_interval' => $this->dbCacheService->getSearchIndexUpdateInterval(),
 			'print_image' => $this->service->getPrintImage(),
+			self::KEY_VISIBLE_INFO_BLOCKS => $this->service->getVisibleInfoBlocks(),
 		], Http::STATUS_OK);
 	}
 
@@ -72,6 +75,10 @@ public function config() {
 			$this->service->setPrintImage((bool)$data['print_image']);
 		}
 
+		if (isset($data[self::KEY_VISIBLE_INFO_BLOCKS])) {
+			$this->service->setVisibleInfoBlocks($data[self::KEY_VISIBLE_INFO_BLOCKS]);
+		}
+
 		$this->dbCacheService->triggerCheck();
 
 		return new JSONResponse('OK', Http::STATUS_OK);
diff --git a/lib/Helper/UserConfigHelper.php b/lib/Helper/UserConfigHelper.php
index 980b1b0c7..8eafd21a6 100644
--- a/lib/Helper/UserConfigHelper.php
+++ b/lib/Helper/UserConfigHelper.php
@@ -39,6 +39,7 @@ public function __construct(
 	protected const KEY_LAST_INDEX_UPDATE = 'last_index_update';
 	protected const KEY_UPDATE_INTERVAL = 'update_interval';
 	protected const KEY_PRINT_IMAGE = 'print_image';
+	protected const KEY_VISIBLE_INFO_BLOCKS = 'visible_info_blocks';
 	protected const KEY_FOLDER = 'folder';
 
 	/**
@@ -154,6 +155,38 @@ public function setPrintImage(bool $value): void {
 		}
 	}
 
+	/**
+	 * Determines which info blocks are displayed next to the recipe
+	 *
+	 * @return array<string, bool> keys: info block ids, values: display state
+	 * @throws UserNotLoggedInException if no user is logged in
+	 */
+	public function getVisibleInfoBlocks(): array {
+		$rawValue = $this->getRawValue(self::KEY_VISIBLE_INFO_BLOCKS);
+		
+		if ($rawValue === '') {
+			return [
+				'preparation-time' => true,
+				'cooking-time' => true,
+				'total-time' => true,
+				'nutrition-information' => true,
+				'tools' => true,
+			];
+		}
+
+		return json_decode($rawValue, true);
+	}
+
+	/**
+	 * Sets which info blocks are displayed next to the recipe
+	 *
+	 * @param array<string, bool> keys: info block ids, values: display state
+	 * @throws UserNotLoggedInException if no user is logged in
+	 */
+	public function setVisibleInfoBlocks(array $visibleInfoBlocks): void {
+		$this->setRawValue(self::KEY_VISIBLE_INFO_BLOCKS, json_encode($visibleInfoBlocks));
+	}
+
 	/**
 	 * Get the name of the default cookbook.
 	 *
diff --git a/lib/Service/RecipeService.php b/lib/Service/RecipeService.php
index d4020bb56..0ec4c44c9 100755
--- a/lib/Service/RecipeService.php
+++ b/lib/Service/RecipeService.php
@@ -515,6 +515,22 @@ public function getPrintImage() {
 		return $this->userConfigHelper->getPrintImage();
 	}
 
+	/**
+	 * Sets which info blocks are displayed next to the recipe
+	 * @param array<string, bool> keys: info block ids, values: display state
+	 */
+	public function setVisibleInfoBlocks(array $visibleInfoBlocks) {
+		$this->userConfigHelper->setVisibleInfoBlocks($visibleInfoBlocks);
+	}
+
+	/**
+	 * Determines which info blocks are displayed next to the recipe
+	 * @return array<string, bool> keys: info block ids, values: display state
+	 */
+	public function getVisibleInfoBlocks(): array {
+		return $this->userConfigHelper->getVisibleInfoBlocks();
+	}
+
 	/**
 	 * Get recipe file contents as an array
 	 *
diff --git a/src/components/SettingsDialog.vue b/src/components/SettingsDialog.vue
index 2b62fc422..fc73bf06e 100644
--- a/src/components/SettingsDialog.vue
+++ b/src/components/SettingsDialog.vue
@@ -88,14 +88,18 @@
         >
             <fieldset>
                 <legend class="settings-info-blocks__legend">
-                    Control which blocks of information are shown in the recipe view. If you do not use some features and find them distracting, you may hide them.
+                    Control which blocks of information are shown in the recipe
+                    view. If you do not use some features and find them
+                    distracting, you may hide them.
                 </legend>
                 <ul>
                     <li>
                         <input
                             id="info-blocks-checkbox-preparation-time"
+                            v-model="visibleInfoBlocks"
                             type="checkbox"
                             class="checkbox"
+                            value="preparation-time"
                         />
                         <label for="info-blocks-checkbox-preparation-time">
                             {{ t("cookbook", "Preparation time") }}
@@ -104,8 +108,10 @@
                     <li>
                         <input
                             id="info-blocks-checkbox-cooking-time"
+                            v-model="visibleInfoBlocks"
                             type="checkbox"
                             class="checkbox"
+                            value="cooking-time"
                         />
                         <label for="info-blocks-checkbox-cooking-time">
                             {{ t("cookbook", "Cooking time") }}
@@ -114,8 +120,10 @@
                     <li>
                         <input
                             id="info-blocks-checkbox-total-time"
+                            v-model="visibleInfoBlocks"
                             type="checkbox"
                             class="checkbox"
+                            value="total-time"
                         />
                         <label for="info-blocks-checkbox-total-time">
                             {{ t("cookbook", "Total time") }}
@@ -124,8 +132,10 @@
                     <li>
                         <input
                             id="info-blocks-checkbox-nutrition-information"
+                            v-model="visibleInfoBlocks"
                             type="checkbox"
                             class="checkbox"
+                            value="nutrition-information"
                         />
                         <label for="info-blocks-checkbox-nutrition-information">
                             {{ t("cookbook", "Nutrition information") }}
@@ -134,8 +144,10 @@
                     <li>
                         <input
                             id="info-blocks-checkbox-tools"
+                            v-model="visibleInfoBlocks"
                             type="checkbox"
                             class="checkbox"
+                            value="tools"
                         />
                         <label for="info-blocks-checkbox-tools">
                             {{ t("cookbook", "Tools") }}
@@ -161,6 +173,23 @@ import { showSimpleAlertModal } from "cookbook/js/modals"
 
 export const SHOW_SETTINGS_EVENT = "show-settings"
 
+const INFO_BLOCK_KEYS = [
+    "preparation-time",
+    "cooking-time",
+    "total-time",
+    "nutrition-information",
+    "tools",
+]
+
+// The Vue representation of multiple checkboxes is an array of all checked values
+// However, the backend representation is an object (map of block ids to booleans)
+const visibleInfoBlocksEncode = (arr) =>
+    Object.fromEntries(INFO_BLOCK_KEYS.map((key) => [key, arr.includes(key)]))
+const visibleInfoBlocksDecode = (obj) =>
+    Object.entries(obj)
+        .filter(([, v]) => v)
+        .map(([k]) => k)
+
 export default {
     name: "SettingsDialog",
     components: {
@@ -183,6 +212,8 @@ export default {
             // (the one when config is loaded at page load)
             resetInterval: true,
             updateInterval: 0,
+            visibleInfoBlocks: [...INFO_BLOCK_KEYS],
+            resetVisibleInfoBlocks: true,
         }
     },
     watch: {
@@ -232,6 +263,26 @@ export default {
                 this.updateInterval = oldVal
             }
         },
+        async visibleInfoBlocks(newVal, oldVal) {
+            // Avoid infinite loop on page load and when reseting value after failed submit
+            if (this.resetVisibleInfoBlocks) {
+                this.resetVisibleInfoBlocks = false
+                return
+            }
+            try {
+                const data = visibleInfoBlocksEncode(newVal)
+                await api.config.visibleInfoBlocks.update(data)
+                // Should this check the response of the query? To catch some errors that redirect the page
+            } catch (err) {
+                // eslint-disable-next-line no-console
+                console.error("Error while trying to save info blocks", err)
+                await showSimpleAlertModal(
+                    t("cookbook", "Could save visible info blocks")
+                )
+                this.resetVisibleInfoBlocks = true
+                this.visibleInfoBlocks = oldVal
+            }
+        },
     },
     mounted() {
         this.setup()
@@ -290,6 +341,9 @@ export default {
                 }
 
                 this.printImage = config.print_image
+                this.visibleInfoBlocks = visibleInfoBlocksDecode(
+                    config.visibleInfoBlocks
+                )
                 this.showTagCloudInRecipeList =
                     this.$store.state.localSettings.showTagCloudInRecipeList
                 this.updateInterval = config.update_interval
diff --git a/src/js/api-interface.js b/src/js/api-interface.js
index faffa46b3..bcc30fda4 100644
--- a/src/js/api-interface.js
+++ b/src/js/api-interface.js
@@ -90,6 +90,10 @@ function updateRecipeDirectory(newDir) {
     return instance.post(`${baseUrl}/config`, { folder: newDir })
 }
 
+function updateVisibleInfoBlocks(visibleInfoBlocks) {
+    return instance.post(`${baseUrl}/config`, { visibleInfoBlocks })
+}
+
 function reindex() {
     return instance.post(`${baseUrl}/reindex`)
 }
@@ -125,5 +129,8 @@ export default {
         updateInterval: {
             update: updateUpdateInterval,
         },
+        visibleInfoBlocks: {
+            update: updateVisibleInfoBlocks,
+        },
     },
 }

From 7caca72c8887077b02abf6fbf21aab5c896c9d74 Mon Sep 17 00:00:00 2001
From: Marcel Robitaille <mail@marcelrobitaille.me>
Date: Thu, 29 Dec 2022 16:00:34 -0400
Subject: [PATCH 04/14] Hide info blocks that should not be visible

Signed-off-by: Marcel Robitaille <mail@marcelrobitaille.me>
---
 src/components/RecipeView.vue     | 22 +++++++++++++++++-----
 src/components/SettingsDialog.vue |  2 ++
 src/store/index.js                |  7 +++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/components/RecipeView.vue b/src/components/RecipeView.vue
index 2b24a7ff9..677953d00 100644
--- a/src/components/RecipeView.vue
+++ b/src/components/RecipeView.vue
@@ -70,19 +70,27 @@
                 </div>
                 <div class="times">
                     <RecipeTimer
-                        v-if="recipe.timerPrep"
+                        v-if="
+                            recipe.timerPrep &&
+                            visibleInfoBlocks['preparation-time']
+                        "
                         :value="recipe.timerPrep"
                         :timer="false"
                         :label="t('cookbook', 'Preparation time (H:MM)')"
                     />
                     <RecipeTimer
-                        v-if="recipe.timerCook"
+                        v-if="
+                            recipe.timerCook &&
+                            visibleInfoBlocks['cooking-time']
+                        "
                         :value="recipe.timerCook"
                         :timer="true"
                         :label="t('cookbook', 'Cooking time (H:MM)')"
                     />
                     <RecipeTimer
-                        v-if="recipe.timerTotal"
+                        v-if="
+                            recipe.timerTotal && visibleInfoBlocks['total-time']
+                        "
                         :value="recipe.timerTotal"
                         :timer="false"
                         :label="t('cookbook', 'Total time (H:MM)')"
@@ -109,7 +117,7 @@
                     </ul>
                 </section>
 
-                <section class="tools">
+                <section v-if="visibleInfoBlocks.tools" class="tools">
                     <h3 v-if="parsedTools.length">
                         {{ t("cookbook", "Tools") }}
                     </h3>
@@ -446,9 +454,13 @@ export default {
             return (
                 this.recipe.nutrition &&
                 !(this.recipe.nutrition instanceof Array) &&
-                Object.keys(this.recipe.nutrition).length > 1
+                Object.keys(this.recipe.nutrition).length > 1 &&
+                this.visibleInfoBlocks["nutrition-information"]
             )
         },
+        visibleInfoBlocks() {
+            return this.$store.state.localSettings.visibleInfoBlocks ?? {}
+        },
     },
     watch: {
         recipe(r) {
diff --git a/src/components/SettingsDialog.vue b/src/components/SettingsDialog.vue
index fc73bf06e..7e0b5f616 100644
--- a/src/components/SettingsDialog.vue
+++ b/src/components/SettingsDialog.vue
@@ -272,6 +272,7 @@ export default {
             try {
                 const data = visibleInfoBlocksEncode(newVal)
                 await api.config.visibleInfoBlocks.update(data)
+                this.$store.dispatch('setVisibleInfoBlocks', { visibleInfoBlocks: data })
                 // Should this check the response of the query? To catch some errors that redirect the page
             } catch (err) {
                 // eslint-disable-next-line no-console
@@ -344,6 +345,7 @@ export default {
                 this.visibleInfoBlocks = visibleInfoBlocksDecode(
                     config.visibleInfoBlocks
                 )
+                this.$store.dispatch('setVisibleInfoBlocks', { visibleInfoBlocks: config.visibleInfoBlocks })
                 this.showTagCloudInRecipeList =
                     this.$store.state.localSettings.showTagCloudInRecipeList
                 this.updateInterval = config.update_interval
diff --git a/src/store/index.js b/src/store/index.js
index a02bb7cf2..7fb904ccb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -45,6 +45,7 @@ export default new Vuex.Store({
         categoryUpdating: null,
         localSettings: {
             showTagCloudInRecipeList: true,
+            visibleInfoBlocks: null,
         },
     },
 
@@ -101,6 +102,9 @@ export default new Vuex.Store({
             localStorage.setItem("showTagCloudInRecipeList", JSON.stringify(b))
             state.localSettings.showTagCloudInRecipeList = b
         },
+        setVisibleInfoBlocks(state, { visibleInfoBlocks }) {
+            state.localSettings.visibleInfoBlocks = visibleInfoBlocks
+        },
         setUser(state, { u }) {
             state.user = u
         },
@@ -167,6 +171,9 @@ export default new Vuex.Store({
         setShowTagCloudInRecipeList(c, { showTagCloud }) {
             c.commit("setShowTagCloudInRecipeList", { b: showTagCloud })
         },
+        setVisibleInfoBlocks(c, { visibleInfoBlocks }) {
+            c.commit("setVisibleInfoBlocks", { visibleInfoBlocks })
+        },
         updateCategoryName(c, { categoryNames }) {
             const oldName = categoryNames[0]
             const newName = categoryNames[1]

From 35bb8d0722df5fef61ceac45492ca47f1381cd3e Mon Sep 17 00:00:00 2001
From: Marcel Robitaille <mail@marcelrobitaille.me>
Date: Thu, 29 Dec 2022 16:32:24 -0400
Subject: [PATCH 05/14] Handle config in store consistently

Only refresh the config from the database in a single action in the
store
Don't update the config in two different places in the settings dialog

Signed-off-by: Marcel Robitaille <mail@marcelrobitaille.me>
---
 src/components/RecipeView.vue     |  2 +-
 src/components/SettingsDialog.vue | 14 ++++++++------
 src/store/index.js                | 19 ++++++++++++-------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/components/RecipeView.vue b/src/components/RecipeView.vue
index 677953d00..5a7e9631d 100644
--- a/src/components/RecipeView.vue
+++ b/src/components/RecipeView.vue
@@ -459,7 +459,7 @@ export default {
             )
         },
         visibleInfoBlocks() {
-            return this.$store.state.localSettings.visibleInfoBlocks ?? {}
+            return this.$store.state.config?.visibleInfoBlocks ?? {}
         },
     },
     watch: {
diff --git a/src/components/SettingsDialog.vue b/src/components/SettingsDialog.vue
index 7e0b5f616..589e1c376 100644
--- a/src/components/SettingsDialog.vue
+++ b/src/components/SettingsDialog.vue
@@ -224,7 +224,7 @@ export default {
                 return
             }
             try {
-                api.config.printImage.update(newVal)
+                await api.config.printImage.update(newVal)
                 // Should this check the response of the query? To catch some errors that redirect the page
             } catch {
                 await showSimpleAlertModal(
@@ -272,7 +272,7 @@ export default {
             try {
                 const data = visibleInfoBlocksEncode(newVal)
                 await api.config.visibleInfoBlocks.update(data)
-                this.$store.dispatch('setVisibleInfoBlocks', { visibleInfoBlocks: data })
+                await this.$store.dispatch("refreshConfig")
                 // Should this check the response of the query? To catch some errors that redirect the page
             } catch (err) {
                 // eslint-disable-next-line no-console
@@ -333,9 +333,10 @@ export default {
          */
         async setup() {
             try {
-                const response = await api.config.get()
-                const config = response.data
+                await this.$store.dispatch("refreshConfig")
+                const { config } = this.$store.state
                 this.resetPrintImage = false
+                this.resetVisibleInfoBlocks = false
 
                 if (!config) {
                     throw new Error()
@@ -345,12 +346,13 @@ export default {
                 this.visibleInfoBlocks = visibleInfoBlocksDecode(
                     config.visibleInfoBlocks
                 )
-                this.$store.dispatch('setVisibleInfoBlocks', { visibleInfoBlocks: config.visibleInfoBlocks })
                 this.showTagCloudInRecipeList =
                     this.$store.state.localSettings.showTagCloudInRecipeList
                 this.updateInterval = config.update_interval
                 this.recipeFolder = config.folder
-            } catch {
+            } catch (err) {
+                // eslint-disable-next-line no-console
+                console.error("Error setting up SettingsDialog", err)
                 await showSimpleAlertModal(
                     t("cookbook", "Loading config failed")
                 )
diff --git a/src/store/index.js b/src/store/index.js
index 7fb904ccb..3a48dc154 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -45,11 +45,14 @@ export default new Vuex.Store({
         categoryUpdating: null,
         localSettings: {
             showTagCloudInRecipeList: true,
-            visibleInfoBlocks: null,
         },
+        config: null,
     },
 
     mutations: {
+        setConfig(state, { config }) {
+            state.config = config
+        },
         initializeStore(state) {
             if (localStorage.getItem("showTagCloudInRecipeList")) {
                 state.localSettings.showTagCloudInRecipeList = JSON.parse(
@@ -102,9 +105,6 @@ export default new Vuex.Store({
             localStorage.setItem("showTagCloudInRecipeList", JSON.stringify(b))
             state.localSettings.showTagCloudInRecipeList = b
         },
-        setVisibleInfoBlocks(state, { visibleInfoBlocks }) {
-            state.localSettings.visibleInfoBlocks = visibleInfoBlocks
-        },
         setUser(state, { u }) {
             state.user = u
         },
@@ -114,6 +114,14 @@ export default new Vuex.Store({
     },
 
     actions: {
+        /**
+         * Read/Update the user settings from the backend
+         */
+        async refreshConfig(c) {
+            const config = (await api.config.get()).data
+            c.commit("setConfig", { config })
+        },
+
         /**
          * Create new recipe on the server
          */
@@ -171,9 +179,6 @@ export default new Vuex.Store({
         setShowTagCloudInRecipeList(c, { showTagCloud }) {
             c.commit("setShowTagCloudInRecipeList", { b: showTagCloud })
         },
-        setVisibleInfoBlocks(c, { visibleInfoBlocks }) {
-            c.commit("setVisibleInfoBlocks", { visibleInfoBlocks })
-        },
         updateCategoryName(c, { categoryNames }) {
             const oldName = categoryNames[0]
             const newName = categoryNames[1]

From cc98191fef77cc53830990e781bae9de96d05739 Mon Sep 17 00:00:00 2001
From: Marcel Robitaille <mail@marcelrobitaille.me>
Date: Thu, 29 Dec 2022 16:50:16 -0400
Subject: [PATCH 06/14] Fix backend unit test

Signed-off-by: Marcel Robitaille <mail@marcelrobitaille.me>
---
 .../Unit/Controller/Implementation/ConfigImplementationTest.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Unit/Controller/Implementation/ConfigImplementationTest.php b/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
index 88348da01..376f2e542 100644
--- a/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
+++ b/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
@@ -88,6 +88,7 @@ public function testList(): void {
 			'folder' => $folder,
 			'update_interval' => $interval,
 			'print_image' => $printImage,
+			'visibleInfoBlocks' => Array (),
 		];
 
 		$this->userFolder->method('getPath')->willReturn($folder);

From c2a5362362df0d27228b2e55205ec33eb5d6b73d Mon Sep 17 00:00:00 2001
From: Marcel Robitaille <mail@marcelrobitaille.me>
Date: Thu, 29 Dec 2022 16:51:59 -0400
Subject: [PATCH 07/14] Update chnagelog

Signed-off-by: Marcel Robitaille <mail@marcelrobitaille.me>
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 229cff746..946599859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+### Changed
+- Make info block visibility configurable
+  [1404](https://github.com/nextcloud/cookbook/pull/1404) @MarcelRobitaille
+
 ### Fixed
 - Make "None" category string translatable
   [#1323](https://github.com/nextcloud/cookbook/pull/1344) @seyfeb

From 8e7124fa518a23eeb60e65d71eedec4439575f7a Mon Sep 17 00:00:00 2001
From: Marcel Robitaille <mail@marcelrobitaille.me>
Date: Thu, 29 Dec 2022 16:57:03 -0400
Subject: [PATCH 08/14] Run PHP style fixer

Signed-off-by: Marcel Robitaille <mail@marcelrobitaille.me>
---
 lib/Helper/UserConfigHelper.php                                 | 2 +-
 .../Unit/Controller/Implementation/ConfigImplementationTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Helper/UserConfigHelper.php b/lib/Helper/UserConfigHelper.php
index 8eafd21a6..860bff502 100644
--- a/lib/Helper/UserConfigHelper.php
+++ b/lib/Helper/UserConfigHelper.php
@@ -163,7 +163,7 @@ public function setPrintImage(bool $value): void {
 	 */
 	public function getVisibleInfoBlocks(): array {
 		$rawValue = $this->getRawValue(self::KEY_VISIBLE_INFO_BLOCKS);
-		
+
 		if ($rawValue === '') {
 			return [
 				'preparation-time' => true,
diff --git a/tests/Unit/Controller/Implementation/ConfigImplementationTest.php b/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
index 376f2e542..63b727e70 100644
--- a/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
+++ b/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
@@ -88,7 +88,7 @@ public function testList(): void {
 			'folder' => $folder,
 			'update_interval' => $interval,
 			'print_image' => $printImage,
-			'visibleInfoBlocks' => Array (),
+			'visibleInfoBlocks' => array(),
 		];
 
 		$this->userFolder->method('getPath')->willReturn($folder);

From 46a91bfecbff8befab70ce9a012fa4e931a5ac4f Mon Sep 17 00:00:00 2001
From: Marcel Robitaille <mail@marcelrobitaille.me>
Date: Thu, 29 Dec 2022 22:14:47 -0400
Subject: [PATCH 09/14] Make info blocks description translatable

Signed-off-by: Marcel Robitaille <mail@marcelrobitaille.me>
---
 src/components/SettingsDialog.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/SettingsDialog.vue b/src/components/SettingsDialog.vue
index 589e1c376..1dc05473c 100644
--- a/src/components/SettingsDialog.vue
+++ b/src/components/SettingsDialog.vue
@@ -88,9 +88,14 @@
         >
             <fieldset>
                 <legend class="settings-info-blocks__legend">
-                    Control which blocks of information are shown in the recipe
-                    view. If you do not use some features and find them
-                    distracting, you may hide them.
+                    {{
+                        t(
+                            "cookbook",
+                            `Control which blocks of information are shown in
+                            the recipe view. If you do not use some features
+                            and find them distracting, you may hide them.`
+                        )
+                    }}
                 </legend>
                 <ul>
                     <li>

From 38c87983ab7677fc5c85d82586c471a91dc7112b Mon Sep 17 00:00:00 2001
From: Marcel Robitaille <mail@marcelrobitaille.me>
Date: Sun, 22 Jan 2023 14:47:30 -0400
Subject: [PATCH 10/14] Use logging framework instead of console.error

Signed-off-by: Marcel Robitaille <mail@marcelrobitaille.me>
---
 src/components/SettingsDialog.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/SettingsDialog.vue b/src/components/SettingsDialog.vue
index 1dc05473c..21272659c 100644
--- a/src/components/SettingsDialog.vue
+++ b/src/components/SettingsDialog.vue
@@ -356,8 +356,7 @@ export default {
                 this.updateInterval = config.update_interval
                 this.recipeFolder = config.folder
             } catch (err) {
-                // eslint-disable-next-line no-console
-                console.error("Error setting up SettingsDialog", err)
+                this.$log.error("Error setting up SettingsDialog", err)
                 await showSimpleAlertModal(
                     t("cookbook", "Loading config failed")
                 )

From ef574a5042b5da26ef92265aa3e532593129046b Mon Sep 17 00:00:00 2001
From: Marcel Robitaille <mail@marcelrobitaille.me>
Date: Sun, 22 Jan 2023 14:54:46 -0400
Subject: [PATCH 11/14] Remove newlines from translatable string

Signed-off-by: Marcel Robitaille <mail@marcelrobitaille.me>
---
 src/components/SettingsDialog.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/SettingsDialog.vue b/src/components/SettingsDialog.vue
index 21272659c..d5b9af50d 100644
--- a/src/components/SettingsDialog.vue
+++ b/src/components/SettingsDialog.vue
@@ -91,9 +91,7 @@
                     {{
                         t(
                             "cookbook",
-                            `Control which blocks of information are shown in
-                            the recipe view. If you do not use some features
-                            and find them distracting, you may hide them.`
+                            "Control which blocks of information are shown in the recipe view. If you do not use some features and find them distracting, you may hide them."
                         )
                     }}
                 </legend>

From 38d4a3c96ed36defd6bc153c82f819891c2869ae Mon Sep 17 00:00:00 2001
From: Christian Wolf <git@christianwolf.email>
Date: Wed, 15 Mar 2023 20:11:14 +0100
Subject: [PATCH 12/14] Fix visual representation with empty spacing

Signed-off-by: Christian Wolf <git@christianwolf.email>
---
 src/components/RecipeView.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/RecipeView.vue b/src/components/RecipeView.vue
index 5a7e9631d..b3537ecd5 100644
--- a/src/components/RecipeView.vue
+++ b/src/components/RecipeView.vue
@@ -873,6 +873,7 @@ main {
     display: grid;
 
     grid-template-columns: 1fr 1em 2fr;
+    grid-template-rows: 100% 100% 100% 1fr;
 
     .ingredients {
         grid-column: 1/2;

From 2684d2121ff595c9b657547805da3d91b75b96e5 Mon Sep 17 00:00:00 2001
From: Christian Wolf <git@christianwolf.email>
Date: Wed, 15 Mar 2023 20:51:53 +0100
Subject: [PATCH 13/14] Fix unit tests

Signed-off-by: Christian Wolf <git@christianwolf.email>
---
 .../ConfigImplementationTest.php              | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/tests/Unit/Controller/Implementation/ConfigImplementationTest.php b/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
index 63b727e70..282d0506c 100644
--- a/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
+++ b/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
@@ -111,7 +111,7 @@ public function testList(): void {
 	 * @param mixed $interval
 	 * @param mixed $printImage
 	 */
-	public function testConfig($data, $folderPath, $interval, $printImage): void {
+	public function testConfig($data, $folderPath, $interval, $printImage, $visibleInfoBlocks): void {
 		$this->restParser->method('getParameters')->willReturn($data);
 
 		$this->dbCacheService->expects($this->once())->method('triggerCheck');
@@ -136,6 +136,12 @@ public function testConfig($data, $folderPath, $interval, $printImage): void {
 			$this->recipeService->expects($this->once())->method('setPrintImage')->with($printImage);
 		}
 
+		if (is_null($visibleInfoBlocks)) {
+			$this->recipeService->expects($this->never())->method('setVisibleInfoBlocks');
+		} else {
+			$this->recipeService->expects($this->once())->method('setVisibleInfoBlocks')->with($visibleInfoBlocks);
+		}
+
 		/**
 		 * @var JSONResponse $response
 		 */
@@ -147,23 +153,28 @@ public function testConfig($data, $folderPath, $interval, $printImage): void {
 	public function dataProviderConfig() {
 		return [
 			'noChange' => [
-				[], null, null, null
+				[], null, null, null, null
 			],
 			'changeFolder' => [
-				['folder' => '/path/to/whatever'], '/path/to/whatever', null, null
+				['folder' => '/path/to/whatever'], '/path/to/whatever', null, null, null
 			],
 			'changeinterval' => [
-				['update_interval' => 15], null, 15, null
+				['update_interval' => 15], null, 15, null, null
 			],
 			'changePrint' => [
-				['print_image' => true], null, null, true
+				['print_image' => true], null, null, true, null
+			],
+			'changeVisibleBlocks' => [
+				['visibleInfoBlocks' => ['cooking-time' => true, 'preparation-time' => true]], 
+				null, null, null, ['cooking-time' => true, 'preparation-time' => true]
 			],
 			'changeAll' => [
 				[
 					'folder' => '/my/custom/path',
 					'update_interval' => 12,
-					'print_image' => false
-				], '/my/custom/path', 12, false
+					'print_image' => false,
+					'visibleInfoBlocks' => ['cooking-time' => true, 'preparation-time' => true],
+				], '/my/custom/path', 12, false, ['cooking-time' => true, 'preparation-time' => true]
 			],
 		];
 	}

From b1cd19eafcc88f8fecbc0407a92f740c90e163f0 Mon Sep 17 00:00:00 2001
From: Christian Wolf <git@christianwolf.email>
Date: Thu, 16 Mar 2023 10:11:08 +0100
Subject: [PATCH 14/14] Make PHP code styler happy

Signed-off-by: Christian Wolf <git@christianwolf.email>
---
 .../Controller/Implementation/ConfigImplementationTest.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Unit/Controller/Implementation/ConfigImplementationTest.php b/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
index 282d0506c..212dd6243 100644
--- a/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
+++ b/tests/Unit/Controller/Implementation/ConfigImplementationTest.php
@@ -110,6 +110,7 @@ public function testList(): void {
 	 * @param mixed $folderPath
 	 * @param mixed $interval
 	 * @param mixed $printImage
+	 * @param mixed $visibleInfoBlocks
 	 */
 	public function testConfig($data, $folderPath, $interval, $printImage, $visibleInfoBlocks): void {
 		$this->restParser->method('getParameters')->willReturn($data);
@@ -165,7 +166,7 @@ public function dataProviderConfig() {
 				['print_image' => true], null, null, true, null
 			],
 			'changeVisibleBlocks' => [
-				['visibleInfoBlocks' => ['cooking-time' => true, 'preparation-time' => true]], 
+				['visibleInfoBlocks' => ['cooking-time' => true, 'preparation-time' => true]],
 				null, null, null, ['cooking-time' => true, 'preparation-time' => true]
 			],
 			'changeAll' => [