From c8994c11edfb06a45ed618d3bb8e92ab30f65f13 Mon Sep 17 00:00:00 2001 From: Mikko Koski Date: Thu, 18 Jan 2018 10:33:08 +0200 Subject: [PATCH] Review: Use generic getMarketplaceEntities instead --- src/containers/EditListingPage/EditListingPage.js | 5 +++-- src/ducks/marketplaceData.duck.js | 15 --------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/containers/EditListingPage/EditListingPage.js b/src/containers/EditListingPage/EditListingPage.js index 5ee785f4..9518b800 100644 --- a/src/containers/EditListingPage/EditListingPage.js +++ b/src/containers/EditListingPage/EditListingPage.js @@ -7,7 +7,7 @@ import { connect } from 'react-redux'; import { types as sdkTypes } from '../../util/sdkLoader'; import { createSlug } from '../../util/urlHelpers'; import { propTypes } from '../../util/types'; -import { getOwnListingsById } from '../../ducks/marketplaceData.duck'; +import { getMarketplaceEntities } from '../../ducks/marketplaceData.duck'; import { manageDisableScrolling, isScrollingDisabled } from '../../ducks/UI.duck'; import { stripeAccountClearError, createStripeAccount } from '../../ducks/user.duck'; import { EditListingWizard, NamedRedirect, Page } from '../../components'; @@ -216,7 +216,8 @@ const mapStateToProps = state => { const fetchInProgress = createStripeAccountInProgress; const getListing = id => { - const listings = getOwnListingsById(state, [id]); + const listings = getMarketplaceEntities(state, [{ id, type: 'ownListing' }]); + return listings.length === 1 ? listings[0] : null; }; return { diff --git a/src/ducks/marketplaceData.duck.js b/src/ducks/marketplaceData.duck.js index 25b459f5..e15919e0 100644 --- a/src/ducks/marketplaceData.duck.js +++ b/src/ducks/marketplaceData.duck.js @@ -46,21 +46,6 @@ export const getListingsById = (state, listingIds) => { } }; -/** - * Get the denormalised ownListing entities with the given IDs - * - * @param {Object} state the full Redux store - * @param {Array} listingIds listing IDs to select from the store - */ -export const getOwnListingsById = (state, listingIds) => { - const { entities } = state.marketplaceData; - try { - return denormalisedEntities(entities, 'ownListing', listingIds); - } catch (e) { - return []; - } -}; - /** * Get the denormalised entities from the given entity references. *