greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: Remove unnecessary catch and rethrow for notification 

Just encode notification in original exception to make conversion
as reusable as possible. Also make properties readable with :original-name
as they are case sensitive
experiment/tanstack-table
Gabriel Horner 2024-05-17 17:25:53 -04:00
parent a17ed389e8
commit efab7f403e
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
deps/outliner/src/logseq/outliner/property.cljs vendored
View File

@ -50,7 +50,10 @@
[v-str] [v-str]
(let [result (parse-double v-str)] (let [result (parse-double v-str)]
(or result (or result
(throw (js/Error. (str "Can't convert \"" v-str "\" to a number")))))) (throw (ex-info (str "Can't convert \"" v-str "\" to a number")
{:type :notification
:payload {:message (str "Can't convert \"" v-str "\" to a number")
:type :error}})))))
(defn ^:api convert-property-input-string (defn ^:api convert-property-input-string
[schema-type v-str] [schema-type v-str]
@ -447,15 +450,7 @@
property-type (get property-schema :type :default)] property-type (get property-schema :type :default)]
(when (contains? db-property-type/closed-value-property-types property-type) (when (contains? db-property-type/closed-value-property-types property-type)
(let [value' (if (string? value) (string/trim value) value) (let [value' (if (string? value) (string/trim value) value)
resolved-value (try resolved-value (convert-property-input-string (:type property-schema) value')
(convert-property-input-string (:type property-schema) value')
(catch :default e
(js/console.error e)
(throw (ex-info "Property converted failed"
{:type :notification
:payload {:message (str e)
:type :error}}))
nil))
validate-message (validate-property-value validate-message (validate-property-value
(get-property-value-schema @conn property-type property {:new-closed-value? true}) (get-property-value-schema @conn property-type property {:new-closed-value? true})
resolved-value)] resolved-value)]
@ -474,7 +469,6 @@
:type :warning}})) :type :warning}}))
validate-message validate-message
;; Make sure to update frontend.handler.db-based.property-test when updating ex-info message ;; Make sure to update frontend.handler.db-based.property-test when updating ex-info message
(throw (ex-info "Invalid property value" (throw (ex-info "Invalid property value"
{:error :value-invalid {:error :value-invalid

2
src/main/frontend/handler/db_based/property/util.cljs
View File

@ -28,7 +28,7 @@
(when-let [block (db-utils/entity [:block/uuid %])] (when-let [block (db-utils/entity [:block/uuid %])]
(db-property/closed-value-name block)) (db-property/closed-value-name block))
%)] %)]
[(-> prop-ent :block/name keyword) [(-> prop-ent :block/original-name keyword)
(if (set? v) (if (set? v)
(set (map readable-property-val v)) (set (map readable-property-val v))
(readable-property-val v))]))) (readable-property-val v))])))

2
src/test/frontend/handler/db_based/property_test.cljs
View File

@ -300,7 +300,7 @@
(is (is
(thrown-with-msg? (thrown-with-msg?
js/Error js/Error
#"Property converted failed" #"Can't convert"
(outliner-property/upsert-closed-value! conn (:db/id property) {:value "not a number"}))) (outliner-property/upsert-closed-value! conn (:db/id property) {:value "not a number"})))
(let [values (get-value-ids k)] (let [values (get-value-ids k)]
(is (= #{"1" "2"} (get-closed-values values))))) (is (= #{"1" "2"} (get-closed-values values)))))