Merge b04cbe3 into a615252

CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- `contentSchemas.json` for definition of content properties.
+- i18n content edition support through CMS.
 
 ## [2.21.0] - 2019-05-21
 ### Fixed

manifest.json

@@ -15,9 +15,11 @@
     "postreleasy": "vtex publish --verbose"
   },
   "dependencies": {
+    "vtex.native-types": "0.x",
     "vtex.store-components": "3.x",
     "vtex.store-resources": "0.x",
     "vtex.product-review-interfaces": "1.x",
     "vtex.styleguide": "9.x"
-  }
-}
+  },
+  "$schema": "https://raw.githubusercontent.com/vtex/node-vtex-api/master/gen/manifest.schema"
+}

react/__mocks__/vtex.native-types/index.js

@@ -0,0 +1,4 @@
+import React from 'react'
+import { FormattedMessage } from 'react-intl'
+
+export const IOMessage = props => <FormattedMessage {...props} />

react/__tests__/ProductSummary.test.js

@@ -1,11 +1,19 @@
 import React from 'react'
 import { render } from '@vtex/test-tools/react'
+const fs = require('fs')
 
 import ProductSummary from '../legacy/index'
 
 describe('<ProductSummary /> component', () => {
+  // TODO: Remove this later when we have a better way to resolve contentSchemas.json at test-tools
+  const rawData = fs.readFileSync('../store/contentSchemas.json')
+  const contentSchema = JSON.parse(rawData)
+  const buyButtonText =
+    contentSchema.definitions.ProductSummary.properties.buyButtonText.default
+
   const props = {
     runtime: { hints: {} },
+    buyButtonText,
     product: {
       productId: '123456789',
       linkText: 'linkText',
@@ -101,7 +109,9 @@ describe('<ProductSummary /> component', () => {
   describe('Site editor editable', () => {
     it('should export getSchema and return object with title', () => {
       const schema = ProductSummary.schema || ProductSummary.getSchema({})
-      expect(schema).toEqual(expect.objectContaining({title: expect.any(String)}))
+      expect(schema).toEqual(
+        expect.objectContaining({ title: expect.any(String) })
+      )
     })
   })
 })

react/components/ProductSummaryBuyButton/ProductSummaryBuyButton.js

@@ -3,7 +3,7 @@ import BuyButton from 'vtex.store-components/BuyButton'
 import { withRuntimeContext } from 'vtex.render-runtime'
 import { equals, path } from 'ramda'
 import classNames from 'classnames'
-import { FormattedMessage } from 'react-intl'
+import { IOMessage } from 'vtex.native-types'
 
 import ProductSummaryContext from '../ProductSummaryContext'
 import displayButtonTypes, {
@@ -79,7 +79,7 @@ const ProductSummaryBuyButton = ({
             }
             isOneClickBuy={isOneClickBuy}
           >
-            {buyButtonText || <FormattedMessage id="store/button-label" />}
+            <IOMessage id="store/button-label" />
           </BuyButton>
         </div>
       </div>
@@ -128,11 +128,6 @@ ProductSummaryBuyButton.getSchema = () => {
         default: displayButtonTypes.DISPLAY_ALWAYS.value,
         isLayout: true,
       },
-      buyButtonText: {
-        type: 'string',
-        title: 'admin/editor.productSummary.buyButtonText.title',
-        isLayout: false,
-      },
     },
   }
 }

react/components/ProductSummaryImage/ProductImage.js

@@ -173,11 +173,6 @@ ProductImage.getSchema = () => {
         default: ProductImage.defaultProps.showBadge,
         isLayout: true,
       },
-      badgeText: {
-        type: 'string',
-        title: 'admin/editor.productSummary.badgeText.title',
-        isLayout: false,
-      },
       showCollections: {
         type: 'boolean',
         title: 'admin/editor.productSummary.showCollections.title',

react/legacy/components/ProductSummaryBuyButton.js

@@ -2,7 +2,7 @@ import React from 'react'
 import BuyButton from 'vtex.store-components/BuyButton'
 import { equals, path } from 'ramda'
 import classNames from 'classnames'
-import { FormattedMessage } from 'react-intl'
+import { IOMessage } from 'vtex.native-types'
 
 import displayButtonTypes from '../../utils/displayButtonTypes'
 import productSummary from '../../productSummary.css'
@@ -72,7 +72,7 @@ const ProductSummaryBuyButton = ({
             }
             isOneClickBuy={isOneClickBuy}
           >
-            {buyButtonText || <FormattedMessage id="store/button-label" />}
+            <IOMessage id={buyButtonText} />
           </BuyButton>
         </div>
       </div>

react/legacy/components/ProductSummaryNormal.js

@@ -63,6 +63,7 @@ class ProductSummaryNormal extends Component {
 
     const descriptionClasses = `${productSummary.description} c-muted-2 t-small`
 
+
     return (
       <section
         className={containerClasses}

react/legacy/index.js

@@ -203,16 +203,6 @@ const defaultSchema = {
       default: true,
       isLayout: true,
     },
-    badgeText: {
-      type: 'string',
-      title: 'admin/editor.productSummary.badgeText.title',
-      isLayout: false,
-    },
-    buyButtonText: {
-      type: 'string',
-      title: 'admin/editor.productSummary.buyButtonText.title',
-      isLayout: false,
-    },
     displayBuyButton: {
       title: 'admin/editor.productSummary.displayBuyButton.title',
       type: 'string',

store/contentSchemas.json

@@ -0,0 +1,17 @@
+{
+  "definitions": {
+    "ProductSummary": {
+      "properties": {
+        "badgeText": {
+          "title": "admin/editor.productSummary.badgeText.title",
+          "$ref": "app:vtex.native-types#/definitions/text"
+        },
+        "buyButtonText": {
+          "title": "admin/editor.productSummary.buyButtonText.title",
+          "$ref": "app:vtex.native-types#/definitions/text",
+          "default": "store/button-label"
+        }
+      }
+    }
+  }
+}

store/interfaces.json

@@ -1,6 +1,9 @@
 {
   "product-summary": {
     "component": "ProductSummaryLegacy",
+    "content": {
+      "$ref": "#/definitions/ProductSummary"
+    },
     "allowed": ["addon-summary-btn"]
   },
   "product-summary.shelf": {
@@ -66,13 +69,27 @@
     "component": "ProductSummaryAttachmentList"
   },
   "product-summary-buy-button": {
-    "component": "ProductSummaryBuyButton"
+    "component": "ProductSummaryBuyButton",
+    "content": {
+      "properties": {
+        "buyButtonText": {
+          "$ref": "#/definitions/ProductSummary/properties/buyButtonText"
+        }
+      }
+    }
   },
   "product-summary-description": {
     "component": "ProductSummaryDescription"
   },
   "product-summary-image": {
-    "component": "ProductSummaryImage"
+    "component": "ProductSummaryImage",
+    "content": {
+      "properties": {
+        "badgeText": {
+          "$ref": "#/definitions/ProductSummary/properties/badgeText"
+        }
+      }
+    }
   },
   "product-summary-name": {
     "component": "ProductSummaryName"