@sapui5/sap.cux.home 1.141.0 → 1.142.1

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

@@ -19,7 +19,7 @@ import BaseLayout from "./BaseLayout";
 import type { $BaseNewsPanelSettings } from "./BaseNewsPanel";
 import BaseNewsPanel from "./BaseNewsPanel";
 import MenuItem from "./MenuItem";
-import NewsAndPagesContainer from "./NewsAndPagesContainer";
+import NewsAndPagesContainer from "./NewsContainer";
 import NewsGroup from "./NewsGroup";
 import NewsItem from "./NewsItem";
 import { NewsType } from "./library";
@@ -209,6 +209,7 @@ export default class NewsPanel extends BaseNewsPanel {
 	private defaultUrl!: string;
 	private _noUpdatesNewsFeed: boolean = false; // flag to check if no updates news tile is shown or not
 	private _endUserResponse!: ODataResponse;
+	private defaultNewsItems?: INewsFeed[] | null;
 
 	static readonly metadata: MetadataOptions = {
 		library: "sap.cux.home",
@@ -321,19 +322,16 @@ export default class NewsPanel extends BaseNewsPanel {
 	 * @returns {Promise} A promise that resolves when the news data is retrieved.
 	 */
 	public async getData() {
-		let sUrl: string = this.getUrl();
-		let showCustom = this.getProperty("type") === NewsType.Custom;
-		let showDefault = this.getProperty("type") === NewsType.Default;
-		let showRssAtom = this.getProperty("type") === NewsType.NewsUrl;
-
+		// Use getter methods instead of direct property access because URL and type can be updated
+		// after personalization. This keeps both values consistent and in sync.
 		this.mandatoryNewsFeed = [];
-		if (this.fetchedFeedUrl && this.fetchedFeedUrl === sUrl) {
+		if (this.fetchedFeedUrl && this.fetchedFeedUrl === this.getUrl()) {
 			return;
 		}
 		const endUserChange = (this.getParent() as NewsAndPagesContainer).getIsEndUserChange();
 		if (endUserChange.isEndUser) {
 			//url scenario (developer side)
-			const response = await fetch(sUrl);
+			const response = await fetch(this.getUrl());
 			if (!response.ok) {
 				throw new Error(`HTTP error! status: ${response.status}`);
 			}
@@ -343,25 +341,25 @@ export default class NewsPanel extends BaseNewsPanel {
 				await this.setNewsFeedFromUrl(this._endUserResponse?.value);
 			} else {
 				endUserChange.newsType = NewsType.NewsUrl;
-				this.oNewsModel = await this.initializeXmlModel(sUrl);
+				this.oNewsModel = await this.initializeXmlModel(this.getUrl());
 				this.oNewsTile.setModel(this.oNewsModel);
 				this.oManageMenuItem.setVisible(false);
 			}
 		} else {
 			//key user scenarios
 			if (!this.persDataNewsFeed) {
-				await this.setPersDataNewsFeed(showDefault);
+				await this.setPersDataNewsFeed(this.getProperty("type") === NewsType.Default);
 			}
-			if (showDefault) {
+			if (this.getProperty("type") === NewsType.Default) {
 				//default news scenario
 				this.bNewsLoad = this.bNewsLoad || false;
 				await this.setDefaultNews();
-			} else if (sUrl && showRssAtom) {
+			} else if (this.getUrl() && this.getProperty("type") === NewsType.NewsUrl) {
 				//rss feed scenario
-				this.oNewsModel = await this.initializeXmlModel(sUrl);
+				this.oNewsModel = await this.initializeXmlModel(this.getUrl());
 				this.oNewsTile.setModel(this.oNewsModel);
 				this.oManageMenuItem.setVisible(false);
-			} else if (showCustom) {
+			} else if (this.getProperty("type") === NewsType.Custom) {
 				//custom news scenario
 				this.bNewsLoad = this.bNewsLoad || false;
 				this.oManageMenuItem.setVisible(true);
@@ -933,30 +931,43 @@ export default class NewsPanel extends BaseNewsPanel {
 	 * @private
 	 */
 	private getDefaultNewsFeedDetails(newsResponse: ODataResponse) {
-		let newsFeedItems: INewsFeed[] = JSON.parse(JSON.stringify(newsResponse.value || [])) as INewsFeed[];
-		const defaultNews: INewsFeed[] = [];
-		const defaultFeedDict = {} as Record<string, string>;
+		const newsFeedItems: INewsFeed[] = JSON.parse(JSON.stringify(newsResponse.value || [])) as INewsFeed[];
 		this.mandatoryNewsFeed = [];
 		if (newsFeedItems?.length > 0) {
 			this.mandatoryNewsFeed = this.filterMandatoryNews(newsFeedItems).map((oFeed) => oFeed.group_id || "");
 			this.markGroupsWithCriticalArticles(newsFeedItems);
+		}
+		return 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;
-				}
+	/**
+	 * 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
+	 */
+	private removeExpiredArticleGroup(newsFeedItems: INewsFeed[] = []): INewsFeed[] {
+		const defaultNews: INewsFeed[] = [];
+		const defaultFeedSet = new Set<string>();
+		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;
@@ -1042,6 +1053,7 @@ export default class NewsPanel extends BaseNewsPanel {
 					}
 				}
 			]);
+
 			if (supported) {
 				if (this._endUserResponse) {
 					this._defaultNewsResponse = this._endUserResponse;
@@ -1082,14 +1094,27 @@ export default class NewsPanel extends BaseNewsPanel {
 		const feedType = this.getNewsType();
 		const isDefaultNews = feedType === NewsType.Default;
 		if (isDefaultNews) {
-			await this.getDefaultNewsResponse();
-			let aDefaultgroups = this.getDefaultNewsFeedDetails(this._defaultNewsResponse);
-			return aDefaultgroups;
+			let aDefaultNewsItems = this.defaultNewsItems ? this.defaultNewsItems : await this.getDefaultNewsData();
+			return this.removeExpiredArticleGroup(aDefaultNewsItems);
 		} else {
 			return this.getCustomFeedData(sFeedId, showAllPreparationRequired);
 		}
 	}
 
+	/**
+	 * 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
+	 */
+	public async getDefaultNewsData(): Promise<INewsFeed[]> {
+		await this.getDefaultNewsResponse();
+		if (!this.defaultNewsItems) {
+			this.defaultNewsItems = this.getDefaultNewsFeedDetails(this._defaultNewsResponse);
+		}
+		return this.defaultNewsItems;
+	}
+
 	/**
 	 * 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.

package/src/sap/cux/home/NewsSettingsPanel.d.ts

@@ -27,6 +27,9 @@ declare module "sap/cux/home/NewsSettingsPanel" {
         private deselectedDefaultFeeds;
         private headerText;
         private title;
+        private groupTable;
+        private newsListVBox;
+        private _resetActionButton;
         /**
          * Init lifecycle method
          *
@@ -60,12 +63,18 @@ declare module "sap/cux/home/NewsSettingsPanel" {
          */
         private setTitleMessage;
         /**
-         * Returns the content for the news List
+         * Returns the content for the news List for custom news feed
          *
          * @private
          * @returns {sap.ui.core.Control} The control containing the News Settings Panel's List
          */
-        private setNewsList;
+        private createCustomNewsList;
+        /**
+         *	Creates and returns a table for managing default news group settings.
+         * @returns {Table} Table for news groups for default manage news feed
+         * @private
+         */
+        private createNewsGroupTable;
         /**
          * Checks if the custom file format is CSV based on the custom file name.
          *
@@ -80,17 +89,31 @@ declare module "sap/cux/home/NewsSettingsPanel" {
          * @private
          */
         private saveNewsFeedSettings;
-        /** Get groupId info  for the default NewsList
-         * @param {HBox} [contentBox] content Hbox
+        /**
+         * Collect selected custom feed titles from the list
+         * @returns {string[]} Array of selected custom feed titles
+         * @private
+         */
+        private collectSelectedCustomFeedTitles;
+        /**
+         * Collect deselected default group IDs from the table
+         * @returns {string[]} Array of deselected default group IDs from the table
+         * @private
+         */
+        private collectDeselectedDefaultGroupIds;
+        /**
+         * Get groupId info  for the default NewsList
+         * @param {HBox | ColumnListItem} contentBox, content Hbox or ColumnListItem
          * @returns {string} groupId
          * @private
          */
         private getDefaultGroupId;
-        /** Set items for the NewsList
+        /**
+         * Set items for the NewsList for custom news feed
          * @param {Array} [aItems] news items to be set as items aggregation
          * @private
          */
-        private setItems;
+        private setCustomNewsItems;
         /**
          * Loads news feed settings
          *
@@ -108,6 +131,12 @@ declare module "sap/cux/home/NewsSettingsPanel" {
          * If no news feed is provided, it returns undefined.
          */
         private _handleDefaultNewsFeed;
+        /**
+         * This method populates the column list items in the group table for the default news feed settings.
+         * @param aItems Array of news feed items
+         * @private
+         */
+        private setColumnListItems;
         /**
          * @param {INewsFeed[]} aNewsFeed
          * @param aPersNewsFeed
@@ -120,6 +149,13 @@ declare module "sap/cux/home/NewsSettingsPanel" {
          * It also sets the state of the show switch based on the `showAllPreparationRequired` parameter.
          */
         private _handleCustomNewsFeed;
+        /**
+         * Resets the default manage news' news settings to default by clearing
+         * the personalization data and updating the news panel.
+         * @private
+         * @returns {Promise<INewsFeed[] | undefined>} A promise that resolves to the updated news feed items or undefined.
+         */
+        private resetDefaultNewsSettings;
         /**
          * Checks if the News Settings Panel is supported based on the properties of the News Panel.
          *

package/src/sap/cux/home/NewsSettingsPanel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NewsSettingsPanel.d.ts","sourceRoot":"../../../../..","sources":["src/sap/cux/home/NewsSettingsPanel.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,gCAAgC,CAAC;IAmBhD,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;IAU/D,UAAU,YAAY;QACrB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,0BAA0B,CAAC,EAAE,OAAO,CAAC;KACrC;IAED;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,iBAAiB;QAC/D,OAAO,CAAC,WAAW,CAAU;QAC7B,OAAO,CAAC,wBAAwB,CAAQ;QACxC,OAAO,CAAC,KAAK,CAAQ;QACrB,OAAO,CAAC,aAAa,CAAsB;QAC3C,OAAO,CAAC,UAAU,CAAa;QAC/B,OAAO,CAAC,YAAY,CAA0B;QAC9C,OAAO,CAAC,sBAAsB,CAAY;QAC1C,OAAO,CAAC,UAAU,CAAQ;QAC1B,OAAO,CAAC,KAAK,CAAS;QAEtB;;;;;WAKG;QACI,IAAI,IAAI,IAAI;QAkBnB;;;;;WAKG;QACH,OAAO,CAAC,UAAU;QAWlB;;WAEG;gBACW,kBAAkB;QAUhC;;;;;WAKG;QACH,OAAO,CAAC,SAAS;QAYjB;;;;;WAKG;QACH,OAAO,CAAC,eAAe;QAkBvB;;;;;WAKG;QACH,OAAO,CAAC,WAAW;QA6CnB;;;;;WAKG;QACH,OAAO,CAAC,eAAe;QAIvB;;;;;WAKG;gBACW,oBAAoB;QA6ClC;;;;WAIG;QACH,OAAO,CAAC,iBAAiB;QAKzB;;;WAGG;QACH,OAAO,CAAC,QAAQ;QAgChB;;;;WAIG;gBACW,oBAAoB;QAyBlC;;;;;;;;;WASG;QACH,OAAO,CAAC,sBAAsB;QA4B9B;;;;;;;;;;WAUG;QACH,OAAO,CAAC,qBAAqB;QAyB7B;;;;WAIG;QACU,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;KAW5C;CAEA"}
+{"version":3,"file":"NewsSettingsPanel.d.ts","sourceRoot":"../../../../..","sources":["src/sap/cux/home/NewsSettingsPanel.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,gCAAgC,CAAC;IAsBhD,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;IAU/D,UAAU,YAAY;QACrB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,0BAA0B,CAAC,EAAE,OAAO,CAAC;KACrC;IAED;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,iBAAiB;QAC/D,OAAO,CAAC,WAAW,CAAU;QAC7B,OAAO,CAAC,wBAAwB,CAAQ;QACxC,OAAO,CAAC,KAAK,CAAQ;QACrB,OAAO,CAAC,aAAa,CAAsB;QAC3C,OAAO,CAAC,UAAU,CAAa;QAC/B,OAAO,CAAC,YAAY,CAA0B;QAC9C,OAAO,CAAC,sBAAsB,CAAY;QAC1C,OAAO,CAAC,UAAU,CAAQ;QAC1B,OAAO,CAAC,KAAK,CAAS;QACtB,OAAO,CAAC,UAAU,CAAS;QAC3B,OAAO,CAAC,YAAY,CAAQ;QAC5B,OAAO,CAAC,kBAAkB,CAAU;QAEpC;;;;;WAKG;QACI,IAAI,IAAI,IAAI;QA2BnB;;;;;WAKG;QACH,OAAO,CAAC,UAAU;QAWlB;;WAEG;gBACW,kBAAkB;QAUhC;;;;;WAKG;QACH,OAAO,CAAC,SAAS;QAYjB;;;;;WAKG;QACH,OAAO,CAAC,eAAe;QAkBvB;;;;;WAKG;QACH,OAAO,CAAC,oBAAoB;QA8C5B;;;;WAIG;QACH,OAAO,CAAC,oBAAoB;QA8B5B;;;;;WAKG;QACH,OAAO,CAAC,eAAe;QAIvB;;;;;WAKG;gBACW,oBAAoB;QAoClC;;;;WAIG;QACH,OAAO,CAAC,+BAA+B;QAYvC;;;;WAIG;QACH,OAAO,CAAC,gCAAgC;QAYxC;;;;;WAKG;QACH,OAAO,CAAC,iBAAiB;QAKzB;;;;WAIG;QACH,OAAO,CAAC,kBAAkB;QA2B1B;;;;WAIG;gBACW,oBAAoB;QA6BlC;;;;;;;;;WASG;QACH,OAAO,CAAC,sBAAsB;QAkC9B;;;;WAIG;QACH,OAAO,CAAC,kBAAkB;QA2B1B;;;;;;;;;;WAUG;QACH,OAAO,CAAC,qBAAqB;QA4B7B;;;;;WAKG;gBACW,wBAAwB;QAWtC;;;;WAIG;QACU,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;KAW5C;CAEA"}