3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-11 07:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4190 from penpot/palba-bugfixes-002

Browse source 
🐛 Fix impossible to move an element when it's in a main component
This commit is contained in:
Alejandro 2024-02-27 08:53:06 +01:00 • committed by GitHub
commit addf83ab22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 68 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

21
frontend/src/app/main/ui/dashboard/file_menu.cljs
View file

@ -133,14 +133,29 @@
(st/emit! (dd/fetch-recent-files team-id)
(dd/clear-selected-files))))
on-move-accept
(fn [params team-id project-id]
(st/emit! (dd/move-files
(with-meta params
{:on-success #(on-move-success team-id project-id)}))))
on-move
(fn [team-id project-id]
(let [params {:ids (into #{} (map :id) files)
:project-id project-id}]
(fn []
(st/emit! (dd/move-files
(with-meta params
{:on-success #(on-move-success team-id project-id)}))))))
(let [num-shared (filter #(:is-shared %) files)]
(if (and (< 0 (count num-shared))
(not= team-id current-team-id))
(st/emit! (modal/show
{:type :delete-shared-libraries
:origin :move
:ids (into #{} (map :id) files)
:on-accept #(on-move-accept params team-id project-id)
:count-libraries (count num-shared)}))
(on-move-accept params team-id project-id))))))
add-shared
#(st/emit! (dd/set-file-shared (assoc file :is-shared true)))

30
frontend/src/app/main/ui/delete_shared.cljs
View file

@ -35,28 +35,26 @@
cancel-label (tr "labels.cancel")
accept-style (or accept-style :danger)
is-delete? (= origin :delete)
count-files (count (keys references))
title (if ^boolean is-delete?
(tr "modals.delete-shared-confirm.title" (i18n/c count-libraries))
(tr "modals.unpublish-shared-confirm.title" (i18n/c count-libraries)))
title (case origin
:delete (tr "modals.delete-shared-confirm.title" (i18n/c count-libraries))
:unpublish (tr "modals.unpublish-shared-confirm.title" (i18n/c count-libraries))
:move (tr "modals.move-shared-confirm.title" (i18n/c count-libraries)))
subtitle (if ^boolean is-delete?
(tr "modals.delete-shared-confirm.message" (i18n/c count-libraries))
(tr "modals.unpublish-shared-confirm.message" (i18n/c count-libraries)))
subtitle (case origin
:delete (tr "modals.delete-shared-confirm.message" (i18n/c count-libraries))
:unpublish (tr "modals.unpublish-shared-confirm.message" (i18n/c count-libraries))
:move (tr "modals.move-shared-confirm.message" (i18n/c count-libraries)))
accept-label (if ^boolean is-delete?
(tr "modals.delete-shared-confirm.accept" (i18n/c count-libraries))
(tr "modals.unpublish-shared-confirm.accept" (i18n/c count-libraries)))
accept-label (case origin
:delete (tr "modals.delete-shared-confirm.accept" (i18n/c count-libraries))
:unpublish (tr "modals.unpublish-shared-confirm.accept" (i18n/c count-libraries))
:move (tr "modals.move-shared-confirm.accept" (i18n/c count-libraries)))
no-files-msg (if ^boolean is-delete?
(tr "modals.delete-shared-confirm.activated.no-files-message" (i18n/c count-libraries))
(tr "modals.unpublish-shared-confirm.activated.no-files-message" (i18n/c count-libraries)))
no-files-msg (tr "modals.delete-shared-confirm.activated.no-files-message" (i18n/c count-libraries))
scd-msg (if ^boolean is-delete?
(tr "modals.delete-shared-confirm.activated.scd-message" (i18n/c count-libraries))
(tr "modals.unpublish-shared-confirm.activated.scd-message" (i18n/c count-libraries)))
scd-msg (tr "modals.delete-shared-confirm.activated.scd-message" (i18n/c count-libraries))
hint (tr "modals.delete-unpublish-shared-confirm.activated.hint" (i18n/c count-files))