From d2c63c59cc5ea417be0d4901f2da553fa6d6a847 Mon Sep 17 00:00:00 2001 From: Teemu Patja Date: Wed, 8 Nov 2017 12:23:32 +0200 Subject: [PATCH] Activity feed item for claim pending Fixes: #152 --- ...-claim-pending-activity-feed-item.down.sql | 0 ...31-claim-pending-activity-feed-item.up.sql | 47 +++++++++++++++++++ src/cljs/commiteth/activity.cljs | 1 + 3 files changed, 48 insertions(+) create mode 100644 resources/migrations/20171108121831-claim-pending-activity-feed-item.down.sql create mode 100644 resources/migrations/20171108121831-claim-pending-activity-feed-item.up.sql diff --git a/resources/migrations/20171108121831-claim-pending-activity-feed-item.down.sql b/resources/migrations/20171108121831-claim-pending-activity-feed-item.down.sql new file mode 100644 index 0000000..e69de29 diff --git a/resources/migrations/20171108121831-claim-pending-activity-feed-item.up.sql b/resources/migrations/20171108121831-claim-pending-activity-feed-item.up.sql new file mode 100644 index 0000000..ac9db64 --- /dev/null +++ b/resources/migrations/20171108121831-claim-pending-activity-feed-item.up.sql @@ -0,0 +1,47 @@ +CREATE OR REPLACE VIEW "public"."activity_feed_view" AS + SELECT 'open-claim'::text AS type, + claims_view.issue_title, + claims_view.repo_name, + claims_view.repo_owner, + claims_view.issue_number, + claims_view.user_name, + claims_view.user_avatar_url, + claims_view.balance_eth, + claims_view.tokens, + claims_view.value_usd, + claims_view.updated + FROM claims_view + WHERE claims_view.pr_state = 0 + AND claims_view.payout_receipt IS NULL + AND claims_view.issue_open IS TRUE +UNION + SELECT 'claim-pending'::text AS type, + claims_view.issue_title, + claims_view.repo_name, + claims_view.repo_owner, + claims_view.issue_number, + claims_view.user_name, + claims_view.user_avatar_url, + claims_view.balance_eth, + claims_view.tokens, + claims_view.value_usd, + claims_view.issue_updated AS updated + FROM claims_view + WHERE claims_view.pr_state = 1 + AND claims_view.payout_receipt IS NULL +UNION + SELECT 'claim-payout'::text AS type, + claims_view.issue_title, + claims_view.repo_name, + claims_view.repo_owner, + claims_view.issue_number, + claims_view.user_name, + claims_view.user_avatar_url, + claims_view.balance_eth, + claims_view.tokens, + claims_view.value_usd, + claims_view.issue_updated AS updated + FROM claims_view + WHERE claims_view.pr_state = 1 + AND claims_view.payout_receipt IS NOT NULL + ORDER BY 11 DESC; diff --git a/src/cljs/commiteth/activity.cljs b/src/cljs/commiteth/activity.cljs index 6db4784..8c1ba94 100644 --- a/src/cljs/commiteth/activity.cljs +++ b/src/cljs/commiteth/activity.cljs @@ -21,6 +21,7 @@ " for " issue-link] "open-claim" [:div "Submitted a claim for " issue-link] "balance-update" [:div issue-link " bounty increased to USD " value-usd] + "claim-pending" [:div "Won USD " value-usd " for " issue-link " (payout pending maintainer confirmation)"] "")))