mirror of
https://github.com/status-im/open-bounty.git
synced 2025-01-22 23:40:51 +00:00
Merge branch 'develop' into fix/update-github-comment-339
This commit is contained in:
Tetiana Churikova
GitHub
commit
c5e9e91b3f
@ -401,6 +401,14 @@ SELECT exists(SELECT 1
|
||||
FROM issues
|
||||
WHERE issue_id = :issue_id);
|
||||
|
||||
-- :name get-issue :? :1
|
||||
-- :doc get issue from DB by repo-id and issue-number
|
||||
SELECT issue_id, issue_number, is_open, winner_login, commit_sha
|
||||
FROM issues
|
||||
WHERE repo_id = :repo_id
|
||||
AND issue_number = :issue_number;
|
||||
|
||||
|
||||
|
||||
-- :name open-bounties :? :*
|
||||
-- :doc all open bounty issues
|
||||
|
||||
@ -65,6 +65,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
|
||||
src="https://www.facebook.com/tr?id=293089407869419&ev=PageView&noscript=1"
|
||||
/></noscript>
|
||||
<link href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.1.8/semantic.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="https://unpkg.com/tachyons@4.9.1/css/tachyons.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="/css/style.css?v={{commiteth-version}}" rel="stylesheet" type="text/css" />
|
||||
<script type="text/javascript" src="/js/app.js?v={{commiteth-version}}"></script>
|
||||
<script>
|
||||
|
||||
@ -95,3 +95,9 @@
|
||||
first
|
||||
:exists
|
||||
boolean)))
|
||||
|
||||
(defn get-issue
|
||||
[repo-id issue-number]
|
||||
(jdbc/with-db-connection [con-db *db*]
|
||||
(db/get-issue con-db {:repo_id repo-id
|
||||
:issue_number issue-number})))
|
||||
|
||||
@ -109,26 +109,17 @@
|
||||
(extract pr-title))))
|
||||
|
||||
|
||||
(defn ensure-bounty-issue
|
||||
"Checks if an issue has a bounty label attached and returns its number"
|
||||
[user repo issue-number]
|
||||
(when-let [issue (github/get-issue user repo issue-number)]
|
||||
(when (bounties/has-bounty-label? issue)
|
||||
issue-number)))
|
||||
|
||||
|
||||
(defn handle-claim
|
||||
[user-id login name avatar_url owner repo repo-id bounty-issue-number pr-id pr-number head-sha merged? event-type]
|
||||
[issue user-id login name avatar_url owner repo repo-id pr-id pr-number head-sha merged? event-type]
|
||||
(users/create-user user-id login name nil avatar_url)
|
||||
(let [issue (github/get-issue owner repo bounty-issue-number)
|
||||
open-or-edit? (contains? #{:opened :edited} event-type)
|
||||
(let [open-or-edit? (contains? #{:opened :edited} event-type)
|
||||
close? (= :closed event-type)
|
||||
pr-data {:repo_id repo-id
|
||||
:pr_id pr-id
|
||||
:pr_number pr-number
|
||||
:user_id user-id
|
||||
:issue_number bounty-issue-number
|
||||
:issue_id (:id issue)
|
||||
:issue_number (:issue_number issue)
|
||||
:issue_id (:issue_id issue)
|
||||
:state event-type}]
|
||||
|
||||
;; TODO: in the opened case if the submitting user has no
|
||||
@ -138,18 +129,18 @@
|
||||
(cond
|
||||
open-or-edit? (do
|
||||
(log/info "PR with reference to bounty issue"
|
||||
bounty-issue-number "opened")
|
||||
(:issue_number issue) "opened")
|
||||
(pull-requests/save (merge pr-data {:state :opened
|
||||
:commit_sha head-sha})))
|
||||
close? (if merged?
|
||||
(do (log/info "PR with reference to bounty issue"
|
||||
bounty-issue-number "merged")
|
||||
(:issue_number issue) "merged")
|
||||
(pull-requests/save
|
||||
(merge pr-data {:state :merged
|
||||
:commit_sha head-sha}))
|
||||
(issues/update-commit-sha (:id issue) head-sha))
|
||||
(issues/update-commit-sha (:issue_id issue) head-sha))
|
||||
(do (log/info "PR with reference to bounty issue"
|
||||
bounty-issue-number "closed with no merge")
|
||||
(:issue_number issue) "closed with no merge")
|
||||
(pull-requests/save
|
||||
(merge pr-data {:state :closed
|
||||
:commit_sha head-sha})))))))
|
||||
@ -177,26 +168,27 @@
|
||||
pr-number :number
|
||||
pr-body :body
|
||||
pr-title :title} :pull_request}]
|
||||
(log/debug "handle-pull-request-event" event-type owner repo repo-id login pr-body pr-title)
|
||||
(log/debug (extract-issue-number pr-body pr-title))
|
||||
(if-let [bounty-issue-number (->>
|
||||
(extract-issue-number pr-body pr-title)
|
||||
(log/info "handle-pull-request-event" event-type owner repo repo-id login pr-body pr-title)
|
||||
(if-let [issue (some->> (extract-issue-number pr-body pr-title)
|
||||
(first)
|
||||
(ensure-bounty-issue owner repo))]
|
||||
(issues/get-issue repo-id))]
|
||||
(if-not (:commit_sha issue) ; no PR has been merged yet referencing this issue
|
||||
(do
|
||||
(log/debug "Referenced bounty issue found" owner repo bounty-issue-number)
|
||||
(handle-claim user-id
|
||||
(log/info "Referenced bounty issue found" owner repo (:issue_number issue))
|
||||
(handle-claim issue
|
||||
user-id
|
||||
login name
|
||||
avatar_url
|
||||
owner repo
|
||||
repo-id
|
||||
bounty-issue-number
|
||||
pr-id
|
||||
pr-number
|
||||
head-sha
|
||||
merged?
|
||||
event-type))
|
||||
(log/info "PR for issue already merged"))
|
||||
(when (= :edited event-type)
|
||||
; Remove PR if it does not reference any issue
|
||||
(pull-requests/remove pr-id))))
|
||||
|
||||
|
||||
|
||||
@ -135,4 +135,10 @@
|
||||
[:div.page-nav-text [:span (str "Page " page-number " of " page-count)]]
|
||||
[draw-page-numbers page-number page-count container-element]]])))
|
||||
|
||||
(defn usd-string
|
||||
"Turn a given float into a USD currency string based on the browsers locale setting.
|
||||
|
||||
A more complex and customizable approach can be found in goog.i18n.NumberFormat:
|
||||
https://google.github.io/closure-library/api/goog.i18n.NumberFormat.html"
|
||||
[usd-float]
|
||||
(.toLocaleString usd-float js/navigator.language #js {:style "currency" :currency "USD"}))
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
(ns commiteth.manage-payouts
|
||||
(:require [re-frame.core :as rf]
|
||||
[commiteth.common :refer [human-time]]))
|
||||
[commiteth.common :as common :refer [human-time]]))
|
||||
|
||||
|
||||
|
||||
@ -57,9 +57,21 @@
|
||||
(:claims bounty))]
|
||||
[claim-card bounty claim]))))
|
||||
|
||||
(defn bounty-stats [{:keys [paid unpaid]}]
|
||||
[:div.cf
|
||||
[:div.fl-ns.w-50-ns.tc.pv4
|
||||
[:div.ttu.tracked "Open"]
|
||||
[:div.f2.pa2 (common/usd-string (:combined-usd-value unpaid))]
|
||||
[:div (:count unpaid) " bounties"]]
|
||||
|
||||
[:div.fl-ns.w-50-ns.tc.pv4
|
||||
[:div.ttu.tracked "Paid"]
|
||||
[:div.f2.pa2 (common/usd-string (:combined-usd-value paid))]
|
||||
[:div (:count paid) " bounties"]]])
|
||||
|
||||
(defn manage-payouts-page []
|
||||
(let [owner-bounties (rf/subscribe [:owner-bounties])
|
||||
bounty-stats-data (rf/subscribe [:owner-bounties-stats])
|
||||
owner-bounties-loading? (rf/subscribe [:get-in [:owner-bounties-loading?]])]
|
||||
(fn []
|
||||
(if @owner-bounties-loading?
|
||||
@ -67,17 +79,14 @@
|
||||
[:div.ui.active.inverted.dimmer
|
||||
[:div.ui.text.loader "Loading"]]]
|
||||
(let [web3 (.-web3 js/window)
|
||||
bounties (vals @owner-bounties)
|
||||
unpaid? #(empty? (:payout_hash %))
|
||||
paid? #(not-empty (:payout_hash %))
|
||||
unpaid-bounties (filter unpaid? bounties)
|
||||
paid-bounties (filter paid? bounties)]
|
||||
bounties (vals @owner-bounties)]
|
||||
[:div.ui.container
|
||||
(when (nil? web3)
|
||||
[:div.ui.warning.message
|
||||
[:i.warning.icon]
|
||||
"To sign off claims, please view Status Open Bounty in Status, Mist or Metamask"])
|
||||
[bounty-stats @bounty-stats-data]
|
||||
[:h3 "New claims"]
|
||||
[claim-list unpaid-bounties]
|
||||
[claim-list (filter (complement :paid?) bounties)]
|
||||
[:h3 "Old claims"]
|
||||
[claim-list paid-bounties]])))))
|
||||
[claim-list (filter :paid? bounties)]])))))
|
||||
|
||||
@ -68,7 +68,26 @@
|
||||
(reg-sub
|
||||
:owner-bounties
|
||||
(fn [db _]
|
||||
(:owner-bounties db)))
|
||||
(->> (for [[id bounty] (:owner-bounties db)]
|
||||
;; TODO(martinklepsch) we might want to consider using a
|
||||
;; special prefix or namespace for derived properties that
|
||||
;; are added to domain records like this
|
||||
;; e.g. `derived/paid?`
|
||||
[id (assoc bounty :paid? (boolean (:payout_hash bounty)))])
|
||||
(into {}))))
|
||||
|
||||
(reg-sub
|
||||
:owner-bounties-stats
|
||||
:<- [:owner-bounties]
|
||||
(fn [owner-bounties _]
|
||||
(let [sum-dollars (fn sum-dollars [bounties]
|
||||
(reduce + (map #(js/parseFloat (:value_usd %)) bounties)))
|
||||
{:keys [paid unpaid]} (group-by #(if (:paid? %) :paid :unpaid)
|
||||
(vals owner-bounties))]
|
||||
{:paid {:count (count paid)
|
||||
:combined-usd-value (sum-dollars paid)}
|
||||
:unpaid {:count (count unpaid)
|
||||
:combined-usd-value (sum-dollars unpaid)}})))
|
||||
|
||||
(reg-sub
|
||||
:pagination
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user