Browse Source

Merge branch 'master' into enhance/mobile-silk

Tienson Qin 7 months ago
parent
commit
a7fa1812da

+ 1 - 1
.github/workflows/build-desktop-release.yml

@@ -130,7 +130,7 @@ jobs:
           echo "ENABLE_FILE_SYNC_PRODUCTION=${{ github.event_name == 'schedule' || github.event.inputs.enable-file-sync-production == 'true' }}" >> $GITHUB_ENV
 
       - name: Compile CLJS
-        run: yarn install && gulp build && yarn cljs:release-electron
+        run: yarn install && gulp build && yarn cljs:release-electron && yarn webpack-app-build
         env:
           LOGSEQ_SENTRY_DSN: ${{ secrets.LOGSEQ_SENTRY_DSN }}
           LOGSEQ_POSTHOG_TOKEN: ${{ secrets.LOGSEQ_POSTHOG_TOKEN }}

+ 1 - 1
package.json

@@ -59,7 +59,7 @@
         "release-mobile": "run-s gulp:buildMobile cljs:release-mobile webpack-mobile-build",
         "dev-release-app": "run-s gulp:build cljs:dev-release-app webpack-app-build",
         "dev-electron-app": "gulp electron",
-        "release-electron": "run-s gulp:build && gulp electronMaker webpack-app-build",
+        "release-electron": "run-s gulp:build && yarn webpack-app-build && gulp electronMaker",
         "debug-electron": "cd static/ && yarn electron:debug",
         "webpack": "webpack --watch",
         "webpack-app-watch": "npx webpack --watch --config-name app",

+ 5 - 5
src/main/frontend/modules/instrumentation/posthog.cljs

@@ -1,10 +1,10 @@
 (ns frontend.modules.instrumentation.posthog
-  (:require [frontend.config :as config]
-            [frontend.util :as util]
+  (:require ["posthog-js$default" :as posthog]
+            [cljs-bean.core :as bean]
+            [frontend.config :as config]
             [frontend.mobile.util :as mobile-util]
-            [frontend.version :refer [version]]
-            ["posthog-js" :as posthog]
-            [cljs-bean.core :as bean]))
+            [frontend.util :as util]
+            [frontend.version :refer [version]]))
 
 (goog-define POSTHOG-TOKEN "")
 (def ^:const masked "masked")

+ 8 - 1
src/main/frontend/worker/embedding.cljs

@@ -48,6 +48,13 @@
   [repo]
   (get-in @*vector-search-state [:repo->index-info repo :indexing?]))
 
+(defn- hidden-entity?
+  [entity]
+  (or (ldb/hidden? entity)
+      (let [page (:block/page entity)]
+        (and (ldb/hidden? page)
+             (not= (:block/title page) common-config/quick-add-page-name)))))
+
 (defn- stale-block-filter-preds
   "When `reset?`, ignore :logseq.property.embedding/hnsw-label-updated-at in block"
   [reset?]
@@ -57,7 +64,7 @@
                                  (and (or (nil? db-ident)
                                           (not (string/starts-with? (namespace db-ident) "logseq.")))
                                       (not (string/blank? title))
-                                      (not (ldb/hidden? title))
+                                      (not (hidden-entity? b))
                                       (nil? (:logseq.property/view-for b))
                                       (not (keyword-identical?
                                             :logseq.property/description