@sapui5/sap.cux.home 1.141.0 → 1.143.0

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",
@@ -933,30 +934,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 +1056,7 @@ export default class NewsPanel extends BaseNewsPanel {
 					}
 				}
 			]);
+
 			if (supported) {
 				if (this._endUserResponse) {
 					this._defaultNewsResponse = this._endUserResponse;
@@ -1082,14 +1097,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"}

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

@@ -2,7 +2,7 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *  * (c) Copyright 2009-2025 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/Label", "sap/m/List", "sap/m/Switch", "sap/m/Text", "sap/m/Title", "sap/m/VBox", "sap/ui/core/CustomData", "./BaseSettingsPanel", "./library", "./utils/Accessibility", "./utils/Constants", "./utils/FESRUtil", "./utils/PersonalisationUtils", "./utils/UshellPersonalizer"], function (CheckBox, CustomListItem, HBox, Label, List, Switch, Text, Title, VBox, CustomData, __BaseSettingsPanel, ___library, ___utils_Accessibility, ___utils_Constants, ___utils_FESRUtil, __PersonalisationUtils, __UshellPersonalizer) {
+sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Column", "sap/m/ColumnListItem", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/Label", "sap/m/List", "sap/m/Switch", "sap/m/Table", "sap/m/Text", "sap/m/Title", "sap/m/VBox", "sap/ui/core/CustomData", "./BaseSettingsPanel", "./library", "./utils/Accessibility", "./utils/Constants", "./utils/FESRUtil", "./utils/PersonalisationUtils", "./utils/UshellPersonalizer"], function (Button, CheckBox, Column, ColumnListItem, CustomListItem, HBox, Label, List, Switch, Table, Text, Title, VBox, CustomData, __BaseSettingsPanel, ___library, ___utils_Accessibility, ___utils_Constants, ___utils_FESRUtil, __PersonalisationUtils, __UshellPersonalizer) {
   "use strict";
 
   function _interopRequireDefault(obj) {
@@ -43,7 +43,15 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
       this.setProperty("key", SETTINGS_PANELS_KEYS.NEWS);
       this.setProperty("title", this._i18nBundle.getText("news"));
       this.setProperty("icon", "sap-icon://newspaper");
-
+      this._resetActionButton = new Button({
+        id: `${this.getId()}-newsResetBtn`,
+        visible: false,
+        enabled: false,
+        text: this._i18nBundle.getText("resetDefaultButton"),
+        press: () => this.resetDefaultNewsSettings()
+      });
+      // Add button to actionButtons aggregation
+      this.addActionButton(this._resetActionButton);
       //setup layout content
       this.addAggregation("content", this.getContent());
 
@@ -65,7 +73,7 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
       const oContentVBox = new VBox(this.getId() + "--idNewsPageOuterVBoX", {
         alignItems: "Start",
         justifyContent: "SpaceBetween",
-        items: [oHeader, oTitle, this.setNewsList()]
+        items: [oHeader, oTitle, this.createCustomNewsList(), this.createNewsGroupTable()]
       });
       return oContentVBox;
     },
@@ -131,49 +139,85 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
       return oTitleVBox;
     },
     /**
-     * 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
      */
-    setNewsList: function _setNewsList() {
-      //showAllPrepRequired Switch
-      const oShowSwitchLabel = new Label(this.getId() + "--idShowAllCustNewsSwitchLabel", {
-        text: this._i18nBundle.getText("showAllPreparationRequiredSwitchLabel")
-      });
-      this.oShowSwitch = new Switch(`${this.getId()}-showSwitch`, {
-        // 'ariaLabelledBy': "idShowAllCustNewsSwitchLabel idShowAllCustNewsSwitch",
-        customTextOn: " ",
-        customTextOff: " ",
-        change: () => {
-          void this.saveNewsFeedSettings();
-        },
-        // 'fesr:change': "showPrepRequire",
-        state: false,
-        ariaLabelledBy: [`${this.getId()}--idShowAllCustNewsSwitchLabel`]
-      });
-      addFESRSemanticStepName(this.oShowSwitch, FESR_EVENTS.CHANGE, "showPrepRequire");
-      this.oCustNewsSwitchContainer = new HBox(this.getId() + "--idShowAllCustNewsSwitchContainer", {
-        alignItems: "Center",
-        items: [oShowSwitchLabel, this.oShowSwitch],
-        width: "94%"
-      }).addStyleClass("sapUiSmallMarginTop");
-      const oShowAllPrep = new VBox(this.getId() + "--idShowAllCustNewsSwitchVBox", {
-        items: [this.oCustNewsSwitchContainer],
-        width: "94%"
-      }).addStyleClass("sapUiSmallMarginTop");
-      const oInvisibleText = getInvisibleText(`${this.getId()}--newsTitleText`, this._i18nBundle.getText("newsTitle"));
-      //List of news items
-      this.oList = new List(this.getId() + "--idCustNewsFeedList", {
-        ariaLabelledBy: [oInvisibleText.getId(), `${this.getId()}--idCustNewsFeedSettingsText`, `${this.getId()}--idCustNewsFeedSettignsTitle`]
-      });
-      //Outer VBox
-      const oNewsListVBox = new VBox(this.getId() + "--idCustNewsFeedListContainer", {
-        direction: "Column",
-        items: [this.oList, oShowAllPrep, oInvisibleText],
-        width: "96%"
-      }).addStyleClass("sapUiSmallMarginTop sapUiSmallMarginBegin");
-      return oNewsListVBox;
+    createCustomNewsList: function _createCustomNewsList() {
+      if (!this.newsListVBox) {
+        //showAllPrepRequired Switch
+        const oShowSwitchLabel = new Label(this.getId() + "--idShowAllCustNewsSwitchLabel", {
+          text: this._i18nBundle.getText("showAllPreparationRequiredSwitchLabel")
+        });
+        this.oShowSwitch = new Switch(`${this.getId()}-showSwitch`, {
+          customTextOn: " ",
+          customTextOff: " ",
+          change: () => {
+            void this.saveNewsFeedSettings();
+          },
+          state: false,
+          ariaLabelledBy: [`${this.getId()}--idShowAllCustNewsSwitchLabel`]
+        });
+        addFESRSemanticStepName(this.oShowSwitch, FESR_EVENTS.CHANGE, "showPrepRequire");
+        this.oCustNewsSwitchContainer = new HBox(this.getId() + "--idShowAllCustNewsSwitchContainer", {
+          alignItems: "Center",
+          items: [oShowSwitchLabel, this.oShowSwitch],
+          width: "94%"
+        }).addStyleClass("sapUiSmallMarginTop");
+        const oShowAllPrep = new VBox(this.getId() + "--idShowAllCustNewsSwitchVBox", {
+          items: [this.oCustNewsSwitchContainer],
+          width: "94%"
+        }).addStyleClass("sapUiSmallMarginTop");
+        const oInvisibleText = getInvisibleText(`${this.getId()}--newsTitleText`, this._i18nBundle.getText("newsTitle"));
+        //List of news items
+        this.oList = new List(this.getId() + "--idCustNewsFeedList", {
+          ariaLabelledBy: [oInvisibleText.getId(), `${this.getId()}--idCustNewsFeedSettingsText`, `${this.getId()}--idCustNewsFeedSettignsTitle`]
+        });
+        //Outer VBox
+        this.newsListVBox = new VBox(this.getId() + "--idCustNewsFeedListContainer", {
+          direction: "Column",
+          visible: false,
+          items: [this.oList, oShowAllPrep, oInvisibleText],
+          width: "96%"
+        }).addStyleClass("sapUiSmallMarginTop sapUiSmallMarginBegin");
+      }
+      return this.newsListVBox;
+    },
+    /**
+     *	Creates and returns a table for managing default news group settings.
+     * @returns {Table} Table for news groups for default manage news feed
+     * @private
+     */
+    createNewsGroupTable: function _createNewsGroupTable() {
+      //Table for news groups
+      if (!this.groupTable) {
+        this.groupTable = new Table(this.getId() + "--idNewsGroupTbl", {
+          includeItemInSelection: true,
+          visible: false
+        }).addStyleClass("sapUiTinyMarginBegin");
+        const placeHolderCol = new Column(this.getId() + "--idNewsGroupPlaceHolder", {
+          width: "15%"
+        });
+
+        //title column
+        const titleCol = new Column(this.getId() + "--idNewsGroupTitle", {
+          header: new Label(this.getId() + "--idNewsGroupTitleLbl", {
+            text: this._i18nBundle.getText("defaultNewsSettingsHeading")
+          }),
+          width: "45%"
+        });
+        const articleCount = new Column(this.getId() + "--idNewsGroupCount", {
+          header: new Label(this.getId() + "--idNewsGroupCountLbl", {
+            text: this._i18nBundle.getText("articleCount")
+          }),
+          width: "40%"
+        });
+        this.groupTable.addColumn(placeHolderCol);
+        this.groupTable.addColumn(titleCol);
+        this.groupTable.addColumn(articleCount);
+      }
+      return this.groupTable;
     },
     /**
      * Checks if the custom file format is CSV based on the custom file name.
@@ -199,20 +243,11 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
         const showDefault = newsType === NewsType.Default;
         const customFileName = _this2.oNewsPanel.getProperty("customFileName");
         const feedKey = _this2.oNewsPanel.getCustomFeedKey();
-        _this2.oList.getItems().forEach(item => {
-          const newsListContent = item.getAggregation("content");
-          const newsListHBox = newsListContent[0];
-          const [checkbox, label] = newsListHBox.getItems();
-          const isSelected = checkbox.getSelected();
-          if (showDefault) {
-            const groupId = _this2.getDefaultGroupId(newsListHBox);
-            if (!isSelected && groupId) {
-              deselectedDefaultFeeds.push(groupId);
-            }
-          } else if (isSelected) {
-            selectedFeeds.push(label.getText());
-          }
-        });
+        if (showDefault) {
+          deselectedDefaultFeeds.push(..._this2.collectDeselectedDefaultGroupIds());
+        } else {
+          selectedFeeds.push(..._this2.collectSelectedCustomFeedTitles());
+        }
         return Promise.resolve(_this2.getPersonalization()).then(function (personalizer) {
           return Promise.resolve(personalizer.read()).then(function (personalizationData) {
             if (showDefault) {
@@ -229,6 +264,8 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
               // get the latest value of switch and set the state
               if (!showDefault) {
                 _this2.oShowSwitch.setState(personalizationData.favNewsFeed?.showAllPreparationRequired);
+              } else {
+                _this2._resetActionButton.setEnabled(!!(deselectedDefaultFeeds.length > 0));
               }
               return Promise.resolve(_this2.oNewsPanel.setCustomNewsFeed(showDefault ? "" : feedKey)).then(function () {});
             });
@@ -238,8 +275,41 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
         return Promise.reject(e);
       }
     },
-    /** 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
+     */
+    collectSelectedCustomFeedTitles: function _collectSelectedCustomFeedTitles() {
+      const items = this.oList?.getItems() ?? [];
+      if (!items.length) return [];
+      return items.flatMap(item => {
+        const content = item.getAggregation("content");
+        const hBox = content?.[0];
+        if (!hBox) return [];
+        const [checkBox, text] = hBox.getItems();
+        return checkBox.getSelected() ? [text.getText()] : [];
+      });
+    },
+    /**
+     * Collect deselected default group IDs from the table
+     * @returns {string[]} Array of deselected default group IDs from the table
+     * @private
+     */
+    collectDeselectedDefaultGroupIds: function _collectDeselectedDefaultGroupIds() {
+      const rows = this.groupTable?.getItems() ?? [];
+      if (!rows.length) return [];
+      return rows.flatMap(row => {
+        const cells = row.getCells();
+        const checkBox = cells[0];
+        if (checkBox.getSelected()) return [];
+        const groupId = this.getDefaultGroupId(row);
+        return groupId ? [groupId] : [];
+      });
+    },
+    /**
+     * Get groupId info  for the default NewsList
+     * @param {HBox | ColumnListItem} contentBox, content Hbox or ColumnListItem
      * @returns {string} groupId
      * @private
      */
@@ -247,14 +317,13 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
       const customData = contentBox.getCustomData();
       return customData?.length ? customData[0].getValue() : "";
     },
-    /** 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
      */
-    setItems: function _setItems(aItems) {
+    setCustomNewsItems: function _setCustomNewsItems(aItems) {
       this.oList.destroyAggregation("items", true);
-      const newsType = this.oNewsPanel?.getNewsType();
-      let showDefault = newsType === NewsType.Default;
       (aItems || []).forEach((oItem, i) => {
         let oNewsListItemHbox = new HBox({
           id: `${this.getId()}--idCustNewsFeedItemContent--${i}`,
@@ -270,13 +339,6 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
           })],
           width: "100%"
         });
-        if (showDefault) {
-          // if showDefault is true, add group_id as custom data to the item
-          oNewsListItemHbox.addCustomData(new CustomData({
-            key: "newsGroupId",
-            value: oItem.group_id
-          }));
-        }
         const customListItem = new CustomListItem({
           id: `${this.getId()}--idCustNewsFeedItem--${i}`,
           content: [oNewsListItemHbox]
@@ -304,13 +366,21 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
           return Promise.resolve(oPersonalizer.read()).then(function (oPersData) {
             const aPersNewsFeed = showDefaultNewsFeed ? oPersData?.["defaultNewsFeed"] : oPersData?.["favNewsFeed"];
             const showAllPreparationRequired = aPersNewsFeed?.showAllPreparationRequired ?? !aPersNewsFeed;
-            return Promise.resolve(_this3.oNewsPanel.getCustomOrDefaultNewsFeed(showDefaultNewsFeed ? "" : sFeedKey, false)).then(function (aNewsFeed) {
-              if (showDefaultNewsFeed) {
+            let aNewsFeed;
+            if (showDefaultNewsFeed) {
+              _this3._resetActionButton.setVisible(true);
+              _this3._resetActionButton.setEnabled(!!(aPersNewsFeed?.items?.length > 0));
+              return Promise.resolve(_this3.oNewsPanel.getDefaultNewsData()).then(function (_this3$oNewsPanel$get) {
+                aNewsFeed = _this3$oNewsPanel$get;
                 return _this3._handleDefaultNewsFeed(aNewsFeed, aPersNewsFeed);
-              } else {
+              });
+            } else {
+              _this3._resetActionButton.setVisible(false);
+              return Promise.resolve(_this3.oNewsPanel.getCustomOrDefaultNewsFeed(showDefaultNewsFeed ? "" : sFeedKey, false)).then(function (_this3$oNewsPanel$get2) {
+                aNewsFeed = _this3$oNewsPanel$get2;
                 return _this3._handleCustomNewsFeed(aNewsFeed, aPersNewsFeed, showAllPreparationRequired);
-              }
-            });
+              });
+            }
           });
         });
       } catch (e) {
@@ -328,8 +398,10 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
      * If no news feed is provided, it returns undefined.
      */
     _handleDefaultNewsFeed: function _handleDefaultNewsFeed(aNewsFeed, aPersNewsFeed) {
-      this.headerText.setText(this._i18nBundle.getText("defaultNewsSettingsText"));
-      this.title.setText(this._i18nBundle.getText("defaultNewsSettingsHeading"));
+      this.headerText.setText(this._i18nBundle.getText("defaultNewsSettingsText") + "\n" + this._i18nBundle.getText("defaultNewsSettingsSubText"));
+      this.title.setVisible(false);
+      this.newsListVBox.setVisible(false);
+      this.oShowSwitch.setState(false);
       const mandatoryNewsFeed = this.oNewsPanel.getMandatoryDefaultNewsFeed();
       this.deselectedDefaultFeeds = aPersNewsFeed?.items || [];
       if (!aNewsFeed || aNewsFeed.length === 0) {
@@ -346,10 +418,45 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
         }
         return oNewsFeed;
       });
-      this.setItems(aNewsFeed);
-      this.oShowSwitch.setState(false);
+      this.groupTable.setVisible(true);
+      this.setColumnListItems(aNewsFeed);
       return aNewsFeed;
     },
