fix: invalidated blocks

related to https://github.com/logseq/db-test/issues/281

src/main/frontend/handler/export.cljs

@@ -271,12 +271,13 @@
                        (idb/get-item (str "handle/" (js/btoa repo) "/" backup-folder))
                        (catch :default _e
                          (throw (ex-info "Backup file handle no longer exists" {:repo repo}))))
-              [_folder handle] (try
-                                 (utils/verifyPermission handle true)
-                                 [backup-folder handle]
-                                 (catch :default e
-                                   (js/console.error e)
-                                   (choose-backup-folder repo)))
+              [_folder handle] (when handle
+                                 (try
+                                   (utils/verifyPermission handle true)
+                                   [backup-folder handle]
+                                   (catch :default e
+                                     (js/console.error e)
+                                     (choose-backup-folder repo))))
               repo-name (common-sqlite/sanitize-db-name repo)]
         (if handle
           (->

src/main/frontend/worker/db/validate.cljs

@@ -1,13 +1,42 @@
 (ns frontend.worker.db.validate
   "Validate db"
-  (:require [frontend.worker.shared-service :as shared-service]
+  (:require [datascript.core :as d]
+            [frontend.worker.shared-service :as shared-service]
+            [logseq.db :as ldb]
             [logseq.db.frontend.validate :as db-validate]))
 
+(defn- fix-invalid-blocks!
+  [conn errors]
+  (let [tx-data (keep
+                 (fn [{:keys [entity dispatch-key]}]
+                   (let [entity (d/entity @conn (:db/id entity))]
+                     (cond
+                       (:block.temp/fully-loaded? entity)
+                       [:db/retract (:db/id entity) :block.temp/fully-loaded?]
+                       (and (:block/page entity) (not (:block/parent entity)))
+                       [:db/add (:db/id entity) :block/parent (:db/id (:block/page entity))]
+                       (and (not (:block/page entity)) (not (:block/parent entity)) (not (:block/name entity)))
+                       [:db/retractEntity (:db/id entity)]
+                       (and (= dispatch-key :property-value-block) (:block/title entity))
+                       [:db/retract (:db/id entity) :block/title]
+                       (and (ldb/class? entity) (not (:logseq.property.class/extends entity)))
+                       [:db/add (:db/id entity) :logseq.property.class/extends :logseq.class/Root]
+                       (and (or (ldb/class? entity) (ldb/property? entity)) (ldb/internal-page? entity))
+                       [:db/retract (:db/id entity) :block/tags :logseq.class/Page]
+                       :else
+                       nil)))
+                 errors)]
+    (when (seq tx-data)
+      (ldb/transact! conn tx-data {:fix-db? true}))))
+
 (defn validate-db
-  [db]
-  (let [{:keys [errors datom-count entities]} (db-validate/validate-db! db)]
+  [conn]
+  (let [db @conn
+        {:keys [errors datom-count entities]} (db-validate/validate-db! db)
+        invalid-entity-ids (distinct (map (fn [e] (:db/id (:entity e))) errors))]
     (if errors
       (do
+        (fix-invalid-blocks! conn errors)
         (shared-service/broadcast-to-clients! :log [:db-invalid :error
                                                     {:msg "Validation errors"
                                                      :errors errors}])
@@ -20,4 +49,4 @@
                                              :success false]))
     {:errors errors
      :datom-count datom-count
-     :invalid-entity-ids (distinct (map (fn [e] (:db/id (:entity e))) errors))}))
+     :invalid-entity-ids invalid-entity-ids}))

src/main/frontend/worker/db_worker.cljs

@@ -651,7 +651,7 @@
 (def-thread-api :thread-api/validate-db
   [repo]
   (when-let [conn (worker-state/get-datascript-conn repo)]
-    (worker-db-validate/validate-db @conn)))
+    (worker-db-validate/validate-db conn)))
 
 (def-thread-api :thread-api/export-edn
   [repo options]