Merge pull request #863 from MetaPhase-Consulting/fix/bid-tracker-url

Fix bid tracker URL
MetaPhase-Consulting · Apr 29, 2020 · 1cd3263 · 1cd3263
2 parents f2c43ff + 90affee
commit 1cd3263
Show file tree

Hide file tree

Showing 15 changed files with 80 additions and 37 deletions.
diff --git a/src/Components/BidTracker/BidTrackerCard/BidTrackerCard.jsx b/src/Components/BidTracker/BidTrackerCard/BidTrackerCard.jsx
@@ -28,7 +28,7 @@ class BidTrackerCard extends Component {
   }
   render() {
     const { bid, acceptBid, condensedView, declineBid, priorityExists, submitBid, deleteBid,
-      registerHandshake, showBidCount, /* userProfile, */ useCDOView } = this.props;
+      registerHandshake, showBidCount, /* userProfile, */ useCDOView, userId } = this.props;
     // determine whether we render an alert on top of the card
     const showAlert = shouldShowAlert(bid, { condensedView });
     // determine whether we should show the contacts section based on the status
@@ -68,6 +68,7 @@ class BidTrackerCard extends Component {
                   declineBid={declineBid}
                   submitBid={submitBid}
                   deleteBid={deleteBid}
+                  userId={userId}
                   registerHandshake={registerHandshake}
                 />
             }
