fix: tests

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

@@ -64,10 +64,6 @@
    :logseq.property/hl-page {:schema {:type :number}}
    :logseq.property/hl-stamp {:schema {:type :number}}
    :logseq.property/hl-color {:schema {:type :default}}
-   :logseq.property/macro-name {:name :logseq.macro-name
-                                :schema {:type :default}}
-   :logseq.property/macro-arguments {:name :logseq.macro-arguments
-                                     :schema {:type :coll}}
    :logseq.property/order-list-type {:name :logseq.order-list-type
                                      :schema {:type :default}}
    :logseq.property.tldraw/page {:name :logseq.tldraw.page

deps/graph-parser/src/logseq/graph_parser/property.cljs

@@ -76,7 +76,7 @@
      :id :background-color :heading :collapsed
      :created-at :updated-at :last-modified-at
      :query-table :query-properties :query-sort-by :query-sort-desc :ls-type
-     :hl-type :hl-page :hl-stamp :hl-color :logseq.macro-name :logseq.macro-arguments
+     :hl-type :hl-page :hl-stamp :hl-color
      :logseq.order-list-type :logseq.tldraw.page :logseq.tldraw.shape
      ; task markers
      :todo :doing :now :later :done}

deps/graph-parser/src/logseq/graph_parser/test/docs_graph_helper.cljs

@@ -109,11 +109,11 @@
     (is (= {:markdown 6113 :org 509} (get-block-format-counts db))
         "Block format counts")
 
-    (is (= {:description 81, :updated-at 46, :tags 5, :logseq.macro-arguments 104
+    (is (= {:description 81, :updated-at 46, :tags 5,
             :logseq.tldraw.shape 79, :card-last-score 6, :card-repeats 6,
             :card-next-schedule 6, :ls-type 79, :card-last-interval 6, :type 107,
             :template 5, :title 114, :alias 41, :supports 5, :id 145, :url 5,
-            :card-ease-factor 6, :logseq.macro-name 104, :created-at 46,
+            :card-ease-factor 6, :created-at 46,
             :card-last-reviewed 6, :platforms 51, :initial-version 8, :heading 226}
            (get-top-block-properties db))
         "Counts for top block properties")
@@ -161,7 +161,7 @@
   ;; only increase over time as the docs graph rarely has deletions
   (testing "Counts"
     (is (= 303 (count files)) "Correct file count")
-    (is (= 64382 (count (d/datoms db :eavt))) "Correct datoms count")
+    (is (= 63961 (count (d/datoms db :eavt))) "Correct datoms count")
 
     (is (= 5866
            (ffirst

src/main/frontend/db/model.cljs

@@ -939,20 +939,6 @@ independent of format as format specific heading characters are stripped"
   (let [db (conn/get-db)]
     (ldb/get-orphaned-pages db opts)))
 
-;; FIXME: replace :logseq.macro-name with id
-(defn get-macro-blocks
-  [repo macro-name]
-  (d/q
-   '[:find [(pull ?b [*]) ...]
-     :in $ ?macro-name
-     :where
-     [?b :block/type "macro"]
-     [?b :block/properties ?properties]
-     [(get ?properties :logseq.macro-name) ?name]
-     [(= ?name ?macro-name)]]
-   (conn/get-db repo)
-   macro-name))
-
 (defn- block-or-page
   [page-name-or-uuid]
   (let [entity (get-page (str page-name-or-uuid))]

src/main/frontend/extensions/srs.cljs

@@ -588,12 +588,10 @@
 
 (declare cards)
 
+;; TODO: FIXME: macros have been deleted
 (rum/defc cards-select
   [{:keys [on-chosen]}]
-  (let [cards (db-model/get-macro-blocks (state/get-current-repo) "cards")
-        items (->> (map (comp :logseq.macro-arguments :block/properties) cards)
-                   (map (fn [col] (string/join " " col))))
-        items (concat items [(t :flashcards/modal-select-all)])]
+  (let [items [(t :flashcards/modal-select-all)]]
     (component-select/select {:items items
                               :on-chosen on-chosen
                               :close-modal? false