Просмотр исходного кода

fix: disallow db version from creating deprecated title property

also add fixmes for other known properties conversions
Gabriel Horner 2 лет назад
Родитель
Сommit
0483e60eeb

+ 1 - 0
src/main/frontend/extensions/pdf/assets.cljs

@@ -166,6 +166,7 @@
         (page-handler/create! page-name {:redirect?        false :create-first-block? false
                                          :split-namespace? false
                                          :format           format
+                                         ;; FIXME: file and file-path properties for db version
                                          :properties       {:file      (case format
                                                                          :markdown
                                                                          (util/format "[%s](%s)" label url)

+ 6 - 5
src/main/frontend/handler/page.cljs

@@ -101,8 +101,8 @@
           :block/properties-order (keys ps)})))))
 
 (defn- create-title-property?
-  [journal? page-name]
-  (and (not (config/db-based-graph? (state/get-current-repo)))
+  [repo journal? page-name]
+  (and (not (config/db-based-graph? repo))
        (not journal?)
        (= (state/get-filename-format) :legacy) ;; reduce title computation
        (fs-util/create-title-property? page-name)))
@@ -111,7 +111,7 @@
   (when (:block/uuid page)
     (let [page-entity   [:block/uuid (:block/uuid page)]
           title         (util/get-page-original-name page)
-          create-title? (create-title-property? journal? title)
+          create-title? (create-title-property? repo journal? title)
           page          (merge page
                                (when (seq properties) {:block/properties properties})
                                (when whiteboard? {:block/type "whiteboard"})
@@ -212,7 +212,7 @@
        (when create-first-block?
          (when (or
                 (db/page-empty? repo (:db/id (db/entity [:block/name page-name])))
-                (create-title-property? journal? page-name))
+                (create-title-property? repo journal? page-name))
            (editor-handler/api-insert-new-block! "" {:page page-name}))))
 
      (when redirect?
@@ -639,7 +639,8 @@
 
         (db/transact! repo page-txs)
 
-        (when (fs-util/create-title-property? new-page-name)
+        (when (and (not (config/db-based-graph? repo))
+                   (fs-util/create-title-property? new-page-name))
           (page-property/add-property! new-page-name :title new-name))
 
         (when (and file (not journal?))

+ 2 - 0
src/main/frontend/handler/whiteboard.cljs

@@ -29,6 +29,7 @@
   (js->clj obj :keywordize-keys true))
 
 (defn shape->block [shape page-name]
+  ;; FIXME: support whiteboard props for db graph
   (let [properties {:ls-type :whiteboard-shape
                     :logseq.tldraw.shape shape}
         block {:block/page {:block/name (util/page-name-sanity-lc page-name)}
@@ -76,6 +77,7 @@
         get-k #(gobj/get tldraw-page %)]
     {:block/name page-name
      :block/type "whiteboard"
+     ;; FIXME: support whiteboard props for db graph
      :block/properties {:ls-type :whiteboard-page
                         :logseq.tldraw.page {:id (get-k "id")
                                              :name (get-k "name")

+ 1 - 0
src/main/logseq/api.cljs

@@ -738,6 +738,7 @@
      (state/get-current-repo)
      (sdk-utils/uuid-or-throw-error block-uuid) key)))
 
+;; FIXME: Update :block/properties for db version
 (def ^:export get_block_property
   (fn [block-uuid key]
     (when-let [block (db-model/query-block-by-uuid (sdk-utils/uuid-or-throw-error block-uuid))]