fix: view ops for queries

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

@@ -379,15 +379,19 @@
     (get-entities db view feat-type index-attr view-for-id)))
 
 (defn get-property-values
-  [db property-ident {:keys [view-id]}]
+  [db property-ident {:keys [view-id query-entity-ids]}]
   (let [property (d/entity db property-ident)
         default-value (:logseq.property/default-value property)
         empty-id (:db/id (d/entity db :logseq.property/empty-placeholder))
         ref-type? (= :db.type/ref (:db/valueType property))
         values (if view-id
                  (let [entities-result (get-view-entities db view-id)
-                       entities (if (map? entities-result)
+                       entities (cond
+                                  query-entity-ids
+                                  (keep #(d/entity db %) query-entity-ids)
+                                  (map? entities-result)
                                   (:ref-blocks entities-result)
+                                  :else
                                   entities-result)]
                    (->> (mapcat (fn [entity]
                                   (let [v (get entity property-ident)]
@@ -424,7 +428,7 @@
       values)))
 
 (defn get-view-data
-  [db view-id {:keys [journals? _view-for-id view-feature-type input]
+  [db view-id {:keys [journals? _view-for-id view-feature-type input query-entity-ids]
                :as opts}]
   ;; TODO: create a view for journals maybe?
   (cond
@@ -442,7 +446,10 @@
           filters (:logseq.property.table/filters view)
           list-view? (= :logseq.property.view/type.list (:db/ident (:logseq.property.view/type view)))
           feat-type (or view-feature-type (:logseq.property.view/feature-type view))
-          entities-result (get-view-entities db view-id opts)
+          query? (= feat-type :query-result)
+          entities-result (if query?
+                            (keep #(d/entity db %) query-entity-ids)
+                            (get-view-entities db view-id opts))
           entities (if (= feat-type :linked-references)
                      (:ref-blocks entities-result)
                      entities-result)

src/main/frontend/components/query/view.cljs

@@ -52,5 +52,6 @@
        :view-entity view-entity
        :view-feature-type :query-result
        :data (mapv :db/id result')
+       :query-entity-ids (mapv :db/id result')
        :set-data! set-data!
        :columns columns'})]))

src/main/frontend/components/views.cljs

@@ -660,16 +660,8 @@
    {:value "Custom date"
     :label "Custom date"}])
 
-(defn- get-property-values
-  [view-id property-ident]
-  (when (and view-id property-ident)
-    (p/let [data-str (.get-property-values ^js @state/*db-worker (state/get-current-repo)
-                                           (ldb/write-transit-str {:view-id view-id
-                                                                   :property-ident property-ident}))]
-      (ldb/read-transit-str data-str))))
-
 (rum/defc filter-property < rum/static
-  [view-entity columns {:keys [data-fns] :as table}]
+  [view-entity columns {:keys [data-fns] :as table} opts]
   (let [[property set-property!] (rum/use-state nil)
         [values set-values!] (rum/use-state nil)
         schema (:schema (db/get-db))
@@ -710,7 +702,8 @@
     (hooks/use-effect!
      (fn []
        (when (and view-entity property-ident (not (or timestamp? checkbox?)))
-         (p/let [data (db-async/<get-property-values property-ident {:view-id (:db/id view-entity)})]
+         (p/let [data (db-async/<get-property-values property-ident {:view-id (:db/id view-entity)
+                                                                     :query-entity-ids (:query-entity-ids opts)})]
            (set-values! data))))
      [property-ident])
     (let [option (cond
@@ -766,7 +759,7 @@
       (select/select option))))
 
 (rum/defc filter-properties < rum/static
-  [view-entity columns table]
+  [view-entity columns table opts]
   (shui/button
    {:variant "ghost"
     :class "text-muted-foreground !px-1"
@@ -774,7 +767,7 @@
     :on-click (fn [e]
                 (shui/popup-show! (.-target e)
                                   (fn []
-                                    (filter-property view-entity columns table))
+                                    (filter-property view-entity columns table opts))
                                   {:align :end
                                    :auto-focus? true}))}
    (ui/icon "filter")))
@@ -900,7 +893,7 @@
      :class "w-24 !h-6 !py-0 border-none focus-visible:ring-0 focus-visible:ring-offset-0"})])
 
 (rum/defc filter-value-select < rum/static
-  [view-entity {:keys [data-fns] :as table} property value operator idx]
+  [view-entity {:keys [data-fns] :as table} property value operator idx opts]
   (let [type (:logseq.property/type property)
         property-ident (:db/ident property)
         [values set-values!] (hooks/use-state nil)
@@ -912,7 +905,8 @@
          (when (seq ids) (db-async/<get-blocks (state/get-current-repo) ids)))
        (when (and property-ident dropdown-open?
                   (not (contains? #{:data :datetime :checkbox} type)))
-         (p/let [data (db-async/<get-property-values property-ident {:view-id (:db/id view-entity)})]
+         (p/let [data (db-async/<get-property-values property-ident {:view-id (:db/id view-entity)
+                                                                     :query-entity-ids (:query-entity-ids opts)})]
            (set-values! (map (fn [v] (if (map? (:value v))
                                        (assoc v :value (:block/uuid (:value v)))
                                        v)) data)))))
@@ -1002,7 +996,7 @@
         (select/select option))))))
 
 (rum/defc filter-value < rum/static
-  [view-entity table property operator value filters set-filters! idx]
+  [view-entity table property operator value filters set-filters! idx opts]
   (let [number-operator? (string/starts-with? (name operator) "number-")]
     (case operator
       :between
@@ -1026,10 +1020,10 @@
                         (set-filters! new-filters))))
         :class "w-24 !h-6 !py-0 border-none focus-visible:ring-0 focus-visible:ring-offset-0"})
 
-      (filter-value-select view-entity table property value operator idx))))
+      (filter-value-select view-entity table property value operator idx opts))))
 
 (rum/defc filters-row < rum/static      ;
-  [view-entity {:keys [data-fns columns] :as table}]
+  [view-entity {:keys [data-fns columns] :as table} opts]
   (let [filters (get-in table [:state :filters])
         {:keys [set-filters!]} data-fns]
     (when (seq (:filters filters))
@@ -1053,7 +1047,7 @@
                 :disabled true}
                [:span.text-xs (:block/title property)])
               (filter-operator property operator filters set-filters! idx)
-              (filter-value view-entity table property operator value filters set-filters! idx)
+              (filter-value view-entity table property operator value filters set-filters! idx opts)
               (shui/button
                {:class "!px-1 rounded-none text-muted-foreground"
                 :variant "ghost"
@@ -1501,7 +1495,7 @@
       (when (seq sorting)
         (view-sorting table columns sorting))
 
-      (filter-properties view-entity columns table)
+      (filter-properties view-entity columns table option)
 
       (search input {:on-change set-input!
                      :set-input! set-input!})
@@ -1600,7 +1594,7 @@
      (ui/foldable
       (view-head view-parent view-entity table columns input sorting set-input! add-new-object! option)
       [:div.ls-view-body.flex.flex-col.gap-2.grid.mt-1
-       (filters-row view-entity table)
+       (filters-row view-entity table option)
 
        (let [view-opts {:*scroller-ref *scroller-ref
                         :display-type display-type
@@ -1682,27 +1676,35 @@
     (ldb/read-transit-str data-str)))
 
 (rum/defc view-aux
-  [view-entity {:keys [view-parent view-feature-type data] :as option}]
+  [view-entity {:keys [view-parent view-feature-type data query-entity-ids] :as option}]
   (let [[view-entity set-view-entity!] (db/sub-entity view-entity (str "view-" (:db/id view-entity)))
         query? (= view-feature-type :query-result)
         [loading? set-loading!] (hooks/use-state (not query?))
         [data set-data!] (hooks/use-state data)
         [ref-pages-count set-ref-pages-count!] (hooks/use-state nil)
         load-view-data (fn load-view-data [input]
-                         (when-not query?                 ; TODO: move query logic to worker
-                           (->
-                            (p/let [{:keys [data ref-pages-count]} (<load-view-data view-entity
-                                                                                    {:view-for-id (or (:db/id (:logseq.property/view-for view-entity))
-                                                                                                      (:db/id view-parent))
-                                                                                     :view-feature-type view-feature-type
-                                                                                     :input input})]
-                              (set-data! data)
-                              (when ref-pages-count
-                                (set-ref-pages-count! ref-pages-count))
-                              (set-loading! false))
-                            (p/catch (fn [e]
-                                       (js/console.error e)
-                                       (set-loading! false))))))]
+                         (let [sorting (:logseq.property.table/sorting view-entity)
+                               filters (:logseq.property.table/filters view-entity)
+                               need-query? (and query? (seq query-entity-ids) (or sorting filters (not (string/blank? input))))]
+                           (if (and query? (not (or sorting filters)) (string/blank? input))
+                             (set-data! query-entity-ids)
+                             (when (or (not query?) need-query?)
+                               (->
+                                (p/let [{:keys [data ref-pages-count]} (<load-view-data view-entity
+                                                                                        (cond->
+                                                                                         {:view-for-id (or (:db/id (:logseq.property/view-for view-entity))
+                                                                                                           (:db/id view-parent))
+                                                                                          :view-feature-type view-feature-type
+                                                                                          :input input}
+                                                                                          query?
+                                                                                          (assoc :query-entity-ids query-entity-ids)))]
+                                  (set-data! data)
+                                  (when ref-pages-count
+                                    (set-ref-pages-count! ref-pages-count))
+                                  (set-loading! false))
+                                (p/catch (fn [e]
+                                           (js/console.error e)
+                                           (set-loading! false))))))))]
     (hooks/use-effect!
      #(load-view-data nil)
      [;; page filters

src/main/frontend/db/async.cljs

@@ -94,11 +94,10 @@
 (defn <get-property-values
   "For db graphs, returns property value ids for given property db-ident.
    Separate from file version because values are lazy loaded"
-  [property-id & {:keys [view-id]}]
+  [property-id & {:as opts}]
   (when property-id
     (p/let [data-str (.get-property-values ^js @state/*db-worker (state/get-current-repo)
-                                           (ldb/write-transit-str {:view-id view-id
-                                                                   :property-ident property-id}))]
+                                           (ldb/write-transit-str (assoc opts :property-ident property-id)))]
       (ldb/read-transit-str data-str))))
 
 (defonce *block-cache (atom (cache/lru-cache-factory {} :threshold 1000)))

src/main/frontend/worker/db_worker.cljs

@@ -918,9 +918,8 @@
   (get-property-values
    [_this repo opts-str]
    (let [conn (worker-state/get-datascript-conn repo)
-         {:keys [view-id property-ident]} (ldb/read-transit-str opts-str)
-         data (db-view/get-property-values @conn property-ident
-                                           {:view-id view-id})]
+         {:keys [property-ident] :as opts} (ldb/read-transit-str opts-str)
+         data (db-view/get-property-values @conn property-ident opts)]
      (ldb/write-transit-str data)))
 
   (dangerousRemoveAllDbs