Merge pull request #3803 from penpot/niwinz-develop-components-migration-4

🐛 Several bugfixes
This commit is contained in:
Pablo Alba 2023-11-15 19:59:11 +01:00 committed by GitHub
commit 83d786743b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 209 additions and 206 deletions

View file

@ -920,8 +920,8 @@
(rx/tap on-success)
(rx/catch on-error))))))
;; --- EVENT: clone-template
(defn clone-template
[{:keys [template-id project-id] :as params}]
(dm/assert! (uuid? project-id))

View file

@ -298,6 +298,7 @@
(rx/map (fn [[file thumbnails team-users comments-users]]
(let [bundle (-> bundle
(assoc :file file)
(assoc :features features)
(assoc :thumbnails thumbnails)
(assoc :team-users team-users)
(assoc :comments-users comments-users))]

View file

@ -50,6 +50,13 @@
(finally
(js/console.groupEnd message))))
(defn print-cause!
[message cause]
(print-group! message (fn []
(print-data! cause)
(print-explain! cause)
(print-trace! cause))))
(defn on-error
"A general purpose error handler."
[error]

View file

@ -13,6 +13,7 @@
[app.main.data.events :as ev]
[app.main.data.messages :as msg]
[app.main.data.modal :as modal]
[app.main.errors :as errors]
[app.main.features :as features]
[app.main.store :as st]
[app.main.ui.components.file-uploader :refer [file-uploader]]
@ -296,10 +297,10 @@
(st/emit! (dd/fetch-recent-files)))
on-template-cloned-error
(fn []
(st/emit!
(modal/hide)
(msg/error (tr "dashboard.libraries-and-templates.import-error"))))
(fn [cause]
(errors/print-cause! "Template Clone Error" cause)
(st/emit! (modal/hide)
(msg/error (tr "dashboard.libraries-and-templates.import-error"))))
continue-files
(fn []
@ -314,7 +315,8 @@
continue-template
(fn []
(let [mdata {:on-success on-template-cloned-success :on-error on-template-cloned-error}
(let [mdata {:on-success on-template-cloned-success
:on-error on-template-cloned-error}
params {:project-id project-id :template-id (:id template)}]
(swap! state
(fn [state]