fix: allow editing a block's other properties if there's invalid URL

Related to logseq/db-test#556

Author: tiensonqin

deps/db/src/logseq/db/frontend/malli_schema.cljs

@@ -89,12 +89,13 @@
   expected to be a coll if the property has a :many cardinality. validate-fn is
   a fn that is called directly on each value to return a truthy value.
   validate-fn varies by property type"
-  [db validate-fn [property property-val] & {:keys [new-closed-value?]}]
+  [db validate-fn [property property-val] & {:keys [new-closed-value? _skip-strict-url-validate?]
+                                             :as validate-option}]
   ;; For debugging
   ;; (when (not (internal-ident? (:db/ident property))) (prn :validate-val (dissoc property :property/closed-values) property-val))
   (let [validate-fn' (if (db-property-type/property-types-with-db (:logseq.property/type property))
                        (fn [value]
-                         (validate-fn db value {:new-closed-value? new-closed-value?}))
+                         (validate-fn db value validate-option))
                        validate-fn)
         validate-fn'' (if (and (db-property-type/closed-value-property-types (:logseq.property/type property))
                                ;; new closed values aren't associated with the property yet
@@ -221,6 +222,10 @@
   "Used by validate-fns which need db as input"
   nil)
 
+(def ^:dynamic *skip-strict-url-validate?*
+  "`true` allows updating a block's other property when it has invalid URL value"
+  false)
+
 (def property-tuple
   "A tuple of a property map and a property value"
   (into
@@ -235,7 +240,8 @@
               (when error-message
                 {:error/message error-message})
               (fn [tuple]
-                (validate-property-value *db-for-validate-fns* schema-fn tuple))])])
+                (validate-property-value *db-for-validate-fns* schema-fn tuple
+                                         {:skip-strict-url-validate? *skip-strict-url-validate?*}))])])
         db-property-type/built-in-validation-schemas)))
 
 (def block-properties

deps/db/src/logseq/db/frontend/property/type.cljs

@@ -99,12 +99,14 @@
 
 (defn- url-entity?
   "Empty string, url or macro url"
-  [db val {:keys [new-closed-value?]}]
+  [db val {:keys [new-closed-value? skip-strict-url-validate?]}]
   (if new-closed-value?
     (or (url? val) (macro-url? val))
     (when-let [ent (d/entity db val)]
       (let [title (:block/title ent)]
-        (or (string/blank? title) (url? title) (macro-url? title))))))
+        (if skip-strict-url-validate?
+          (string? title)
+          (or (string/blank? title) (url? title) (macro-url? title)))))))
 
 (defn- entity?
   [db id]

deps/db/src/logseq/db/frontend/validate.cljs

@@ -24,42 +24,43 @@
 (defn validate-tx-report
   "Validates the datascript tx-report for entities that have changed. Returns
   boolean indicating if db is valid"
-  [{:keys [db-after tx-data tx-meta]} validate-options]
-  (let [changed-ids (->> tx-data (keep :e) distinct)
-        tx-datoms (mapcat #(d/datoms db-after :eavt %) changed-ids)
-        ent-maps* (map (fn [[db-id m]]
+  [{:keys [db-after tx-data tx-meta]} {:keys [closed-schema?]}]
+  (binding [db-malli-schema/*skip-strict-url-validate?* true]
+    (let [changed-ids (->> tx-data (keep :e) distinct)
+          tx-datoms (mapcat #(d/datoms db-after :eavt %) changed-ids)
+          ent-maps* (map (fn [[db-id m]]
                          ;; Add :db/id for debugging
-                         (assoc m :db/id db-id))
-                       (db-malli-schema/datoms->entity-maps tx-datoms {:entity-fn #(d/entity db-after %)}))
-        ent-maps (db-malli-schema/update-properties-in-ents db-after ent-maps*)
-        validator (get-schema-validator (:closed-schema? validate-options))]
-    (binding [db-malli-schema/*db-for-validate-fns* db-after]
-      (let [invalid-ent-maps (remove
+                           (assoc m :db/id db-id))
+                         (db-malli-schema/datoms->entity-maps tx-datoms {:entity-fn #(d/entity db-after %)}))
+          ent-maps (db-malli-schema/update-properties-in-ents db-after ent-maps*)
+          validator (get-schema-validator closed-schema?)]
+      (binding [db-malli-schema/*db-for-validate-fns* db-after]
+        (let [invalid-ent-maps (remove
                               ;; remove :db/id as it adds needless declarations to schema
-                              #(validator [(dissoc % :db/id)])
-                              ent-maps)]
-        (if (seq invalid-ent-maps)
-          (do
-            (prn "Invalid datascript entities detected amongst changed entity ids:" changed-ids :tx-meta tx-meta)
-            (let [explainer (get-schema-explainer (:closed-schema? validate-options))
-                  errors (doall
-                          (map
-                           (fn [m]
-                             (let [m' (update m :block/properties (fn [properties]
-                                                                    (map (fn [[p v]]
-                                                                           [(:db/ident p) v])
-                                                                         properties)))
-                                   data {:entity-map m'
-                                         :errors (me/humanize (explainer [(dissoc m :db/id)]))}]
-                               (try
-                                 (pprint/pprint data)
-                                 (catch :default _e
-                                   (prn data)))
-                               data))
-                           invalid-ent-maps))]
+                                #(validator [(dissoc % :db/id)])
+                                ent-maps)]
+          (if (seq invalid-ent-maps)
+            (do
+              (prn "Invalid datascript entities detected amongst changed entity ids:" changed-ids :tx-meta tx-meta)
+              (let [explainer (get-schema-explainer closed-schema?)
+                    errors (doall
+                            (map
+                             (fn [m]
+                               (let [m' (update m :block/properties (fn [properties]
+                                                                      (map (fn [[p v]]
+                                                                             [(:db/ident p) v])
+                                                                           properties)))
+                                     data {:entity-map m'
+                                           :errors (me/humanize (explainer [(dissoc m :db/id)]))}]
+                                 (try
+                                   (pprint/pprint data)
+                                   (catch :default _e
+                                     (prn data)))
+                                 data))
+                             invalid-ent-maps))]
 
-              [false errors]))
-          [true nil])))))
+                [false errors]))
+            [true nil]))))))
 
 (defn group-errors-by-entity
   "Groups malli errors by entities. db is used for providing more debugging info"

src/main/frontend/components/block.cljs

@@ -2374,7 +2374,7 @@
                      :color (when-not built-in-color? "white")}
              :class "px-1 with-bg-color"})))
 
-     ;; children
+       ;; children
        (let [area?  (= :area (keyword (pu/lookup block :logseq.property.pdf/hl-type)))
              hl-ref #(when (not (#{:default :whiteboard-shape} block-type))
                        [:div.prefix-link