@@ -112,6 +113,7 @@ BidTrackerCard.propTypes = {
   priorityExists: PropTypes.bool,
   useCDOView: PropTypes.bool,
   readOnly: PropTypes.bool,
+  userId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 };
 
 BidTrackerCard.defaultProps = {
@@ -123,6 +125,7 @@ BidTrackerCard.defaultProps = {
   priorityExists: false,
   useCDOView: false,
   readOnly: false,
+  userId: '',
 };
 
 BidTrackerCard.childContextTypes = {

diff --git a/src/Components/BidTracker/BidTrackerCard/__snapshots__/BidTrackerCard.test.jsx.snap b/src/Components/BidTracker/BidTrackerCard/__snapshots__/BidTrackerCard.test.jsx.snap
@@ -188,6 +188,7 @@ exports[`BidTrackerCardComponent matches snapshot 1`] = `
         deleteBid={[Function]}
         registerHandshake={[Function]}
         submitBid={[Function]}
+        userId=""
       />
     </div>
   </div>

diff --git a/...ts/BidTracker/BidTrackerCardContainer/__snapshots__/BidTrackerCardContainer.test.jsx.snap b/...ts/BidTracker/BidTrackerCardContainer/__snapshots__/BidTrackerCardContainer.test.jsx.snap
@@ -66,6 +66,7 @@ exports[`BidTrackerCardContainerComponent matches snapshot when priorityExists i
     showBidCount={true}
     submitBid={[Function]}
     useCDOView={false}
+    userId=""
     userProfile={
       Object {
         "bid_statistics": Array [
@@ -261,6 +262,7 @@ exports[`BidTrackerCardContainerComponent matches snapshot when priorityExists i
       showBidCount={false}
       submitBid={[Function]}
       useCDOView={false}
+      userId=""
       userProfile={
         Object {
           "bid_statistics": Array [

diff --git a/src/Components/BidTracker/OverlayAlert/ClosedAlert/ClosedAlert.jsx b/src/Components/BidTracker/OverlayAlert/ClosedAlert/ClosedAlert.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import LinkButton from '../../../LinkButton';
 
 
-const ClosedAlert = ({ title, date, id }, { condensedView }) => (
+const ClosedAlert = ({ title, date, bidIdUrl }, { condensedView }) => (
   <div className="bid-tracker-alert-container bid-tracker-alert-container--closed">
     <div className="top-text">
         Your bid  on {title} is no longer applicable.
@@ -17,7 +17,7 @@ const ClosedAlert = ({ title, date, id }, { condensedView }) => (
     {
       condensedView &&
       <div className="usa-grid-full">
-        <LinkButton toLink={`/profile/bidtracker/${id || ''}`} className="tm-button-transparent">
+        <LinkButton toLink={bidIdUrl} className="tm-button-transparent">
           Go to Bid Tracker
         </LinkButton>
       </div>
@@ -28,12 +28,12 @@ const ClosedAlert = ({ title, date, id }, { condensedView }) => (
 ClosedAlert.propTypes = {
   title: PropTypes.string.isRequired,
   date: PropTypes.string,
-  id: PropTypes.number,
+  bidIdUrl: PropTypes.string,
 };
 
 ClosedAlert.defaultProps = {
-  id: 0,
   date: '',
+  bidIdUrl: '',
 };
 
 ClosedAlert.contextTypes = {

diff --git a/src/Components/BidTracker/OverlayAlert/DeclinedAlert/DeclinedAlert.jsx b/src/Components/BidTracker/OverlayAlert/DeclinedAlert/DeclinedAlert.jsx
@@ -2,15 +2,15 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import LinkButton from '../../../LinkButton';
 
-const DeclinedAlert = ({ bureau, id }, { condensedView }) => (
+const DeclinedAlert = ({ bureau, bidIdUrl }, { condensedView }) => (
   <div className="bid-tracker-alert-container bid-tracker-alert-container--declined">
     <div className="top-text">
       {bureau || 'The bureau'} has <strong>declined</strong> the bid
     </div>
     {
       condensedView &&
       <div className="usa-grid-full">
-        <LinkButton toLink={`/profile/bidtracker/${id || ''}`} className="tm-button-transparent">
+        <LinkButton toLink={bidIdUrl} className="tm-button-transparent">
           Go to Bid Tracker
         </LinkButton>
       </div>
@@ -20,11 +20,11 @@ const DeclinedAlert = ({ bureau, id }, { condensedView }) => (
 
 DeclinedAlert.propTypes = {
   bureau: PropTypes.string.isRequired,
-  id: PropTypes.number,
+  bidIdUrl: PropTypes.string,
 };
 
 DeclinedAlert.defaultProps = {
-  id: 0,
+  bidIdUrl: '',
 };
 
 DeclinedAlert.contextTypes = {

diff --git a/src/Components/BidTracker/OverlayAlert/HandshakeDeclinedAlert/HandshakeDeclinedAlert.jsx b/src/Components/BidTracker/OverlayAlert/HandshakeDeclinedAlert/HandshakeDeclinedAlert.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import LinkButton from '../../../LinkButton';
 
-const HandshakeDeclinedAlert = ({ userName, bureau, id }, { condensedView }) => (
+const HandshakeDeclinedAlert = ({ userName, bureau, bidIdUrl }, { condensedView }) => (
   <div
     className="bid-tracker-alert-container bid-tracker-alert-container--handshake-declined"
   >
@@ -17,7 +17,7 @@ const HandshakeDeclinedAlert = ({ userName, bureau, id }, { condensedView }) =>
     {
       condensedView &&
       <div className="usa-grid-full">
-        <LinkButton toLink={`/profile/bidtracker/${id || ''}`} className="tm-button-transparent">
+        <LinkButton toLink={bidIdUrl} className="tm-button-transparent">
           Go to Bid Tracker
         </LinkButton>
       </div>
@@ -28,11 +28,11 @@ const HandshakeDeclinedAlert = ({ userName, bureau, id }, { condensedView }) =>
 HandshakeDeclinedAlert.propTypes = {
   userName: PropTypes.string.isRequired,
   bureau: PropTypes.string.isRequired,
-  id: PropTypes.number,
+  bidIdUrl: PropTypes.string,
 };
 
 HandshakeDeclinedAlert.defaultProps = {
-  id: 0,
+  bidIdUrl: '',
 };
 
 HandshakeDeclinedAlert.contextTypes = {

diff --git a/src/Components/BidTracker/OverlayAlert/HandshakeOfferedAlert/HandshakeOfferedAlert.jsx b/src/Components/BidTracker/OverlayAlert/HandshakeOfferedAlert/HandshakeOfferedAlert.jsx
@@ -15,15 +15,15 @@ class HandshakeOfferedAlert extends Component {
   };
 
   render() {
-    const { userName, id } = this.props;
+    const { userName, bidIdUrl } = this.props;
     const { condensedView } = this.context;
     return (
       <div className="bid-tracker-alert-container bid-tracker-alert-container--handshake-offered">
         <div className="top-text">{`${userName}, you've been offered a handshake`}</div>
         <div className="usa-grid-full">
           {
             condensedView ?
-              <LinkButton toLink={`/profile/bidtracker/${id}`} className="tm-button-transparent">
+              <LinkButton toLink={bidIdUrl} className="tm-button-transparent">
                 Go to Bid Tracker
               </LinkButton>
               :
@@ -46,6 +46,11 @@ HandshakeOfferedAlert.propTypes = {
   userName: PropTypes.string.isRequired,
   acceptBid: PropTypes.func.isRequired,
   declineBid: PropTypes.func.isRequired,
+  bidIdUrl: PropTypes.string,
+};
+
+HandshakeOfferedAlert.defaultProps = {
+  bidIdUrl: '',
 };
 
 HandshakeOfferedAlert.contextTypes = {

diff --git a/src/Components/BidTracker/OverlayAlert/OverlayAlert.jsx b/src/Components/BidTracker/OverlayAlert/OverlayAlert.jsx
@@ -1,23 +1,24 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { BID_OBJECT } from '../../../Constants/PropTypes';
+import { BID_OBJECT } from 'Constants/PropTypes';
 import { APPROVED_PROP, CLOSED_PROP, HAND_SHAKE_OFFERED_PROP, DRAFT_PROP,
-  HAND_SHAKE_DECLINED_PROP, IN_PANEL_PROP, DECLINED_PROP, PANEL_RESCHEDULED_PROP, HAND_SHAKE_NEEDS_REGISTER_PROP } from '../../../Constants/BidData';
+  HAND_SHAKE_DECLINED_PROP, IN_PANEL_PROP, DECLINED_PROP, PANEL_RESCHEDULED_PROP,
+  HAND_SHAKE_NEEDS_REGISTER_PROP } from 'Constants/BidData';
 import ApprovedAlert from './ApprovedAlert';
 import HandshakeOfferedAlert from './HandshakeOfferedAlert';
 import InPanelAlert from './InPanelAlert';
 import HandshakeDeclinedAlert from './HandshakeDeclinedAlert';
 import DeclinedAlert from './DeclinedAlert';
 import ClosedAlert from './ClosedAlert';
 import PanelRescheduledAlert from './PanelRescheduledAlert';
-import DraftAlert from './DraftAlert';
 import HandshakeRegisterAlert from './HandshakeRegisterAlert';
+import DraftAlert from './DraftAlert';
+import { getBidIdUrl } from './helpers';
 
 // Alert rendering based on status is handled here.
 // eslint-disable-next-line complexity
-const OverlayAlert = (
-  { bid, acceptBid, declineBid, submitBid, registerHandshake },
-  { condensedView }) => {
+const OverlayAlert = ({ bid, acceptBid, declineBid, submitBid, userId, registerHandshake },
+  { condensedView, readOnly }) => {
   const CLASS_PENDING = 'bid-tracker-overlay-alert--pending';
   const CLASS_SUCCESS = 'bid-tracker-overlay-alert--success';
   const CLASS_CLOSED = 'bid-tracker-overlay-alert--closed';
@@ -27,6 +28,8 @@ const OverlayAlert = (
   const { position } = bid;
   const BID_TITLE = `${position.title}${position.position_number ? ` (${position.position_number})` : ''}`;
 
+  const bidIdUrl = getBidIdUrl(bid.id, readOnly, userId);
+
   let overlayClass = '';
   let overlayContent = '';
 
@@ -50,7 +53,6 @@ const OverlayAlert = (
       overlayClass = CLASS_REGISTER;
       overlayContent = (
         <HandshakeRegisterAlert
-          id={bid.id}
           registerHandshake={registerHandshake}
           bid={bid}
         />);
@@ -66,6 +68,7 @@ const OverlayAlert = (
           userName={bid.user}
           acceptBid={acceptBid}
           declineBid={declineBid}
+          bidIdUrl={bidIdUrl}
         />
       );
       break;
@@ -78,17 +81,22 @@ const OverlayAlert = (
         <HandshakeDeclinedAlert
           userName={bid.user}
           bureau={position.bureau}
-          id={bid.id}
+          bidIdUrl={bidIdUrl}
         />
       );
       break;
     case DECLINED_PROP:
       overlayClass = CLASS_CLOSED;
-      overlayContent = <DeclinedAlert bureau={position.bureau} id={bid.id} />;
+      overlayContent = <DeclinedAlert bureau={position.bureau} id={bid.id} bidIdUrl={bidIdUrl} />;
       break;
     case CLOSED_PROP:
       overlayClass = CLASS_CLOSED;
-      overlayContent = <ClosedAlert title={BID_TITLE} date={bid.closed_date} id={bid.id} />;
+      overlayContent =
+        (<ClosedAlert
+          title={BID_TITLE}
+          date={bid.closed_date}
+          bidIdUrl={bidIdUrl}
+        />);
       break;
     case PANEL_RESCHEDULED_PROP:
       overlayClass = CLASS_PENDING;
@@ -98,7 +106,6 @@ const OverlayAlert = (
       overlayClass = CLASS_DRAFT;
       overlayContent = (
         <DraftAlert
-          id={bid.id}
           bid={bid}
           submitBid={submitBid}
         />);
@@ -122,11 +129,17 @@ OverlayAlert.propTypes = {
   acceptBid: PropTypes.func.isRequired,
   declineBid: PropTypes.func.isRequired,
   submitBid: PropTypes.func.isRequired,
+  userId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   registerHandshake: PropTypes.func.isRequired,
 };
 
+OverlayAlert.defaultProps = {
+  userId: '',
+};
+
 OverlayAlert.contextTypes = {
   condensedView: PropTypes.bool,
+  readOnly: PropTypes.bool,
 };
 
 export default OverlayAlert;
diff --git a/src/Components/BidTracker/OverlayAlert/__snapshots__/OverlayAlert.test.jsx.snap b/src/Components/BidTracker/OverlayAlert/__snapshots__/OverlayAlert.test.jsx.snap
@@ -27,8 +27,8 @@ exports[`OverlayAlertComponent matches snapshot when type is "closed" 1`] = `
       className="bid-tracker-overlay-alert-content"
     >
       <ClosedAlert
+        bidIdUrl="/profile/bidtracker/3"
         date="2017-12-20"
-        id={3}
         title="POLITICAL/ECONOMIC OFFICER (10035561)"
       />
     </div>
@@ -47,6 +47,7 @@ exports[`OverlayAlertComponent matches snapshot when type is "declined" 1`] = `
       className="bid-tracker-overlay-alert-content"
     >
       <DeclinedAlert
+        bidIdUrl="/profile/bidtracker/3"
         bureau="(AF) BUREAU OF AFRICAN AFFAIRS"
         id={3}
       />
@@ -117,7 +118,6 @@ exports[`OverlayAlertComponent matches snapshot when type is "draft" 1`] = `
             "user": "rehmant",
           }
         }
-        id={3}
         submitBid={[Function]}
       />
     </div>
@@ -150,8 +150,8 @@ exports[`OverlayAlertComponent matches snapshot when type is "handshake_declined
       className="bid-tracker-overlay-alert-content"
     >
       <HandshakeDeclinedAlert
+        bidIdUrl="/profile/bidtracker/3"
         bureau="(AF) BUREAU OF AFRICAN AFFAIRS"
-        id={3}
         userName="rehmant"
       />
     </div>
@@ -221,7 +221,6 @@ exports[`OverlayAlertComponent matches snapshot when type is "handshake_needs_re
             "user": "rehmant",
           }
         }
-        id={3}
         registerHandshake={[Function]}
       />
     </div>
@@ -241,6 +240,7 @@ exports[`OverlayAlertComponent matches snapshot when type is "handshake_offered"
     >
       <HandshakeOfferedAlert
         acceptBid={[Function]}
+        bidIdUrl="/profile/bidtracker/3"
         declineBid={[Function]}
         id={3}
         userName="rehmant"

diff --git a/src/Components/BidTracker/OverlayAlert/helpers.js b/src/Components/BidTracker/OverlayAlert/helpers.js
@@ -0,0 +1,12 @@
+export const getBidIdUrl = (id = '', isPublic = false, userId = '') => {
+  let url = '/profile/bidtracker';
+  if (isPublic && userId) {
+    url = `${url}/public/${userId}`;
+  }
+  if (id) {
+    url = `${url}/${id}`;
+  }
+  return url;
+};
+
+export default getBidIdUrl;
diff --git a/src/Components/ProfileDashboard/BidList/BidList.jsx b/src/Components/ProfileDashboard/BidList/BidList.jsx
@@ -28,6 +28,7 @@ const BidList = ({ bids, submitBidPosition, deleteBid, registerHandshake, isLoad
       deleteBid={deleteBid}
       priorityExists={doesPriorityExist}
       readOnly={isPublic}
+      userId={userId}
     />
   ));
   return (

diff --git a/src/Components/ProfileDashboard/BidList/__snapshots__/BidList.test.jsx.snap b/src/Components/ProfileDashboard/BidList/__snapshots__/BidList.test.jsx.snap
@@ -99,6 +99,7 @@ exports[`BidListComponent matches snapshot 1`] = `
         showBidCount={true}
         submitBid={[Function]}
         useCDOView={false}
+        userId=""
       />
       <BidTrackerCard
         acceptBid={[Function]}
@@ -163,6 +164,7 @@ exports[`BidListComponent matches snapshot 1`] = `
         showBidCount={true}
         submitBid={[Function]}
         useCDOView={false}
+        userId=""
       />
       <BidTrackerCard
         acceptBid={[Function]}
@@ -230,6 +232,7 @@ exports[`BidListComponent matches snapshot 1`] = `
         showBidCount={true}
         submitBid={[Function]}
         useCDOView={false}
+        userId=""
       />
     </div>
     <div