notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fixes 1099 page

Browse Source
This commit is contained in:
Bryce Covert
2023-04-06 19:57:32 -07:00
parent e291c22179
commit 0423b31d02
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
iol_ion/src/iol_ion/query.clj
View File

@@ -51,4 +51,9 @@
(range)))) (range))))
(defn can-see-client? [identity client]
(when (not client)
(println "WARNING - permission checking for null client"))
(or (= "admin" (:user/role identity))
((set (map :db/id (:user/clients identity))) (:db/id client))
((set (map :db/id (:user/clients identity))) client)))

1
resources/datomic/ion-config.edn
View File

@@ -16,5 +16,6 @@
iol-ion.query/localize iol-ion.query/localize
iol-ion.query/recent-date iol-ion.query/recent-date
iol-ion.query/excel-date iol-ion.query/excel-date
iol-ion.query/can-see-client?
] ]
:app-name "iol-cloud"} :app-name "iol-cloud"}

5
src/clj/auto_ap/ssr/company/company_1099.clj
View File

@@ -1,7 +1,8 @@
(ns auto-ap.ssr.company.company-1099 (ns auto-ap.ssr.company.company-1099
(:require (:require
[auto-ap.datomic :refer [conn remove-nils]] [auto-ap.datomic :refer [conn remove-nils]]
[auto-ap.graphql.utils :refer [can-see-client? is-admin?]] [auto-ap.graphql.utils :refer [is-admin?]]
[iol-ion.query :refer [can-see-client?]]
[auto-ap.shared-views.company.sidebar :refer [company-side-bar]] [auto-ap.shared-views.company.sidebar :refer [company-side-bar]]
[auto-ap.ssr-routes :as ssr-routes] [auto-ap.ssr-routes :as ssr-routes]
[auto-ap.ssr.ui :refer [base-page]] [auto-ap.ssr.ui :refer [base-page]]
@@ -20,7 +21,7 @@
(let [clients (->> (dc/q '[:find ?c (let [clients (->> (dc/q '[:find ?c
:in $ ?user :in $ ?user
:where [?c :client/code] :where [?c :client/code]
[(auto-ap.graphql.utils/can-see-client? ?user ?c)]] [(iol-ion.query/can-see-client? ?user ?c)]]
(dc/db conn) user) (dc/db conn) user)
(map first) (map first)
set) set)

5
src/clj/auto_ap/ssr/company_dropdown.clj
View File

@@ -1,7 +1,8 @@
(ns auto-ap.ssr.company-dropdown (ns auto-ap.ssr.company-dropdown
(:require (:require
[auto-ap.datomic :refer [conn]] [auto-ap.datomic :refer [conn]]
[auto-ap.graphql.utils :refer [assert-can-see-client can-see-client?]] [auto-ap.graphql.utils :refer [assert-can-see-client]]
[iol-ion.query :refer [can-see-client?]]
[auto-ap.ssr-routes :as ssr-routes] [auto-ap.ssr-routes :as ssr-routes]
[auto-ap.ssr.components.navbar-dropdown :refer [navbar-dropdown]] [auto-ap.ssr.components.navbar-dropdown :refer [navbar-dropdown]]
[auto-ap.ssr.utils :refer [html-response]] [auto-ap.ssr.utils :refer [html-response]]
@@ -13,7 +14,7 @@
(let [options (->> (dc/q '[:find ?c ?n (let [options (->> (dc/q '[:find ?c ?n
:in $ ?user :in $ ?user
:where [?c :client/name ?n] :where [?c :client/name ?n]
[(auto-ap.graphql.utils/can-see-client? ?user ?c)]] [(iol-ion.query/can-see-client? ?user ?c)]]
(dc/db conn) (dc/db conn)
identity) identity)
(map (fn [[k v]] (map (fn [[k v]]