Browse Source

fix: closed value test

Tienson Qin 1 year ago
parent
commit
76464cdbe5

+ 1 - 2
deps/db/src/logseq/db.cljs

@@ -203,8 +203,7 @@
   [page]
   (when page
     (if (string? page)
-      (or (and (string/starts-with? page "$$$")
-               (common-util/uuid-string? (common-util/safe-subs page 3)))
+      (or (string/starts-with? page "$$$")
           (= common-config/favorites-page-name page))
       (contains? (set (:block/type page)) "hidden"))))
 

+ 3 - 3
src/main/frontend/handler/db_based/property.cljs

@@ -21,8 +21,7 @@
             [frontend.handler.property.util :as pu]
             [promesa.core :as p]
             [frontend.db.async :as db-async]
-            [logseq.db :as ldb]
-            [datascript.impl.entity :as de]))
+            [logseq.db :as ldb]))
 
 ;; schema -> type, cardinality, object's class
 ;;           min, max -> string length, number range, cardinality size limit
@@ -482,7 +481,7 @@
 
 (defn create-property-text-block!
   [block property value parse-block {:keys [class-schema?]}]
-  (assert (de/entity? property))
+  (assert (e/entity? property))
   (let [repo (state/get-current-repo)
         {:keys [page blocks]} (property-create-new-block block property value parse-block)
         first-block (first blocks)
@@ -625,6 +624,7 @@
 (defn <add-existing-values-to-closed-values!
   "Adds existing values as closed values and returns their new block uuids"
   [property values]
+  (assert (e/entity? property))
   (when (seq values)
     (let [values' (remove string/blank? values)
           property-schema (:block/schema property)]

+ 1 - 10
src/main/frontend/worker/search.cljs

@@ -300,20 +300,11 @@
      :name (:block/name p)
      :original-name (:block/original-name p)}))
 
-(defn- safe-subs
-  ([s start]
-   (let [c (count s)]
-     (safe-subs s start c)))
-  ([s start end]
-   (let [c (count s)]
-     (subs s (min c start) (min c end)))))
-
 (defn- hidden-page?
   [page]
   (when page
     (if (string? page)
-      (and (string/starts-with? page "$$$")
-           (common-util/uuid-string? (safe-subs page 3)))
+      (string/starts-with? page "$$$")
       (contains? (set (:block/type page)) "hidden"))))
 
 (defn get-all-pages

+ 3 - 3
src/test/frontend/handler/db_based/property_closed_value_test.cljs

@@ -26,8 +26,8 @@
    :after test-helper/destroy-test-db!})
 
 (defn- get-value-ids
-  [property-name]
-  (:values (:block/schema (db/entity [:block/name property-name]))))
+  [k]
+  (:values (:block/schema (db/entity k))))
 
 (defn- get-closed-values
   "Get value from block ids"
@@ -85,4 +85,4 @@
             (db-property-handler/delete-closed-value! property (db/entity [:block/uuid block-id]))
             (testing "Delete closed value"
               (is (nil? (db/entity [:block/uuid block-id])))
-              (is (= 2 (count (:values (:block/schema (db/entity [:block/name k]))))))))))))))
+              (is (= 2 (count (:values (:block/schema (db/entity k))))))))))))))