@sapui5/sap.cux.home 1.140.0 → 1.142.0

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

@@ -767,7 +767,6 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
         this.oNewsTile.removeStyleClass("sapUiSmallMarginTop");
       } else {
         this.oNewsTile.addStyleClass("sapUiSmallMarginTop");
-        this.getNewsWrapper().setWidth("100%");
       }
     },
     /**
@@ -786,11 +785,11 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
             let oTile;
             if (newsInfo.getElementsByTagName("link").length > 0) {
               oTile = new NewsItem(recycleId(`${sId}-news-item`), {
-                url: String(this.getPropertyValue(newsInfo, "link")),
-                title: String(this.getPropertyValue(newsInfo, "title")),
-                subTitle: String(this.getPropertyValue(newsInfo, "description")),
-                imageUrl: String(this.getPropertyValue(newsInfo, "imageUrl")),
-                footer: this.formatDate(String(this.getPropertyValue(newsInfo, "pubDate")))
+                url: String(this.getPropertyValue(newsInfo, "link") ?? ""),
+                title: String(this.getPropertyValue(newsInfo, "title") ?? ""),
+                subTitle: String(this.getPropertyValue(newsInfo, "description") ?? ""),
+                imageUrl: String(this.getPropertyValue(newsInfo, "imageUrl") ?? ""),
+                footer: this.formatDate(String(this.getPropertyValue(newsInfo, "pubDate") ?? ""))
               });
               this.addAggregation("newsItems", oTile, true);
             } else {
@@ -798,12 +797,12 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
               let newsId = sGroupId && sGroupId.trim() ? `${sId}-newsgroup-${sGroupId}` : `${sId}-newsgroup`;
               let subTitleNews = this.getPropertyValue(newsInfo, "subTitle") ?? "";
               oTile = new NewsGroup(recycleId(newsId), {
-                title: String(this.getPropertyValue(newsInfo, "title")),
+                title: String(this.getPropertyValue(newsInfo, "title") ?? ""),
                 subTitle: subTitleNews || this._i18nBundle.getText("newsFeedDescription"),
-                imageUrl: String(this.getPropertyValue(newsInfo, "imageUrl")),
-                footer: String(this.getPropertyValue(newsInfo, "footer")),
+                imageUrl: String(this.getPropertyValue(newsInfo, "imageUrl") ?? ""),
+                footer: String(this.getPropertyValue(newsInfo, "footer") ?? ""),
                 priority: this.getPropertyValue(newsInfo, "priority"),
-                priorityText: String(this.getPropertyValue(newsInfo, "priorityText"))
+                priorityText: String(this.getPropertyValue(newsInfo, "priorityText") ?? "")
               });
               this.addAggregation("newsGroup", oTile, true);
             }
@@ -830,7 +829,7 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
           return i++;
         }, function () {
           const oItemElement = oDocument?.getElementsByTagName("item")[i];
-          return Promise.resolve(_this6.extractImage(String(oItemElement.getElementsByTagName("link")[0].textContent))).then(function (sUrl) {
+          return Promise.resolve(_this6.extractImage(String(oItemElement.getElementsByTagName("link")[0].textContent ?? ""))).then(function (sUrl) {
             const oImageUrl = oDocument.createElement("imageUrl");
             oImageUrl.textContent = sUrl;
             oItemElement.appendChild(oImageUrl);
@@ -1067,29 +1066,42 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      * @private
      */
     getDefaultNewsFeedDetails: function _getDefaultNewsFeedDetails(newsResponse) {
-      let newsFeedItems = JSON.parse(JSON.stringify(newsResponse.value || []));
-      const defaultNews = [];
-      const defaultFeedDict = {};
+      const newsFeedItems = JSON.parse(JSON.stringify(newsResponse.value || []));
       this.mandatoryNewsFeed = [];
       if (newsFeedItems?.length > 0) {
         this.mandatoryNewsFeed = this.filterMandatoryNews(newsFeedItems).map(oFeed => oFeed.group_id || "");
         this.markGroupsWithCriticalArticles(newsFeedItems);
-        for (const feed of newsFeedItems) {
-          const title = feed.title;
-          let subTitle = "";
-          if (!defaultFeedDict[title]) {
-            subTitle = feed.subTitle || feed.description || "";
-            defaultNews.push({
-              title: title,
-              footer: feed?.footer_text,
-              imageUrl: this.getDefaultFeedImage(feed),
-              group_id: feed.group_id,
-              subTitle: subTitle,
-              priority: feed?.priority == "1" ? Priority.Medium : Priority.None,
-              priorityText: feed?.priority == "1" ? this._i18nBundle.getText("criticalNews") : ""
-            });
-            defaultFeedDict[title] = title;
-          }
+      }
+      return newsFeedItems;
+    },
+    /**
+     * Removes expired article groups from the provided news feed items.
+     * An article group is considered expired if it has no associated articles in _group_to_article
+     *
+     * @param {INewsFeed[]} newsFeedItems - An array of news feed items to filter.
+     * @returns {INewsFeed[]} An array of news feed items that have associated articles.
+     * @private
+     */
+    removeExpiredArticleGroup: function _removeExpiredArticleGroup(newsFeedItems) {
+      const defaultNews = [];
+      const defaultFeedSet = new Set();
+      for (const feed of newsFeedItems) {
+        const title = feed.title;
+        const group_id = feed.group_id;
+        let subTitle = "";
+        const hasArticles = (feed._group_to_article?.length ?? 0) > 0;
+        if (group_id && !defaultFeedSet.has(group_id) && hasArticles) {
+          subTitle = feed.subTitle || feed.description || "";
+          defaultNews.push({
+            title: title,
+            footer: feed?.footer_text,
+            imageUrl: this.getDefaultFeedImage(feed),
+            group_id: feed.group_id,
+            subTitle: subTitle,
+            priority: feed?.priority == "1" ? Priority.Medium : Priority.None,
+            priorityText: feed?.priority == "1" ? this._i18nBundle.getText("criticalNews") : ""
+          });
+          defaultFeedSet.add(group_id);
         }
       }
       return defaultNews;
@@ -1225,10 +1237,11 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
         const feedType = _this1.getNewsType();
         const isDefaultNews = feedType === NewsType.Default;
         if (isDefaultNews) {
-          return Promise.resolve(_this1.getDefaultNewsResponse()).then(function () {
-            let aDefaultgroups = _this1.getDefaultNewsFeedDetails(_this1._defaultNewsResponse);
-            return aDefaultgroups;
-          });
+          function _temp15(aDefaultNewsItems) {
+            return _this1.removeExpiredArticleGroup(aDefaultNewsItems);
+          }
+          let _this1$defaultNewsIte = _this1.defaultNewsItems;
+          return Promise.resolve(_this1$defaultNewsIte ? Promise.resolve(_this1.getDefaultNewsData()).then(_temp15) : _temp15(_this1$defaultNewsIte));
         } else {
           return Promise.resolve(_this1.getCustomFeedData(sFeedId, showAllPreparationRequired));
         }
@@ -1236,6 +1249,25 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
         return Promise.reject(e);
       }
     },
