Merge pull request #3569 from penpot/superalex-fix-invalid-file-amount-after-moving-files

🐛 Bugfixing

CHANGES.md

@@ -10,6 +10,8 @@
 ### :bug: Bugs fixed
 
 - Fix unexpected output on get-page rpc method when invalid object-id is provided [Github #3546](https://github.com/penpot/penpot/issues/3546)
+- Fix Invalid files amount after moving file from Project to Drafts [Taiga #5638](https://tree.taiga.io/project/penpot/us/5638)
+- Fix deleted pages comments shown in right sidebar [Taiga #5648](https://tree.taiga.io/project/penpot/us/5648)
 
 ## 1.19.1
 

frontend/src/app/main/data/comments.cljs

@@ -279,7 +279,9 @@
                  (assoc-in (conj path :position) (:position comment-thread))
                  (assoc-in (conj path :frame-id) (:frame-id comment-thread))))))
            (fetched [[users comments] state]
-             (let [state (-> state
+             (let [pages (get-in state [:workspace-data :pages-index])
+                   comments (filter #(some? (get pages (:page-id %))) comments)
+                   state (-> state
                              (assoc :comment-threads (d/index-by :id comments))
                              (update :current-file-comments-users merge (d/index-by :id users)))]
                (reduce set-comment-threds state comments)))]

frontend/src/app/main/data/dashboard.cljs

@@ -891,13 +891,13 @@
     ptk/UpdateEvent
     (update [_ state]
       (let [origin-project (get-in state [:dashboard-files (first ids) :project-id])
-            update-project (fn [project delta]
+            update-project (fn [project delta op]
                              (-> project
-                                 (update :count #(+ % (count ids)))
+                                 (update :count #(op % (count ids)))
                                  (assoc :modified-at (dt/plus (dt/now) {:milliseconds delta}))))]
         (-> state
-            (d/update-in-when [:dashboard-projects origin-project] update-project 0)
-            (d/update-in-when [:dashboard-projects project-id] update-project 10))))
+            (d/update-in-when [:dashboard-projects origin-project] update-project 0 -)
+            (d/update-in-when [:dashboard-projects project-id] update-project 10 +))))
 
     ptk/WatchEvent
     (watch [_ _ _]