Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-26 08:29:42 -05:00
Code Issues Activity

🐛 Fix some bugs when deleting library items in dashboard

Browse source
This commit is contained in:
Andrés Moya 2020-05-13 11:23:27 +02:00
parent 0c12d7b0d2
commit c4c7fc71a0
1 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
frontend/src/uxbox/main/ui/dashboard/library.cljs
View file

@ -161,9 +161,10 @@
:accept-text "Delete"})))]]}]] :accept-text "Delete"})))]]}]]
[:div.library-top-menu-actions [:div.library-top-menu-actions
[:a.library-top-menu-actions-delete (when on-delete-selected
{:on-click #(when on-delete-selected (on-delete-selected))} [:a.library-top-menu-actions-delete
i/trash] {:on-click on-delete-selected}
i/trash])
(if (= section :palettes) (if (= section :palettes)
[:button.btn-secondary.btn-small [:button.btn-secondary.btn-small
@ -184,11 +185,10 @@
:style {:display "none"}}]])]])) :style {:display "none"}}]])]]))
(mf/defc library-icon-card (mf/defc library-icon-card
[{:keys [item on-select on-unselect]}] [{:keys [item on-select on-unselect on-delete]}]
(let [{:keys [id name url content metadata library-id modified-at]} item (let [{:keys [id name url content metadata library-id modified-at]} item
locale (i18n/use-locale) locale (i18n/use-locale)
state (mf/use-state {:is-open false state (mf/use-state {:is-open false :selected false})
:selected false})
time (dt/timeago modified-at {:locale locale}) time (dt/timeago modified-at {:locale locale})
handle-change (fn [] handle-change (fn []
(swap! state update :selected not) (swap! state update :selected not)
@ -200,7 +200,7 @@
[:input {:type "checkbox" [:input {:type "checkbox"
:id (str "icon-" id) :id (str "icon-" id)
:on-change handle-change :on-change handle-change
:checked (:selected @state)}] :value (:selected @state)}]
[:label {:for (str "icon-" id)}]] [:label {:for (str "icon-" id)}]]
[:div.library-card-image [:div.library-card-image
[:svg {:view-box (->> metadata :view-box (str/join " ")) [:svg {:view-box (->> metadata :view-box (str/join " "))
@ -221,15 +221,17 @@
(fn [] (fn []
(modal/show! (modal/show!
confirm-dialog confirm-dialog
{:on-accept #(st/emit! (dlib/delete-item :icons library-id id)) {:on-accept #(do
(st/emit! (dlib/delete-item :icons library-id id))
(on-delete id))
:message "Are you sure you want to delete this icon?" :message "Are you sure you want to delete this icon?"
:accept-text "Delete"}))]]}]]])) :accept-text "Delete"}))]]}]]]))
(mf/defc library-image-card (mf/defc library-image-card
[{:keys [item on-select on-unselect]}] [{:keys [item on-select on-unselect on-delete]}]
(let [{:keys [id name thumb-uri library-id modified-at]} item (let [{:keys [id name thumb-uri library-id modified-at]} item
locale (i18n/use-locale) locale (i18n/use-locale)
state (mf/use-state {:is-open false}) state (mf/use-state {:is-open false :selected false})
time (dt/timeago modified-at {:locale locale}) time (dt/timeago modified-at {:locale locale})
handle-change (fn [] handle-change (fn []
(swap! state update :selected not) (swap! state update :selected not)
@ -241,7 +243,7 @@
[:input {:type "checkbox" [:input {:type "checkbox"
:id (str "image-" id) :id (str "image-" id)
:on-change handle-change :on-change handle-change
:checked (:selected @state)}] :value (:selected @state)}]
[:label {:for (str "image-" id)}]] [:label {:for (str "image-" id)}]]
[:div.library-card-image [:div.library-card-image
[:img {:src thumb-uri}]] [:img {:src thumb-uri}]]
@ -258,15 +260,17 @@
(fn [] (fn []
(modal/show! (modal/show!
confirm-dialog confirm-dialog
{:on-accept #(st/emit! (dlib/delete-item :images library-id id)) {:on-accept #(do
(st/emit! (dlib/delete-item :images library-id id))
(on-delete id))
:message "Are you sure you want to delete this image?" :message "Are you sure you want to delete this image?"
:accept-text "Delete"}))]]}]]])) :accept-text "Delete"}))]]}]]]))
(mf/defc library-color-card (mf/defc library-color-card
[{:keys [item on-select on-unselect]}] [{:keys [item on-select on-unselect on-delete]}]
(let [{:keys [ id content library-id modified-at]} item (let [{:keys [id content library-id modified-at]} item
locale (i18n/use-locale) locale (i18n/use-locale)
state (mf/use-state {:is-open false}) state (mf/use-state {:is-open false :selected false})
handle-change (fn [] handle-change (fn []
(swap! state update :selected not) (swap! state update :selected not)
(if (:selected @state) (if (:selected @state)
@ -278,7 +282,7 @@
[:input {:type "checkbox" [:input {:type "checkbox"
:id (str "color-" id) :id (str "color-" id)
:on-change handle-change :on-change handle-change
:checked (:selected @state)}] :value (:selected @state)}]
[:label {:for (str "color-" id)}]] [:label {:for (str "color-" id)}]]
[:div.library-card-image [:div.library-card-image
{ :style { :background-color content }}] { :style { :background-color content }}]
@ -297,7 +301,9 @@
(fn [] (fn []
(modal/show! (modal/show!
confirm-dialog confirm-dialog
{:on-accept #(st/emit! (dlib/delete-item :palettes library-id id)) {:on-accept #(do
(st/emit! (dlib/delete-item :palettes library-id id))
(on-delete id))
:message "Are you sure you want to delete this color?" :message "Are you sure you want to delete this color?"
:accept-text "Delete"}))]]}]]]))) :accept-text "Delete"}))]]}]]])))
@ -366,16 +372,14 @@
:library-id library-id :library-id library-id
:team-id team-id :team-id team-id
:on-delete-selected :on-delete-selected
(fn [] (when-not (empty? (:selected @state))
(when (-> @state :selected count (> 0)) (fn []
(modal/show! (modal/show!
confirm-dialog confirm-dialog
{:on-accept #(st/emit! (dlib/batch-delete-item section library-id (:selected @state))) {:on-accept #(do (st/emit! (dlib/batch-delete-item section library-id (:selected @state)))
:message (str "Are you sure you want to delete " (-> @state :selected count) " items?") (swap! state assoc :selected #{}))
:accept-text "Delete"}) :message (str "Are you sure you want to delete " (-> @state :selected count) " items?")
) :accept-text "Delete"})))}]
)
}]
[:* [:*
(if (> (count items) 0) (if (> (count items) 0)
[:div.library-page-cards-container [:div.library-page-cards-container
@ -384,7 +388,8 @@
props {:item item props {:item item
:key (:id item) :key (:id item)
:on-select #(swap! state update :selected conj %) :on-select #(swap! state update :selected conj %)
:on-unselect #(swap! state update :selected disj %)}] :on-unselect #(swap! state update :selected disj %)
:on-delete #(swap! state update :selected disj %)}]
(case section (case section
:icons [:& library-icon-card props] :icons [:& library-icon-card props]
:images [:& library-image-card props] :images [:& library-image-card props]