From 69c28dadc24553735897365f38384dd8f86974e8 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 12 Dec 2024 16:24:42 -0500
Subject: [PATCH 1/5] Redaction layers are appearing on other documents Fixes
 #968

---
 src/langs/json/en.json                        |  1 +
 .../components/viewer/RedactionLayer.svelte   | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/langs/json/en.json b/src/langs/json/en.json
index 939923a1b..530a6a009 100644
--- a/src/langs/json/en.json
+++ b/src/langs/json/en.json
@@ -458,6 +458,7 @@
     "undo": "Undo",
     "cancel": "Discard",
     "cancelWarning": "You will lose unsaved redactions. Are you sure you want to cancel?",
+    "leaveWarning": "You have unsaved redactions. Are you sure you want to leave?",
     "success": "Redactions saved",
     "error": "Error"
   },
diff --git a/src/lib/components/viewer/RedactionLayer.svelte b/src/lib/components/viewer/RedactionLayer.svelte
index 786d99579..ca9749109 100644
--- a/src/lib/components/viewer/RedactionLayer.svelte
+++ b/src/lib/components/viewer/RedactionLayer.svelte
@@ -1,6 +1,8 @@
 <!-- @component
 This is a box to draw redactions on.
 It's layered over a PDF page and allows us to render redactions and draw new ones.
+When saved, redactions are burned into the PDF.
+So this layer is only showing unsaved redactions.
 -->
 <script context="module" lang="ts">
   import type { Redaction, Nullable } from "$lib/api/types";
@@ -30,6 +32,10 @@ It's layered over a PDF page and allows us to render redactions and draw new one
 </script>
 
 <script lang="ts">
+  import { onMount } from "svelte";
+  import { _ } from "svelte-i18n";
+  import { beforeNavigate } from "$app/navigation";
+
   export let active = false;
   export let page_number: number; // 0-indexed
 
@@ -99,6 +105,25 @@ It's layered over a PDF page and allows us to render redactions and draw new one
     $redactions = [...$redactions, currentRedaction];
     currentRedaction = null;
   }
+
+  beforeNavigate(({ cancel }) => {
+    // if there's redactions, confirm before navigating away
+    if ($redactions.length > 0) {
+      if (confirm($_("redact.leaveWarning"))) {
+        clear();
+        return;
+      } else {
+        cancel();
+      }
+    }
+  });
+
+  onMount(() => {
+    // before unmounting the component, clear the current redactions
+    return () => {
+      clear();
+    };
+  });
 </script>
 
 <div

From e1b96f013ce7ea2e6773c130b55f21f2c8214604 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 12 Dec 2024 16:35:11 -0500
Subject: [PATCH 2/5] Small optims

---
 src/lib/components/forms/ConfirmRedaction.svelte |  1 +
 src/lib/components/viewer/RedactionLayer.svelte  | 14 +-------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/lib/components/forms/ConfirmRedaction.svelte b/src/lib/components/forms/ConfirmRedaction.svelte
index 7f84750c3..8a2961c9a 100644
--- a/src/lib/components/forms/ConfirmRedaction.svelte
+++ b/src/lib/components/forms/ConfirmRedaction.svelte
@@ -44,6 +44,7 @@ This almost certainly lives in a modal.
       if (result.type === "success") {
         // need to invalidate before navigating
         await invalidate(`document:${document.id}`);
+        $redactions = [];
         $pending = result.data.redactions;
         goto("?mode=document");
         dispatch("close");
diff --git a/src/lib/components/viewer/RedactionLayer.svelte b/src/lib/components/viewer/RedactionLayer.svelte
index ca9749109..d61e340be 100644
--- a/src/lib/components/viewer/RedactionLayer.svelte
+++ b/src/lib/components/viewer/RedactionLayer.svelte
@@ -28,13 +28,13 @@ So this layer is only showing unsaved redactions.
 
   export function clear() {
     redactions.set([]);
+    pending.set([]);
   }
 </script>
 
 <script lang="ts">
   import { onMount } from "svelte";
   import { _ } from "svelte-i18n";
-  import { beforeNavigate } from "$app/navigation";
 
   export let active = false;
   export let page_number: number; // 0-indexed
@@ -106,18 +106,6 @@ So this layer is only showing unsaved redactions.
     currentRedaction = null;
   }
 
