From f01cad9ce712dc43351e6e925a594bbc091be3ba Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 15 Dec 2023 14:51:47 +0100
Subject: [PATCH] :bug: Fix incorrect error reporting on clone template error

---
 frontend/src/app/main/ui/dashboard/import.cljs   | 12 +++++-------
 frontend/src/app/main/ui/dashboard/projects.cljs |  9 +++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/main/ui/dashboard/import.cljs b/frontend/src/app/main/ui/dashboard/import.cljs
index 426843edb..f85df2def 100644
--- a/frontend/src/app/main/ui/dashboard/import.cljs
+++ b/frontend/src/app/main/ui/dashboard/import.cljs
@@ -351,17 +351,15 @@
 
         on-template-cloned-success
         (fn []
-          (swap! state
-                 (fn [state]
-                   (-> state
-                       (assoc :status :importing :importing-templates 0))))
+          (swap! state assoc :status :importing :importing-templates 0)
           (st/emit! (dd/fetch-recent-files)))
 
         on-template-cloned-error
         (fn [cause]
-          (errors/print-cause! "Template Clone Error" cause)
-          (st/emit! (modal/hide)
-                    (msg/error (tr "dashboard.libraries-and-templates.import-error"))))
+          (swap! state assoc :status :error :importing-templates 0)
+          (errors/print-error! cause)
+          (rx/of (modal/hide)
+                 (msg/error (tr "dashboard.libraries-and-templates.import-error"))))
 
         continue-files
         (fn []
diff --git a/frontend/src/app/main/ui/dashboard/projects.cljs b/frontend/src/app/main/ui/dashboard/projects.cljs
index 545d9c0aa..01538627e 100644
--- a/frontend/src/app/main/ui/dashboard/projects.cljs
+++ b/frontend/src/app/main/ui/dashboard/projects.cljs
@@ -15,6 +15,7 @@
    [app.main.data.messages :as msg]
    [app.main.data.modal :as modal]
    [app.main.data.users :as du]
+   [app.main.errors :as errors]
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.context :as ctx]
@@ -138,10 +139,10 @@
 
         on-template-cloned-error
         (mf/use-fn
-         (fn []
-           (swap! state #(assoc % :status :waiting))
-           (st/emit!
-            (msg/error (tr "dashboard.libraries-and-templates.import-error")))))
+         (fn [cause]
+           (swap! state assoc :status :error)
+           (errors/print-error! cause)
+           (st/emit! (msg/error (tr "dashboard.libraries-and-templates.import-error")))))
 
         download-tutorial
         (mf/use-fn