+    /**
+     * 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
+     */
+    setColumnListItems: function _setColumnListItems(aItems) {
+      this.groupTable.destroyItems();
+      //add column list item, title and article count
+      (aItems || []).forEach((oItem, i) => {
+        const colListItem = new ColumnListItem({
+          id: `${this.getId()}--idNewsGroupColListItem--${i}`,
+          selected: oItem.selected,
+          type: "Active",
+          cells: [new CheckBox({
+            id: `${this.getId()}--idNewsGroupCheckBox--${i}`,
+            selected: oItem.selected,
+            enabled: !oItem.disabled,
+            select: () => {
+              void this.saveNewsFeedSettings();
+            }
+          }), new Text({
+            text: oItem.title
+          }), new Text({
+            text: String(oItem._group_to_article?.length ?? 0)
+          })]
+        });
+
+        // if showDefault is true, add group_id as custom data to the item
+        colListItem.addCustomData(new CustomData({
+          key: "newsGroupId",
+          value: oItem.group_id
+        }));
+        this.groupTable.addItem(colListItem);
+      });
+    },
     /**
      * @param {INewsFeed[]} aNewsFeed
      * @param aPersNewsFeed
@@ -362,8 +469,11 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
      * It also sets the state of the show switch based on the `showAllPreparationRequired` parameter.
      */
     _handleCustomNewsFeed: function _handleCustomNewsFeed(aNewsFeed, aPersNewsFeed, showAllPreparationRequired) {
+      this.groupTable.setVisible(false);
       this.headerText.setText(this._i18nBundle.getText("newsFeedSettingsText"));
       this.title.setText(this._i18nBundle.getText("newsFeedSettingsHeading"));
+      this.title.setVisible(true);
+      this.newsListVBox.setVisible(true);
       if (!aNewsFeed || aNewsFeed.length === 0) {
         return;
       }
@@ -374,10 +484,38 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
         return oNewsFeed;
       });
       this.aFavNewsFeed = aNewsFeed;
