Merge branch 'master' into feat/capacitor-new

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
     paths-ignore:
       - '*.md'
   pull_request:
-    branches: [master, "feat/db"]
+    branches: [master]
     paths-ignore:
       - '*.md'
 

.github/workflows/clj-e2e.yml

@@ -10,7 +10,7 @@ on:
       - deps/**
       - packages/**
   pull_request:
-    branches: [master, "feat/db"]
+    branches: [master]
     paths:
       - 'clj-e2e/**'
       - '.github/workflows/clj-e2e.yml'

.github/workflows/clj-rtc-e2e.yml

@@ -10,7 +10,7 @@ on:
       - deps/**
       - packages/**
   pull_request:
-    branches: [master, "feat/db"]
+    branches: [master]
     paths:
       - 'clj-e2e/**'
       - '.github/workflows/clj-rtc-e2e.yml'

.github/workflows/db.yml

@@ -9,7 +9,7 @@ on:
       - '.github/workflows/db.yml'
       - '!deps/db/**.md'
   pull_request:
-    branches: [master, "feat/db"]
+    branches: [master]
     paths:
       - 'deps/db/**'
       - '.github/workflows/db.yml'

.github/workflows/e2e.yml

@@ -24,6 +24,7 @@ env:
 
 jobs:
   e2e-test-build:
+    if: false                   # disabled
     name: Build Test Artifact
     runs-on: ubuntu-22.04
     steps:

.github/workflows/graph-parser.yml

@@ -12,7 +12,7 @@ on:
       - '.github/workflows/graph-parser.yml'
       - '!deps/graph-parser/**.md'
   pull_request:
-    branches: [master, "feat/db"]
+    branches: [master]
     paths:
       - 'deps/graph-parser/**'
       - 'deps/db/**'

.github/workflows/logseq-common.yml

@@ -9,7 +9,7 @@ on:
       - '.github/workflows/logseq-common.yml'
       - '!deps/common/**.md'
   pull_request:
-    branches: [master, "feat/db"]
+    branches: [master]
     paths:
       - 'deps/common/**'
       - '.github/workflows/logseq-common.yml'

.github/workflows/outliner.yml

@@ -12,7 +12,7 @@ on:
       - '.github/workflows/outliner.yml'
       - '!deps/outliner/**.md'
   pull_request:
-    branches: [master, "feat/db"]
+    branches: [master]
     paths:
       - 'deps/outliner/**'
       - 'deps/db/**'

.github/workflows/publishing.yml

@@ -12,7 +12,7 @@ on:
       - '.github/workflows/publishing.yml'
       - '!deps/publishing/**.md'
   pull_request:
-    branches: [master, "feat/db"]
+    branches: [master]
     paths:
       - 'deps/publishing/**'
       - 'deps/db/**'

clj-e2e/test/logseq/e2e/rtc_extra_test.clj

@@ -255,9 +255,7 @@
           (w/click (format ".ls-block :text('%s')" (str title-prefix "-" 0)))
           (b/delete-blocks)))
       (validate-2-graphs))
-    (comment
-      "this case is failing now"
-      (testing "
+    (testing "
 origin:
 - block2
 - block3
@@ -270,22 +268,22 @@ page2:
 ;; block2 deleted
 - block4
   - block3"
-        (rtc/with-stop-restart-rtc
-          [@*page1 @*page2]
-          [@*page1 (rtc/with-wait-tx-updated (b/new-block "page1-done-2"))
-           @*page2 (rtc/with-wait-tx-updated (b/new-block "page2-done-2"))]
-          (w/with-page @*page1
-            (w/click (format ".ls-block :text('%s')" (str title-prefix "-" 3)))
-            (b/indent)
-            (k/arrow-down)
-            (b/indent)
-            (b/indent))
-          (w/with-page @*page2
-            (w/click (format ".ls-block :text('%s')" (str title-prefix "-" 2)))
-            (b/delete-blocks)
-            (w/click (format ".ls-block :text('%s')" (str title-prefix "-" 3)))
-            (k/shift+arrow-down)
-            (k/meta+shift+arrow-down)
-            (k/enter)
-            (b/indent)))
-        (validate-2-graphs)))))
+      (rtc/with-stop-restart-rtc
+        [@*page1 @*page2]
+        [@*page1 (rtc/with-wait-tx-updated (b/new-block "page1-done-2"))
+         @*page2 (rtc/with-wait-tx-updated (b/new-block "page2-done-2"))]
+        (w/with-page @*page1
+          (w/click (format ".ls-block :text('%s')" (str title-prefix "-" 3)))
+          (b/indent)
+          (k/arrow-down)
+          (b/indent)
+          (b/indent))
+        (w/with-page @*page2
+          (w/click (format ".ls-block :text('%s')" (str title-prefix "-" 2)))
+          (b/delete-blocks)
+          (w/click (format ".ls-block :text('%s')" (str title-prefix "-" 3)))
+          (k/shift+arrow-down)
+          (k/meta+shift+arrow-down)
+          (k/enter)
+          (b/indent)))
+      (validate-2-graphs))))

deps/db/src/logseq/db/common/view.cljs

@@ -50,7 +50,9 @@
                                          (into {})))
         get-property-value-fn (fn [entity]
                                 (if (de/entity? property)
-                                  (get-property-value-for-search entity property)
+                                  (if (= :date (:logseq.property/type property))
+                                    (:block/journal-day (get entity db-ident))
+                                    (get-property-value-for-search entity property))
                                   (get entity db-ident)))]
     (fn [entity]
       (cond