Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed my proposals pagination #60

Merged
merged 2 commits into from
Feb 22, 2024
Merged

Fixed my proposals pagination #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94473ef
fixed my proposals pagination
Megha-Dev-19 Feb 22, 2024
4eaa922
fix table view
Megha-Dev-19 Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions apps/astraplusplus/widget/DAO/Proposals/Table/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,36 +159,38 @@ return (
</thead>
<tbody>
{proposals !== null &&
proposals.map(({ proposal, proposal_type, proposal_id }, i) => {
if (!isCongressDaoID && !isVotingBodyDao) {
proposal.kind = {
[proposal_type]: {
...proposal.kind
}
};
proposals.map(
({ proposal, proposal_type, proposal_id, dao_id }, i) => {
if (!isCongressDaoID && !isVotingBodyDao) {
proposal.kind = {
[proposal_type]: {
...proposal.kind
}
};
}
proposal.id = proposal_id;
if (proposal.status === "Removed") return <></>;
return (
<Widget
src="/*__@appAccount__*//widget/DAO.Proposals.Table.Row"
props={{
proposal,
proposal_type,
proposal_id,
i,
daoId: daoId ?? dao_id,
multiSelectMode,
isAllowedTo,
isCongressDaoID,
isVotingBodyDao,
daoConfig,
isHuman,
dev: props.dev
}}
/>
);
}
proposal.id = proposal_id;
if (proposal.status === "Removed") return <></>;
return (
<Widget
src="/*__@appAccount__*//widget/DAO.Proposals.Table.Row"
props={{
proposal,
proposal_type,
proposal_id,
i,
daoId,
multiSelectMode,
isAllowedTo,
isCongressDaoID,
isVotingBodyDao,
daoConfig,
isHuman,
dev: props.dev
}}
/>
);
})}
)}
</tbody>
</table>
)}
Expand Down
204 changes: 185 additions & 19 deletions apps/astraplusplus/widget/MyProposals/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,203 @@
const baseApi = "https://api.pikespeak.ai/daos/proposals-by-proposer";
const publicApiKey = "/*__@replace:pikespeakApiKey__*/";
const resPerPage = 20;
const accountId = context.accountId;

const defaultMultiSelectMode = Storage.privateGet("multiSelectMode");
const defaultTableView = Storage.privateGet("tableView");

if (defaultMultiSelectMode === null) return "";
if (defaultTableView === null) return "";

State.init({
multiSelectMode: defaultMultiSelectMode ?? false,
tableView: defaultTableView ?? false
page: 0,
multiSelectMode: defaultMultiSelectMode ?? false,
tableView: defaultTableView ?? false
});

const forgeUrl = (apiUrl, params) =>
apiUrl +
Object.keys(params)
.sort()
.reduce((paramString, p) => paramString + `${p}=${params[p]}&`, "?");

function fetchMyProposals() {
asyncFetch(`${baseApi}/${context.accountId}?limit=${resPerPage}&offset=0`, {
method: "GET",
headers: { "x-api-key": "/*__@replace:pikespeakApiKey__*/" }
}).then((resp) => {
if (resp?.body) State.update({ proposals: resp });
});
const resp = fetch(
forgeUrl(`${baseApi}/${context.accountId}`, {
offset: state.page * resPerPage,
limit: resPerPage,
proposal_types: state.filters.proposal_types,
status: state.filters.status,
time_start: state.filters.time_start,
time_end: state.filters.time_end
}),
{
mode: "cors",
headers: {
"x-api-key": publicApiKey
}
}
);

return resp;
}

fetchMyProposals();
const update = (newState) => State.update(newState);

let res = fetchMyProposals();

function hasNextHandler() {
const hasNext = false;
hasNext = resPerPage === res.body.length;
return hasNext;
}

return (
<div>
<div className="d-flex justify-content-between flex-wrap mb-3 align-items-center gap-3 pb-3">
<h2 className="my-auto">My Proposals</h2>
</div>

<div className="w-100">
<Widget
src="/*__@appAccount__*//widget/DAO.Proposals.ProposalsPikespeak"
props={{ proposals: state.proposals, dev: props.dev }}
<>
<div
className="d-flex align-items-center gap-2 flex-wrap-reverse justify-content-end"
id="proposals-top"
>
<Widget
src="nearui.near/widget/Input.Text"
props={{
placeholder: "Search by proposal ID or name",
disabled: true,
type,
size,
icon: (
<i
className="bi bi-search"
style={{
color: "#4F46E5"
}}
/>
</div>
),
inputProps: {
title: "Disabled because no API for searching yet"
}
}}
/>
<Widget
src="nearui.near/widget/Input.Button"
props={{
children: state.multiSelectMode ? (
<>
Multi-Vote
<i class="bi bi-x-lg"></i>
</>
) : (
<>
Multi-Vote
<i class="bi bi-card-checklist"></i>
</>
),
variant: "info outline",
size: "md",
onClick: () => {
Storage.privateSet("multiSelectMode", !state.multiSelectMode);
State.update({
...state,
multiSelectMode: !state.multiSelectMode
});
}
}}
/>
<Widget
src="nearui.near/widget/Input.Button"
props={{
children: (
<>
Table View
{state.tableView ? (
<i className="bi bi-x-lg"></i>
) : (
<i className="bi bi-table"></i>
)}
</>
),
variant: "info outline",
size: "md",
onClick: () => {
Storage.privateSet("tableView", !state.tableView);
State.update({
...state,
tableView: !state.tableView
});
}
}}
/>
</div>
{res !== null && !res.body && (
<div className="alert alert-danger mt-2" role="alert">
Couldn't fetch proposals from API. Please try again later.
</div>
)}
<div>
{state.tableView ? (
<Widget
src="/*__@appAccount__*//widget/DAO.Proposals.Table.index"
props={{
state,
resPerPage,
proposals: res === null ? null : res.body
}}
/>
) : (
<Widget
src="/*__@appAccount__*//widget/DAO.Proposals.CardsList"
props={{
state,
resPerPage,
proposals: res === null ? null : res.body
}}
/>
)}

<div className="d-flex justify-content-center my-4">
<Widget
src="nearui.near/widget/Navigation.PrevNext"
props={{
hasPrev: state.page > 0,
hasNext: hasNextHandler(),
onPrev: () => {
update({
page: state.page - 1
});
},
onNext: () => {
update({
page: state.page + 1
});
},
nextHref: `#proposals-top`
}}
/>
</div>
</div>
{state.multiSelectMode && (
<>
<div
style={{
height: 180,
width: "100%"
}}
></div>
<Widget
src="/*__@appAccount__*//widget/DAO.Proposals.MultiVote"
props={{
daoId: state.daoId,
view: "submit",
onHideMultiSelect: () => {
State.update({
...state,
multiSelectMode: false
});
Storage.privateSet("multiSelectMode", false);
}
}}
/>
</>
)}
</>
);
Loading