+    /**
+     * Get the default news feed items.
+     * This method fetches the default news response and processes it to extract the news feed details.
+     * @returns {Promise<INewsFeed[]>} A promise that resolves to an array of default news feed items.
+     * @private
+     */
+    getDefaultNewsData: function _getDefaultNewsData() {
+      try {
+        const _this10 = this;
+        return Promise.resolve(_this10.getDefaultNewsResponse()).then(function () {
+          if (!_this10.defaultNewsItems) {
+            _this10.defaultNewsItems = _this10.getDefaultNewsFeedDetails(_this10._defaultNewsResponse);
+          }
+          return _this10.defaultNewsItems;
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    },
     /**
      * Retrieves custom news feed items identified by the provided feed ID and settings.
      * It processes the response data and returns an array of custom news feed items.
@@ -1246,19 +1278,19 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      */
     getCustomFeedData: function _getCustomFeedData(sFeedId, showAllPreparationRequired) {
       try {
-        const _this10 = this;
+        const _this11 = this;
         return Promise.resolve(_catch(function () {
           let newsDetailUrl;
-          const isEnduser = _this10.getParent().getIsEndUserChange().isEndUser;
-          newsDetailUrl = isEnduser ? _this10.getUrl() : _this10.getNewsFeedDetailsUrl({
+          const isEnduser = _this11.getParent().getIsEndUserChange().isEndUser;
+          newsDetailUrl = isEnduser ? _this11.getUrl() : _this11.getNewsFeedDetailsUrl({
             changeId: sFeedId,
             showAllPreparationRequired
           });
-          if (!_this10.customNewsFeedCache.has(newsDetailUrl)) {
-            _this10.customNewsFeedCache.set(newsDetailUrl, _this10.getAuthNewsFeed(newsDetailUrl));
+          if (!_this11.customNewsFeedCache.has(newsDetailUrl)) {
+            _this11.customNewsFeedCache.set(newsDetailUrl, _this11.getAuthNewsFeed(newsDetailUrl));
           }
-          return Promise.resolve(_this10.customNewsFeedCache.get(newsDetailUrl)).then(function (_this10$customNewsFee) {
-            const authorizedNewsFeeds = _this10$customNewsFee;
+          return Promise.resolve(_this11.customNewsFeedCache.get(newsDetailUrl)).then(function (_this11$customNewsFee) {
+            const authorizedNewsFeeds = _this11$customNewsFee;
             const oFeedDict = {};
             const aFeeds = [];
             if (authorizedNewsFeeds?.length > 0) {
@@ -1268,7 +1300,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: _this10.getCustomFeedImage(title.value)
+                    imageUrl: _this11.getCustomFeedImage(title.value)
                   });
                   oFeedDict[title.value] = title.value;
                 }
@@ -1307,10 +1339,10 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      */
     getAuthNewsFeed: function _getAuthNewsFeed(sNewsUrl, newsTitle) {
       try {
-        const _this11 = this;
+        const _this12 = this;
         return Promise.resolve(_catch(function () {
-          return Promise.resolve(Promise.all([_this11.getAllAvailableApps(), _this11.getNewsFeedDetails(sNewsUrl, newsTitle)])).then(function ([aAvailableApps, aNewsFeed]) {
-            return aAvailableApps.length === 0 ? aNewsFeed : _this11.arrangeNewsFeeds(aNewsFeed, aAvailableApps);
+          return Promise.resolve(Promise.all([_this12.getAllAvailableApps(), _this12.getNewsFeedDetails(sNewsUrl, newsTitle)])).then(function ([aAvailableApps, aNewsFeed]) {
+            return aAvailableApps.length === 0 ? aNewsFeed : _this12.arrangeNewsFeeds(aNewsFeed, aAvailableApps);
           });
         }, function (err) {
           Log.error(err);
@@ -1392,14 +1424,14 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
     getNewsFeedDetails: function _getNewsFeedDetails(sUrl, newsTitle) {
       try {
         let _exit3 = false;
-        const _this12 = this;
-        function _temp16(_result6) {
+        const _this13 = this;
+        function _temp17(_result6) {
           if (_exit3) return _result6;
           const fnFormattedLabel = sLabel => sLabel.replace(/([a-z0-9])([A-Z])/g, "$1 $2");
-          return Promise.resolve(Promise.all([_this12._endUserResponse ? Promise.resolve(_this12._endUserResponse) : HttpHelper.GetJSON(sUrl), _this12.getTranslatedText(_this12.getCustomFeedKey())])).then(function ([newsResponse, translationResponse]) {
+          return Promise.resolve(Promise.all([_this13._endUserResponse ? Promise.resolve(_this13._endUserResponse) : HttpHelper.GetJSON(sUrl), _this13.getTranslatedText(_this13.getCustomFeedKey())])).then(function ([newsResponse, translationResponse]) {
             let aNews = JSON.parse(JSON.stringify(newsResponse.value || []));
             const aTranslation = JSON.parse(JSON.stringify(translationResponse.value || []));
-            aNews = _this12.filterNewsOnTitle(aNews, newsTitle);
+            aNews = _this13.filterNewsOnTitle(aNews, newsTitle);
             return aNews.map(oNews => {
               const aFields = Object.keys(oNews);
               const aExpandFields = [];
@@ -1415,7 +1447,7 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
                 }
               });
               oNews.Link = {
-                label: _this12._i18nBundle.getText("readMoreLink"),
+                label: _this13._i18nBundle.getText("readMoreLink"),
                 value: oNews[CUSTOM_NEWS_FEED.LINK],
                 text: "Link"
               };
@@ -1425,16 +1457,16 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
             });
           });
         }
-        const _temp15 = function () {
-          if (_this12.customNewsFeedCache.has(sUrl)) {
-            return Promise.resolve(_this12.customNewsFeedCache.get(sUrl)).then(function (newsFeedDetails) {
-              const _this12$filterNewsOnT = _this12.filterNewsOnTitle(newsFeedDetails, newsTitle);
+        const _temp16 = function () {
+          if (_this13.customNewsFeedCache.has(sUrl)) {
+            return Promise.resolve(_this13.customNewsFeedCache.get(sUrl)).then(function (newsFeedDetails) {
+              const _this13$filterNewsOnT = _this13.filterNewsOnTitle(newsFeedDetails, newsTitle);
               _exit3 = true;
-              return _this12$filterNewsOnT;
+              return _this13$filterNewsOnT;
             });
           }
         }();
-        return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(_temp16) : _temp16(_temp15));
+        return Promise.resolve(_temp16 && _temp16.then ? _temp16.then(_temp17) : _temp17(_temp16));
       } catch (e) {
         return Promise.reject(e);
       }
@@ -1480,25 +1512,25 @@ sap.ui.define(["sap/base/Log", "sap/m/GenericTile", "sap/m/SlideTile", "sap/m/li
      */
     loadCustomNewsFeed: function _loadCustomNewsFeed(feeds, feedType) {
       try {
-        const _this13 = this;
-        const oXMLResponse = _this13.parseJsonToXml(JSON.parse(JSON.stringify(feeds)), feedType);
-        const oParent = _this13.getParent();
-        if (!_this13.oNewsModel) {
-          _this13.oNewsModel = new XMLModel(oXMLResponse);
-          if (!_this13.bNewsLoad) {
+        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) {
             oParent?.panelLoadedFn("News", {
               loaded: true,
               count: DEFAULT_FEED_COUNT
             });
-            _this13.bNewsLoad = true;
+            _this14.bNewsLoad = true;
           }
-          _this13.oNewsTile.setModel(_this13.oNewsModel);
+          _this14.oNewsTile.setModel(_this14.oNewsModel);
         } else {
-          _this13.oNewsTile.unbindAggregation("tiles", false); // Unbind the bound aggregation
-          _this13.oNewsTile.destroyAggregation("tiles"); // Removes old tiles
-          _this13.oNewsModel.setData(oXMLResponse);
+          _this14.oNewsTile.unbindAggregation("tiles", false); // Unbind the bound aggregation
+          _this14.oNewsTile.destroyAggregation("tiles"); // Removes old tiles
+          _this14.oNewsModel.setData(oXMLResponse);
         }
-        return Promise.resolve(_this13.loadNewsFeed(oXMLResponse, feeds.length)).then(function () {});
+        return Promise.resolve(_this14.loadNewsFeed(oXMLResponse, feeds.length)).then(function () {});
       } catch (e) {
         return Promise.reject(e);
       }