diff --git a/backend/src/app/http/errors.clj b/backend/src/app/http/errors.clj index 0e8e065ad2..580cd67039 100644 --- a/backend/src/app/http/errors.clj +++ b/backend/src/app/http/errors.clj @@ -81,6 +81,7 @@ (cond (or (= code :spec-validation) (= code :params-validation) + (= code :schema-validation) (= code :data-validation)) (let [explain (ex/explain data)] {::rres/status 400 diff --git a/backend/src/app/rpc/commands/binfile.clj b/backend/src/app/rpc/commands/binfile.clj index 253d77fba0..7e7327b32e 100644 --- a/backend/src/app/rpc/commands/binfile.clj +++ b/backend/src/app/rpc/commands/binfile.clj @@ -722,7 +722,8 @@ (-> fdata (update :pages-index relink-shapes) (update :components relink-shapes) - (update :media relink-media)))))) + (update :media relink-media) + (d/without-nils)))))) (defmethod read-section :v1/files diff --git a/frontend/src/app/worker/import.cljs b/frontend/src/app/worker/import.cljs index bccb975ea0..a4a132f326 100644 --- a/frontend/src/app/worker/import.cljs +++ b/frontend/src/app/worker/import.cljs @@ -726,16 +726,13 @@ (log/error :hint "unexpected error on import process" :project-id project-id ::log/sync? true) - - (when (map? cause) + (let [edata (if (map? cause) cause (ex-data cause))] (println "Error data:") - (pp/pprint (dissoc cause :explain) {:level 2 :length 10})) + (pp/pprint (dissoc edata :explain) {:level 2 :length 10}) - (when (string? (:explain cause)) - (js/console.log (:explain cause))) + (when (string? (:explain edata)) + (js/console.log (:explain edata))) - (rx/of {:status :import-error - :file-id (:file-id data) - :error (:hint cause) - :error-data cause})))))))))) + (rx/of {:status :import-error + :file-id (:file-id data)})))))))))))