@micromag/screen-urbania-article 0.3.75 → 0.3.78

package/es/index.js

@@ -103,7 +103,6 @@ var propTypes$1 = {
   image: PropTypes$1.visualElement,
   title: PropTypes$1.headingElement,
   overTitle: PropTypes$1.headingElement,
-  authors: PropTypes.arrayOf(PropTypes.shape({})),
   author: PropTypes$1.authorElement,
   sponsor: PropTypes.arrayOf(PropTypes.shape({})),
   sponsorPrefix: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
@@ -122,7 +121,6 @@ var defaultProps$1 = {
   image: null,
   title: null,
   overTitle: null,
-  authors: null,
   author: null,
   sponsor: null,
   sponsorPrefix: null,
@@ -137,14 +135,13 @@ var defaultProps$1 = {
 };
 
 var UrbaniaArticle = function UrbaniaArticle(_ref) {
-  var _ref6;
+  var _ref5;
 
   var hasArticle = _ref.hasArticle,
       type = _ref.type,
       image = _ref.image,
       title = _ref.title,
       overTitle = _ref.overTitle,
-      authors = _ref.authors,
       author = _ref.author,
       sponsor = _ref.sponsor,
       sponsorPrefix = _ref.sponsorPrefix,
@@ -200,17 +197,15 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
   var hasOverTitle = isTextFilled(overTitle);
   var hasTitle = isTextFilled(title);
   var hasSponsor = isTextFilled(sponsor);
-  var hasAuthors = (authors || []).length > 0 || author !== null;
 
   var _ref3 = author || {},
       authorFullName = _ref3.name;
 
-  var _ref4 = authorFullName || {},
-      authorName = _ref4.body;
+  var hasAuthor = isTextFilled(authorFullName);
 
-  var _ref5 = image || {},
-      _ref5$url = _ref5.url,
-      url = _ref5$url === void 0 ? null : _ref5$url;
+  var _ref4 = image || {},
+      _ref4$url = _ref4.url,
+      url = _ref4$url === void 0 ? null : _ref4$url;
 
   var hasImage = url !== null;
   var backgroundPlaying = current && (isView || isEdit);
@@ -269,15 +264,11 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
         "value": "Authors"
       }]
     }))),
