From f23cb8b440fbab5881d0d3b9d71bacfca25fe3d1 Mon Sep 17 00:00:00 2001
From: liangping <18786721@qq.com>
Date: Sat, 27 May 2023 14:08:01 +0800
Subject: [PATCH] load pagination votes

---
 src/components/ProposalListItem.vue       |  2 +-
 src/libs/api.ts                           |  2 +-
 src/libs/client.ts                        | 10 ++---
 src/modules/[chain]/gov/[proposal_id].vue | 53 ++++++++++-------------
 4 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/src/components/ProposalListItem.vue b/src/components/ProposalListItem.vue
index 4ba91a5a..58032010 100644
--- a/src/components/ProposalListItem.vue
+++ b/src/components/ProposalListItem.vue
@@ -110,7 +110,7 @@ const proposalInfo = ref();
           </td>
 
           <td v-if="statusMap?.[item?.status] === 'VOTING'" class="w-40">
-            <div class="" v-show="item?.voterStatus === 'No With Veto'">
+            <div class="">
               <label
                 for="vote"
                 class="btn btn-xs btn-primary rounded-sm"
diff --git a/src/libs/api.ts b/src/libs/api.ts
index 62356b8d..fcfabe89 100644
--- a/src/libs/api.ts
+++ b/src/libs/api.ts
@@ -66,7 +66,7 @@ export const DEFAULT: RequestRegistry = {
     adapter,
   },
   gov_proposals_votes: {
-    url: '/cosmos/gov/v1beta1/proposals/{proposal_id}/votes?pagination.key={next_key}',
+    url: '/cosmos/gov/v1beta1/proposals/{proposal_id}/votes',
     adapter,
   },
   gov_proposals_votes_voter: {
diff --git a/src/libs/client.ts b/src/libs/client.ts
index 81979b8e..442d605b 100644
--- a/src/libs/client.ts
+++ b/src/libs/client.ts
@@ -116,11 +116,11 @@ export class CosmosRestClient extends BaseRestClient<RequestRegistry> {
   async getGovProposalTally(proposal_id: string) {
     return this.request(this.registry.gov_proposals_tally, { proposal_id });
   }
-  async getGovProposalVotes(proposal_id: string, next_key?: string) {
-    return this.request(this.registry.gov_proposals_votes, {
-      proposal_id,
-      next_key,
-    });
+  async getGovProposalVotes(proposal_id: string, page?: PageRequest) {
+    if(!page) page = new PageRequest()
+    page.reverse = true
+    const query =`?proposal_status={status}&${page.toQueryString()}`;
+    return this.request(this.registry.gov_proposals_votes, { proposal_id }, query);
   }
   async getGovProposalVotesVoter(proposal_id: string, voter: string) {
     return this.request(this.registry.gov_proposals_votes_voter, {
diff --git a/src/modules/[chain]/gov/[proposal_id].vue b/src/modules/[chain]/gov/[proposal_id].vue
index 1977ccf0..d0152fd5 100644
--- a/src/modules/[chain]/gov/[proposal_id].vue
+++ b/src/modules/[chain]/gov/[proposal_id].vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import { computed } from '@vue/reactivity';
 import ObjectElement from '@/components/dynamic/ObjectElement.vue';
 import {
   useBaseStore,
@@ -7,15 +8,16 @@ import {
   useStakingStore,
   useTxDialog,
 } from '@/stores';
-import type {
-  GovProposal,
-  GovVote,
-  PaginatedProposalDeposit,
-  Pagination,
+import {
+PageRequest,
+  type GovProposal,
+  type GovVote,
+  type PaginatedProposalDeposit,
+  type Pagination,
 } from '@/types';
 import { ref, reactive } from 'vue';
 import Countdown from '@/components/Countdown.vue';
-import { computed } from '@vue/reactivity';
+import PaginationBar from '@/components/PaginationBar.vue'
 
 const props = defineProps(['proposal_id', 'chain']);
 const proposal = ref({} as GovProposal);
@@ -53,27 +55,14 @@ const deposit = ref({} as PaginatedProposalDeposit);
 store.fetchProposalDeposits(props.proposal_id).then((x) => (deposit.value = x));
 
 const votes = ref({} as GovVote[]);
-const votePage = ref({} as Pagination);
-const loading = ref(false);
+const pageRequest = ref(new PageRequest())
+const pageResponse = ref({} as Pagination)
 
 store.fetchProposalVotes(props.proposal_id).then((x) => {
   votes.value = x.votes;
-  votePage.value = x.pagination;
+  pageResponse.value = x.pagination;
 });
 
-function loadMore() {
-  if (votePage.value.next_key) {
-    loading.value = true;
-    store
-      .fetchProposalVotes(props.proposal_id, votePage.value.next_key)
-      .then((x) => {
-        votes.value = votes.value.concat(x.votes);
-        votePage.value = x.pagination;
-        loading.value = false;
-      });
-  }
-}
-
 function shortTime(v: string) {
   if (v) {
     return format.toDay(v, 'from');
@@ -159,6 +148,16 @@ const processList = computed(() => {
     { name: 'Abstain', value: abstain.value, class: 'bg-warning' },
   ];
 });
+
+function pageload(p: number) {
+  pageRequest.value.setPage(p)
+  store
+      .fetchProposalVotes(props.proposal_id, pageRequest.value)
+      .then((x) => {
+        votes.value = x.votes;
+        pageResponse.value = x.pagination;
+      });
+}
 </script>
 
 <template>
@@ -338,15 +337,7 @@ const processList = computed(() => {
             </tr>
           </tbody>
         </table>
-
-        <button
-          @click="loadMore()"
-          v-if="votePage.next_key"
-          :disabled="loading"
-          class="btn btn-outline btn-primary w-full mt-4"
-        >
-          Load more
-        </button>
+        <PaginationBar :limit="pageRequest.limit" :total="pageResponse.total" :callback="pageload"/>
       </div>
     </div>
   </div>