Revisions on grid page to make parameters easier to grok

This commit is contained in:
2023-09-25 16:26:42 -07:00
parent e23cc6e8fd
commit d5565f7cf8
9 changed files with 107 additions and 89 deletions

View File

@@ -10,7 +10,8 @@
query2]]
[auto-ap.graphql.utils :refer [can-see-client? extract-client-ids]]
[clj-time.coerce :as c]
[datomic.api :as dc]))
[datomic.api :as dc]
[clojure.set :as set]))
(def default-read '[:db/id :report/client :report/created :report/url :report/name :report/creator])
@@ -21,16 +22,11 @@
(when (:client-code args)
[:client/code (:client-code args)]))
query (cond-> {:query {:find []
:in ['$ ]
:where []}
:args [db]}
:in '[$ [?c ...]]
:where '[[?e :report/client ?c]]}
:args [db valid-clients]}
(seq (:clients args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :report/client ?xx]]}
:args [valid-clients]})
(:sort args) (add-sorter-fields {"client" ['[?e :report/client ?c]
'[?c :client/name ?sort-client]]
"created" ['[?e :report/created ?sort-created]]
@@ -48,16 +44,21 @@
(defn graphql-results [ids db args]
(let [results (->> (pull-many db default-read ids)
(map #(update % :report/created c/from-date))
(group-by :db/id))]
(group-by :db/id))
valid-clients (extract-client-ids (:clients args)
(:client-id args)
(when (:client-code args)
[:client/code (:client-code args)]))]
(->> ids
(map results)
(filter identity)
(map first)
(filter (fn [r]
(every?
#(can-see-client? (:id args) %)
(map :db/id (:report/client r))))))))
(let [used-clients (set (map :db/id (:report/client r)))]
(= used-clients
(set/intersection valid-clients
used-clients))))))))
(defn get-graphql [args]
(let [db (dc/db conn)

View File

@@ -40,7 +40,8 @@
'[?client-id :client/code ?client-code]]}
:args [ (:client-code args)]})
(:sort args) (add-sorter-fields {"status" ['[?e :yodlee-provider-account/status ?sort-status]]}
(:sort args) (add-sorter-fields {"status" ['[?e :yodlee-provider-account/status ?sort-status]]
"last-updated" ['[?e :yodlee-provider-account/last-updated ?sort-last-updated]]}
args)
true
(merge-query {:query {:find ['?e ]