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.

Sign up for GitHub

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

Jump to bottom

Update/bid tracker text v2 TM-1746 #946

Merged
merged 8 commits into from
Jun 10, 2020
Merged

Update/bid tracker text v2 TM-1746 #946

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
55c8776
Change text to match past tense success
scott062 May 27, 2020
926186b
Update snapshots for new text
scott062 May 27, 2020
f13549e
Merge branch 'dev' into update/bid-tracker-text
mjoyce91 Jun 3, 2020
9b3d30a
Merge branch 'dev' into update/bid-tracker-text
mjoyce91 Jun 9, 2020
1c2156c
Add bidClassObject to show pending review while waiting on cdo to reg…
scott062 Jun 10, 2020
b390b82
testing ability to commit
elizabeth-jimenez Jun 10, 2020
33fa292
Fix merge conflict
scott062 Jun 10, 2020
00e7ff7
Merge branch 'dev' into update/bid-tracker-text-v2
mjoyce91 Jun 10, 2020
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
51 changes: 41 additions & 10 deletions src/Components/BidTracker/BidPhaseConfig/Complete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ import {
GET_DRAFT_TITLE,
GET_SUBMIT_BID_ACTION_TITLE,
GET_SUBMIT_BID_COMPLETE_TITLE,
GET_HAND_SHAKE_EVALUATE_TITLE,
GET_HAND_SHAKE_EVALUATING_TITLE,
GET_HAND_SHAKE_OFFERED_TITLE,
GET_HAND_SHAKE_ACCEPTED_TITLE,
GET_BID_REVIEW_COMPLETE_TITLE,
GET_PANEL_TITLE,
GET_APPROVAL_TITLE,
DRAFT_NUMBER,
Expand Down Expand Up @@ -50,9 +49,8 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
const DRAFT_TITLE = GET_DRAFT_TITLE();
const SUBMIT_BID_ACTION_TITLE = GET_SUBMIT_BID_ACTION_TITLE();
const SUBMIT_BID_COMPLETE_TITLE = GET_SUBMIT_BID_COMPLETE_TITLE();
const HAND_SHAKE_EVALUATE_TITLE = GET_HAND_SHAKE_EVALUATE_TITLE();
const HAND_SHAKE_EVALUATING_TITLE = GET_HAND_SHAKE_EVALUATING_TITLE();
const HAND_SHAKE_OFFERED_TITLE = GET_HAND_SHAKE_OFFERED_TITLE();
const BID_REVIEW_COMPLETE_TITLE = GET_BID_REVIEW_COMPLETE_TITLE();
const HAND_SHAKE_ACCEPTED_TITLE = GET_HAND_SHAKE_ACCEPTED_TITLE();
const PANEL_TITLE = GET_PANEL_TITLE();
const APPROVAL_TITLE = GET_APPROVAL_TITLE();
Expand Down Expand Up @@ -81,7 +79,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
...DEFAULT_INCOMPLETE_OBJECT,
date: HAND_SHAKE_OFFERED_DATE,
title: HAND_SHAKE_EVALUATE_TITLE,
title: HAND_SHAKE_EVALUATING_TITLE,
number: HAND_SHAKE_OFFERED_NUMBER };
bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
...DEFAULT_INCOMPLETE_OBJECT,
Expand All @@ -106,6 +104,39 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
// or when they've declined it.
case SUBMITTED_PROP:
case HAND_SHAKE_OFFERED_PROP:
bidClassObject.stages[DRAFT_PROP] = Object.assign(
{},
DEFAULT_COMPLETE_OBJECT,
{ number: DRAFT_NUMBER, date: DRAFT_DATE, title: DRAFT_TITLE },
);
bidClassObject.stages[SUBMITTED_PROP] = {
...DEFAULT_COMPLETE_OBJECT,
date: SUBMITTED_DATE,
title: SUBMIT_BID_COMPLETE_TITLE,
number: SUBMITTED_NUMBER };
bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
...DEFAULT_INCOMPLETE_OBJECT,
date: HAND_SHAKE_OFFERED_DATE,
title: HAND_SHAKE_EVALUATING_TITLE,
needsAction: false,
isCurrent: true,
number: HAND_SHAKE_OFFERED_NUMBER };
bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
...DEFAULT_INCOMPLETE_OBJECT,
date: HAND_SHAKE_ACCEPTED_DATE,
title: HAND_SHAKE_ACCEPTED_TITLE,
number: HAND_SHAKE_ACCEPTED_NUMBER };
bidClassObject.stages[IN_PANEL_PROP] = {
...DEFAULT_INCOMPLETE_OBJECT,
date: IN_PANEL_DATE,
title: PANEL_TITLE,
number: IN_PANEL_NUMBER };
bidClassObject.stages[APPROVED_PROP] = {
...DEFAULT_INCOMPLETE_OBJECT,
date: APPROVED_DATE,
title: APPROVAL_TITLE,
number: APPROVED_NUMBER };
return bidClassObject;
case HAND_SHAKE_DECLINED_PROP:
case CLOSED_PROP:
bidClassObject.stages[DRAFT_PROP] = Object.assign(
Expand All @@ -121,7 +152,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
...DEFAULT_INCOMPLETE_OBJECT,
date: HAND_SHAKE_OFFERED_DATE,
title: HAND_SHAKE_EVALUATING_TITLE,
title: BID_REVIEW_COMPLETE_TITLE,
needsAction: false,
isCurrent: true,
number: HAND_SHAKE_OFFERED_NUMBER };
Expand Down Expand Up @@ -155,7 +186,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
...DEFAULT_COMPLETE_OBJECT,
date: HAND_SHAKE_OFFERED_DATE,
title: HAND_SHAKE_OFFERED_TITLE,
title: BID_REVIEW_COMPLETE_TITLE,
number: SUBMITTED_NUMBER };
bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
...DEFAULT_COMPLETE_OBJECT,
Expand Down Expand Up @@ -194,7 +225,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
...DEFAULT_COMPLETE_OBJECT,
date: HAND_SHAKE_OFFERED_DATE,
title: HAND_SHAKE_OFFERED_TITLE,
title: BID_REVIEW_COMPLETE_TITLE,
number: SUBMITTED_NUMBER };
bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
...DEFAULT_COMPLETE_OBJECT,
Expand Down Expand Up @@ -233,7 +264,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
...DEFAULT_COMPLETE_OBJECT,
date: HAND_SHAKE_OFFERED_DATE,
title: HAND_SHAKE_OFFERED_TITLE,
title: BID_REVIEW_COMPLETE_TITLE,
number: SUBMITTED_NUMBER };
bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
...DEFAULT_COMPLETE_OBJECT,
Expand Down Expand Up @@ -273,7 +304,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
...DEFAULT_COMPLETE_OBJECT,
date: HAND_SHAKE_OFFERED_DATE,
title: HAND_SHAKE_OFFERED_TITLE,
title: BID_REVIEW_COMPLETE_TITLE,
number: SUBMITTED_NUMBER };
bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
...DEFAULT_COMPLETE_OBJECT,
Expand Down
4 changes: 0 additions & 4 deletions src/Components/BidTracker/BidPhaseConfig/Limited.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { keys } from 'lodash';
import {
HAND_SHAKE_OFFERED_PROP,
GET_HAND_SHAKE_EVALUATING_TITLE,
} from '../../../Constants/BidData';
import getBidObject from './Complete';

