Merge pull request #56 from yochannah/summary-fields-for-popovers

Summary fields for popovers
intermine · Oct 17, 2019 · b2131b2 · b2131b2
2 parents 24e0724 + e850e5a
commit b2131b2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/im_tables/events.cljs b/src/im_tables/events.cljs
@@ -137,7 +137,6 @@
   [m k]
   (if (contains? m k) (dissoc m k) (assoc m k true)))
 
-
 ;;;; FILTERS
 
 
@@ -170,7 +169,6 @@
      ;                 (into [:div] (map (fn [s] [:span.label.label-default s]) columns-to-add))]
      ;       :location loc}
 
-
 (reg-event-fx
  :filters/add-constraint
  (sandbox)
@@ -282,7 +280,6 @@
 (defn coll-contains? [needle haystack] (some? (some #{needle} haystack)))
 (defn without [coll item] (filter (partial not= item) coll))
 
-
 ;;;;; Relationship Manager
 
 ; Copy the main query to our cache for editing
@@ -435,7 +432,6 @@
                          (into [:div.table-history-detail]
                                (map (fn [v]
                                       [:div v]) current-selection))]}}
-
        {:db db}))))
 
 (reg-event-fx
@@ -494,7 +490,6 @@
       :dispatch [:im-tables.main/run-query loc]})))
 
 
-
 ;;;;;; SUMMARY CACHING
 
 
@@ -523,17 +518,15 @@
  (fn [{db :db} [_ loc {:keys [class id] :as item}]]
    (cond-> {:db db}
      (not (get-in db [:cache :item-details id]))
-     (assoc :im-tables/im-operation {:on-success
-                                     [:main/cache-item-summary loc]
-                                     :op
-                                     (partial fetch/records
-                                              (get db :service)
-                                              (summary-query
-                                               (assoc item :summary-fields
-                                                      (into [] (keys (get-in db [:service :model :classes (keyword class) :attributes]))))))}))))
-
-
-
+     (assoc :im-tables/im-operation
+            {:on-success
+             [:main/cache-item-summary loc]
+             :op
+             (partial fetch/records
+                      (get db :service)
+                      (summary-query
+                       (assoc item :summary-fields
+                              (into []  (get-in db [:service :summary-fields (keyword class)])))))}))))
 
 ;;;;;;;;;;;;;;
 

diff --git a/src/im_tables/views.cljs b/src/im_tables/views.cljs
@@ -5,14 +5,11 @@
             [reagent.dom.server :as server]
             [oops.core :refer [ocall]]))
 
-(def some-im-tables-config {:service {:root "beta.humanmine.org/beta"}
-                            :query {:from "Gene"
+(def some-im-tables-config {:service {:root "https://yeastmine.yeastgenome.org/yeastmine"}
+                            :query {:from "Protein"
                                     :select ["symbol"
                                              "secondaryIdentifier"
-                                             "dataSets.description"
-                                             "primaryIdentifier"
-                                             "organism.name"
-                                             "dataSets.name"]}
+                                             "primaryIdentifier"]}
                             :settings {:pagination {:limit 10}
                                        :links {:vocab {:mine "BananaMine"}
                                                :url (fn [vocab] (str "#/reportpage/"