Merge 54a0469 into e51d964

AutarkLabs · Apr 11, 2019 · c70db57 · c70db57
2 parents e51d964 + 54a0469
commit c70db57
Show file tree

Hide file tree

Showing 10 changed files with 316 additions and 114 deletions.
diff --git a/apps/projects/app/components/App/App.js b/apps/projects/app/components/App/App.js
@@ -296,11 +296,27 @@ class App extends React.PureComponent {
     this.setState((_prevState, _prevProps) => ({
       panel: PANELS.FundIssues,
       panelProps: {
-        issues: issues,
+        issues,
+        mode: 'new',
+        onSubmit: this.onSubmitBountyAllocation,
+        bountySettings: this.props.bountySettings,
+        closePanel: this.closePanel,
+        tokens: this.props.tokens !== undefined ? this.props.tokens : [],
+      },
+    }))
+  }
+
+  updateBounty = issues => {
+    this.setState((_prevState, _prevProps) => ({
+      panel: PANELS.FundIssues,
+      panelProps: {
+        title: 'Update Funding',
+        issues,
+        mode: 'update',
         onSubmit: this.onSubmitBountyAllocation,
         bountySettings: this.props.bountySettings,
-        tokens: this.props.tokens ? this.props.tokens : [],
         closePanel: this.cancelBounties,
+        tokens: this.props.tokens !== undefined ? this.props.tokens : [],
       },
     }))
   }
@@ -549,6 +565,7 @@ class App extends React.PureComponent {
                 onNewIssue={this.newIssue}
                 onCurateIssues={this.curateIssues}
                 onAllocateBounties={this.newBountyAllocation}
+                onUpdateBounty={this.updateBounty}
                 onSubmitWork={this.submitWork}
                 onRequestAssignment={this.requestAssignment}
                 activeIndex={activeIndex}

diff --git a/apps/projects/app/components/App/AppContent.js b/apps/projects/app/components/App/AppContent.js
@@ -93,6 +93,7 @@ AppContent.propTypes = {
   bountySettings: PropTypes.object.isRequired,
   onNewProject: PropTypes.func.isRequired,
   onNewIssue: PropTypes.func.isRequired,
+  onUpdateBounty: PropTypes.func.isRequired,
   activeIndex: PropTypes.object.isRequired,
   changeActiveIndex: PropTypes.func.isRequired,
   status: PropTypes.string.isRequired,

diff --git a/apps/projects/app/components/Card/Issue.js b/apps/projects/app/components/Card/Issue.js
@@ -59,6 +59,7 @@ const Issue = ({
   onRequestAssignment,
   onReviewApplication,
   onAllocateSingleBounty,
+  onUpdateBounty,
   onReviewWork,
   balance,
   symbol,
@@ -104,11 +105,11 @@ const Issue = ({
                 onRequestAssignment={onRequestAssignment}
                 onReviewApplication={onReviewApplication}
                 onReviewWork={onReviewWork}
+                onUpdateBounty={onUpdateBounty}
               />
             </ContextMenu>
           )}
         </div>
-
         <IssueTitleDetailsBalance>
           <IssueTitleDetails>
             <IssueTitle>

diff --git a/apps/projects/app/components/Content/IssueDetail/IssueDetail.js b/apps/projects/app/components/Content/IssueDetail/IssueDetail.js
@@ -28,7 +28,7 @@ export default class IssueDetail extends React.Component {
   }
 
   render() {
-    const { onClose, issue, onReviewApplication, onRequestAssignment, onSubmitWork, onAllocateSingleBounty, onReviewWork } = this.props
+    const { onClose, issue, onReviewApplication, onRequestAssignment, onSubmitWork, onAllocateSingleBounty, onReviewWork, onUpdateBounty } = this.props
 
     return createPortal(
       <div style={issueDetailStyle}>
@@ -40,6 +40,7 @@ export default class IssueDetail extends React.Component {
           onSubmitWork={onSubmitWork}
           onAllocateSingleBounty={onAllocateSingleBounty}
           onReviewWork={onReviewWork}
+          onUpdateBounty={onUpdateBounty}
         />
       </div>,
       this.el

diff --git a/apps/projects/app/components/Content/IssueDetail/components/Detail.js b/apps/projects/app/components/Content/IssueDetail/components/Detail.js
@@ -390,7 +390,6 @@ const Detail = ({
   createdAt,
   expLevel,
   deadline,
-  slots,
   work,
   workStatus,
   onReviewApplication,
@@ -445,6 +444,7 @@ const Detail = ({
                     work={work}
                     workStatus={workStatus}
                     requestsData={requestsData}
+                    onUpdateBounty={onUpdateBounty}
                     onAllocateSingleBounty={onAllocateSingleBounty}
                     onSubmitWork={onSubmitWork}
                     onRequestAssignment={onRequestAssignment}
@@ -509,7 +509,6 @@ const Detail = ({
     </Content>
   )
 }
-
 const DetailsCard = styled.div`
   flex: 0 1 auto;
   text-align: left;

diff --git a/apps/projects/app/components/Content/Issues.js b/apps/projects/app/components/Content/Issues.js
@@ -65,6 +65,10 @@ class Issues extends React.PureComponent {
     this.props.onAllocateBounties([issue])
   }
 
+  handleUpdateBounty = issue => {
+    this.props.onUpdateBounty([issue])
+  }
+
   handleAllocateBounties = () => {
     console.log('handleAllocationBounties:', this.state.selectedIssues)
     this.props.onAllocateBounties(this.state.selectedIssues)
@@ -93,7 +97,7 @@ class Issues extends React.PureComponent {
     if (this.state.allSelected) {
       this.setState({ allSelected: false, selectedIssues: [] })
     } else {
-      this.setState({ allSelected: true, selectedIssues: issuesFiltered })
+      this.setState({ allSelected: true, selectedIssues: this.shapeIssues(issuesFiltered) })
     }
   }
 
@@ -413,6 +417,9 @@ class Issues extends React.PureComponent {
           onAllocateSingleBounty={() => {
             this.handleAllocateSingleBounty(currentIssueShaped)
           }}
+          onUpdateBounty={() => {
+            this.handleUpdateBounty(currentIssueShaped)
+          }}
           onReviewWork={() => {
             this.handleReviewWork(currentIssueShaped)
           }}
@@ -471,6 +478,9 @@ class Issues extends React.PureComponent {
                           onAllocateSingleBounty={() => {
                             this.handleAllocateSingleBounty(issue)
                           }}
+                          onUpdateBounty={() => {
+                            this.handleUpdateBounty(issue)
+                          }}
                           onReviewWork={() => {
                             this.handleReviewWork(issue)
                           }}