revert abort error filtering

repath-project · Nov 10, 2024 · 17f153e · 17f153e
1 parent 71de461
commit 17f153e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 25 deletions.
diff --git a/src/renderer/document/events.cljs b/src/renderer/document/events.cljs
@@ -15,7 +15,7 @@
    [renderer.document.handlers :as h]
    [renderer.element.handlers :as element.h]
    [renderer.history.handlers :as history.h]
-   [renderer.notification.events :as notification.e]
+   [renderer.notification.events :as-alias notification.e]
    [renderer.notification.handlers :as notification.h]
    [renderer.notification.views :as notification.v]
    [renderer.snap.handlers :as snap.h]
@@ -182,20 +182,13 @@
                               :formatter #(mapv edn/read-string %)}}
      {::app.fx/file-open {:options file-picker-options
                           :on-success [::file-read]
-                          :on-error [::file-error]}})))
+                          :on-error [::notification.e/exception]}})))
 
 (rf/reg-event-fx
  ::file-read
  (fn [_ [_ file]]
    {::fx/read file}))
 
-(rf/reg-event-fx
- ::file-error
- (fn [{:keys [db]} [_ ^js/Error error]]
-   (cond-> db
-     (not= (.-name error) "AbortError")
-     (notification.h/add (notification.v/exception error)))))
-
 (rf/reg-event-fx
  ::open-directory
  (fn [_ [_ path]]
@@ -239,7 +232,7 @@
                             :formatter (fn [file] {:id (:id document)
                                                    :title (.-name file)})
                             :on-success [::saved]
-                            :on-error [::file-error]}}))))
+                            :on-error [::notification.e/exception]}}))))
 
 (rf/reg-event-fx
  ::download
@@ -263,7 +256,7 @@
                             :formatter (fn [file] {:id id
                                                    :title (.-name file)})
                             :on-success [::close-saved]
-                            :on-error [::file-error]}}))))
+                            :on-error [::notification.e/exception]}}))))
 
 (rf/reg-event-fx
  ::save-as
@@ -280,7 +273,7 @@
                             :formatter (fn [file] {:id (:id document)
                                                    :title (.-name file)})
                             :on-success [::saved]
-                            :on-error [::file-error]}}))))
+                            :on-error [::notification.e/exception]}}))))
 
 (rf/reg-event-db
  ::saved

diff --git a/src/renderer/tool/impl/element/image.cljs b/src/renderer/tool/impl/element/image.cljs
@@ -3,8 +3,7 @@
   (:require
    [re-frame.core :as rf]
    [renderer.app.effects :as-alias app.fx]
-   [renderer.notification.handlers :as notification.h]
-   [renderer.notification.views :as notification.v]
+   [renderer.notification.events :as-alias notification.e]
    [renderer.tool.handlers :as tool.h]
    [renderer.tool.hierarchy :as hierarchy]
    [renderer.utils.drop :as drop]))
@@ -23,7 +22,7 @@
                                                   "image/jpeg" [".jpeg" ".jpg"]
                                                   "image/bmp" [".fmp"]}}]}
                       :on-success [::success]
-                      :on-error [::error]}]))
+                      :on-error [::notification.e/exception]}]))
 
 (rf/reg-event-fx
  ::success
@@ -32,13 +31,6 @@
     ::add-image [file (or (:point (:nearest-neighbor db))
                           (:adjusted-pointer-pos db))]}))
 
-(rf/reg-event-db
- ::error
- (fn [db [_ error]]
-   (cond-> db
-     (not= (.-name error) "AbortError")
-     (notification.h/add (notification.v/exception error)))))
-
 (rf/reg-fx
  ::add-image
  (fn [[file position]]

diff --git a/src/renderer/tool/impl/misc/dropper.cljs b/src/renderer/tool/impl/misc/dropper.cljs
@@ -45,6 +45,5 @@
 (rf/reg-event-db
  ::error
  (fn [db [_ error]]
-   (cond-> (h/activate db :transform)
-     (not= (.-name error) "AbortError")
-     (notification.h/add (notification.v/exception error)))))
+   (-> (h/activate db :transform)
+       (notification.h/add (notification.v/exception error)))))