diff --git a/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js b/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js index f2a0c343..ecc9202f 100644 --- a/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js +++ b/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js @@ -56,7 +56,12 @@ const EditListingDescriptionPanel = props => { const updateValues = { title, description, + + // Save category also to the deprecated customAttributes + // so it can be used in search. + // TODO: remove when publicData is used in search customAttributes: { category }, + publicData: { category }, }; diff --git a/src/components/EditListingWizard/EditListingWizard.js b/src/components/EditListingWizard/EditListingWizard.js index 0206f3bb..9af01f48 100644 --- a/src/components/EditListingWizard/EditListingWizard.js +++ b/src/components/EditListingWizard/EditListingWizard.js @@ -185,7 +185,6 @@ EditListingWizard.propTypes = { // We cannot use propTypes.listing since the listing might be a draft. listing: shape({ attributes: shape({ - customAttributes: object, // structure (key: value) can be defined in management console publicData: object, description: string, geolocation: object, diff --git a/src/components/EditListingWizard/EditListingWizardTab.js b/src/components/EditListingWizard/EditListingWizardTab.js index 750c3851..888a040c 100644 --- a/src/components/EditListingWizard/EditListingWizardTab.js +++ b/src/components/EditListingWizard/EditListingWizardTab.js @@ -215,7 +215,6 @@ EditListingWizardTab.propTypes = { // We cannot use propTypes.listing since the listing might be a draft. listing: shape({ attributes: shape({ - customAttributes: object, // structure (key: value) can be defined in management console publicData: object, description: string, geolocation: object, diff --git a/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap b/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap index 1474eb95..1094879a 100644 --- a/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap +++ b/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap @@ -55,7 +55,6 @@ exports[`TransactionPanel - Order accepted matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -168,7 +167,6 @@ exports[`TransactionPanel - Order accepted matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -300,7 +298,6 @@ exports[`TransactionPanel - Order accepted matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -429,7 +426,6 @@ exports[`TransactionPanel - Order accepted matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -558,7 +554,6 @@ exports[`TransactionPanel - Order accepted matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -805,7 +800,6 @@ exports[`TransactionPanel - Order accepted matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -915,7 +909,6 @@ exports[`TransactionPanel - Order autodeclined matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -1028,7 +1021,6 @@ exports[`TransactionPanel - Order autodeclined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -1160,7 +1152,6 @@ exports[`TransactionPanel - Order autodeclined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -1289,7 +1280,6 @@ exports[`TransactionPanel - Order autodeclined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -1418,7 +1408,6 @@ exports[`TransactionPanel - Order autodeclined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -1665,7 +1654,6 @@ exports[`TransactionPanel - Order autodeclined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -1775,7 +1763,6 @@ exports[`TransactionPanel - Order canceled matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -1888,7 +1875,6 @@ exports[`TransactionPanel - Order canceled matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -2020,7 +2006,6 @@ exports[`TransactionPanel - Order canceled matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -2149,7 +2134,6 @@ exports[`TransactionPanel - Order canceled matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -2278,7 +2262,6 @@ exports[`TransactionPanel - Order canceled matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -2525,7 +2508,6 @@ exports[`TransactionPanel - Order canceled matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -2635,7 +2617,6 @@ exports[`TransactionPanel - Order declined matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -2748,7 +2729,6 @@ exports[`TransactionPanel - Order declined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -2880,7 +2860,6 @@ exports[`TransactionPanel - Order declined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -3009,7 +2988,6 @@ exports[`TransactionPanel - Order declined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -3138,7 +3116,6 @@ exports[`TransactionPanel - Order declined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -3385,7 +3362,6 @@ exports[`TransactionPanel - Order declined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -3495,7 +3471,6 @@ exports[`TransactionPanel - Order delivered matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -3608,7 +3583,6 @@ exports[`TransactionPanel - Order delivered matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -3740,7 +3714,6 @@ exports[`TransactionPanel - Order delivered matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -3869,7 +3842,6 @@ exports[`TransactionPanel - Order delivered matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -3998,7 +3970,6 @@ exports[`TransactionPanel - Order delivered matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -4245,7 +4216,6 @@ exports[`TransactionPanel - Order delivered matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -4355,7 +4325,6 @@ exports[`TransactionPanel - Order enquired matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -4468,7 +4437,6 @@ exports[`TransactionPanel - Order enquired matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -4600,7 +4568,6 @@ exports[`TransactionPanel - Order enquired matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -4729,7 +4696,6 @@ exports[`TransactionPanel - Order enquired matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -4858,7 +4824,6 @@ exports[`TransactionPanel - Order enquired matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -5105,7 +5070,6 @@ exports[`TransactionPanel - Order enquired matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -5215,7 +5179,6 @@ exports[`TransactionPanel - Order preauthorized matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -5328,7 +5291,6 @@ exports[`TransactionPanel - Order preauthorized matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -5460,7 +5422,6 @@ exports[`TransactionPanel - Order preauthorized matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -5589,7 +5550,6 @@ exports[`TransactionPanel - Order preauthorized matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -5718,7 +5678,6 @@ exports[`TransactionPanel - Order preauthorized matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -5965,7 +5924,6 @@ exports[`TransactionPanel - Order preauthorized matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -6069,7 +6027,6 @@ exports[`TransactionPanel - Sale accepted matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -6182,7 +6139,6 @@ exports[`TransactionPanel - Sale accepted matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -6301,7 +6257,6 @@ exports[`TransactionPanel - Sale accepted matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -6418,7 +6373,6 @@ exports[`TransactionPanel - Sale accepted matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -6535,7 +6489,6 @@ exports[`TransactionPanel - Sale accepted matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -6770,7 +6723,6 @@ exports[`TransactionPanel - Sale accepted matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -6861,7 +6813,6 @@ exports[`TransactionPanel - Sale autodeclined matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -6974,7 +6925,6 @@ exports[`TransactionPanel - Sale autodeclined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -7093,7 +7043,6 @@ exports[`TransactionPanel - Sale autodeclined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -7210,7 +7159,6 @@ exports[`TransactionPanel - Sale autodeclined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -7327,7 +7275,6 @@ exports[`TransactionPanel - Sale autodeclined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -7562,7 +7509,6 @@ exports[`TransactionPanel - Sale autodeclined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -7653,7 +7599,6 @@ exports[`TransactionPanel - Sale canceled matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -7766,7 +7711,6 @@ exports[`TransactionPanel - Sale canceled matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -7885,7 +7829,6 @@ exports[`TransactionPanel - Sale canceled matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -8002,7 +7945,6 @@ exports[`TransactionPanel - Sale canceled matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -8119,7 +8061,6 @@ exports[`TransactionPanel - Sale canceled matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -8354,7 +8295,6 @@ exports[`TransactionPanel - Sale canceled matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -8445,7 +8385,6 @@ exports[`TransactionPanel - Sale declined matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -8558,7 +8497,6 @@ exports[`TransactionPanel - Sale declined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -8677,7 +8615,6 @@ exports[`TransactionPanel - Sale declined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -8794,7 +8731,6 @@ exports[`TransactionPanel - Sale declined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -8911,7 +8847,6 @@ exports[`TransactionPanel - Sale declined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -9146,7 +9081,6 @@ exports[`TransactionPanel - Sale declined matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -9237,7 +9171,6 @@ exports[`TransactionPanel - Sale delivered matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -9350,7 +9283,6 @@ exports[`TransactionPanel - Sale delivered matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -9469,7 +9401,6 @@ exports[`TransactionPanel - Sale delivered matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -9586,7 +9517,6 @@ exports[`TransactionPanel - Sale delivered matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -9703,7 +9633,6 @@ exports[`TransactionPanel - Sale delivered matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -9938,7 +9867,6 @@ exports[`TransactionPanel - Sale delivered matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -10029,7 +9957,6 @@ exports[`TransactionPanel - Sale enquired matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -10142,7 +10069,6 @@ exports[`TransactionPanel - Sale enquired matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -10261,7 +10187,6 @@ exports[`TransactionPanel - Sale enquired matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -10378,7 +10303,6 @@ exports[`TransactionPanel - Sale enquired matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -10495,7 +10419,6 @@ exports[`TransactionPanel - Sale enquired matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -10730,7 +10653,6 @@ exports[`TransactionPanel - Sale enquired matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -10821,7 +10743,6 @@ exports[`TransactionPanel - Sale preauthorized matches snapshot 1`] = ` currentListing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -10934,7 +10855,6 @@ exports[`TransactionPanel - Sale preauthorized matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -11053,7 +10973,6 @@ exports[`TransactionPanel - Sale preauthorized matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -11170,7 +11089,6 @@ exports[`TransactionPanel - Sale preauthorized matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -11287,7 +11205,6 @@ exports[`TransactionPanel - Sale preauthorized matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -11522,7 +11439,6 @@ exports[`TransactionPanel - Sale preauthorized matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { diff --git a/src/config.js b/src/config.js index 2d8002da..75fe03a2 100644 --- a/src/config.js +++ b/src/config.js @@ -211,41 +211,6 @@ const stripeSupportedCountries = [ }, ]; -// Custom attributes are marketplace specific listing data (e.g. listing could have a category). -// Custom attributes can be defined through management console and code related to custom -// attributes should be changed accordingly. -// -// Here's an example what custom attributes might look like for bicycle listings. This code -// assumes that a custom attribute, called 'category', is created through management console -// with 4 possible values: 'road', 'mountain', 'track', and 'other'. -// -// When listing information is queried customAttributes is returned among other attributes: -// { -// id: 1, -// type: 'listing', -// attributes: { -// title: 'sauna', -// // and description, price, etc. -// customAttributes: { -// category: "mountain", -// // and other added custom attributes as "key: value" pairs -// }, -// }, -// } -const exampleCustomAttributes = { - category: { - select: 'single', // possible values: 'single' (only type supported atm.) - type: 'string', - values: ['road', 'mountain', 'track', 'other'], - }, -}; - -// To use the example custom attributes, set the -// REACT_APP_USE_EXAMPLE_CUSTOM_ATTRIBUTES variable to `true` in the -// gitignored `.env.development.local` file -const useExampleCustomAttributes = process.env.REACT_APP_USE_EXAMPLE_CUSTOM_ATTRIBUTES === 'true'; -const customAttributes = useExampleCustomAttributes ? exampleCustomAttributes : {}; - // Address information is used in SEO schema for Organization (http://schema.org/PostalAddress) const addressCountry = 'FI'; const addressRegion = 'Helsinki'; @@ -284,7 +249,6 @@ const config = { sdk: { clientId: sdkClientId, baseUrl: sdkBaseUrl }, currency, currencyConfig, - customAttributes, stripe: { publishableKey: stripePublishableKey, supportedCountries: stripeSupportedCountries }, canonicalRootURL, address: { diff --git a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap index c1fcbaf5..713fd620 100644 --- a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap +++ b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap @@ -54,7 +54,6 @@ exports[`ListingPage matches snapshot 1`] = ` listing={ Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { diff --git a/src/containers/TransactionPage/__snapshots__/TransactionPage.test.js.snap b/src/containers/TransactionPage/__snapshots__/TransactionPage.test.js.snap index 6fffbd0d..a6eb12ed 100644 --- a/src/containers/TransactionPage/__snapshots__/TransactionPage.test.js.snap +++ b/src/containers/TransactionPage/__snapshots__/TransactionPage.test.js.snap @@ -148,7 +148,6 @@ exports[`TransactionPage - Order matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { @@ -346,7 +345,6 @@ exports[`TransactionPage - Sale matches snapshot 1`] = ` }, "listing": Object { "attributes": Object { - "customAttributes": Object {}, "deleted": false, "description": "listing1 description", "geolocation": LatLng { diff --git a/src/util/data.js b/src/util/data.js index 82ca3211..95c39bd8 100644 --- a/src/util/data.js +++ b/src/util/data.js @@ -165,7 +165,7 @@ export const ensureListing = listing => { const empty = { id: null, type: 'listing', - attributes: { customAttributes: {}, publicData: {} }, + attributes: { publicData: {} }, images: [], }; return { ...empty, ...listing }; @@ -180,7 +180,7 @@ export const ensureOwnListing = listing => { const empty = { id: null, type: 'ownListing', - attributes: { customAttributes: {}, publicData: {} }, + attributes: { publicData: {} }, images: [], }; return { ...empty, ...listing }; diff --git a/src/util/test-data.js b/src/util/test-data.js index 37903a15..d2124356 100644 --- a/src/util/test-data.js +++ b/src/util/test-data.js @@ -86,7 +86,6 @@ export const createListing = (id, attributes = {}, includes = {}) => ({ deleted: false, state: LISTING_STATE_PUBLISHED, price: new Money(5500, 'USD'), - customAttributes: {}, publicData: {}, ...attributes, }, @@ -104,7 +103,6 @@ export const createOwnListing = (id, attributes = {}, includes = {}) => ({ deleted: false, state: LISTING_STATE_PUBLISHED, price: new Money(5500, 'USD'), - customAttributes: {}, publicData: {}, ...attributes, }, diff --git a/src/util/types.js b/src/util/types.js index 1f2de950..ad6b6289 100644 --- a/src/util/types.js +++ b/src/util/types.js @@ -142,7 +142,6 @@ const listingAttributes = shape({ deleted: propTypes.value(false).isRequired, state: oneOf(LISTING_STATES).isRequired, price: propTypes.money, - customAttributes: object, publicData: object.isRequired, }); @@ -153,7 +152,6 @@ const ownListingAttributes = shape({ deleted: propTypes.value(false).isRequired, state: oneOf(LISTING_STATES).isRequired, price: propTypes.money, - customAttributes: object, publicData: object.isRequired, });