-      this.setItems(this.aFavNewsFeed);
+      this.setCustomNewsItems(this.aFavNewsFeed);
       this.oShowSwitch.setState(!!showAllPreparationRequired);
       return aNewsFeed;
     },
+    /**
+     * 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.
+     */
+    resetDefaultNewsSettings: function _resetDefaultNewsSettings() {
+      try {
+        const _this4 = this;
+        return Promise.resolve(_this4.getPersonalization()).then(function (personalizer) {
+          return Promise.resolve(personalizer.read()).then(function (personalizationData) {
+            personalizationData.defaultNewsFeed = {
+              items: []
+            };
+            return Promise.resolve(personalizer.write(personalizationData)).then(function () {
+              return Promise.resolve(_this4.oNewsPanel.setCustomNewsFeed("")).then(function () {
+                return Promise.resolve(_this4.oNewsPanel.getDefaultNewsData()).then(function (aNewsFeed) {
+                  _this4._resetActionButton.setEnabled(false);
+                  return _this4._handleDefaultNewsFeed(aNewsFeed, personalizationData.defaultNewsFeed);
+                });
+              });
+            });
+          });
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    },
     /**
      * Checks if the News Settings Panel is supported based on the properties of the News Panel.
      *
@@ -385,8 +523,8 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
      */
     isSupported: function _isSupported() {
       try {
-        const _this4 = this;
-        const newsPanel = _this4._getPanel();
+        const _this5 = this;
+        const newsPanel = _this5._getPanel();
         if (!newsPanel || !(newsPanel?.getParent()).getProperty("newsFeedVisibility")) {
           return Promise.resolve(false);
         }