Show extra message for error

scpwiki · Sep 28, 2024 · 618e531 · 618e531
1 parent e320d50
commit 618e531
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 21 deletions.
diff --git a/framerail/src/lib/popup/error.svelte b/framerail/src/lib/popup/error.svelte
@@ -30,6 +30,11 @@
     <div id="modal-message" class="modal-message">
       {$showErrorPopup.message}
     </div>
+    {#if $showErrorPopup.data}
+      <div id="model-message-extra" class="modal-message-extra">
+        {$showErrorPopup.data}
+      </div>
+    {/if}
   </div>
 </div>
 

diff --git a/framerail/src/lib/stores.ts b/framerail/src/lib/stores.ts
@@ -3,5 +3,6 @@ import { useWritable } from "./use-shared-store"
 export const useErrorPopup = () =>
   useWritable("errorPopup", {
     state: false,
-    message: null
+    message: null,
+    data: null,
   })
diff --git a/framerail/src/routes/+error.svelte b/framerail/src/routes/+error.svelte
@@ -27,7 +27,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       goto(`/${$page.params.slug}`, {
@@ -46,7 +47,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       deletedPages = res
@@ -65,7 +67,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       showRestoreAction = false

diff --git a/framerail/src/routes/+layout.svelte b/framerail/src/routes/+layout.svelte
@@ -8,7 +8,8 @@
   function closeErrorPopup() {
     showErrorPopup.set({
       state: false,
-      message: null
+      message: null,
+      data: null
     })
   }
 </script>

diff --git a/framerail/src/routes/[slug]/[...extra]/page.svelte b/framerail/src/routes/[slug]/[...extra]/page.svelte
@@ -34,7 +34,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else invalidateAll()
   }
@@ -69,7 +70,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       goto(`/${$page.data.page.slug}`, {
@@ -97,7 +99,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       goto(`/${newSlug}`, {
@@ -119,7 +122,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       showLayoutAction = false
@@ -138,7 +142,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       parents = res.join(" ")
@@ -173,7 +178,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       showParentAction = false
@@ -192,7 +198,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       res.forEach((rev) => {
@@ -229,7 +236,8 @@
       if (res?.message) {
         showErrorPopup.set({
           state: true,
-          message: res.message
+          message: res.message,
+          data: res.data
         })
       } else if (!rev) {
         // This is a revision we didn't even cache...?
@@ -258,7 +266,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else invalidateAll()
   }
@@ -274,7 +283,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       voteRating = res.score ?? 0
@@ -293,7 +303,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       voteMap = new Map()
@@ -315,7 +326,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     }
   }
@@ -331,7 +343,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     }
   }

diff --git a/framerail/src/routes/[x+2d]/admin/+page.svelte b/framerail/src/routes/[x+2d]/admin/+page.svelte
@@ -23,7 +23,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       isEdit = false

diff --git a/framerail/src/routes/[x+2d]/login/+page.svelte b/framerail/src/routes/[x+2d]/login/+page.svelte
@@ -20,7 +20,8 @@
     } else {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     }
   }

diff --git a/framerail/src/routes/[x+2d]/user/+page.svelte b/framerail/src/routes/[x+2d]/user/+page.svelte
@@ -21,7 +21,8 @@
     if (res?.message) {
       showErrorPopup.set({
         state: true,
-        message: res.message
+        message: res.message,
+        data: res.data
       })
     } else {
       isEdit = false