Merge pull request #317 from WPMedia/AIO-343

Added height and width customField KVP AIO-343
WPMedia · Dec 22, 2020 · 0d0604b · 0d0604b
2 parents 529312f + 593f455
commit 0d0604b
Show file tree

Hide file tree

Showing 52 changed files with 587 additions and 237 deletions.
diff --git a/.changeset/dirty-moons-yawn.md b/.changeset/dirty-moons-yawn.md
@@ -0,0 +1,5 @@
+---
+'@wpmedia/feeds-prop-types': minor
+---
+
+Added resizer width and height kvp
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -0,0 +1,25 @@
+{
+  "mode": "exit",
+  "tag": "ttk",
+  "initialVersions": {
+    "@wpmedia/feeds-source-collections-block": "0.1.0",
+    "@wpmedia/feeds-source-content-api-block": "0.9.0",
+    "@wpmedia/feeds-source-video-api-block": "0.3.0",
+    "@wpmedia/mrss-feature-block": "0.9.0",
+    "@wpmedia/rss-fbia-feature-block": "0.7.0",
+    "@wpmedia/rss-feature-block": "0.8.0",
+    "@wpmedia/rss-flipboard-feature-block": "0.9.0",
+    "@wpmedia/rss-google-news-feature-block": "0.7.0",
+    "@wpmedia/rss-msn-feature-block": "0.8.0",
+    "@wpmedia/sitemap-feature-block": "0.9.0",
+    "@wpmedia/sitemap-index-feature-block": "0.9.0",
+    "@wpmedia/sitemap-news-feature-block": "0.8.0",
+    "@wpmedia/sitemap-video-feature-block": "0.7.0",
+    "@wpmedia/feeds-content-elements": "0.4.0",
+    "@wpmedia/feeds-find-video-stream": "0.2.0",
+    "@wpmedia/feeds-prop-types": "0.6.0",
+    "@wpmedia/feeds-resizer": "0.3.0",
+    "@wpmedia/feeds-xml-output": "0.3.0"
+  },
+  "changesets": ["dirty-moons-yawn"]
+}
diff --git a/blocks/feeds-source-collections-block/package-lock.json b/blocks/feeds-source-collections-block/package-lock.json
diff --git a/blocks/feeds-source-content-api-block/package-lock.json b/blocks/feeds-source-content-api-block/package-lock.json
diff --git a/blocks/feeds-source-video-api-block/package-lock.json b/blocks/feeds-source-video-api-block/package-lock.json
diff --git a/blocks/mrss-feature-block/CHANGELOG.md b/blocks/mrss-feature-block/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @wpmedia/mrss-feature-block
 
+## 0.9.1-ttk.0
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @wpmedia/feeds-prop-types@0.7.0-ttk.0
+
 ## 0.9.0
 
 ### Minor Changes

