@sapui5/sap.cux.home 1.136.2 → 1.138.0

package/src/sap/cux/home/NewsPanel.js

@@ -229,7 +229,6 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
    * @since 1.121
    *
    * @internal
-   * @experimental Since 1.121
    * @public
    *
    * @alias sap.cux.home.NewsPanel
@@ -291,16 +290,6 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
           group: "Misc",
           defaultValue: false
         },
-        /**
-         * The flag for custom news feed is checked or not.
-         *
-         * @private
-         */
-        showRss: {
-          type: "boolean",
-          group: "Misc",
-          defaultValue: false
-        },
         /**
          * Property to set default News.
          *
@@ -403,15 +392,8 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
             _this.fireEvent("loaded");
             _this.adjustLayout();
           }
-          const isUrlFeed = sUrl && !sUrl.includes(DEFAULT_NEWS_BASE_URL) && !showCustom && !showDefault;
-          const isFallbackToDefault = !sUrl && !showCustom && !showDefault && !showRss;
-
-          // if no url and showCustom set as false, then set showDefault as true
-          if (!sUrl && !showCustom && !_this.getProperty("showDefault")) {
-            _this.setProperty("showDefault", true);
-          }
           const _temp4 = function () {
-            if (isUrlFeed || showRss) {
+            if (sUrl && !sUrl.includes(DEFAULT_NEWS_BASE_URL) && !showCustom) {
               //rss feed scenario
               return Promise.resolve(_this.initializeXmlModel(sUrl)).then(function (_this$initializeXmlMo) {
                 _this.oNewsModel = _this$initializeXmlMo;
@@ -420,31 +402,27 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
               });
             } else {
               const _temp3 = function () {
-                if (_this.getProperty("showCustom")) {
-                  //custom news scenario
+                if (showDefault && !showCustom) {
+                  // default news scenario, if url property is passed and showDefault is true
+                  // check if url contains default news base url
+                  _this.defaultUrl = sUrl && sUrl.includes(DEFAULT_NEWS_BASE_URL) ? sUrl : DEFAULT_NEWS_URL;
                   _this.bNewsLoad = _this.bNewsLoad || false;
-                  _this.oManageMenuItem.setVisible(true);
-                  const sCustomNewsFeedKey = _this.getCustomFeedKey();
-                  const _temp = function () {
-                    if (sCustomNewsFeedKey) {
-                      return Promise.resolve(_this.setCustomNewsFeed(sCustomNewsFeedKey)).then(function () {});
-                    } else {
-                      _this.handleFeedError();
-                    }
-                  }();
-                  if (_temp && _temp.then) return _temp.then(function () {});
+                  return Promise.resolve(_this.setDefaultNews(showDefault)).then(function () {});
                 } else {
                   const _temp2 = function () {
-                    if (showDefault || isFallbackToDefault) {
-                      if (isFallbackToDefault) {
-                        _this.setProperty("showDefault", true);
-                      }
-
-                      // default news scenario, if url property is passed and showDefault is true
-                      // check if url contains default news base url
-                      _this.defaultUrl = sUrl && sUrl.includes(DEFAULT_NEWS_BASE_URL) ? sUrl : DEFAULT_NEWS_URL;
-                      _this.bNewsLoad = _this.bNewsLoad ?? false;
-                      return Promise.resolve(_this.setDefaultNews(true)).then(function () {});
+                    if (_this.getProperty("showCustom")) {
+                      //custom news scenario
+                      _this.bNewsLoad = _this.bNewsLoad || false;
+                      _this.oManageMenuItem.setVisible(true);
+                      const sCustomNewsFeedKey = _this.getCustomFeedKey();
+                      const _temp = function () {
+                        if (sCustomNewsFeedKey) {
+                          return Promise.resolve(_this.setCustomNewsFeed(sCustomNewsFeedKey)).then(function () {});
+                        } else {
+                          _this.handleFeedError();
+                        }
+                      }();
+                      if (_temp && _temp.then) return _temp.then(function () {});
                     } else {
                       _this.handleFeedError();
                     }
@@ -459,16 +437,18 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
         }
         let sUrl = _this.getUrl();
         let showCustom = _this.getProperty("showCustom");
+        // if no url and showCustom set as false, then set showDefault as true
+        if (!sUrl && !showCustom && !_this.getProperty("showDefault")) {
+          _this.setProperty("showDefault", true);
+        }
         let showDefault = _this.getProperty("showDefault");
-        let showRss = _this.getProperty("showRss");
         _this.mandatoryNewsFeed = [];
         if (_this.fetchedFeedUrl && _this.fetchedFeedUrl === sUrl) {
           return Promise.resolve();
         }
         const _temp6 = function () {
           if (!_this.persDataNewsFeed) {
-            //if showcustom false, fetch defaultNewsFeed from pers data
-            return Promise.resolve(_this.setPersDataNewsFeed(!showCustom)).then(function () {});
+            return Promise.resolve(_this.setPersDataNewsFeed(showDefault)).then(function () {});
           }
         }();
         return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(_temp7) : _temp7(_temp6));
@@ -482,7 +462,7 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      * @param {boolean} [isKeyUserChange=false] - Indicates if the change is made by a key user.
      * @private
      */
