Merge pull request #676 from getguesstimate/delete-facts

Adds fact deletion logic and buttons.

src/components/organizations/show/facts/factRow.js

@@ -6,7 +6,7 @@ import Histogram from 'gComponents/simulations/histogram/index'
 
 import './facts.css'
 
-export const FactRow = ({fact, onEdit}) => (
+export const FactRow = ({fact, onEdit, onDelete}) => (
   <div className='Fact'>
     <div className='row'>
       <div className='col-md-3'>
@@ -16,15 +16,16 @@ export const FactRow = ({fact, onEdit}) => (
           cutOffRatio={0.995}
         />
       </div>
-      <div className='col-md-6'><span className='name'>{fact.name}</span></div>
+      <div className='col-md-5'><span className='name'>{fact.name}</span></div>
       <div className='col-md-2'>
         <div className='variableName'>
           <span className='prefix'>#</span>
           <span className='variable'>{fact.variable_name}</span>
         </div>
       </div>
-      <div className='col-md-1'>
+      <div className='col-md-2'>
         <span className='ui button options' onClick={onEdit}>Edit</span>
+        <span className='ui button options' onClick={onDelete}>Delete</span>
       </div>
     </div>
   </div>

src/components/organizations/show/facts/facts.js

@@ -22,6 +22,7 @@ export class FactBookTab extends Component {
         key={fact.id}
         fact={fact}
         onEdit={() => {this.setState({editingFactId: fact.id})}}
+        onDelete={() => {this.props.onDeleteFact(fact)}}
       />
     )
   }

src/components/organizations/show/index.js

@@ -146,6 +146,7 @@ export default class OrganizationShow extends Component{
 
             {(openTab === FACT_BOOK_TAB) && meIsMember && !!facts &&
               <FactBookTab
+                onDeleteFact={fact => this.props.dispatch(organizationActions.deleteFact(organization, fact))}
                 onAddFact={fact => this.props.dispatch(organizationActions.addFact(organization, fact))}
                 onEditFact={fact => this.props.dispatch(organizationActions.editFact(organization, fact))}
                 facts={facts}

src/lib/guesstimate_api/resources/Organizations.js

@@ -39,6 +39,13 @@ export default class Organizations extends AbstractResource {
     this.guesstimateMethod({url, method, data})(callback)
   }
 
+  deleteFact({id}, fact, callback) {
+    const url = `organizations/${id}/facts/${fact.id}`
+    const method = 'DELETE'
+
+    this.guesstimateMethod({url, method})(callback)
+  }
+
   getInvitations({organizationId}, callback) {
     const url = `organizations/${organizationId}/invitees`
     const method = 'GET'

src/modules/facts/actions.js

@@ -18,3 +18,7 @@ export function loadByOrg(facts) {
 export function addToOrg(organizationVariableName, fact) {
   return {type: 'ADD_FACT_TO_ORG', organizationVariableName, fact: withSortedValues(fact)}
 }
+
+export function deleteFromOrg(organizationVariableName, {id}) {
+  return {type: 'DELETE_FACT_FROM_ORG', organizationVariableName, id}
+}

src/modules/facts/reducer.js

@@ -33,6 +33,20 @@ export function factsR(state = INITIAL_STATE, action) {
         ],
       }
     }
+    case 'DELETE_FACT_FROM_ORG': {
+      const organizationFact = state.organizationFacts.find(e => e.variable_name === action.organizationVariableName)
+      const children = !!organizationFact ? organizationFact.children.filter(c => c.id !== action.id) : []
+      return {
+        ...state,
+        organizationFacts: [
+          {
+            variable_name: action.organizationVariableName,
+            children,
+          },
+          ...state.organizationFacts.filter(e => e.variable_name !== action.organizationVariableName)
+        ],
+      }
+    }
     case 'SUGGEST_FACT':
       return {
         ...state,

src/modules/organizations/actions.js

@@ -113,3 +113,15 @@ export function editFact(organization, rawFact) {
     })
   }
 }
+
+export function deleteFact(organization, fact) {
+  return (dispatch, getState) => {
+    api(getState()).organizations.deleteFact(organization, fact, (err, serverFact) => {
+      if (err) {
+        captureApiError('OrganizationsFactDestroy', err.jqXHR, err.textStatus, err, {url: 'destroyOrganizationMember'})
+      } else {
+        dispatch(factActions.deleteFromOrg(organizationReadableId(organization), fact))
+      }
+    })
+  }
+}