diff --git a/blocks/mrss-feature-block/features/mrss/xml.js b/blocks/mrss-feature-block/features/mrss/xml.js
@@ -31,6 +31,8 @@ const rssTemplate = (
     itemCategory,
     includeContent,
     resizerURL,
+    resizerWidth,
+    resizerHeight,
     domain,
     feedTitle,
     feedLanguage,
@@ -132,7 +134,13 @@ const rssTemplate = (
             ...(img &&
               img.url && {
                 'media:thumbnail': {
-                  '@url': buildResizerURL(img.url, resizerKey, resizerURL),
+                  '@url': buildResizerURL(
+                    img.url,
+                    resizerKey,
+                    resizerURL,
+                    resizerWidth,
+                    resizerHeight,
+                  ),
                 },
               }),
           },
@@ -149,6 +157,7 @@ export function Mrss({ globalContent, customFields, arcSite }) {
     feedTitle = '',
     feedLanguage = '',
   } = getProperties(arcSite)
+  const { width = 0, height = 0 } = customFields.resizerKVP || {}
 
   // can't return null for xml return type, must return valid xml template
   return rssTemplate(
@@ -157,6 +166,8 @@ export function Mrss({ globalContent, customFields, arcSite }) {
     {
       ...customFields,
       resizerURL,
+      resizerWidth: width,
+      resizerHeight: height,
       domain: feedDomainURL,
       feedTitle,
       feedLanguage,

diff --git a/blocks/mrss-feature-block/features/mrss/xml.test.js b/blocks/mrss-feature-block/features/mrss/xml.test.js
@@ -175,6 +175,7 @@ it('returns RSS template with default values', () => {
       pubDate: 'display_date',
       itemCategory: 'taxonomy.primary_section.name',
       videoInfo: { bitrate: 5400, stream_type: 'mp4' },
+      resizerKVP: {},
     },
   })
   expect(video).toMatchSnapshot({

diff --git a/blocks/mrss-feature-block/package-lock.json b/blocks/mrss-feature-block/package-lock.json
diff --git a/blocks/mrss-feature-block/package.json b/blocks/mrss-feature-block/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wpmedia/mrss-feature-block",
-  "version": "0.9.0",
+  "version": "0.9.1-ttk.0",
   "description": "Fusion components for building rss",
   "main": "index.js",
   "files": [
@@ -23,7 +23,7 @@
   "homepage": "https://github.com/WPMedia/feed-components#readme",
   "dependencies": {
     "@wpmedia/feeds-content-elements": "^0.4.0",
-    "@wpmedia/feeds-prop-types": "^0.4.0",
+    "@wpmedia/feeds-prop-types": "^0.7.0-ttk.1",
     "@wpmedia/feeds-resizer": "^0.3.0",
     "jmespath": "^0.15.0",
     "moment": "^2.24.0"

diff --git a/blocks/rss-fbia-feature-block/CHANGELOG.md b/blocks/rss-fbia-feature-block/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @wpmedia/sitemaps-feature-block
 
+## 0.7.1-ttk.0
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @wpmedia/feeds-prop-types@0.7.0-ttk.0
+
 ## 0.7.0
 
 ### Minor Changes

diff --git a/blocks/rss-fbia-feature-block/features/rss/xml.js b/blocks/rss-fbia-feature-block/features/rss/xml.js
@@ -32,6 +32,8 @@ const rssTemplate = (
     includePromo,
     includeContent,
     resizerURL,
+    resizerWidth,
+    resizerHeight,
     domain,
     feedTitle,
     feedLanguage,
@@ -103,7 +105,13 @@ const rssTemplate = (
             (category = jmespath.search(s, itemCategory)) &&
             category && { category: category }),
           ...(includeContent !== 0 &&
-            (body = fbiaBuildContent.parse(s, includeContent, domain)) &&
+            (body = fbiaBuildContent.parse(
+              s,
+              includeContent,
+              domain,
+              resizerWidth,
+              resizerHeight,
+            )) &&
             body && {
               'content:encoded': {
                 $: body,
@@ -114,7 +122,13 @@ const rssTemplate = (
             img.url && {
               'media:content': {
                 '@type': 'image/jpeg',
-                '@url': buildResizerURL(img.url, resizerKey, resizerURL),
+                '@url': buildResizerURL(
+                  img.url,
+                  resizerKey,
+                  resizerURL,
+                  resizerWidth,
+                  resizerHeight,
+                ),
                 ...(jmespath.search(img, imageCaption) && {
                   'media:description': {
                     '@type': 'plain',
@@ -148,6 +162,7 @@ export function FbiaRss({ globalContent, customFields, arcSite }) {
     feedTitle = '',
     feedLanguage = '',
   } = getProperties(arcSite)
+  const { width = 0, height = 0 } = customFields.resizerKVP || {}
 
   function FbiaBuildContent(
     domain,
@@ -165,7 +180,7 @@ export function FbiaRss({ globalContent, customFields, arcSite }) {
   ) {
     BuildContent.call(this)
 
-    this.buildHTMLHead = (s, domain) => {
+    this.buildHTMLHead = (s, domain, resizerWidth, resizerHeight) => {
       const img =
         s.promo_items && (s.promo_items.basic || s.promo_items.lead_art)
       const url = `${domain}${s.website_url || s.canonical_url || ''}`
@@ -219,7 +234,7 @@ export function FbiaRss({ globalContent, customFields, arcSite }) {
         ],
       }
     }
-    this.buildHTMLBody = (s, numRows, domain) => {
+    this.buildHTMLBody = (s, numRows, domain, resizerWidth, resizerHeight) => {
       const authorDescription =
         jmespath.search(s, 'credits.by[].description') || []
       const lastUpdatedDate = jmespath.search(s, 'last_updated_date')
@@ -275,7 +290,13 @@ export function FbiaRss({ globalContent, customFields, arcSite }) {
           figure: {
             '@class': 'fb-feed-cover',
             img: {
-              '@src': buildResizerURL(image.url, resizerKey, resizerURL),
+              '@src': buildResizerURL(
+                image.url,
+                resizerKey,
+                resizerURL,
+                resizerWidth,
+                resizerHeight,
+              ),
             },
             ...(customFields.imageCaption &&
               jmespath.search(image, customFields.imageCaption) && {
@@ -308,7 +329,13 @@ export function FbiaRss({ globalContent, customFields, arcSite }) {
             '#': header,
           },
           '#': [
-            this.buildContentElements(s, numRows, domain),
+            this.buildContentElements(
+              s,
+              numRows,
+              domain,
+              resizerWidth,
+              resizerHeight,
+            ),
             ...(adScripts && [adScripts]),
           ],
           footer: {
@@ -324,7 +351,14 @@ export function FbiaRss({ globalContent, customFields, arcSite }) {
         },
       }
     }
-    this.buildContentElements = (s, numRows, domain) => {
+
+    this.buildContentElements = (
+      s,
+      numRows,
+      domain,
+      resizerWidth,
+      resizerHeight,
+    ) => {
       let item
       const body = []
       const maxRows =
@@ -355,8 +389,8 @@ export function FbiaRss({ globalContent, customFields, arcSite }) {
                         element,
                         resizerKey,
                         resizerURL,
-                        resizeWidth,
-                        resizeHeight,
+                        resizerWidth,
+                        resizerHeight,
                       )
                       break
                     case 'header':
@@ -367,8 +401,8 @@ export function FbiaRss({ globalContent, customFields, arcSite }) {
                         element,
                         resizerKey,
                         resizerURL,
-                        resizeWidth,
-                        resizeHeight,
+                        resizerWidth,
+                        resizerHeight,
                       )
                       break
                     case 'interstitial_link':
@@ -419,13 +453,25 @@ export function FbiaRss({ globalContent, customFields, arcSite }) {
             )
       return body.length ? body : ['']
     }
-    this.image = (element, resizerKey, resizerURL) => {
+    this.image = (
+      element,
+      resizerKey,
+      resizerURL,
+      resizerWidth,
+      resizerHeight,
+    ) => {
       const credits = jmespath.search(element, 'credits.by[].name') || []
       return {
         figure: {
           img: {
             '@': {
-              src: buildResizerURL(element.url, resizerKey, resizerURL),
+              src: buildResizerURL(
+                element.url,
+                resizerKey,
+                resizerURL,
+                resizerWidth,
+                resizerHeight,
+              ),
             },
           },
           ...(element.caption && {
@@ -490,12 +536,18 @@ export function FbiaRss({ globalContent, customFields, arcSite }) {
       }
       return item
     }
-    this.parse = (s, numRows, domain) => {
+    this.parse = (s, numRows, domain, resizerWidth, resizerHeight) => {
       const fbiaContent = {
         html: {
           '@lang': feedLanguage,
-          head: this.buildHTMLHead(s, domain),
-          body: this.buildHTMLBody(s, numRows, domain),
+          head: this.buildHTMLHead(s, domain, resizerWidth, resizerHeight),
+          body: this.buildHTMLBody(
+            s,
+            numRows,
+            domain,
+            resizerWidth,
+            resizerHeight,
+          ),
         },
       }
       return '<!doctype html>'.concat(fragment(fbiaContent).toString())
@@ -521,6 +573,8 @@ export function FbiaRss({ globalContent, customFields, arcSite }) {
   return rssTemplate(get(globalContent, 'content_elements', []), {
     ...customFields,
     resizerURL,
+    resizerWidth: width,
+    resizerHeight: height,
     domain: feedDomainURL,
     feedTitle,
     feedLanguage,