@twreporter/universal-header 2.4.3-rc.3 → 2.4.3-rc.5

package/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.4.3-rc.5](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.4.3-rc.4...@twreporter/universal-header@2.4.3-rc.5) (2023-03-16)
+
+
+### Bug Fixes
+
+* add error handle for getChannelLink function ([cbda297](https://github.com/twreporter/twreporter-npm-packages/commit/cbda2974b2b9f54f9d3019aa150fad9bfef46774))
+* decoupling CHANNEL_KEY and get channel link function ([c7856a1](https://github.com/twreporter/twreporter-npm-packages/commit/c7856a10811b9053577bcde36aeb73a69c007784))
+* patch latest & topic on desktop channel ([56c9ca2](https://github.com/twreporter/twreporter-npm-packages/commit/56c9ca2c100a9131d0326b15ef5ab1c8b5c8a47f))
+
+
+
+
+
+## [2.4.3-rc.4](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.4.3-rc.3...@twreporter/universal-header@2.4.3-rc.4) (2023-03-09)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
 ## [2.4.3-rc.3](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.4.3-rc.2...@twreporter/universal-header@2.4.3-rc.3) (2023-03-08)
 
 **Note:** Version bump only for package @twreporter/universal-header

package/lib/components/channels.js

@@ -17,6 +17,8 @@ var _headerContext = _interopRequireDefault(require("../contexts/header-context"
 
 var _links = require("../utils/links");
 
+var _channels = require("../constants/channels");
+
 var _customizedLink = _interopRequireDefault(require("@twreporter/react-components/lib/customized-link"));
 
 var _categorySet = require("@twreporter/core/lib/constants/category-set");
@@ -29,6 +31,10 @@ var _divider = _interopRequireDefault(require("@twreporter/react-components/lib/
 
 var _map = _interopRequireDefault(require("lodash/map"));
 
+var _reduce = _interopRequireDefault(require("lodash/reduce"));
+
+var _concat = _interopRequireDefault(require("lodash/concat"));
+
 var _excluded = ["onClickHambuger"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -42,7 +48,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 var _ = {
-  map: _map["default"]
+  map: _map["default"],
+  reduce: _reduce["default"],
+  concat: _concat["default"]
 };
 
 var Item = /*#__PURE__*/_styledComponents["default"].div.withConfig({
@@ -60,37 +68,75 @@ var ChannelContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig(
   componentId: "nu2llv-2"
 })(["display:flex;flex-direction:column;align-items:center;"]);
 
-var Channel = function Channel(_ref) {
-  var onClickHambuger = _ref.onClickHambuger,
-      props = _objectWithoutProperties(_ref, _excluded);
+var ChannelItem = function ChannelItem(_ref) {
+  var _ref$link = _ref.link,
+      link = _ref$link === void 0 ? {} : _ref$link,
+      _ref$label = _ref.label,
+      label = _ref$label === void 0 ? '' : _ref$label;
 
   var _useContext = (0, _react.useContext)(_headerContext["default"]),
-      isLinkExternal = _useContext.isLinkExternal,
-      releaseBranch = _useContext.releaseBranch,
       theme = _useContext.theme;
 
-  var CategoryJsx = _.map(_categorySet.CATEGORY_ORDER, function (categoryKey) {
-    var label = _categorySet.CATEGORY_LABEL[categoryKey];
-    var path = "/categories/".concat(categoryKey);
-    var link = (0, _links.getCategoryLink)(isLinkExternal, releaseBranch, path);
-    return /*#__PURE__*/_react["default"].createElement(Item, {
-      key: categoryKey
-    }, /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], link, /*#__PURE__*/_react["default"].createElement(_button.TextButton, {
-      text: label,
-      size: "L",
-      theme: theme
-    })));
-  });
+  return /*#__PURE__*/_react["default"].createElement(Item, null, /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], link, /*#__PURE__*/_react["default"].createElement(_button.TextButton, {
+    text: label,
+    size: "L",
+    theme: theme
+  })));
+};
+
+ChannelItem.propTypes = {
+  link: _propTypes["default"].object,
+  label: _propTypes["default"].string
+};
+
+var Channel = function Channel(_ref2) {
+  var onClickHambuger = _ref2.onClickHambuger,
+      props = _objectWithoutProperties(_ref2, _excluded);
+
+  var _useContext2 = (0, _react.useContext)(_headerContext["default"]),
+      isLinkExternal = _useContext2.isLinkExternal,
+      releaseBranch = _useContext2.releaseBranch,
+      theme = _useContext2.theme;
 
   var hamburgerIcon = /*#__PURE__*/_react["default"].createElement(_icon.Hamburger, {
     releaseBranch: releaseBranch
   });
 
+  var ItemJSX = _.reduce(_channels.DESKTOP_CHANNEL_ORDER, function (res, channelKey) {
+    if (channelKey === _channels.CHANNEL_KEY.category) {
+      var categoryJSX = _.map(_categorySet.CATEGORY_ORDER, function (categoryKey) {
+        var label = _categorySet.CATEGORY_LABEL[categoryKey];
+        var path = "/categories/".concat(categoryKey);
+        var link = (0, _links.getLink)(isLinkExternal, releaseBranch, path);
+        return /*#__PURE__*/_react["default"].createElement(ChannelItem, {
+          key: categoryKey,
+          label: label,
+          link: link
+        });
+      });
+
+      res = _.concat(res, categoryJSX);
+    } else {
+      var label = _channels.CHANNEL_LABEL[channelKey];
+      var link = (0, _links.getLink)(isLinkExternal, releaseBranch, _channels.CHANNEL_PATH[channelKey]);
+
+      if (label && link) {
+        res.push( /*#__PURE__*/_react["default"].createElement(ChannelItem, {
+          key: channelKey,
+          label: label,
+          link: link
+        }));
+      }
+    }
+
+    return res;
+  }, []);
+
   return /*#__PURE__*/_react["default"].createElement(ChannelContainer, props, /*#__PURE__*/_react["default"].createElement(CategoryContainer, null, /*#__PURE__*/_react["default"].createElement(_button.IconButton, {
     iconComponent: hamburgerIcon,
     theme: theme,
     onClick: onClickHambuger
-  }), CategoryJsx), /*#__PURE__*/_react["default"].createElement(_divider["default"], null));
+  }), ItemJSX), /*#__PURE__*/_react["default"].createElement(_divider["default"], null));
 };
 
 Channel.propTypes = {

package/lib/components/hamburger-menu.js

@@ -177,7 +177,7 @@ var DropdownContent = function DropdownContent(_ref) {
     subItemJSX = _.map(_categorySet.CATEGORY_ORDER, function (catKey) {
       var label = _categorySet.CATEGORY_LABEL[catKey];
       var path = "/categories/".concat(catKey);
-      var link = (0, _links.getCategoryLink)(isLinkExternal, releaseBranch, path);
+      var link = (0, _links.getLink)(isLinkExternal, releaseBranch, path);
 
       if (!label || !link) {
         return;
@@ -209,7 +209,7 @@ var DropdownContent = function DropdownContent(_ref) {
         path = subItem.path;
       }
 
-      var link = (0, _links.getCategoryLink)(isLinkExternal, releaseBranch, path);
+      var link = (0, _links.getLink)(isLinkExternal, releaseBranch, path);
 
       if (!label || !link) {
         return;

package/lib/constants/channels.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.CHANNEL_ORDER = exports.CHANNEL_DROPDOWN = exports.CHANNEL_TYPE = exports.CHANNEL_DROPDOWN_TYPE = exports.CHANNEL_LINK_TYPE = exports.CHANNEL_LABEL = exports.CHANNEL_PATH = exports.CHANNEL_KEY = void 0;
+exports["default"] = exports.DESKTOP_CHANNEL_ORDER = exports.CHANNEL_ORDER = exports.CHANNEL_DROPDOWN = exports.CHANNEL_TYPE = exports.CHANNEL_DROPDOWN_TYPE = exports.CHANNEL_LINK_TYPE = exports.CHANNEL_LABEL = exports.CHANNEL_PATH = exports.CHANNEL_KEY = void 0;
 
 var _infogram = require("@twreporter/core/lib/constants/infogram");
 
@@ -63,12 +63,15 @@ var CHANNEL_DROPDOWN = (_CHANNEL_DROPDOWN = {}, _defineProperty(_CHANNEL_DROPDOW
 exports.CHANNEL_DROPDOWN = CHANNEL_DROPDOWN;
 var CHANNEL_ORDER = [channelKey.latest, 'divider', channelKey.topic, channelKey.category, channelKey.opinion, channelKey.humanStory, 'divider', channelKey.photography, channelKey.podcast, channelKey.kidsReporter, channelKey.infographic, 'divider'];
 exports.CHANNEL_ORDER = CHANNEL_ORDER;
+var DESKTOP_CHANNEL_ORDER = [channelKey.latest, channelKey.topic, channelKey.category];
+exports.DESKTOP_CHANNEL_ORDER = DESKTOP_CHANNEL_ORDER;
 var _default = {
   CHANNEL_LINK_TYPE: CHANNEL_LINK_TYPE,
   CHANNEL_DROPDOWN_TYPE: CHANNEL_DROPDOWN_TYPE,
   CHANNEL_PATH: CHANNEL_PATH,
   CHANNEL_LABEL: CHANNEL_LABEL,
   CHANNEL_TYPE: CHANNEL_TYPE,
-  CHANNEL_ORDER: CHANNEL_ORDER
+  CHANNEL_ORDER: CHANNEL_ORDER,
+  DESKTOP_CHANNEL_ORDER: DESKTOP_CHANNEL_ORDER
 };
 exports["default"] = _default;

package/lib/utils/links.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getLink = getLink;
 exports.getLogoutLink = getLogoutLink;
 exports.getLoginLink = getLoginLink;
 exports.getBookmarksLink = getBookmarksLink;
@@ -13,7 +14,7 @@ exports.getFooterLinks = getFooterLinks;
 exports.getSocialMediaLinks = getSocialMediaLinks;
 exports.getChannelLinks = getChannelLinks;
 exports.getTabBarLinks = getTabBarLinks;
-exports.getCategoryLink = exports.checkPathnameParent = exports.checkReferrer = void 0;
+exports.checkPathnameParent = exports.checkReferrer = void 0;
 
 var _services = require("../constants/services");
 
@@ -126,14 +127,12 @@ var checkPathnameParent = function checkPathnameParent() {
 
 exports.checkPathnameParent = checkPathnameParent;
 
-var getCategoryLink = function getCategoryLink() {
+function getLink() {
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
   var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   return __getLink(isExternal, releaseBranch, mainBaseURL, path);
-};
-
-exports.getCategoryLink = getCategoryLink;
+}
 
 function getLogoutLink() {
   var releaseBranch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultReleaseBranch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/universal-header",
-  "version": "2.4.3-rc.3",
+  "version": "2.4.3-rc.5",
   "description": "Universal header of TWReporter sites",
   "main": "lib/index.js",
   "scripts": {
@@ -21,7 +21,7 @@
   "license": "MIT",
   "dependencies": {
     "@twreporter/core": "^1.8.3-rc.1",
-    "@twreporter/react-components": "^8.17.0-rc.0",
+    "@twreporter/react-components": "^8.17.0-rc.1",
     "lodash": "^4.17.11",
     "prop-types": "^15.6.2",
     "querystring": "^0.2.0",
@@ -48,5 +48,5 @@
     "@storybook/testing-library": "^0.0.13",
     "babel-loader": "^8.2.5"
   },
-  "gitHead": "3047acc88fedab0ebaf202df0901d2871b0644c2"
+  "gitHead": "0a652514023b94e39222028ac5ab1c6bd0f4a2c2"
 }