-    isEmpty: !hasAuthors
-  }, hasAuthors ? /*#__PURE__*/React.createElement("div", {
+    isEmpty: !hasAuthor
+  }, hasAuthor ? /*#__PURE__*/React.createElement("div", {
     className: classNames([styles.authors])
-  }, author !== null && authorName !== null ? /*#__PURE__*/React.createElement(UrbaniaAuthor, {
+  }, /*#__PURE__*/React.createElement(UrbaniaAuthor, {
     author: author
-  }) : (authors || []).map(function (a) {
-    return /*#__PURE__*/React.createElement(UrbaniaAuthor, {
-      author: a
-    });
   })) : null) : null, /*#__PURE__*/React.createElement(ScreenElement, {
     key: "sponsors",
     empty: /*#__PURE__*/React.createElement("div", {
@@ -303,7 +294,7 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
     return it !== null;
   });
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames([styles.container, (_ref6 = {}, _defineProperty(_ref6, className, className !== null), _defineProperty(_ref6, styles.isVideo, isVideo), _defineProperty(_ref6, styles.isPlaceholder, isPlaceholder), _ref6)]),
+    className: classNames([styles.container, (_ref5 = {}, _defineProperty(_ref5, className, className !== null), _defineProperty(_ref5, styles.isVideo, isVideo), _defineProperty(_ref5, styles.isPlaceholder, isPlaceholder), _ref5)]),
     "data-screen-ready": isStatic || isCapture
   }, /*#__PURE__*/React.createElement(Background, {
     background: background,
@@ -389,8 +380,7 @@ UrbaniaArticle.propTypes = propTypes$1;
 UrbaniaArticle.defaultProps = defaultProps$1;
 var UrbaniaArticle$1 = /*#__PURE__*/React.memo(UrbaniaArticle);
 
-var _excluded = ["url", "article"],
-    _excluded2 = ["name", "url"];
+var _excluded = ["url", "article"];
 var propTypes = {
   url: PropTypes.string,
   article: PropTypes.shape({
@@ -421,11 +411,10 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
   }, [url]);
   useEffect(function () {
     if (url !== null) {
-      // TODO: fix cors on urbania.ca
       getJSON("".concat(url, ".json"), {
         mode: 'cors'
       }).then(function (art) {
-        setArticle(art);
+        setArticle(art || null);
       });
     }
   }, [url, setArticle]);
@@ -461,6 +450,8 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
         _ref5$metadata = _ref5.metadata,
         metadata = _ref5$metadata === void 0 ? {} : _ref5$metadata;
 
+    var hasArticle = url !== null && article !== null;
+
     var _ref6 = metadata || {},
         _ref6$authors = _ref6.authors,
         authors = _ref6$authors === void 0 ? [] : _ref6$authors,
@@ -477,18 +468,39 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
 
     var _ref8 = sizes || {},
         medium = _ref8.medium,
-        large = _ref8.large; // Type
+        large = _ref8.large;
+
+    var articleAuthor = (authors || []).length > 0 ? authors[0] : null;
+
+    var _ref9 = articleAuthor || {},
+        _ref9$name = _ref9.name,
+        authorName = _ref9$name === void 0 ? null : _ref9$name,
+        _ref9$avatar = _ref9.avatar,
+        authorImage = _ref9$avatar === void 0 ? null : _ref9$avatar,
+        _ref9$url = _ref9.url,
+        authorUrl = _ref9$url === void 0 ? null : _ref9$url;
+
+    var finalArticleAuthor = _objectSpread(_objectSpread(_objectSpread({}, authorName !== null ? {
+      name: {
+        body: "<p>".concat(authorName, "</p>")
+      }
+    } : null), authorUrl !== null ? {
+      url: "".concat(hostname).concat(authorUrl)
+    } : null), authorImage !== null ? {
+      image: authorImage
+    } : null); // Type
 
 
     var defaultType = articleType || type; // Sponsors
 
-    var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref9) {
-      var _ref9$name = _ref9.name,
-          name = _ref9$name === void 0 ? null : _ref9$name;
+    var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref10) {
+      var _ref10$name = _ref10.name,
+          name = _ref10$name === void 0 ? null : _ref10$name;
       return name;
     }).filter(function (name) {
       return name !== null;
-    }).join(', ').trim() : null;
+    }).join(', ').trim() : null; // Content
+
     var hasTitle = isTextFilled(title);
     var hasOverTitle = isTextFilled(overTitle);
     var hasSponsorProps = isTextFilled(sponsor);
@@ -499,7 +511,6 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
         "value": "Presented by"
       }]
     }) : null;
-    console.log('lol');
     return {
       type: defaultType,
       title: hasTitle ? title : _objectSpread(_objectSpread({}, title), {}, {
@@ -508,21 +519,7 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
       overTitle: hasOverTitle ? overTitle : _objectSpread(_objectSpread({}, overTitle), {}, {
         body: 'En vedette'
       }),
-      authors: authors.map(function (_ref10) {
-        var _ref10$name = _ref10.name,
-            name = _ref10$name === void 0 ? null : _ref10$name,
-            _ref10$url = _ref10.url,
-            authorUrl = _ref10$url === void 0 ? null : _ref10$url,
-            otherProps = _objectWithoutProperties(_ref10, _excluded2);
-
-        return _objectSpread({
-          name: {
-            body: "<p>".concat(name, "</p>")
-          },
-          url: "".concat(hostname).concat(authorUrl)
-        }, otherProps);
-      }),
-      author: author,
+      author: _objectSpread(_objectSpread({}, finalArticleAuthor), author),
       sponsor: defaultSponsor !== null && !hasSponsorProps ? _objectSpread(_objectSpread({}, sponsor), {}, {
         body: "<strong>".concat(defaultSponsor, "</strong>")
       }) : sponsor,
@@ -536,7 +533,7 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
           large: large
         }
       }),
