maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-31 02:26:50 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Transition ref rename: review by customer first -> review 1 by customer

Browse source
This commit is contained in:
Kimmo Puputti 2018-01-11 15:30:52 +02:00
parent f58ccf6a72
commit 217bd92bfc
4 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/ActivityFeed/ActivityFeed.example.js
View file

@ -14,11 +14,11 @@ import {
TRANSITION_DECLINE, TRANSITION_DECLINE,
TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_EXPIRE_REVIEW_PERIOD,
TRANSITION_REQUEST, TRANSITION_REQUEST,
TRANSITION_REVIEW_1_BY_CUSTOMER,
TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_CUSTOMER,
TX_TRANSITION_ACTOR_PROVIDER, TX_TRANSITION_ACTOR_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
} from '../../util/types'; } from '../../util/types';
import ActivityFeed from './ActivityFeed'; import ActivityFeed from './ActivityFeed';
@ -216,7 +216,7 @@ export const WithAReviewFromBothUsers = {
createTxTransition({ createTxTransition({
at: new Date(Date.UTC(2017, 10, 9, 8, 10)), at: new Date(Date.UTC(2017, 10, 9, 8, 10)),
by: TX_TRANSITION_ACTOR_CUSTOMER, by: TX_TRANSITION_ACTOR_CUSTOMER,
transition: TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST, transition: TRANSITION_REVIEW_1_BY_CUSTOMER,
}), }),
createTxTransition({ createTxTransition({
at: new Date(Date.UTC(2017, 10, 10, 8, 10)), at: new Date(Date.UTC(2017, 10, 10, 8, 10)),

12
src/components/ActivityFeed/ActivityFeed.js
View file

@ -14,11 +14,11 @@ import {
TRANSITION_EXPIRE, TRANSITION_EXPIRE,
TRANSITION_REQUEST, TRANSITION_REQUEST,
TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REQUEST_AFTER_ENQUIRY,
TRANSITION_REVIEW_1_BY_CUSTOMER,
TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_ACTOR_CUSTOMER, TX_TRANSITION_ACTOR_CUSTOMER,
TX_TRANSITION_ACTOR_PROVIDER, TX_TRANSITION_ACTOR_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
areReviewsCompleted, areReviewsCompleted,
propTypes, propTypes,
@ -94,9 +94,9 @@ const shouldRenderTransition = transition => {
TRANSITION_EXPIRE, TRANSITION_EXPIRE,
TRANSITION_REQUEST, TRANSITION_REQUEST,
TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REQUEST_AFTER_ENQUIRY,
TRANSITION_REVIEW_1_BY_CUSTOMER,
TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
].includes(transition); ].includes(transition);
}; };
@ -105,16 +105,16 @@ const shouldRenderTransition = transition => {
// given tx transition. // given tx transition.
const isReviewTransition = transition => { const isReviewTransition = transition => {
return [ return [
TRANSITION_REVIEW_1_BY_CUSTOMER,
TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
].includes(transition); ].includes(transition);
}; };
const hasUserLeftAReviewFirst = (userRole, lastTransition) => { const hasUserLeftAReviewFirst = (userRole, lastTransition) => {
return ( return (
(lastTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST && (lastTransition === TRANSITION_REVIEW_1_BY_CUSTOMER &&
userRole === TX_TRANSITION_ACTOR_CUSTOMER) || userRole === TX_TRANSITION_ACTOR_CUSTOMER) ||
(lastTransition === TRANSITION_REVIEW_1_BY_PROVIDER && (lastTransition === TRANSITION_REVIEW_1_BY_PROVIDER &&
userRole === TX_TRANSITION_ACTOR_PROVIDER) || userRole === TX_TRANSITION_ACTOR_PROVIDER) ||
@ -179,7 +179,7 @@ const resolveTransitionMessage = (
return <FormattedMessage id="ActivityFeed.transitionComplete" values={{ reviewLink }} />; return <FormattedMessage id="ActivityFeed.transitionComplete" values={{ reviewLink }} />;
case TRANSITION_REVIEW_1_BY_PROVIDER: case TRANSITION_REVIEW_1_BY_PROVIDER:
case TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST: case TRANSITION_REVIEW_1_BY_CUSTOMER:
if (isOwnTransition) { if (isOwnTransition) {
return <FormattedMessage id="ActivityFeed.ownTransitionReview" values={{ displayName }} />; return <FormattedMessage id="ActivityFeed.ownTransitionReview" values={{ displayName }} />;
} else { } else {
@ -265,7 +265,7 @@ const Transition = props => {
if (isReviewTransition(currentTransition) && areReviewsCompleted(lastTransition)) { if (isReviewTransition(currentTransition) && areReviewsCompleted(lastTransition)) {
const customerReview = const customerReview =
currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST || currentTransition === TRANSITION_REVIEW_1_BY_CUSTOMER ||
currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND; currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND;
const providerReview = const providerReview =
currentTransition === TRANSITION_REVIEW_1_BY_PROVIDER || currentTransition === TRANSITION_REVIEW_1_BY_PROVIDER ||

6
src/containers/TransactionPage/TransactionPage.duck.js
View file

@ -4,9 +4,9 @@ import { isTransactionsTransitionInvalidTransition, storableError } from '../../
import { import {
TRANSITION_ACCEPT, TRANSITION_ACCEPT,
TRANSITION_DECLINE, TRANSITION_DECLINE,
TRANSITION_REVIEW_1_BY_CUSTOMER,
TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
} from '../../util/types'; } from '../../util/types';
import * as log from '../../util/log'; import * as log from '../../util/log';
@ -404,7 +404,7 @@ const sendReviewAsSecond = (id, params, role, dispatch, sdk) => {
// by calling sendReviewAsSecond(). // by calling sendReviewAsSecond().
const sendReviewAsFirst = (id, params, role, dispatch, sdk) => { const sendReviewAsFirst = (id, params, role, dispatch, sdk) => {
const transition = const transition =
role === CUSTOMER ? TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST : TRANSITION_REVIEW_1_BY_PROVIDER; role === CUSTOMER ? TRANSITION_REVIEW_1_BY_CUSTOMER : TRANSITION_REVIEW_1_BY_PROVIDER;
const include = REVIEW_TX_INCLUDES; const include = REVIEW_TX_INCLUDES;
return sdk.transactions return sdk.transactions
@ -434,7 +434,7 @@ export const sendReview = (role, tx, reviewRating, reviewContent) => (dispatch,
const txStateOtherPartyFirst = const txStateOtherPartyFirst =
role === CUSTOMER role === CUSTOMER
? tx.attributes.lastTransition === TRANSITION_REVIEW_1_BY_PROVIDER ? tx.attributes.lastTransition === TRANSITION_REVIEW_1_BY_PROVIDER
: tx.attributes.lastTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST; : tx.attributes.lastTransition === TRANSITION_REVIEW_1_BY_CUSTOMER;
dispatch(sendReviewRequest()); dispatch(sendReviewRequest());

9
src/util/types.js
View file

@ -188,7 +188,7 @@ export const TRANSITION_COMPLETE = 'transition/mark-delivered';
// Either party (provider or customer) can be the first to give a review. // Either party (provider or customer) can be the first to give a review.
export const TRANSITION_REVIEW_1_BY_PROVIDER = 'transition/review-by-provider-first'; export const TRANSITION_REVIEW_1_BY_PROVIDER = 'transition/review-by-provider-first';
export const TRANSITION_REVIEW_2_BY_PROVIDER = 'transition/review-by-provider-second'; export const TRANSITION_REVIEW_2_BY_PROVIDER = 'transition/review-by-provider-second';
export const TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST = 'transition/review-by-customer-first'; export const TRANSITION_REVIEW_1_BY_CUSTOMER = 'transition/review-by-customer-first';
export const TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND = 'transition/review-by-customer-second'; export const TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND = 'transition/review-by-customer-second';
export const TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER = 'transition/mark-reviewed-by-customer'; export const TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER = 'transition/mark-reviewed-by-customer';
export const TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER = 'transition/mark-reviewed-by-provider'; export const TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER = 'transition/mark-reviewed-by-provider';
@ -204,11 +204,11 @@ export const TX_TRANSITIONS = [
TRANSITION_EXPIRE_REVIEW_PERIOD, TRANSITION_EXPIRE_REVIEW_PERIOD,
TRANSITION_REQUEST, TRANSITION_REQUEST,
TRANSITION_REQUEST_AFTER_ENQUIRY, TRANSITION_REQUEST_AFTER_ENQUIRY,
TRANSITION_REVIEW_1_BY_CUSTOMER,
TRANSITION_REVIEW_1_BY_PROVIDER, TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER, TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER, TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER,
TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER, TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND, TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
]; ];
@ -257,10 +257,7 @@ propTypes.txTransition = shape({
transition: oneOf(TX_TRANSITIONS).isRequired, transition: oneOf(TX_TRANSITIONS).isRequired,
}); });
const firstReviewTransitions = [ const firstReviewTransitions = [TRANSITION_REVIEW_1_BY_CUSTOMER, TRANSITION_REVIEW_1_BY_PROVIDER];
TRANSITION_REVIEW_1_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
];
// Check if tx transition is followed by a state where // Check if tx transition is followed by a state where
// reviews are completed // reviews are completed