github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-26 14:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix grid item date tooltip showing deletion text on non-deleted files (#11161)

Browse Source 
The grid-item-metadata* component always used :will-be-deleted-at (falling
back to :modified-at) and always showed the "Will be deleted %s" tooltip,
even for files in the Recent tab that have no deletion date.

Now the component branches on the presence of :will-be-deleted-at:
- Deleted files: show the deletion timeago with the existing
  "Will be deleted %s" tooltip.
- Regular files: show :modified-at timeago with a new
  "Last modified %s" tooltip key (dashboard.grid.last-modified-at).

Closes #10873

Co-authored-by: Andrey Antukh <niwi@niwi.nz>
This commit is contained in:
0xTHAC0 2026-08-18 16:14:22 +05:30 committed by GitHub
parent 7f2dc66e86
commit b4bc3dfe6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/src/app/main/ui/dashboard/grid.cljs
View File

@ -239,12 +239,18 @@
(mf/defc grid-item-metadata* (mf/defc grid-item-metadata*
{::mf/private true} {::mf/private true}
[{:keys [file layout]}] [{:keys [file layout]}]
(let [time (ct/timeago (or (:will-be-deleted-at file) (let [deleted-at (:will-be-deleted-at file)
(:modified-at file)))] date-class (stl/css-case :grid-item-date (= layout :grid)
[:span {:class (stl/css-case :grid-item-date (= layout :grid) :list-item-date (= layout :list))]
:list-item-date (= layout :list)) (if deleted-at
:title (tr "dashboard.deleted.will-be-deleted-at" time)} (let [time (ct/timeago deleted-at)]
time])) [:span {:class date-class
:title (tr "dashboard.deleted.will-be-deleted-at" time)}
time])
(let [time (ct/timeago (:modified-at file))]
[:span {:class date-class
:title (tr "dashboard.grid.last-modified-at" time)}
time]))))
(defn create-counter-element (defn create-counter-element
[_element file-count] [_element file-count]

6
frontend/translations/en.po
View File

@ -453,10 +453,14 @@ msgstr "Delete team"
msgid "dashboard.deleted.empty-state-description" msgid "dashboard.deleted.empty-state-description"
msgstr "Your trash is empty. Deleted files and projects will appear here." msgstr "Your trash is empty. Deleted files and projects will appear here."
#: src/app/main/ui/dashboard/grid.cljs:247 #: src/app/main/ui/dashboard/grid.cljs:252
msgid "dashboard.deleted.will-be-deleted-at" msgid "dashboard.deleted.will-be-deleted-at"
msgstr "Will be deleted %s" msgstr "Will be deleted %s"
#: src/app/main/ui/dashboard/grid.cljs:256
msgid "dashboard.grid.last-modified-at"
msgstr "Last modified %s"
#: src/app/main/ui/dashboard/file_menu.cljs:329, src/app/main/ui/workspace/main_menu.cljs:732 #: src/app/main/ui/dashboard/file_menu.cljs:329, src/app/main/ui/workspace/main_menu.cljs:732
msgid "dashboard.download-binary-file" msgid "dashboard.download-binary-file"
msgstr "Download Penpot file (.penpot)" msgstr "Download Penpot file (.penpot)"