-      callToAction: _objectSpread({
+      callToAction: _objectSpread(_objectSpread({
         active: true,
         type: 'swipe-up',
         url: canonical,
@@ -549,7 +546,9 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
           id: 'play'
         } : null,
         inWebView: true
-      }, callToAction)
+      }, callToAction), hasArticle ? {
+        active: true
+      } : null)
     };
   }, [article, url, hostname, props]);
   return /*#__PURE__*/React.createElement(UrbaniaArticle$1, Object.assign({}, props, values, {
@@ -576,10 +575,10 @@ var definition = {
     order: 10
   },
   title: defineMessage({
-    id: "Oqks/j",
+    id: "nJgzwC",
     defaultMessage: [{
       "type": 0,
-      "value": "Urbania article screen"
+      "value": "Urbania article"
     }]
   }),
   component: UrbaniaLoaderScreen,

package/lib/index.js

@@ -123,7 +123,6 @@ var propTypes$1 = {
   image: core.PropTypes.visualElement,
   title: core.PropTypes.headingElement,
   overTitle: core.PropTypes.headingElement,
-  authors: PropTypes__default["default"].arrayOf(PropTypes__default["default"].shape({})),
   author: core.PropTypes.authorElement,
   sponsor: PropTypes__default["default"].arrayOf(PropTypes__default["default"].shape({})),
   sponsorPrefix: PropTypes__default["default"].oneOfType([PropTypes__default["default"].node, PropTypes__default["default"].func]),
@@ -142,7 +141,6 @@ var defaultProps$1 = {
   image: null,
   title: null,
   overTitle: null,
-  authors: null,
   author: null,
   sponsor: null,
   sponsorPrefix: null,
@@ -157,14 +155,13 @@ var defaultProps$1 = {
 };
 
 var UrbaniaArticle = function UrbaniaArticle(_ref) {
-  var _ref6;
+  var _ref5;
 
   var hasArticle = _ref.hasArticle,
       type = _ref.type,
       image = _ref.image,
       title = _ref.title,
       overTitle = _ref.overTitle,
-      authors = _ref.authors,
       author = _ref.author,
       sponsor = _ref.sponsor,
       sponsorPrefix = _ref.sponsorPrefix,
@@ -220,17 +217,15 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
   var hasOverTitle = utils.isTextFilled(overTitle);
   var hasTitle = utils.isTextFilled(title);
   var hasSponsor = utils.isTextFilled(sponsor);
-  var hasAuthors = (authors || []).length > 0 || author !== null;
 
   var _ref3 = author || {},
       authorFullName = _ref3.name;
 
-  var _ref4 = authorFullName || {},
-      authorName = _ref4.body;
+  var hasAuthor = utils.isTextFilled(authorFullName);
 
-  var _ref5 = image || {},
-      _ref5$url = _ref5.url,
-      url = _ref5$url === void 0 ? null : _ref5$url;
+  var _ref4 = image || {},
+      _ref4$url = _ref4.url,
+      url = _ref4$url === void 0 ? null : _ref4$url;
 
   var hasImage = url !== null;
   var backgroundPlaying = current && (isView || isEdit);
@@ -289,15 +284,11 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
         "value": "Authors"
       }]
     }))),
