need to test OrgPosItem && VoterPosItem

wevote · Jun 23, 2018 · cfe2fb9 · cfe2fb9
1 parent 8166bb5
commit cfe2fb9
Show file tree

Hide file tree

Showing 7 changed files with 229 additions and 154 deletions.
diff --git a/src/js/components/Ballot/CandidateItem.jsx b/src/js/components/Ballot/CandidateItem.jsx
@@ -203,7 +203,11 @@ export default class CandidateItem extends Component {
               this.goToCandidateLink : null }
           >
           { contest_office_name ?
-          <OfficeNameText political_party={party} contest_office_name={contest_office_name} /> :
+          <OfficeNameText
+            political_party={party}
+            contest_office_name={contest_office_name}
+            office_link={this.getOfficeLink()}
+          /> :
             null
           }
           </p>

diff --git a/src/js/components/Twitter/TwitterSignIn.jsx b/src/js/components/Twitter/TwitterSignIn.jsx
@@ -10,12 +10,7 @@ import TwitterActions from "../../actions/TwitterActions";
 
 const returnURL = webAppConfig.WE_VOTE_URL_PROTOCOL + webAppConfig.WE_VOTE_HOSTNAME + "/twitter_sign_in";
 
-export default class TwitterSignIn extends Component {
-  static propTypes = {
-    buttonText: PropTypes.string,
-    className: PropTypes.string,
-  };
-
+class TwitterSignIn extends Component {
   constructor (props) {
     super(props);
     this.state = {
@@ -150,3 +145,11 @@ export default class TwitterSignIn extends Component {
     </Button>;
   }
 }
+
+TwitterSignIn.propTypes = {
+  buttonText: PropTypes.string,
+  className: PropTypes.string,
+};
+
+export default TwitterSignIn;
+
diff --git a/src/js/components/VoterGuide/OrganizationPositionItem.jsx b/src/js/components/VoterGuide/OrganizationPositionItem.jsx
@@ -15,6 +15,7 @@ import PositionSupportOpposeSnippet from "../Widgets/PositionSupportOpposeSnippe
 import { capitalizeString } from "../../utils/textFormat";
 import SupportStore from "../../stores/SupportStore";
 import VoterStore from "../../stores/VoterStore";
+import CandidateStore from "../../stores/CandidateStore";
 
 export default class OrganizationPositionItem extends Component {
   static propTypes = {
@@ -183,12 +184,14 @@ export default class OrganizationPositionItem extends Component {
     }
 
     // const onEditPositionClick = this.state.showEditPositionModal ? this.closeEditPositionModal.bind(this) : this.openEditPositionModal.bind(this);
-    var contest_office_name;
-    var political_party;
+    let contest_office_name;
+    let political_party;
     if (position.kind_of_ballot_item === "CANDIDATE") {
       contest_office_name = position.contest_office_name;
       political_party = position.ballot_item_political_party;
     }
+    //CHICHI
+    let { office_we_vote_id } = CandidateStore.getCandidate(position.ballot_item_we_vote_id);
     return <li className="position-item card-child">
 
       { is_candidate && !this.props.turnOffLogo ?
@@ -226,7 +229,11 @@ export default class OrganizationPositionItem extends Component {
             </div> :
             null }
           { position.kind_of_ballot_item === "CANDIDATE" && contest_office_name !== undefined ?
-            <OfficeNameText political_party={political_party} contest_office_name={contest_office_name} /> :
+            <OfficeNameText
+              political_party={political_party}
+              contest_office_name={contest_office_name}
+              office_link={"/office/" + office_we_vote_id}
+            /> :
             null
           }
           {/* show explicit position, if available, otherwise show rating */}

diff --git a/src/js/components/VoterGuide/OrganizationVoterGuideCandidateItem.jsx b/src/js/components/VoterGuide/OrganizationVoterGuideCandidateItem.jsx
@@ -212,7 +212,11 @@ export default class OrganizationVoterGuideCandidateItem extends Component {
               this.goToCandidateLink : null }
           >
           { contest_office_name ?
-          <OfficeNameText political_party={party} contest_office_name={contest_office_name} /> :
+          <OfficeNameText
+            political_party={party}
+            contest_office_name={contest_office_name}
+            office_link={this.getOfficeLink()}
+          /> :
             null
           }
           </p>

diff --git a/src/js/components/VoterGuide/VoterPositionItem.jsx b/src/js/components/VoterGuide/VoterPositionItem.jsx
@@ -11,6 +11,7 @@ import PositionRatingSnippet from "../Widgets/PositionRatingSnippet";
 import PositionPublicToggle from "../Widgets/PositionPublicToggle";
 import PositionSupportOpposeSnippet from "../Widgets/PositionSupportOpposeSnippet";
 import SupportStore from "../../stores/SupportStore";
+import CandidateStore from "../../stores/CandidateStore";
 import { capitalizeString } from "../../utils/textFormat";
 
 export default class VoterPositionItem extends Component {
@@ -70,9 +71,8 @@ export default class VoterPositionItem extends Component {
 
   render () {
     renderLog(__filename);
-    let position = this.props.position;
 
-    let { stance_display_off, comment_text_off, popover_off, placement } = this.props;
+    let { position, stance_display_off, comment_text_off, popover_off, placement } = this.props;
     const { supportProps } = this.state;
 
     let statement_text;
@@ -124,6 +124,8 @@ export default class VoterPositionItem extends Component {
       contest_office_name = position.contest_office_name;
       political_party = position.ballot_item_political_party;
     }
+    //CHICHI
+    let { office_we_vote_id } = CandidateStore.getCandidate(position.ballot_item_we_vote_id);
     return <li className="position-item card-child">
       <BookmarkToggle we_vote_id={position.ballot_item_we_vote_id} type={position.kind_of_ballot_item} />
       <div className="card-child__media-object-anchor">
@@ -150,7 +152,11 @@ export default class VoterPositionItem extends Component {
           </Link>
           <br />
             { position.kind_of_ballot_item === "CANDIDATE" && contest_office_name !== undefined ?
-            <OfficeNameText political_party={political_party} contest_office_name={contest_office_name} /> :
+            <OfficeNameText
+              political_party={political_party}
+              contest_office_name={contest_office_name}
+              office_link={"/office/" + office_we_vote_id}
+            /> :
               null
             }
           {/* show explicit position, if available, otherwise show rating */}

diff --git a/src/js/components/Widgets/OfficeNameText.jsx b/src/js/components/Widgets/OfficeNameText.jsx
@@ -1,11 +1,13 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
+import { Link } from "react-router";
 import { renderLog } from "../../utils/logging";
 
 export default class OfficeNameText extends Component {
   static propTypes = {
     political_party: PropTypes.string,
     contest_office_name: PropTypes.string,
+    office_link: PropTypes.string,
   };
 
   constructor (props) {
@@ -25,13 +27,13 @@ export default class OfficeNameText extends Component {
     let { contest_office_name, political_party } = this.props;
     if (political_party === undefined) {
       nameText = <span className="no-political-party">
-      Candidate for <span className="candidate-card-main__office">
-      { contest_office_name } </span> </span>;
+      Candidate for <Link to={this.props.office_link || "/office"}><span className="candidate-card-main__office">
+      { contest_office_name } </span></Link> </span>;
     } else {
       nameText = <span> <span className="card-main__political-party u-bold u-gray-darker">
-      {political_party} </span> candidate for <span className="candidate-card-main__office u-bold u-gray-darker">
+      {political_party} </span> candidate for <Link to={this.props.office_link || "/office"}><span className="candidate-card-main__office u-bold u-gray-darker">
         { contest_office_name }
-      </span></span>;
+      </span></Link></span>;
     }
 
     return nameText;