From b48dfce552933d3ccd1ac32f382cc32e288d5416 Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Mon, 16 Jun 2025 10:56:12 -0400 Subject: [PATCH] fix: migrated properties not migrating :logseq.property/type or most of the property-only properties that a user could have set --- src/main/frontend/worker/db/migrate.cljs | 17 ++++++++++++++--- src/test/frontend/worker/migrate_test.cljs | 9 ++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/frontend/worker/db/migrate.cljs b/src/main/frontend/worker/db/migrate.cljs index f249291498..9f4e545cdb 100644 --- a/src/main/frontend/worker/db/migrate.cljs +++ b/src/main/frontend/worker/db/migrate.cljs @@ -161,16 +161,27 @@ ident (:db/ident class) new-property (sqlite-util/build-new-property (:block/title class) - (get-in class [:logseq.property/type :db/cardinality]) + (select-keys class [:logseq.property/type :db/cardinality]) {:title (:block/title class) :ref-type? true - :properties {:logseq.property/classes id}}) + :properties (merge + (select-keys class [:logseq.property/hide? :logseq.property/public? + :logseq.property/view-context :logseq.property/ui-position + :logseq.property/default-value :logseq.property/hide-empty-value :logseq.property/enable-history?]) + {:logseq.property/classes id})}) retract-property-attrs [[:db/retract id :block/tags :logseq.class/Property] [:db/retract id :logseq.property/type] [:db/retract id :db/cardinality] [:db/retract id :db/valueType] [:db/retract id :db/index] - [:db/retract id :logseq.property/classes]] + [:db/retract id :logseq.property/classes] + [:db/retract id :logseq.property/hide?] + [:db/retract id :logseq.property/public?] + [:db/retract id :logseq.property/view-context] + [:db/retract id :logseq.property/ui-position] + [:db/retract id :logseq.property/default-value] + [:db/retract id :logseq.property/hide-empty-value] + [:db/retract id :logseq.property/enable-history?]] datoms (d/datoms db :avet ident)] (concat [new-property] retract-property-attrs diff --git a/src/test/frontend/worker/migrate_test.cljs b/src/test/frontend/worker/migrate_test.cljs index 6cbc4eaf08..90f3200444 100644 --- a/src/test/frontend/worker/migrate_test.cljs +++ b/src/test/frontend/worker/migrate_test.cljs @@ -19,7 +19,7 @@ :block/uuid :block/order) {:db/index true, - :logseq.property/type :default, + :logseq.property/type :node, :db/valueType :db.type/ref, :block/tags #{:logseq.class/Property}, :block/title "Book", @@ -33,5 +33,12 @@ [:db/retract 156 :db/valueType] [:db/retract 156 :db/index] [:db/retract 156 :logseq.property/classes] + [:db/retract 156 :logseq.property/hide?] + [:db/retract 156 :logseq.property/public?] + [:db/retract 156 :logseq.property/view-context] + [:db/retract 156 :logseq.property/ui-position] + [:db/retract 156 :logseq.property/default-value] + [:db/retract 156 :logseq.property/hide-empty-value] + [:db/retract 156 :logseq.property/enable-history?] [:db/retract 157 :user.class/Book-FrG9O7sY 155] [:db/add 157 (:db/ident new-property) 155]])))))