From 30c639c5de59100b3318b55378c4453b7dfa5378 Mon Sep 17 00:00:00 2001
From: SrGesus <108523575+SrGesus@users.noreply.github.com>
Date: Sun, 26 Jan 2025 01:12:47 +0000
Subject: [PATCH 1/2] fix: Reset cached recipe when edit is closed

---
 frontend/components/Domain/Recipe/RecipePage/RecipePage.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
index 781ffda7b..b6b7d420d 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
@@ -234,7 +234,7 @@ export default defineComponent({
 
     onUnmounted(async () => {
       const isSame = JSON.stringify(props.recipe) === JSON.stringify(originalRecipe.value);
-      if (isEditMode.value && !isSame && props.recipe?.slug !== undefined) {
+      if (!isSame && props.recipe?.slug !== undefined) {
         const save = window.confirm(
           i18n.tc("general.unsaved-changes"),
           );
@@ -274,7 +274,8 @@ export default defineComponent({
       const { data } = await api.recipes.updateOne(props.recipe.slug, props.recipe);
       setMode(PageMode.VIEW);
       if (data?.slug) {
-        router.push(`/g/${groupSlug.value}/r/` + data.slug);
+        Object.assign(originalRecipe.value, props.recipe);
+        router.push(`/g/${groupSlug.value}/r/${data.slug}`);
       }
     }
 

From 269706fb0920b9beaf47e4471b2806e24962a1a3 Mon Sep 17 00:00:00 2001
From: SrGesus <108523575+SrGesus@users.noreply.github.com>
Date: Mon, 27 Jan 2025 18:08:20 +0000
Subject: [PATCH 2/2] fix: Add snackbar to indicate unsaved changes

---
 .../Domain/Recipe/RecipePage/RecipePage.vue   | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
index b6b7d420d..ebf61baf8 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
@@ -1,5 +1,20 @@
 <template>
   <div>
+    <v-snackbar
+      v-model="snackbar"
+      :timeout="0"
+      top
+    >
+      {{ snackbarText }}
+      <template #action="{ attrs }">
+        <v-btn text v-bind="attrs" @click="discardChanges">
+          {{ discardText }}
+        </v-btn>
+        <v-btn color="primary" text v-bind="attrs" @click="saveRecipe">
+          {{ saveText }}
+        </v-btn>
+      </template>
+    </v-snackbar>
     <v-container v-show="!isCookMode" key="recipe-page" :class="{ 'pa-0': $vuetify.breakpoint.smAndDown }">
       <v-card :flat="$vuetify.breakpoint.smAndDown" class="d-print-none">
         <RecipePageHeader
@@ -204,7 +219,7 @@ export default defineComponent({
     },
   },
   setup(props) {
-    const { $auth } = useContext();
+    const { $auth, $vuetify, i18n } = useContext();
     const route = useRoute();
     const groupSlug = computed(() => route.value.params.groupSlug || $auth.user?.groupSlug || "");
     const { isOwnGroup } = useLoggedInState();
@@ -267,14 +282,14 @@ export default defineComponent({
     });
 
     /** =============================================================
-     * Recipe Save Delete
+     * Recipe Save Delete Cancel
      */
 
     async function saveRecipe() {
       const { data } = await api.recipes.updateOne(props.recipe.slug, props.recipe);
       setMode(PageMode.VIEW);
       if (data?.slug) {
-        Object.assign(originalRecipe.value, props.recipe);
+        originalRecipe.value = deepCopy(props.recipe);
         router.push(`/g/${groupSlug.value}/r/${data.slug}`);
       }
     }
@@ -286,10 +301,17 @@ export default defineComponent({
       }
     }
 
+    function discardChanges() {
+      Object.assign(props.recipe, originalRecipe.value);
+    }
+
+    const snackbar = computed(() => {
+      return JSON.stringify(props.recipe) !== JSON.stringify(originalRecipe.value) && pageMode.value !== PageMode.EDIT;
+    })
+
     /** =============================================================
      * View Preferences
      */
-    const { $vuetify, i18n } = useContext();
 
     const landscape = computed(() => {
       const preferLandscape = props.recipe.settings.landscapeView;
@@ -348,7 +370,10 @@ export default defineComponent({
       scale: ref(1),
       EDITOR_OPTIONS,
       landscape,
-
+      snackbar,
+      snackbarText: i18n.tc("general.unsaved-changes"),
+      saveText: i18n.tc("general.save"),
+      discardText: i18n.tc("general.cancel"),
       pageMode,
       editMode,
       PageMode,
@@ -360,6 +385,7 @@ export default defineComponent({
       toggleCookMode,
       saveRecipe,
       deleteRecipe,
+      discardChanges,
       addStep,
       hasLinkedIngredients,
       notLinkedIngredients,