Expand All @@ -16,9 +15,6 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
return false;
}

const HAND_SHAKE_EVALUATING_TITLE = GET_HAND_SHAKE_EVALUATING_TITLE();

bidClassObject$.stages[HAND_SHAKE_OFFERED_PROP].title = HAND_SHAKE_EVALUATING_TITLE;
bidClassObject$.stages[HAND_SHAKE_OFFERED_PROP].date = null;

return bidClassObject$;
Expand Down
4 changes: 2 additions & 2 deletions src/Components/BidTracker/BidStep/__snapshots__/BidSteps.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ exports[`BidStepsComponent matches snapshot 1`] = `
<div
className="step-title-main-text"
>
Pending Review
Bid Reviewed
</div>
<div
className="step-title-sub-text"
Expand Down Expand Up @@ -165,7 +165,7 @@ exports[`BidStepsComponent matches snapshot 1`] = `
<div
className="step-title-main-text"
>
Panel
Panel Scheduled
</div>
<div
className="step-title-sub-text"
Expand Down
6 changes: 4 additions & 2 deletions src/Constants/BidData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ export const GET_SUBMIT_BID_ACTION_TITLE = () => ['Submit Bid'];
export const GET_SUBMIT_BID_COMPLETE_TITLE = () => ['Bid Submitted'];
export const GET_HAND_SHAKE_EVALUATE_TITLE = () => ['Evaluate Bid'];
export const GET_HAND_SHAKE_EVALUATING_TITLE = () => ['Pending Review'];
export const GET_BID_REVIEW_COMPLETE_TITLE = () => ['Bid Reviewed'];
export const GET_HAND_SHAKE_OFFERED_TITLE = () => ['Handshake Offered'];
export const GET_HAND_SHAKE_ACCEPTED_TITLE = () => ['Handshake Accepted'];
export const GET_HAND_SHAKE_NEEDS_REGISTER_TITLE = () => ['Register Handshake'];
export const GET_PANEL_TITLE = () => ['Panel'];
export const GET_APPROVAL_TITLE = () => ['Approval'];
export const GET_HAND_SHAKE_COMPLETE_REGISTER_TITLE = () => ['Handshake Registered'];
export const GET_PANEL_TITLE = () => ['Panel Scheduled'];
export const GET_APPROVAL_TITLE = () => ['Assignment Approved'];