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

Use a shared var for the listing page variant

Browse source
This commit is contained in:
Kimmo Puputti 2018-01-31 11:03:26 +02:00
parent 4940b67c17
commit b6010beb25
5 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/ListingLink/ListingLink.js
View file

@ -10,9 +10,7 @@ import React from 'react';
import { string, oneOfType, node } from 'prop-types';
import { NamedLink } from '../../components';
import { LISTING_STATE_PENDING_APPROVAL, propTypes } from '../../util/types';
import { createSlug } from '../../util/urlHelpers';
const PENDING_APPROVAL_VARIANT = 'pending-approval';
import { LISTING_PAGE_PENDING_APPROVAL_VARIANT, createSlug } from '../../util/urlHelpers';
const ListingLink = props => {
const { className, listing, children } = props;
@ -30,7 +28,7 @@ const ListingLink = props => {
params: {
id,
slug,
variant: PENDING_APPROVAL_VARIANT,
variant: LISTING_PAGE_PENDING_APPROVAL_VARIANT,
},
}
: {

6
src/containers/EditListingPage/EditListingPage.js
View file

@ -5,7 +5,7 @@ import { withRouter } from 'react-router-dom';
import { intlShape, injectIntl } from 'react-intl';
import { connect } from 'react-redux';
import { types as sdkTypes } from '../../util/sdkLoader';
import { createSlug } from '../../util/urlHelpers';
import { LISTING_PAGE_PENDING_APPROVAL_VARIANT, createSlug } from '../../util/urlHelpers';
import { LISTING_STATE_PENDING_APPROVAL, propTypes } from '../../util/types';
import { getMarketplaceEntities } from '../../ducks/marketplaceData.duck';
import { manageDisableScrolling, isScrollingDisabled } from '../../ducks/UI.duck';
@ -29,8 +29,6 @@ import css from './EditListingPage.css';
const { UUID } = sdkTypes;
const PENDING_APPROVAL_VARIANT = 'pending-approval';
// N.B. All the presentational content needs to be extracted to their own components
export const EditListingPageComponent = props => {
const {
@ -79,7 +77,7 @@ export const EditListingPageComponent = props => {
params: {
id: listingId.uuid,
slug: listingSlug,
variant: PENDING_APPROVAL_VARIANT,
variant: LISTING_PAGE_PENDING_APPROVAL_VARIANT,
},
}
: {

3
src/containers/ListingPage/ListingPage.duck.js
View file

@ -4,6 +4,7 @@ import { storableError } from '../../util/errors';
import { addMarketplaceEntities } from '../../ducks/marketplaceData.duck';
import { denormalisedResponseEntities } from '../../util/data';
import { TRANSITION_ENQUIRE } from '../../util/types';
import { LISTING_PAGE_PENDING_APPROVAL_VARIANT } from '../../util/urlHelpers';
import { fetchCurrentUser } from '../../ducks/user.duck';
const { UUID } = sdkTypes;
@ -154,7 +155,7 @@ export const sendEnquiry = (listingId, message) => (dispatch, getState, sdk) =>
export const loadData = (params, search) => dispatch => {
const listingId = new UUID(params.id);
if (params.variant === 'pending-approval') {
if (params.variant === LISTING_PAGE_PENDING_APPROVAL_VARIANT) {
return dispatch(showListing(listingId, true));
}
return Promise.all([dispatch(showListing(listingId)), dispatch(fetchReviews(listingId))]);

15
src/containers/ListingPage/ListingPage.js
View file

@ -10,7 +10,7 @@ import config from '../../config';
import routeConfiguration from '../../routeConfiguration';
import { LISTING_STATE_PENDING_APPROVAL, LISTING_STATE_CLOSED, propTypes } from '../../util/types';
import { types as sdkTypes } from '../../util/sdkLoader';
import { createSlug, parse } from '../../util/urlHelpers';
import { LISTING_PAGE_PENDING_APPROVAL_VARIANT, createSlug, parse } from '../../util/urlHelpers';
import { formatMoney } from '../../util/currency';
import { createResourceLocatorString, findRouteByRouteName } from '../../util/routes';
import { ensureListing, ensureOwnListing, ensureUser, userDisplayName } from '../../util/data';
@ -48,8 +48,6 @@ import css from './ListingPage.css';
// This defines when ModalInMobile shows content as Modal
const MODAL_BREAKPOINT = 1023;
const PENDING_APPROVAL_VARIANT = 'pending-approval';
const { UUID } = sdkTypes;
const priceData = (price, intl) => {
@ -259,10 +257,11 @@ export class ListingPageComponent extends Component {
const isBook = !!parse(location.search).book;
const listingId = new UUID(params.id);
const currentListing =
params.variant === PENDING_APPROVAL_VARIANT
? ensureOwnListing(getOwnListing(listingId))
: ensureListing(getListing(listingId));
const isPendingApprovalVariant = params.variant === LISTING_PAGE_PENDING_APPROVAL_VARIANT;
const currentListing = isPendingApprovalVariant
? ensureOwnListing(getOwnListing(listingId))
: ensureListing(getListing(listingId));
const listingSlug = params.slug || createSlug(currentListing.attributes.title || '');
const {
description = '',
@ -711,7 +710,7 @@ ListingPageComponent.propTypes = {
params: shape({
id: string.isRequired,
slug: string,
variant: oneOf([PENDING_APPROVAL_VARIANT]),
variant: oneOf([LISTING_PAGE_PENDING_APPROVAL_VARIANT]),
}).isRequired,
isAuthenticated: bool.isRequired,

2
src/util/urlHelpers.js
View file

@ -3,6 +3,8 @@ import { types as sdkTypes } from './sdkLoader';
const { LatLng, LatLngBounds } = sdkTypes;
export const LISTING_PAGE_PENDING_APPROVAL_VARIANT = 'pending-approval';
export const createSlug = str =>
encodeURIComponent(
str