diff --git a/CHANGES.md b/CHANGES.md index fd77dae98..5edc09ba2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -86,6 +86,7 @@ - Fix problem with precision in resizes [Taiga #5623](https://tree.taiga.io/project/penpot/issue/5623) - Fix absolute positioned layouts not showing flex properties [Taiga #5630](https://tree.taiga.io/project/penpot/issue/5630) - Fix text gradient handlers [Taiga #4047](https://tree.taiga.io/project/penpot/issue/4047) +- Fix when user deletes one file during import it is impossible to finish importing of second file [Taiga #5656](https://tree.taiga.io/project/penpot/issue/5656) ### :arrow_up: Deps updates diff --git a/frontend/src/app/main/ui/dashboard/import.cljs b/frontend/src/app/main/ui/dashboard/import.cljs index 1aa8fbc73..5a24b393a 100644 --- a/frontend/src/app/main/ui/dashboard/import.cljs +++ b/frontend/src/app/main/ui/dashboard/import.cljs @@ -337,18 +337,18 @@ (st/emit! (modal/hide)) (when on-finish-import (on-finish-import)))) + files (->> (:files @state) (filterv (comp not :deleted?))) + num-importing (+ - (->> @state :files (filter #(= (:status %) :importing)) count) + (->> files (filter #(= (:status %) :importing)) count) (:importing-templates @state)) - warning-files (->> @state :files (filter #(and (= (:status %) :import-finish) (d/not-empty? (:errors %)))) count) - success-files (->> @state :files (filter #(and (= (:status %) :import-finish) (empty? (:errors %)))) count) - pending-analysis? (> (->> @state :files (filter #(= (:status %) :analyzing)) count) 0) + warning-files (->> files (filter #(and (= (:status %) :import-finish) (d/not-empty? (:errors %)))) count) + success-files (->> files (filter #(and (= (:status %) :import-finish) (empty? (:errors %)))) count) + pending-analysis? (> (->> files (filter #(= (:status %) :analyzing)) count) 0) pending-import? (> num-importing 0) - files (->> (:files @state) (filterv (comp not :deleted?))) - ;; pending-import? (> (->> @state :files (filter #(= (:status %) :importing)) count) 0) - ;; files (->> (:files @state) (filterv (comp not :deleted?))) + valid-files? (or (some? template) (> (+ (->> files (filterv (fn [x] (not= (:status x) :analyze-error))) count)) 0))]