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

Transition ref rename: review by provider second -> review 2 by provider

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

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

@ -15,11 +15,11 @@ import {
TRANSITION_EXPIRE_REVIEW_PERIOD,
TRANSITION_REQUEST,
TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_ACTOR_CUSTOMER,
TX_TRANSITION_ACTOR_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
} from '../../util/types';
import ActivityFeed from './ActivityFeed';
@ -211,7 +211,7 @@ export const WithAReviewFromBothUsers = {
{ author: createUser('user2'), subject: createUser('user1') }
),
],
lastTransition: TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
lastTransition: TRANSITION_REVIEW_2_BY_PROVIDER,
transitions: [
createTxTransition({
at: new Date(Date.UTC(2017, 10, 9, 8, 10)),
@ -221,7 +221,7 @@ export const WithAReviewFromBothUsers = {
createTxTransition({
at: new Date(Date.UTC(2017, 10, 10, 8, 10)),
by: TX_TRANSITION_ACTOR_PROVIDER,
transition: TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
transition: TRANSITION_REVIEW_2_BY_PROVIDER,
}),
],
}),

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

@ -15,11 +15,11 @@ import {
TRANSITION_REQUEST,
TRANSITION_REQUEST_AFTER_ENQUIRY,
TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_ACTOR_CUSTOMER,
TX_TRANSITION_ACTOR_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
areReviewsCompleted,
propTypes,
} from '../../util/types';
@ -95,9 +95,9 @@ const shouldRenderTransition = transition => {
TRANSITION_REQUEST,
TRANSITION_REQUEST_AFTER_ENQUIRY,
TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
].includes(transition);
};
@ -106,9 +106,9 @@ const shouldRenderTransition = transition => {
const isReviewTransition = transition => {
return [
TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
].includes(transition);
};
@ -197,7 +197,7 @@ const resolveTransitionMessage = (
/>
);
}
case TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND:
case TRANSITION_REVIEW_2_BY_PROVIDER:
case TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND:
if (isOwnTransition) {
return <FormattedMessage id="ActivityFeed.ownTransitionReview" values={{ displayName }} />;
@ -269,7 +269,7 @@ const Transition = props => {
currentTransition === TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND;
const providerReview =
currentTransition === TRANSITION_REVIEW_1_BY_PROVIDER ||
currentTransition === TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND;
currentTransition === TRANSITION_REVIEW_2_BY_PROVIDER;
if (customerReview) {
const review = reviewByAuthorId(currentTransaction, customer.id);
reviewComponent = (

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

@ -5,9 +5,9 @@ import {
TRANSITION_ACCEPT,
TRANSITION_DECLINE,
TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
} from '../../util/types';
import * as log from '../../util/log';
import { updatedEntities, denormalisedEntities } from '../../util/data';
@ -377,9 +377,7 @@ const REVIEW_TX_INCLUDES = ['reviews', 'reviews.author', 'reviews.subject'];
// TX_TRANSITION_REVIEW_BY_<CUSTOMER/PROVIDER>_SECOND
const sendReviewAsSecond = (id, params, role, dispatch, sdk) => {
const transition =
role === CUSTOMER
? TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND
: TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND;
role === CUSTOMER ? TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND : TRANSITION_REVIEW_2_BY_PROVIDER;
const include = REVIEW_TX_INCLUDES;

6
src/util/types.js
View file

@ -187,7 +187,7 @@ export const TRANSITION_COMPLETE = 'transition/mark-delivered';
// Reviews are given through transaction transitions.
// 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 TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND = '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 TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND = 'transition/review-by-customer-second';
export const TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER = 'transition/mark-reviewed-by-customer';
@ -205,11 +205,11 @@ export const TX_TRANSITIONS = [
TRANSITION_REQUEST,
TRANSITION_REQUEST_AFTER_ENQUIRY,
TRANSITION_REVIEW_1_BY_PROVIDER,
TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER,
TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_FIRST,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
];
// Roles of actors that perform transaction transitions
@ -267,10 +267,10 @@ const firstReviewTransitions = [
export const areReviewsCompleted = transition => {
return [
TRANSITION_EXPIRE_REVIEW_PERIOD,
TRANSITION_REVIEW_2_BY_PROVIDER,
TX_TRANSITION_MARK_REVIEWED_BY_CUSTOMER,
TX_TRANSITION_MARK_REVIEWED_BY_PROVIDER,
TX_TRANSITION_REVIEW_BY_CUSTOMER_SECOND,
TX_TRANSITION_REVIEW_BY_PROVIDER_SECOND,
].includes(transition);
};