fetch all proposals using snapshot (#1169)

* fetch all proposals using snapshot * add date time fixes Co-authored-by: dillchen <dillon@commonwealth.im>
hicommonwealth · May 10, 2021 · b15917e · b15917e
1 parent ae4ea96
commit b15917e
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 33 deletions.
diff --git a/client/scripts/app.ts b/client/scripts/app.ts
@@ -380,6 +380,8 @@ export async function selectNode(n?: NodeInfo, deferred = false): Promise<boolea
     return false;
   } else {
     app.chain = newChain;
+    const snapshotId = app.chain?.meta.chain.snapshot;
+    app.snapshot.fetchSnapshotProposals(snapshotId);
   }
   if (initApi) {
     app.chain.initApi(); // required for loading NearAccounts

diff --git a/client/scripts/controllers/server/snapshot.ts b/client/scripts/controllers/server/snapshot.ts
@@ -2,18 +2,33 @@ import $ from 'jquery';
 import app from 'state';
 import m from 'mithril';
 import { SnapshotProposalStore } from 'stores';
+import { SnapshotProposal } from '../../models';
 
 class SnapshotController {
   private _proposalStore: SnapshotProposalStore = new SnapshotProposalStore();
   // private _votes = new Store<SnapshotVote>();
   public get proposalStore() { return this._proposalStore; }
 
   public async fetchSnapshotProposals(snapshot: string) {
-    return new Promise((resolve, reject) => {
-      this._proposalStore.clear();
-      resolve('');
-      m.redraw();
-    });
+    const response = await $.get(`https://hub.snapshot.page/api/${snapshot}/proposals`);
+    // if (response.status !== 'Success') {
+    //   throw new Error(`Cannot fetch snapshot proposals: ${response.status}`);
+    // }
+    this._proposalStore.clear();
+    for (const key in response) {
+      this._proposalStore.add(new SnapshotProposal(
+        key,
+        response[key].address,
+        +response[key].msg.timestamp,
+        response[key].msg.payload.start,
+        response[key].msg.payload.end,
+        response[key].msg.payload.name,
+        response[key].msg.payload.body,
+        response[key].sig,
+        response[key].authorIpfsHash,
+        response[key].relayerIpfsHash
+      ))
+    }
   }
 }
 

diff --git a/client/scripts/models/SnapshotProposal.ts b/client/scripts/models/SnapshotProposal.ts
@@ -1,5 +1,6 @@
 class SnapshotProposal {
-	public readonly address: string;
+	public readonly ipfsHash: string;
+	public readonly authorAddress: string;
 	public readonly timestamp: string;
 	public readonly start: string;
 	public readonly end: string;
@@ -9,8 +10,9 @@ class SnapshotProposal {
 	public readonly authorIpfsHash: string;
 	public readonly relayerIpfsHash: string;
 
-	constructor(address, timestamp, start, end, name, body, sig, authorIpfsHash, relayerIpfsHash) {
-		this.address = address;
+	constructor(ipfsHash, authorAddress, timestamp, start, end, name, body, sig, authorIpfsHash, relayerIpfsHash) {
+		this.ipfsHash = ipfsHash;
+		this.authorAddress = authorAddress;
 		this.timestamp = timestamp;
 		this.start = start;
 		this.end = end;

diff --git a/client/scripts/views/components/sidebar/index.ts b/client/scripts/views/components/sidebar/index.ts
@@ -91,7 +91,6 @@ export const OffchainNavigationModule: m.Component<{}, { dragulaInitialized: tru
     const onSearchPage = (p) => p.startsWith(`/${app.activeId()}/search`);
     const onMembersPage = (p) => p.startsWith(`/${app.activeId()}/members`)
       || p.startsWith(`/${app.activeId()}/account/`);
-    const onSnapshotProposal = (p) => p.startsWith(`/${app.activeId()}/snapshot-proposals`);
     const onChatPage = (p) => p === `/${app.activeId()}/chat`;
 
     return m('.OffchainNavigationModule.SidebarModule', [
@@ -129,17 +128,6 @@ export const OffchainNavigationModule: m.Component<{}, { dragulaInitialized: tru
           m.route.set(`/${app.activeId()}/members`);
         },
       }),
-      app.chain?.meta.chain.snapshot !== null
-        && m(Button, {
-          rounded: true,
-          fluid: true,
-          active: onSnapshotProposal(m.route.get()),
-          label: 'Snapshot proposal',
-          onclick: (e) => {
-            e.preventDefault();
-            m.route.set(`/${app.activeId()}/snapshot-proposals`);
-          },
-        }),
       // m(Button, {
       //   rounded: true,
       //   fluid: true,
@@ -174,7 +162,8 @@ export const OnchainNavigationModule: m.Component<{}, {}> = {
         || app.chain.class === ChainClass.Moloch
         || app.chain.network === ChainNetwork.Marlin
         || app.chain.network === ChainNetwork.MarlinTestnet
-        || app.chain.class === ChainClass.Commonwealth);
+        || app.chain.class === ChainClass.Commonwealth
+        || app.chain?.meta.chain.snapshot)
     if (!hasProposals) return;
 
     const showMolochMenuOptions = app.user.activeAccount && app.chain?.class === ChainClass.Moloch;
@@ -183,6 +172,7 @@ export const OnchainNavigationModule: m.Component<{}, {}> = {
 
     const showMarlinOptions = app.user.activeAccount && app.chain?.network === ChainNetwork.Marlin;
 
+    const onSnapshotProposal = (p) => p.startsWith(`/${app.activeId()}/snapshot-proposals`);
     const onProposalPage = (p) => (
       p.startsWith(`/${app.activeChainId()}/proposals`)
         || p.startsWith(`/${app.activeChainId()}/proposal/councilmotion`)
@@ -344,6 +334,17 @@ export const OnchainNavigationModule: m.Component<{}, {}> = {
         },
         label: 'Approve tokens',
       }),
+      app.chain?.meta.chain.snapshot !== null
+      && m(Button, {
+        rounded: true,
+        fluid: true,
+        active: onSnapshotProposal(m.route.get()),
+        label: 'Snapshot Proposals',
+        onclick: (e) => {
+          e.preventDefault();
+          m.route.set(`/${app.activeId()}/snapshot-proposals`);
+        },
+      }),
       showCommonwealthMenuOptions && m(Button, {
         fluid: true,
         rounded: true,

diff --git a/client/scripts/views/pages/snapshot_proposals/index.ts b/client/scripts/views/pages/snapshot_proposals/index.ts
@@ -104,6 +104,7 @@ const SnapshotProposalsPage: m.Component<{ topic?: string }, {
   lastSubpage: string;
   lastVisitedUpdated?: boolean;
   onscroll: any;
+  allProposals: any;
 }> = {
   oncreate: (vnode) => {
     mixpanel.track('PageVisit', {
@@ -113,27 +114,27 @@ const SnapshotProposalsPage: m.Component<{ topic?: string }, {
   },
 
   oninit: (vnode) => {
-    const snapshotId = app.chain?.meta.chain.snapshot;
-    app.snapshot.fetchSnapshotProposals(snapshotId);
   },
 
   view: (vnode) => {
     let listing = [];
-    const allProposals = app.snapshot.proposalStore.getAll();
 
-    listing.push(m('.discussion-group-wrap', allProposals
-        .map((proposal) => m(ProposalRow, { proposal }))));
+    listing.push(m('.discussion-group-wrap', app.snapshot.proposalStore.getAll()
+    .map((proposal) => m(ProposalRow, { proposal }))));
+
 
     return m(Sublayout, {
-      class: 'SnapshotProposalsPage',
-      title: '',
+      class: 'DiscussionsPage',
+      title: 'Snapshot Proposals',
       description: '',
       showNewProposalButton: true,
     }, [
       (app.chain || app.community) && [
         m('.discussions-main', [
           m(SnapshotProposalStagesBar, {}),
-          m(Listing, { content: listing }),
+          listing.length === 0
+            ? m('.topic-loading-spinner-wrap', [ m(Spinner, { active: true, size: 'lg' }) ])
+            : m(Listing, { content: listing }),
         ])
       ]
     ]);

diff --git a/client/scripts/views/pages/snapshot_proposals/proposal_row.ts b/client/scripts/views/pages/snapshot_proposals/proposal_row.ts
@@ -1,6 +1,7 @@
 import 'pages/discussions/discussion_row.scss';
 
 import m from 'mithril';
+import moment from 'moment-twitter';
 import _ from 'lodash';
 
 import app from 'state';
@@ -12,17 +13,21 @@ import ProposalListingRow from 'views/components/proposal_listing_row';
 const ProposalRow: m.Component<{ proposal: SnapshotProposal }, { expanded: boolean }> = {
   view: (vnode) => {
     const { proposal } = vnode.attrs;
+
     if (!proposal) return;
-    const proposalLink = `/${app.activeId()}/snapshot-proposals/${proposal.address}`;
+    const proposalLink = `/${app.activeId()}/snapshot-proposals/${proposal.ipfsHash}`;
 
+    const time = moment(+proposal.end * 1000);
+    const now = moment();
     const rowHeader: any = [
       link('a', proposalLink, proposal.name),
     ];
     const rowSubheader = [
-      proposal.address && link('a.proposal-topic', proposalLink, [
-        m('span.proposal-topic-name', `${proposal.address}`),
+      proposal.ipfsHash && link('a.proposal-topic', proposalLink, [
+        m('span.proposal-topic-name', `${proposal.ipfsHash}`),
       ]),
-      m('.created-at', link('a', proposalLink, `Ended ${formatLastUpdated(proposal.end)}`)),
+      m('.created-at', link('a', proposalLink, (now > time) ? `Ended ${formatLastUpdated(time)}` 
+        : `Ending ${formatLastUpdated(moment(+proposal.end * 1000))}`)),
     ];
 
     return m(ProposalListingRow, {