-  beforeNavigate(({ cancel }) => {
-    // if there's redactions, confirm before navigating away
-    if ($redactions.length > 0) {
-      if (confirm($_("redact.leaveWarning"))) {
-        clear();
-        return;
-      } else {
-        cancel();
-      }
-    }
-  });
-
   onMount(() => {
     // before unmounting the component, clear the current redactions
     return () => {

From a89bf61b583515ff8f2e6ab368deb3aa37a955d2 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 12 Dec 2024 16:41:29 -0500
Subject: [PATCH 3/5] Confirm potential to lose changes before navigating

---
 src/lib/components/viewer/RedactionLayer.svelte | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/lib/components/viewer/RedactionLayer.svelte b/src/lib/components/viewer/RedactionLayer.svelte
index d61e340be..de2694ac0 100644
--- a/src/lib/components/viewer/RedactionLayer.svelte
+++ b/src/lib/components/viewer/RedactionLayer.svelte
@@ -35,6 +35,7 @@ So this layer is only showing unsaved redactions.
 <script lang="ts">
   import { onMount } from "svelte";
   import { _ } from "svelte-i18n";
+  import { beforeNavigate } from "$app/navigation";
 
   export let active = false;
   export let page_number: number; // 0-indexed
@@ -106,6 +107,14 @@ So this layer is only showing unsaved redactions.
     currentRedaction = null;
   }
 
+  beforeNavigate(({ cancel }) => {
+    if ($redactions.length > 0) {
+      if (!confirm($_("redact.cancelWarning"))) {
+        cancel();
+      }
+    }
+  });
+
   onMount(() => {
     // before unmounting the component, clear the current redactions
     return () => {

From 6b14a9fe47164a72465658a95fbccc5170ebc4ec Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 12 Dec 2024 16:50:35 -0500
Subject: [PATCH 4/5] Lil fixes

---
 src/langs/json/en.json                          | 2 +-
 src/lib/components/viewer/RedactionLayer.svelte | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/langs/json/en.json b/src/langs/json/en.json
index 530a6a009..fec1b0c91 100644
--- a/src/langs/json/en.json
+++ b/src/langs/json/en.json
@@ -457,7 +457,7 @@
     "instructions": "Click and drag to draw a black rectangle over each portion of the document you’d like to redact. Associated text will be removed when you save your redactions.",
     "undo": "Undo",
     "cancel": "Discard",
-    "cancelWarning": "You will lose unsaved redactions. Are you sure you want to cancel?",
+    "cancelWarning": "You will lose unsaved redactions. Are you sure you want to discard?",
     "leaveWarning": "You have unsaved redactions. Are you sure you want to leave?",
     "success": "Redactions saved",
     "error": "Error"
diff --git a/src/lib/components/viewer/RedactionLayer.svelte b/src/lib/components/viewer/RedactionLayer.svelte
index de2694ac0..5a6290199 100644
--- a/src/lib/components/viewer/RedactionLayer.svelte
+++ b/src/lib/components/viewer/RedactionLayer.svelte
@@ -111,7 +111,9 @@ So this layer is only showing unsaved redactions.
     if ($redactions.length > 0) {
       if (!confirm($_("redact.cancelWarning"))) {
         cancel();
+        return;
       }
+      clear();
     }
   });
 

From c014890e46c13a18b734d74b1546193e8e40b880 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 12 Dec 2024 16:50:56 -0500
Subject: [PATCH 5/5] One more

---
 src/lib/components/viewer/RedactionLayer.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/viewer/RedactionLayer.svelte b/src/lib/components/viewer/RedactionLayer.svelte
index 5a6290199..d5ce73022 100644
--- a/src/lib/components/viewer/RedactionLayer.svelte
+++ b/src/lib/components/viewer/RedactionLayer.svelte
@@ -109,7 +109,7 @@ So this layer is only showing unsaved redactions.
 
   beforeNavigate(({ cancel }) => {
     if ($redactions.length > 0) {
-      if (!confirm($_("redact.cancelWarning"))) {
+      if (!confirm($_("redact.leaveWarning"))) {
         cancel();
         return;
       }