-    isEmpty: !hasAuthors
-  }, hasAuthors ? /*#__PURE__*/React__default["default"].createElement("div", {
+    isEmpty: !hasAuthor
+  }, hasAuthor ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: classNames__default["default"]([styles.authors])
-  }, author !== null && authorName !== null ? /*#__PURE__*/React__default["default"].createElement(UrbaniaAuthor__default["default"], {
+  }, /*#__PURE__*/React__default["default"].createElement(UrbaniaAuthor__default["default"], {
     author: author
-  }) : (authors || []).map(function (a) {
-    return /*#__PURE__*/React__default["default"].createElement(UrbaniaAuthor__default["default"], {
-      author: a
-    });
   })) : null) : null, /*#__PURE__*/React__default["default"].createElement(components.ScreenElement, {
     key: "sponsors",
     empty: /*#__PURE__*/React__default["default"].createElement("div", {
@@ -323,7 +314,7 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
     return it !== null;
   });
   return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"]([styles.container, (_ref6 = {}, _defineProperty__default["default"](_ref6, className, className !== null), _defineProperty__default["default"](_ref6, styles.isVideo, isVideo), _defineProperty__default["default"](_ref6, styles.isPlaceholder, isPlaceholder), _ref6)]),
+    className: classNames__default["default"]([styles.container, (_ref5 = {}, _defineProperty__default["default"](_ref5, className, className !== null), _defineProperty__default["default"](_ref5, styles.isVideo, isVideo), _defineProperty__default["default"](_ref5, styles.isPlaceholder, isPlaceholder), _ref5)]),
     "data-screen-ready": isStatic || isCapture
   }, /*#__PURE__*/React__default["default"].createElement(Background__default["default"], {
     background: background,
@@ -409,8 +400,7 @@ UrbaniaArticle.propTypes = propTypes$1;
 UrbaniaArticle.defaultProps = defaultProps$1;
 var UrbaniaArticle$1 = /*#__PURE__*/React__default["default"].memo(UrbaniaArticle);
 
-var _excluded = ["url", "article"],
-    _excluded2 = ["name", "url"];
+var _excluded = ["url", "article"];
 var propTypes = {
   url: PropTypes__default["default"].string,
   article: PropTypes__default["default"].shape({
@@ -441,11 +431,10 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
   }, [url]);
   React.useEffect(function () {
     if (url !== null) {
-      // TODO: fix cors on urbania.ca
       fetch.getJSON("".concat(url, ".json"), {
         mode: 'cors'
       }).then(function (art) {
-        setArticle(art);
+        setArticle(art || null);
       });
     }
   }, [url, setArticle]);
@@ -481,6 +470,8 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
         _ref5$metadata = _ref5.metadata,
         metadata = _ref5$metadata === void 0 ? {} : _ref5$metadata;
 
+    var hasArticle = url !== null && article !== null;
+
     var _ref6 = metadata || {},
         _ref6$authors = _ref6.authors,
         authors = _ref6$authors === void 0 ? [] : _ref6$authors,
@@ -497,18 +488,39 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
 
     var _ref8 = sizes || {},
         medium = _ref8.medium,
-        large = _ref8.large; // Type
+        large = _ref8.large;
+
+    var articleAuthor = (authors || []).length > 0 ? authors[0] : null;
+
+    var _ref9 = articleAuthor || {},
+        _ref9$name = _ref9.name,
+        authorName = _ref9$name === void 0 ? null : _ref9$name,
+        _ref9$avatar = _ref9.avatar,
+        authorImage = _ref9$avatar === void 0 ? null : _ref9$avatar,
+        _ref9$url = _ref9.url,
+        authorUrl = _ref9$url === void 0 ? null : _ref9$url;
+
+    var finalArticleAuthor = _objectSpread__default["default"](_objectSpread__default["default"](_objectSpread__default["default"]({}, authorName !== null ? {
+      name: {
+        body: "<p>".concat(authorName, "</p>")
+      }
+    } : null), authorUrl !== null ? {
+      url: "".concat(hostname).concat(authorUrl)
+    } : null), authorImage !== null ? {
+      image: authorImage
+    } : null); // Type
 
 
     var defaultType = articleType || type; // Sponsors
 
-    var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref9) {
-      var _ref9$name = _ref9.name,
-          name = _ref9$name === void 0 ? null : _ref9$name;
+    var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref10) {
+      var _ref10$name = _ref10.name,
+          name = _ref10$name === void 0 ? null : _ref10$name;
       return name;
     }).filter(function (name) {
       return name !== null;
-    }).join(', ').trim() : null;
+    }).join(', ').trim() : null; // Content
+
     var hasTitle = utils.isTextFilled(title);
     var hasOverTitle = utils.isTextFilled(overTitle);
     var hasSponsorProps = utils.isTextFilled(sponsor);
@@ -519,7 +531,6 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
         "value": "Presented by"
       }]
     }) : null;