-    setDefaultNews: function _setDefaultNews(showDefault) {
+    setDefaultNews: function _setDefaultNews(showDefault, isKeyUserChange = false) {
       try {
         const _this2 = this;
         // default news scenario, if url property is passed and showDefault is true
@@ -496,6 +476,11 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
         //reset properties
         _this2.setProperty("showCustom", false);
         _this2.setProperty("newsAvailable", true);
+        // if user specifically set defaultNews true,
+        //  then even though url is available in key user settings url input, preference goes to showDefault
+        if (isKeyUserChange) {
+          _this2.setProperty("url", "");
+        }
         _this2.generateErrorMessage().setVisible(false);
         (_this2.getNewsWrapper()?.getParent()).setVisible(true);
         _this2.oManageMenuItem.setVisible(true);
@@ -509,8 +494,7 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      * Set the visibility of the manage news item in the menu.
      * @param visible - A boolean indicating whether the manage news item should be visible or not.
      */
-    setManageNewsItemVisibility: function _setManageNewsItemVisibility() {
-      let visible = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+    setManageNewsItemVisibility: function _setManageNewsItemVisibility(visible = true) {
       if (this.isParentBaseLayout() && this.oManageMenuItem) {
         this.oManageMenuItem.setVisible(visible);
         return visible;
@@ -534,8 +518,7 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      * @param feeds - An array of news feeds to check for descriptions.
      * @returns {void}
      */
-    setPressEnabledForNewsGroup: function _setPressEnabledForNewsGroup() {
-      let feeds = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    setPressEnabledForNewsGroup: function _setPressEnabledForNewsGroup(feeds = []) {
       const newsGroups = this.getAggregation("newsGroup");
       if (!Array.isArray(newsGroups)) return;
 
@@ -806,7 +789,7 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
       try {
         const _this6 = this;
         let i = 0;
-        const _temp10 = _for(function () {
+        const _temp0 = _for(function () {
           return i < noOfFeeds;
         }, function () {
           return i++;
@@ -818,7 +801,7 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
             oItemElement.appendChild(oImageUrl);
           });
         });
-        return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(function () {}) : void 0);
+        return Promise.resolve(_temp0 && _temp0.then ? _temp0.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -977,13 +960,10 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      * @private
      */
     filterMandatoryNews: function _filterMandatoryNews(newsGroups) {
-      return newsGroups.filter(_ref => {
-        let {
-          mandatory_text,
-          mandatory
-        } = _ref;
-        return mandatory_text?.toUpperCase() === "TRUE" || mandatory?.toUpperCase() === "X";
-      });
+      return newsGroups.filter(({
+        mandatory_text,
+        mandatory
+      }) => mandatory_text?.toUpperCase() === "TRUE" || mandatory?.toUpperCase() === "X");
     },
     /**
      * Set the priority of group to critical if any article within the group is critical.
@@ -1107,12 +1087,11 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
                 semanticObject: "NewsArticle",
                 action: "display"
               }
-            }])).then(function (_ref2) {
+            }])).then(function ([{
+              supported
+            }]) {
               let _exit = false;
-              let [{
-                supported
-              }] = _ref2;
-              function _temp12(_result2) {
+              function _temp10(_result2) {
                 if (_exit) return _result2;
                 // If the response is not supported or empty, set the default news response to placeholder news
                 if (!supported || !_this9._defaultNewsResponse?.value?.length) {
@@ -1121,7 +1100,7 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
                 }
                 return _this9._defaultNewsResponse;
               }
-              const _temp11 = function () {
+              const _temp1 = function () {
                 if (supported) {
                   return Promise.resolve(fetch(_this9.defaultUrl || DEFAULT_NEWS_URL)).then(function (response) {
                     if (!response.ok) {
@@ -1133,7 +1112,7 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
                   });
                 }
               }();
-              return _temp11 && _temp11.then ? _temp11.then(_temp12) : _temp12(_temp11);
+              return _temp1 && _temp1.then ? _temp1.then(_temp10) : _temp10(_temp1);
             });
           });
         }, function (error) {
@@ -1156,15 +1135,15 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      */
     getCustomNewsFeed: function _getCustomNewsFeed(sFeedId, showAllPreparationRequired) {
       try {
-        const _this10 = this;
+        const _this0 = this;
         const isDefaultNews = !sFeedId;
         if (isDefaultNews) {
-          return Promise.resolve(_this10.getDefaultNewsResponse()).then(function () {
-            let aDefaultgroups = _this10.getDefaultNewsFeedDetails(_this10._defaultNewsResponse);
+          return Promise.resolve(_this0.getDefaultNewsResponse()).then(function () {
+            let aDefaultgroups = _this0.getDefaultNewsFeedDetails(_this0._defaultNewsResponse);
             return aDefaultgroups;
           });
         } else {
-          return Promise.resolve(_this10.getCustomFeedData(sFeedId, showAllPreparationRequired));
+          return Promise.resolve(_this0.getCustomFeedData(sFeedId, showAllPreparationRequired));
         }
       } catch (e) {
         return Promise.reject(e);
@@ -1180,17 +1159,17 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      */
     getCustomFeedData: function _getCustomFeedData(sFeedId, showAllPreparationRequired) {
       try {
-        const _this11 = this;
+        const _this1 = this;
         return Promise.resolve(_catch(function () {
-          const newsDetailUrl = _this11.getNewsFeedDetailsUrl({
+          const newsDetailUrl = _this1.getNewsFeedDetailsUrl({
             changeId: sFeedId,
             showAllPreparationRequired
           });
-          if (!_this11.customNewsFeedCache.has(newsDetailUrl)) {
-            _this11.customNewsFeedCache.set(newsDetailUrl, _this11.getAuthNewsFeed(newsDetailUrl));
+          if (!_this1.customNewsFeedCache.has(newsDetailUrl)) {
+            _this1.customNewsFeedCache.set(newsDetailUrl, _this1.getAuthNewsFeed(newsDetailUrl));
           }
-          return Promise.resolve(_this11.customNewsFeedCache.get(newsDetailUrl)).then(function (_this11$customNewsFee) {
-            const authorizedNewsFeeds = _this11$customNewsFee;
+          return Promise.resolve(_this1.customNewsFeedCache.get(newsDetailUrl)).then(function (_this1$customNewsFeed) {
+            const authorizedNewsFeeds = _this1$customNewsFeed;
             const oFeedDict = {};
             const aFeeds = [];
             if (authorizedNewsFeeds?.length > 0) {
@@ -1200,7 +1179,7 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
                   aFeeds.push({
                     title: title.value,
                     footer: oFeed[CUSTOM_NEWS_FEED.VALIDITY].value,
-                    imageUrl: _this11.getCustomFeedImage(title.value)
+                    imageUrl: _this1.getCustomFeedImage(title.value)
                   });
                   oFeedDict[title.value] = title.value;
                 }
@@ -1239,11 +1218,10 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      */
     getAuthNewsFeed: function _getAuthNewsFeed(sNewsUrl, newsTitle) {
       try {
-        const _this12 = this;
+        const _this10 = this;
         return Promise.resolve(_catch(function () {
-          return Promise.resolve(Promise.all([_this12.getAllAvailableApps(), _this12.getNewsFeedDetails(sNewsUrl, newsTitle)])).then(function (_ref3) {
-            let [aAvailableApps, aNewsFeed] = _ref3;
-            return aAvailableApps.length === 0 ? aNewsFeed : _this12.arrangeNewsFeeds(aNewsFeed, aAvailableApps);
+          return Promise.resolve(Promise.all([_this10.getAllAvailableApps(), _this10.getNewsFeedDetails(sNewsUrl, newsTitle)])).then(function ([aAvailableApps, aNewsFeed]) {
+            return aAvailableApps.length === 0 ? aNewsFeed : _this10.arrangeNewsFeeds(aNewsFeed, aAvailableApps);
           });
         }, function (err) {
           Log.error(err);
@@ -1325,15 +1303,14 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
     getNewsFeedDetails: function _getNewsFeedDetails(sUrl, newsTitle) {
       try {
         let _exit2 = false;
-        const _this13 = this;
-        function _temp14(_result4) {
+        const _this11 = this;
+        function _temp12(_result4) {
           if (_exit2) return _result4;
           const fnFormattedLabel = sLabel => sLabel.replace(/([a-z0-9])([A-Z])/g, "$1 $2");
-          return Promise.resolve(Promise.all([HttpHelper.GetJSON(sUrl), _this13.getTranslatedText(_this13.getCustomFeedKey())])).then(function (_ref4) {
-            let [newsResponse, translationResponse] = _ref4;
+          return Promise.resolve(Promise.all([HttpHelper.GetJSON(sUrl), _this11.getTranslatedText(_this11.getCustomFeedKey())])).then(function ([newsResponse, translationResponse]) {
             let aNews = JSON.parse(JSON.stringify(newsResponse.value || []));
             const aTranslation = JSON.parse(JSON.stringify(translationResponse.value || []));
-            aNews = _this13.filterNewsOnTitle(aNews, newsTitle);
+            aNews = _this11.filterNewsOnTitle(aNews, newsTitle);
             return aNews.map(oNews => {
               const aFields = Object.keys(oNews);
               const aExpandFields = [];
@@ -1349,7 +1326,7 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
                 }
               });
               oNews.Link = {
-                label: _this13._i18nBundle.getText("readMoreLink"),
+                label: _this11._i18nBundle.getText("readMoreLink"),
                 value: oNews[CUSTOM_NEWS_FEED.LINK],
                 text: "Link"
               };
@@ -1359,16 +1336,16 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
             });
           });
         }
-        const _temp13 = function () {
-          if (_this13.customNewsFeedCache.has(sUrl)) {
-            return Promise.resolve(_this13.customNewsFeedCache.get(sUrl)).then(function (newsFeedDetails) {
-              const _this13$filterNewsOnT = _this13.filterNewsOnTitle(newsFeedDetails, newsTitle);
+        const _temp11 = function () {
+          if (_this11.customNewsFeedCache.has(sUrl)) {
+            return Promise.resolve(_this11.customNewsFeedCache.get(sUrl)).then(function (newsFeedDetails) {
+              const _this11$filterNewsOnT = _this11.filterNewsOnTitle(newsFeedDetails, newsTitle);
               _exit2 = true;
-              return _this13$filterNewsOnT;
+              return _this11$filterNewsOnT;
             });
           }
         }();
-        return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(_temp14) : _temp14(_temp13));
+        return Promise.resolve(_temp11 && _temp11.then ? _temp11.then(_temp12) : _temp12(_temp11));
       } catch (e) {
         return Promise.reject(e);
       }
@@ -1414,25 +1391,25 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      */
     loadCustomNewsFeed: function _loadCustomNewsFeed(feeds, feedType) {
       try {
-        const _this14 = this;
-        const oXMLResponse = _this14.parseJsonToXml(JSON.parse(JSON.stringify(feeds)), feedType);
-        const oParent = _this14.getParent();
-        if (!_this14.oNewsModel) {
-          _this14.oNewsModel = new XMLModel(oXMLResponse);
-          if (!_this14.bNewsLoad) {
+        const _this12 = this;
+        const oXMLResponse = _this12.parseJsonToXml(JSON.parse(JSON.stringify(feeds)), feedType);
+        const oParent = _this12.getParent();
+        if (!_this12.oNewsModel) {
+          _this12.oNewsModel = new XMLModel(oXMLResponse);
+          if (!_this12.bNewsLoad) {
             oParent?.panelLoadedFn("News", {
               loaded: true,
               count: DEFAULT_FEED_COUNT
             });
-            _this14.bNewsLoad = true;
+            _this12.bNewsLoad = true;
           }
-          _this14.oNewsTile.setModel(_this14.oNewsModel);
+          _this12.oNewsTile.setModel(_this12.oNewsModel);
         } else {
-          _this14.oNewsTile.unbindAggregation("tiles", false); // Unbind the bound aggregation
-          _this14.oNewsTile.destroyAggregation("tiles"); // Removes old tiles
-          _this14.oNewsModel.setData(oXMLResponse);
+          _this12.oNewsTile.unbindAggregation("tiles", false); // Unbind the bound aggregation
+          _this12.oNewsTile.destroyAggregation("tiles"); // Removes old tiles
+          _this12.oNewsModel.setData(oXMLResponse);
         }
-        return Promise.resolve(_this14.loadNewsFeed(oXMLResponse, feeds.length)).then(function () {});
+        return Promise.resolve(_this12.loadNewsFeed(oXMLResponse, feeds.length)).then(function () {});
       } catch (e) {
         return Promise.reject(e);
       }