From 68b27fced2faf727e77231782b789ccf387a023d Mon Sep 17 00:00:00 2001
From: Ethan Dalool <git@voussoir.net>
Date: Fri, 6 Nov 2020 21:42:28 -0800
Subject: [PATCH] Add refresh_or_alert so errors aren't missed.

---
 frontends/etiquette_flask/static/js/common.js      | 11 +++++++++++
 frontends/etiquette_flask/templates/album.html     | 14 +++++++-------
 .../etiquette_flask/templates/album_card.html      |  2 +-
 frontends/etiquette_flask/templates/bookmarks.html |  4 ++--
 frontends/etiquette_flask/templates/photo.html     |  2 +-
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/frontends/etiquette_flask/static/js/common.js b/frontends/etiquette_flask/static/js/common.js
index c0900a9..ae06694 100644
--- a/frontends/etiquette_flask/static/js/common.js
+++ b/frontends/etiquette_flask/static/js/common.js
@@ -40,6 +40,17 @@ function refresh()
     window.location.reload();
 }
 
+common.refresh_or_alert =
+function refresh_or_alert(response)
+{
+    if (response.meta.status !== 200)
+    {
+        alert(JSON.stringify(response));
+        return;
+    }
+    window.location.reload();
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // HTTP ////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/frontends/etiquette_flask/templates/album.html b/frontends/etiquette_flask/templates/album.html
index a4e2ada..ca056a8 100644
--- a/frontends/etiquette_flask/templates/album.html
+++ b/frontends/etiquette_flask/templates/album.html
@@ -295,7 +295,7 @@ function add_child(child_id)
     {
         return;
     }
-    api.albums.add_child(ALBUM_ID, child_id, common.refresh);
+    api.albums.add_child(ALBUM_ID, child_id, common.refresh_or_alert);
 }
 
 function delete_album_form()
@@ -305,18 +305,18 @@ function delete_album_form()
 
 function refresh_associated_directories_form()
 {
-    api.albums.refresh_directories(ALBUM_ID, common.refresh);
+    api.albums.refresh_directories(ALBUM_ID, common.refresh_or_alert);
 }
 
 function paste_photo_clipboard()
 {
     const photo_ids = Array.from(photo_clipboard.clipboard);
-    api.albums.add_photos(ALBUM_ID, photo_ids, common.refresh);
+    api.albums.add_photos(ALBUM_ID, photo_ids, common.refresh_or_alert);
 }
 function unpaste_photo_clipboard()
 {
     const photo_ids = Array.from(photo_clipboard.clipboard);
-    api.albums.remove_photos(ALBUM_ID, photo_ids, common.refresh);
+    api.albums.remove_photos(ALBUM_ID, photo_ids, common.refresh_or_alert);
 }
 
 function rename_ed_on_open(ed, edit_element_map, display_element_map)
@@ -450,16 +450,16 @@ function on_album_drag_drop(event)
 
     if (parent_id === "root")
     {
-        api.albums.remove_child(ALBUM_ID, child_id, common.refresh);
+        api.albums.remove_child(ALBUM_ID, child_id, common.refresh_or_alert);
     }
     else if (ALBUM_ID)
     {
         api.albums.add_child(parent_id, child_id, null);
-        api.albums.remove_child(ALBUM_ID, child_id, common.refresh);
+        api.albums.remove_child(ALBUM_ID, child_id, common.refresh_or_alert);
     }
     else
     {
-        api.albums.add_child(parent_id, child_id, common.refresh);
+        api.albums.add_child(parent_id, child_id, common.refresh_or_alert);
     }
 }
 </script>
diff --git a/frontends/etiquette_flask/templates/album_card.html b/frontends/etiquette_flask/templates/album_card.html
index b1f8f52..9cf9ee1 100644
--- a/frontends/etiquette_flask/templates/album_card.html
+++ b/frontends/etiquette_flask/templates/album_card.html
@@ -26,7 +26,7 @@ draggable=true
         {% if unlink_parent is not none %}
         <button
         class="remove_child_button button_with_confirm red_button"
-        data-onclick="return api.albums.remove_child('{{unlink_parent.id}}', '{{album.id}}', common.refresh);"
+        data-onclick="return api.albums.remove_child('{{unlink_parent.id}}', '{{album.id}}', common.refresh_or_alert);"
         data-prompt="Remove child?"
         data-holder-class="remove_child_button"
         data-confirm-class="red_button"
diff --git a/frontends/etiquette_flask/templates/bookmarks.html b/frontends/etiquette_flask/templates/bookmarks.html
index ec439ea..ec96484 100644
--- a/frontends/etiquette_flask/templates/bookmarks.html
+++ b/frontends/etiquette_flask/templates/bookmarks.html
@@ -108,13 +108,13 @@ function create_bookmark_form()
     {
         return;
     }
-    return api.bookmarks.create(url, title, common.refresh);
+    return api.bookmarks.create(url, title, common.refresh_or_alert);
 }
 
 function delete_bookmark_form(event)
 {
     const id = event.target.closest(".bookmark_card").dataset.id;
-    api.bookmarks.delete(id, common.refresh);
+    api.bookmarks.delete(id, common.refresh_or_alert);
 }
 
 function on_open(ed, edit_element_map)
diff --git a/frontends/etiquette_flask/templates/photo.html b/frontends/etiquette_flask/templates/photo.html
index 8a4bc1c..f05b29a 100644
--- a/frontends/etiquette_flask/templates/photo.html
+++ b/frontends/etiquette_flask/templates/photo.html
@@ -418,7 +418,7 @@ function generate_thumbnail_callback(response)
 
 function refresh_metadata_form()
 {
-    api.photos.refresh_metadata(PHOTO_ID, common.refresh);
+    api.photos.refresh_metadata(PHOTO_ID, common.refresh_or_alert);
 }
 
 function set_searchhidden_form()