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.

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

Support for Join and FundingRequest plugins (proposals are read only) #2099

Merged
merged 1 commit into from
Sep 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion src/assets/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,11 @@
"3BoxProfileSuccess": "Profile data saved to 3Box",
"Following": "Now following",
"UnFollowing": "No longer following",
"Raw call data": "Raw call data"
"Raw call data": "Raw call data",
"Address": "Address:",
"Funding": "Funding:",
"Reputation Minted": "Reputation Minted:",
"Minimum DAO bounty": "Minimum DAO bounty:",
"Amount": "Amount:",
"Amount Redeemed": "Amount Redeemed:"
}
1 change: 1 addition & 0 deletions src/components/Plugin/Plugin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
background-color: $disabled-button-color;
border: $disabled-button-border;
cursor: not-allowed;
pointer-events: none;
}
.activationTime {
font-size: $caption;
Expand Down
4 changes: 3 additions & 1 deletion src/components/Plugin/PluginContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ class PluginContainer extends React.Component<IProps, IState> {
}

const isActive = getPluginIsActive(pluginState);
// The next line is temporary until creation of Join and FundingRequest proposals will be available.
const disabled = pluginState.name === "Join" || pluginState.name === "FundingRequest";
const isProposalPlugin = Object.keys(PLUGIN_NAMES).includes(pluginState.name);
const isBountyPlugin = pluginName(pluginState, pluginState.address) === "Standard Bounties";
// checking the special case here where the information tab is the default
Expand Down Expand Up @@ -229,7 +231,7 @@ class PluginContainer extends React.Component<IProps, IState> {
<TrainingTooltip placement="topRight" overlay={i18next.t("New Proposal Button Tooltip")}>
<a className={
classNames({
[css.disabled]: !isActive,
[css.disabled]: !isActive || disabled,
})}
data-test-id="createProposal"
href="#!"
Expand Down
20 changes: 19 additions & 1 deletion src/components/Proposal/ProposalSummary/ProposalSummary.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
import { IDAOState, AnyProposal, IContributionRewardProposalState, IGenericPluginProposalState, IPluginRegistrarProposalState, IProposalState, Proposal, IPluginManagerProposalState } from "@daostack/arc.js";
import {
IDAOState,
AnyProposal,
IContributionRewardProposalState,
IGenericPluginProposalState,
IPluginRegistrarProposalState,
IProposalState,
Proposal,
IPluginManagerProposalState,
IFundingRequestProposalState,
IJoinProposalState } from "@daostack/arc.js";
import classNames from "classnames";
import { GenericPluginRegistry } from "genericPluginRegistry";
import * as React from "react";
Expand All @@ -9,6 +19,8 @@ import ProposalSummaryKnownGenericPlugin from "./ProposalSummaryKnownGenericPlug
import ProposalSummaryPluginRegistrar from "./ProposalSummaryPluginRegistrar";
import ProposalSummaryPluginManager from "./ProposalSummaryPluginManager";
import ProposalSummaryUnknownGenericPlugin from "./ProposalSummaryUnknownGenericPlugin";
import ProposalSummaryJoin from "./ProposalSummaryJoin";
import ProposalSummaryFundingRequest from "./ProposalSummaryFundingRequest";
import { getArc } from "arc";

interface IProps {
Expand Down Expand Up @@ -64,6 +76,12 @@ export default class ProposalSummary extends React.Component<IProps, IState> {
} else {
return <ProposalSummaryUnknownGenericPlugin {...this.props} proposalState={state} />;
}
} else if (proposal.coreState.name === "Join"){
const state = proposal.coreState as IJoinProposalState;
return <ProposalSummaryJoin {...this.props} proposalState={state} />;
} else if (proposal.coreState.name === "FundingRequest") {
const state = proposal.coreState as IFundingRequestProposalState;
return <ProposalSummaryFundingRequest {...this.props} proposalState={state} />;
} else {
return <div className={proposalSummaryClass}>Unknown proposal type</div>;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import { IDAOState, IFundingRequestProposalState } from "@daostack/arc.js";
import classNames from "classnames";
import { getNetworkName, linkToEtherScan, fromWei } from "lib/util";
import * as React from "react";
import { IProfileState } from "reducers/profilesReducer";
import i18next from "i18next";
import * as css from "./ProposalSummary.scss";

interface IExternalProps {
beneficiaryProfile?: IProfileState;
detailView?: boolean;
daoState: IDAOState;
proposalState: IFundingRequestProposalState;
transactionModal?: boolean;
}

interface IState {
network: string;
}

type IProps = IExternalProps;

export default class ProposalSummary extends React.Component<IProps, IState> {

constructor(props: IProps) {
super(props);
this.state = {
network: "",
};

}

public async componentDidMount(): Promise<void> {
this.setState({ network: (await getNetworkName()).toLowerCase() });
}

public render(): RenderOutput {
const { proposalState, detailView, transactionModal } = this.props;
const proposalSummaryClass = classNames({
[css.detailView]: detailView,
[css.transactionModal]: transactionModal,
[css.proposalSummary]: true,
[css.withDetails]: true,
});

return (
<div className={proposalSummaryClass}>
<div>
<span className={css.summaryTitle}>
<a href={linkToEtherScan(proposalState.beneficiary)} target="_blank" rel="noopener noreferrer">{proposalState.name}</a>
</span>
{detailView &&
<div className={css.summaryDetails}>
<table><tbody>
<tr>
<th>
{i18next.t("Address")}
<a href={linkToEtherScan(proposalState.beneficiary)} target="_blank" rel="noopener noreferrer">
<img src="/assets/images/Icon/Link-blue.svg" />
</a>
</th>
<td>{proposalState.beneficiary}</td>
</tr>
<tr><th>{i18next.t("Amount")}</th><td>{fromWei(proposalState.amount)}</td></tr>
<tr><th>{i18next.t("Amount Redeemed")}:</th><td>{fromWei(proposalState.amountRedeemed)}</td></tr>
</tbody></table>
</div>
}
</div>
</div>
);
}
}
74 changes: 74 additions & 0 deletions src/components/Proposal/ProposalSummary/ProposalSummaryJoin.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import { IDAOState, IJoinProposalState } from "@daostack/arc.js";
import classNames from "classnames";
import { getNetworkName, linkToEtherScan, fromWei } from "lib/util";
import * as React from "react";
import { IProfileState } from "reducers/profilesReducer";
import i18next from "i18next";
import * as css from "./ProposalSummary.scss";

interface IExternalProps {
beneficiaryProfile?: IProfileState;
detailView?: boolean;
daoState: IDAOState;
proposalState: IJoinProposalState;
transactionModal?: boolean;
}

interface IState {
network: string;
}

type IProps = IExternalProps;

export default class ProposalSummary extends React.Component<IProps, IState> {

constructor(props: IProps) {
super(props);
this.state = {
network: "",
};

}

public async componentDidMount(): Promise<void> {
this.setState({ network: (await getNetworkName()).toLowerCase() });
}

public render(): RenderOutput {
const { proposalState, detailView, transactionModal } = this.props;
const proposalSummaryClass = classNames({
[css.detailView]: detailView,
[css.transactionModal]: transactionModal,
[css.proposalSummary]: true,
[css.withDetails]: true,
});

return (
<div className={proposalSummaryClass}>
<div>
<span className={css.summaryTitle}>
<a href={linkToEtherScan(proposalState.name)} target="_blank" rel="noopener noreferrer">{proposalState.name}</a>
</span>
{detailView &&
<div className={css.summaryDetails}>
<table><tbody>
<tr>
<th>
{i18next.t("Address")}
<a href={linkToEtherScan(proposalState.proposedMember)} target="_blank" rel="noopener noreferrer">
<img src="/assets/images/Icon/Link-blue.svg" />
</a>
</th>
<td>{proposalState.proposedMember}</td>
</tr>
<tr><th>{i18next.t("Funding")}</th><td>{fromWei(proposalState.funding)}</td></tr>
<tr><th>{i18next.t("Reputation Minted")}</th><td>{fromWei(proposalState.reputationMinted)}</td></tr>
<tr><th>{i18next.t("Minimum DAO bounty")}</th><td>{fromWei(proposalState.genesisProtocolParams.minimumDaoBounty)}</td></tr>
</tbody></table>
</div>
}
</div>
</div>
);
}
}
4 changes: 4 additions & 0 deletions src/lib/pluginUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ export const REQUIRED_PLUGIN_PERMISSIONS: any = {
"UpgradeScheme": PluginPermissions.IsRegistered | PluginPermissions.CanRegisterPlugins | PluginPermissions.CanUpgradeController,
"VestingScheme": PluginPermissions.IsRegistered,
"VoteInOrganizationScheme": PluginPermissions.IsRegistered | PluginPermissions.CanCallDelegateCall,
"Join": PluginPermissions.IsRegistered,
"FundingRequest": PluginPermissions.IsRegistered,
};

/** plugins that we know how to interpret */
Expand All @@ -53,6 +55,8 @@ export const PLUGIN_NAMES = {
SchemeFactory: "Plugin Manager",
Competition: "Competition",
ContributionRewardExt: "Contribution Reward Ext",
Join: "Join",
FundingRequest: "Funding Request",
};

/**
Expand Down