-    console.log('lol');
     return {
       type: defaultType,
       title: hasTitle ? title : _objectSpread__default["default"](_objectSpread__default["default"]({}, title), {}, {
@@ -528,21 +539,7 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
       overTitle: hasOverTitle ? overTitle : _objectSpread__default["default"](_objectSpread__default["default"]({}, overTitle), {}, {
         body: 'En vedette'
       }),
-      authors: authors.map(function (_ref10) {
-        var _ref10$name = _ref10.name,
-            name = _ref10$name === void 0 ? null : _ref10$name,
-            _ref10$url = _ref10.url,
-            authorUrl = _ref10$url === void 0 ? null : _ref10$url,
-            otherProps = _objectWithoutProperties__default["default"](_ref10, _excluded2);
-
-        return _objectSpread__default["default"]({
-          name: {
-            body: "<p>".concat(name, "</p>")
-          },
-          url: "".concat(hostname).concat(authorUrl)
-        }, otherProps);
-      }),
-      author: author,
+      author: _objectSpread__default["default"](_objectSpread__default["default"]({}, finalArticleAuthor), author),
       sponsor: defaultSponsor !== null && !hasSponsorProps ? _objectSpread__default["default"](_objectSpread__default["default"]({}, sponsor), {}, {
         body: "<strong>".concat(defaultSponsor, "</strong>")
       }) : sponsor,
@@ -556,7 +553,7 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
           large: large
         }
       }),
-      callToAction: _objectSpread__default["default"]({
+      callToAction: _objectSpread__default["default"](_objectSpread__default["default"]({
         active: true,
         type: 'swipe-up',
         url: canonical,
@@ -569,7 +566,9 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
           id: 'play'
         } : null,
         inWebView: true
-      }, callToAction)
+      }, callToAction), hasArticle ? {
+        active: true
+      } : null)
     };
   }, [article, url, hostname, props]);
   return /*#__PURE__*/React__default["default"].createElement(UrbaniaArticle$1, Object.assign({}, props, values, {
@@ -596,10 +595,10 @@ var definition = {
     order: 10
   },
   title: reactIntl.defineMessage({
-    id: "Oqks/j",
+    id: "nJgzwC",
     defaultMessage: [{
       "type": 0,
-      "value": "Urbania article screen"
+      "value": "Urbania article"
     }]
   }),
   component: UrbaniaLoaderScreen,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/screen-urbania-article",
-    "version": "0.3.75",
+    "version": "0.3.78",
     "description": "",
     "keywords": [
         "javascript"
@@ -51,18 +51,18 @@
         "@babel/runtime": "^7.13.10",
         "@folklore/fetch": "^0.1.15",
         "@folklore/size": "^0.1.20",
-        "@micromag/core": "^0.3.74",
-        "@micromag/element-background": "^0.3.74",
-        "@micromag/element-call-to-action": "^0.3.74",
-        "@micromag/element-closed-captions": "^0.3.74",
-        "@micromag/element-container": "^0.3.74",
-        "@micromag/element-heading": "^0.3.74",
-        "@micromag/element-image": "^0.3.74",
-        "@micromag/element-media-controls": "^0.3.74",
-        "@micromag/element-urbania-author": "^0.3.74",
-        "@micromag/element-video": "^0.3.74",
-        "@micromag/element-visual": "^0.3.74",
-        "@micromag/transforms": "^0.3.74",
+        "@micromag/core": "^0.3.78",
+        "@micromag/element-background": "^0.3.78",
+        "@micromag/element-call-to-action": "^0.3.78",
+        "@micromag/element-closed-captions": "^0.3.78",
+        "@micromag/element-container": "^0.3.78",
+        "@micromag/element-heading": "^0.3.78",
+        "@micromag/element-image": "^0.3.78",
+        "@micromag/element-media-controls": "^0.3.78",
+        "@micromag/element-urbania-author": "^0.3.78",
+        "@micromag/element-video": "^0.3.78",
+        "@micromag/element-visual": "^0.3.78",
+        "@micromag/transforms": "^0.3.78",
         "classnames": "^2.2.6",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
@@ -72,5 +72,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "ab692045b86265c7f2b3c8287cb3ab6a4b407d64"
+    "gitHead": "68be4e95203a5c15cefe58e423fe43eb374f3a7f"
 }