@sapui5/sap.cux.home 1.138.0 → 1.139.0

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

@@ -4,13 +4,13 @@
  */
 
 import Button from "sap/m/Button";
-import CheckBox, { CheckBox$SelectEvent } from "sap/m/CheckBox";
 import Input, { Input$LiveChangeEvent } from "sap/m/Input";
 import { InputBase$ChangeEvent } from "sap/m/InputBase";
 import Label from "sap/m/Label";
 import MessageBox from "sap/m/MessageBox";
 import MessageStrip from "sap/m/MessageStrip";
 import MessageToast from "sap/m/MessageToast";
+import RadioButton, { RadioButton$SelectEvent } from "sap/m/RadioButton";
 import Toolbar from "sap/m/Toolbar";
 import VBox from "sap/m/VBox";
 import Library from "sap/m/library";
@@ -29,6 +29,7 @@ import NewsAndPagesContainer from "./NewsAndPagesContainer";
 import NewsPanel, { FileFormat } from "./NewsPanel";
 import { CHANGE_TYPES } from "./flexibility/Layout.flexibility";
 import { INewsPersData } from "./interface/KeyUserInterface";
+import { NewsType } from "./library";
 import { DEFAULT_NEWS_URL, KEYUSER_SETTINGS_PANELS_KEYS } from "./utils/Constants";
 import HttpHelper from "./utils/HttpHelper";
 
@@ -75,6 +76,7 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 	private customNewsVisibility!: boolean;
 	private defaultNewsVisibility!: boolean;
 	private validChanges!: boolean;
+	private rssNewsVisibility!: boolean;
 
 	/**
 	 * Init lifecycle method
@@ -136,13 +138,17 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 		return wrapperVBox;
 	}
 
+	public checkNewsType(type: NewsType): boolean {
+		if (this._getPanel().getProperty("type") === type) return true;
+		return false;
+	}
+
 	public async isValidChanges(newsVisible: boolean) {
 		this.validChanges = true;
 		const fileUploader = this.getFileUploader();
 		const keyUserChangeContent = this.getCurrentKeyUserChange();
-		const showCustom =
-			this.customNewsVisibility === undefined ? Boolean(this._getPanel().getProperty("showCustom")) : this.customNewsVisibility;
-		const showDefault = this.defaultNewsVisibility ?? !!this._getPanel().getProperty("showDefault");
+		const showCustom = this.customNewsVisibility ?? !!this.checkNewsType(NewsType.Custom);
+		const showDefault = this.defaultNewsVisibility ?? !!this.checkNewsType(NewsType.Default);
 		if (this.getNewsFeedUploadBtn().getEnabled()) {
 			if (showCustom) {
 				MessageBox.error(String(this._i18nBundle.getText("newsFeedSaveUploadChanges")));
@@ -159,7 +165,12 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 			this.validChanges = false;
 		} else if (!showCustom && !showDefault && newsVisible && !this.getMessageStrip().getVisible()) {
 			const newsUrl = keyUserChangeContent.newsFeedURL;
-			await (this._getPanel() as NewsPanel).setURL(String(newsUrl));
+			if (!newsUrl?.trim()) {
+				this.showMessageStrip(true, MessageType.Error, "invalidNewsUrl");
+				this.validChanges = false;
+			} else {
+				await (this._getPanel() as NewsPanel).setURL(String(newsUrl));
+			}
 		}
 		return this.validChanges;
 	}
@@ -170,12 +181,15 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 		const newsUrlInput = this.controlMap.get(`${this.getId()}-newsFeedURLInput`) as Input;
 		const url = String(newsPanel.getProperty("url"));
 		newsUrlInput.setValue(url !== DEFAULT_NEWS_URL ? url : "");
-		this.customNewsVisibility = Boolean(newsPanel.getProperty("showCustom"));
-		this.defaultNewsVisibility = Boolean(newsPanel.getProperty("showDefault"));
+		this.customNewsVisibility = this.checkNewsType(NewsType.Custom);
+		this.defaultNewsVisibility = this.checkNewsType(NewsType.Default);
+		this.rssNewsVisibility = this.checkNewsType(NewsType.NewsUrl);
+
 		(this.controlMap.get(`${this.getId()}-customNewsUploadFileUploader`) as FileUploader).setEnabled(this.customNewsVisibility);
-		(this.controlMap.get(`${this.getId()}-newsFeedURLInput`) as Input).setEnabled(!this.customNewsVisibility);
-		(this.controlMap.get(`${this.getId()}-customNewsFeedCheckBox`) as CheckBox).setSelected(this.customNewsVisibility);
-		(this.controlMap.get(`${this.getId()}-defaultNewsFeedCheckBox`) as CheckBox).setSelected(this.defaultNewsVisibility);
+		(this.controlMap.get(`${this.getId()}-newsFeedURLInput`) as Input).setEnabled(this.rssNewsVisibility);
+		(this.controlMap.get(`${this.getId()}-customNewsFeedRadioBtn`) as RadioButton).setSelected(this.customNewsVisibility);
+		(this.controlMap.get(`${this.getId()}-defaultNewsFeedRadioBtn`) as RadioButton).setSelected(this.defaultNewsVisibility);
+		(this.controlMap.get(`${this.getId()}-newsUrlRadioBtn`) as RadioButton).setSelected(this.rssNewsVisibility);
 		this.getFileUploader().setValue(String(newsPanel.getProperty("customFileName")));
 		this.clearKeyUserChanges();
 	}
@@ -198,12 +212,11 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 		wrapperVBox.addItem(this.controlMap.get(keyUserNewsPanelToolbarId) as Toolbar);
 	}
 
-	private handleSelectCustomNewsFeed(oEvent: CheckBox$SelectEvent): void {
-		this.customNewsVisibility = oEvent.getSource().getSelected();
+	private handleSelectCustomNewsFeed(oEvent: RadioButton$SelectEvent): void {
+		this.customNewsVisibility = oEvent.getParameter("selected") as boolean;
 
 		(this.controlMap.get(`${this.getId()}-customNewsUploadFileUploader`) as FileUploader).setEnabled(this.customNewsVisibility);
 		(this.controlMap.get(`${this.getId()}-newsFeedURLInput`) as Input).setEnabled(!this.customNewsVisibility);
-		(this.controlMap.get(`${this.getId()}-defaultNewsFeedCheckBox`) as Input).setEnabled(!this.customNewsVisibility);
 
 		const newsPanel = this._getPanel() as NewsPanel;
 		const newsPageContainer = newsPanel.getParent() as NewsAndPagesContainer;
@@ -216,14 +229,17 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 					changeType: CHANGE_TYPES.NEWS_FEED_URL,
 					content: {
 						oldNewsFeedUrl: String(this._getPanel().getProperty("url")),
-						oldShowCustomNewsFeed: Boolean(this._getPanel().getProperty("showCustom")),
+						oldShowCustomNewsFeed: this.checkNewsType(NewsType.Custom),
 						oldCustomNewsFeedKey: String(this._getPanel().getProperty("customFeedKey")),
-						oldshowDefaultNewsFeed: Boolean(this._getPanel().getProperty("showDefault")),
+						oldshowDefaultNewsFeed: this.checkNewsType(NewsType.Default),
+						oldShowRssNewsFeed: this.checkNewsType(NewsType.NewsUrl),
+
 						newsFeedURL: String(this._getPanel().getProperty("url")),
 						showCustomNewsFeed: this.customNewsVisibility,
 						customNewsFeedKey: String(this._getPanel().getProperty("customFeedKey")),
 						customNewsFeedFileName: String(this._getPanel().getProperty("customFileName")),
-						showDefaultNewsFeed: this.defaultNewsVisibility
+						showDefaultNewsFeed: false,
+						showRssNewsFeed: false
 					}
 				}
 			});
@@ -236,66 +252,129 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 	}
 
 	/**
-	 * Add CheckBox for Custom News Feed.
+	 * Add Radio Button for Custom News Feed.
 	 *
 	 * @private
 	 */
-	private addCustomNewsFeedCheckBox(wrapperVBox: VBox): void {
-		const customNewsFeedCheckBoxId = `${this.getId()}-customNewsFeedCheckBox`;
-		const showCustom = Boolean(this._getPanel().getProperty("showCustom"));
-		const showDefault = this._getPanel().getProperty("showDefault") as boolean;
-		if (!this.controlMap.get(customNewsFeedCheckBoxId)) {
-			const customNewsFeedCheckBox = new CheckBox(`${this.getId()}-customNewsFeedCheckBox`, {
+	private addCustomNewsFeedRadioBtn(wrapperVBox: VBox): void {
+		const customNewsFeedRadioBtnId = `${this.getId()}-customNewsFeedRadioBtn`;
+		const showCustom = this.checkNewsType(NewsType.Custom);
+
+		if (!this.controlMap.get(customNewsFeedRadioBtnId)) {
+			const customNewsFeedRadioBtn = new RadioButton(`${this.getId()}-customNewsFeedRadioBtn`, {
 				text: this._i18nBundle.getText("selectCustomNewsFeed"),
 				selected: showCustom,
-				select: this.handleSelectCustomNewsFeed.bind(this),
-				enabled: !showDefault
+				select: this.handleSelectCustomNewsFeed.bind(this)
 			}).addStyleClass("sapUiTinyMargin");
-			this.controlMap.set(customNewsFeedCheckBoxId, customNewsFeedCheckBox);
+			this.controlMap.set(customNewsFeedRadioBtnId, customNewsFeedRadioBtn);
 		} else if (!this.getCurrentKeyUserChange()) {
-			let customCheckbox = this.controlMap.get(`${this.getId()}-customNewsFeedCheckBox`) as CheckBox;
-			customCheckbox.setSelected(showCustom);
-			customCheckbox.setEnabled(!showDefault);
+			let customRadioBtn = this.controlMap.get(`${this.getId()}-customNewsFeedRadioBtn`) as RadioButton;
+			customRadioBtn.setSelected(showCustom);
+			(this.controlMap.get(`${this.getId()}-customNewsUploadFileUploader`) as FileUploader).setEnabled(showCustom);
 		}
-		wrapperVBox.addItem(this.controlMap.get(customNewsFeedCheckBoxId) as CheckBox);
+		wrapperVBox.addItem(this.controlMap.get(customNewsFeedRadioBtnId) as RadioButton);
 	}
 
 	/**
-	 * Add CheckBox for Manage News Feed.
+	 * Add Radio Button for Manage News Feed.
 	 *
 	 * @private
 	 */
-	private addDefaultNewsFeedCheckBox(wrapperVBox: VBox): void {
-		const defaultNewsFeedCheckBoxId = `${this.getId()}-defaultNewsFeedCheckBox`;
-		const showDefault = Boolean(this._getPanel().getProperty("showDefault"));
-		const showCustom = this._getPanel().getProperty("showCustom") as boolean;
-		if (!this.controlMap.get(defaultNewsFeedCheckBoxId)) {
-			const defaultNewsFeedCheckBox = new CheckBox(`${this.getId()}-defaultNewsFeedCheckBox`, {
+	private addDefaultNewsFeedRadioBtn(wrapperVBox: VBox): void {
+		const defaultNewsFeedRadioBtnId = `${this.getId()}-defaultNewsFeedRadioBtn`;
+		const showDefault = this.checkNewsType(NewsType.Default);
+
+		if (!this.controlMap.get(defaultNewsFeedRadioBtnId)) {
+			const defaultNewsFeedRadioBtn = new RadioButton(`${this.getId()}-defaultNewsFeedRadioBtn`, {
 				text: this._i18nBundle.getText("selectDefaultNewsFeed"),
 				selected: showDefault,
-				select: this.handleselectDefaultNewsFeed.bind(this),
-				enabled: !showCustom
+				select: this.handleselectDefaultNewsFeed.bind(this)
+			}).addStyleClass("sapUiTinyMargin");
+			this.controlMap.set(defaultNewsFeedRadioBtnId, defaultNewsFeedRadioBtn);
+		} else if (!this.getCurrentKeyUserChange()) {
+			let defaultRadioBtn = this.controlMap.get(`${this.getId()}-defaultNewsFeedRadioBtn`) as RadioButton;
+			defaultRadioBtn.setSelected(showDefault);
+		}
+		wrapperVBox.addItem(this.controlMap.get(defaultNewsFeedRadioBtnId) as RadioButton);
+	}
+
+	private addNewsPaneLabel(wrapperVBox: VBox): void {
+		const newsPanelLabelId = `${this.getId()}-newsPanelLabel`;
+		if (!this.controlMap.get(newsPanelLabelId)) {
+			const newsPanelLabel = new Label(newsPanelLabelId, {
+				text: this._i18nBundle.getText("newsFeedOptionLabel")
+			}).addStyleClass("sapUiTinyMargin");
+			this.controlMap.set(newsPanelLabelId, newsPanelLabel);
+		}
+		wrapperVBox.addItem(this.controlMap.get(newsPanelLabelId) as Label);
+	}
+
+	private handleSelectRssNewsFeed(oEvent: RadioButton$SelectEvent): void {
+		this.rssNewsVisibility = oEvent.getParameter("selected") as boolean;
+		(this.controlMap.get(`${this.getId()}-customNewsUploadFileUploader`) as FileUploader).setEnabled(!this.rssNewsVisibility);
+		(this.controlMap.get(`${this.getId()}-newsFeedURLInput`) as Input).setEnabled(this.rssNewsVisibility);
+
+		const newsPanel = this._getPanel() as NewsPanel;
+		const newsPageContainer = newsPanel.getParent() as NewsAndPagesContainer;
+		const layout = newsPageContainer.getParent() as BaseLayout;
+		const keyUserChangeContent = this.getCurrentKeyUserChange();
+		if (!keyUserChangeContent) {
+			this.addKeyUserChanges({
+				selectorControl: layout,
+				changeSpecificData: {
+					changeType: CHANGE_TYPES.NEWS_FEED_URL,
+					content: {
+						oldNewsFeedUrl: String(this._getPanel().getProperty("url")),
+						oldShowCustomNewsFeed: this.checkNewsType(NewsType.Custom),
+						oldCustomNewsFeedKey: String(this._getPanel().getProperty("customFeedKey")),
+						oldshowDefaultNewsFeed: this.checkNewsType(NewsType.Default),
+						oldShowRssNewsFeed: this.checkNewsType(NewsType.NewsUrl),
+						newsFeedURL: String(this._getPanel().getProperty("url")),
+						showCustomNewsFeed: false,
+						customNewsFeedKey: String(this._getPanel().getProperty("customFeedKey")),
+						customNewsFeedFileName: String(this._getPanel().getProperty("customFileName")),
+						showDefaultNewsFeed: false,
+						showRssNewsFeed: this.rssNewsVisibility
+					}
+				}
+			});
+			this._eventBus.publish("KeyUserChanges", "addNewsPagesChanges", { changes: this.getKeyUserChanges() });
+		} else if (keyUserChangeContent.showRssNewsFeed !== this.rssNewsVisibility) {
+			keyUserChangeContent.showRssNewsFeed = this.rssNewsVisibility;
+		}
+		this.removeUrlMesageStrip();
+		this._eventBus.publish("KeyUserChanges", "disabledSaveBtn", { disable: false, date: new Date() });
+	}
+
+	private addNewsUrlRadioBtn(wrapperVBox: VBox): void {
+		const newsUrlRadioBtnId = `${this.getId()}-newsUrlRadioBtn`;
+		const showRss = this.checkNewsType(NewsType.NewsUrl);
+		if (!this.controlMap.get(newsUrlRadioBtnId)) {
+			const newsUrlRadioBtn = new RadioButton(`${this.getId()}-newsUrlRadioBtn`, {
+				text: this._i18nBundle.getText("selectNewsFeedUrl"),
+				selected: showRss,
+				select: this.handleSelectRssNewsFeed.bind(this)
 			}).addStyleClass("sapUiTinyMargin");
-			this.controlMap.set(defaultNewsFeedCheckBoxId, defaultNewsFeedCheckBox);
+			this.controlMap.set(newsUrlRadioBtnId, newsUrlRadioBtn);
 		} else if (!this.getCurrentKeyUserChange()) {
-			let checkbox = this.controlMap.get(`${this.getId()}-defaultNewsFeedCheckBox`) as CheckBox;
-			checkbox.setSelected(showDefault);
-			checkbox.setEnabled(!showCustom);
+			let rssRadioBtn = this.controlMap.get(`${this.getId()}-newsUrlRadioBtn`) as RadioButton;
+			rssRadioBtn.setSelected(showRss);
+			(this.controlMap.get(`${this.getId()}-newsFeedURLInput`) as Input).setEnabled(showRss);
 		}
-		wrapperVBox.addItem(this.controlMap.get(defaultNewsFeedCheckBoxId) as CheckBox);
+
+		wrapperVBox.addItem(this.controlMap.get(newsUrlRadioBtnId) as RadioButton);
 	}
 
 	/**
-	 * Handle the selection of the Manage News Feed checkbox.
+	 * Handle the selection of the Manage News Feed Radio Button.
 	 *
 	 * @private
 	 */
-	private handleselectDefaultNewsFeed(oEvent: CheckBox$SelectEvent): void {
-		this.defaultNewsVisibility = oEvent.getSource().getSelected();
+	private handleselectDefaultNewsFeed(oEvent: RadioButton$SelectEvent): void {
+		this.defaultNewsVisibility = oEvent.getParameter("selected") as boolean;
 
 		(this.controlMap.get(`${this.getId()}-customNewsUploadFileUploader`) as FileUploader).setEnabled(!this.defaultNewsVisibility);
 		(this.controlMap.get(`${this.getId()}-newsFeedURLInput`) as Input).setEnabled(!this.defaultNewsVisibility);
-		(this.controlMap.get(`${this.getId()}-customNewsFeedCheckBox`) as Input).setEnabled(!this.defaultNewsVisibility);
 
 		const newsPanel = this._getPanel() as NewsPanel;
 		const newsPageContainer = newsPanel.getParent() as NewsAndPagesContainer;
@@ -310,20 +389,24 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 					changeType: CHANGE_TYPES.NEWS_FEED_URL,
 					content: {
 						oldNewsFeedUrl: String(this._getPanel().getProperty("url")),
-						oldShowCustomNewsFeed: Boolean(this._getPanel().getProperty("showCustom")),
+						oldShowCustomNewsFeed: this.checkNewsType(NewsType.Custom),
 						oldCustomNewsFeedKey: String(this._getPanel().getProperty("customFeedKey")),
-						oldshowDefaultNewsFeed: Boolean(this._getPanel().getProperty("showDefault")),
+						oldshowDefaultNewsFeed: this.checkNewsType(NewsType.Default),
+						oldShowRssNewsFeed: this.checkNewsType(NewsType.NewsUrl),
+
 						newsFeedURL: String(newsUrlInput.getValue()),
-						showCustomNewsFeed: this.customNewsVisibility,
+						showCustomNewsFeed: false,
 						customNewsFeedKey: String(this._getPanel().getProperty("customFeedKey")),
 						customNewsFeedFileName: String(this._getPanel().getProperty("customFileName")),
-						showDefaultNewsFeed: this.defaultNewsVisibility
+						showDefaultNewsFeed: this.defaultNewsVisibility,
+						showRssNewsFeed: false
 					}
 				}
 			});
 			this._eventBus.publish("KeyUserChanges", "addNewsPagesChanges", { changes: this.getKeyUserChanges() });
 		} else if (keyUserChangeContent.showDefaultNewsFeed !== this.defaultNewsVisibility) {
 			keyUserChangeContent.showDefaultNewsFeed = this.defaultNewsVisibility;
+			keyUserChangeContent.showCustomNewsFeed = false;
 		}
 		this.removeUrlMesageStrip();
 		this._eventBus.publish("KeyUserChanges", "disabledSaveBtn", { disable: false, date: new Date() });
@@ -347,14 +430,17 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 					changeType: CHANGE_TYPES.NEWS_FEED_URL,
 					content: {
 						oldNewsFeedUrl: String(this._getPanel().getProperty("url")),
-						oldShowCustomNewsFeed: Boolean(this._getPanel().getProperty("showCustom")),
+						oldShowCustomNewsFeed: this.checkNewsType(NewsType.Custom),
 						oldCustomNewsFeedKey: String(this._getPanel().getProperty("customFeedKey")),
-						oldshowDefaultNewsFeed: Boolean(this._getPanel().getProperty("showDefault")),
+						oldshowDefaultNewsFeed: this.checkNewsType(NewsType.Default),
+						oldShowRssNewsFeed: this.checkNewsType(NewsType.NewsUrl),
+
 						newsFeedURL: newsUrl,
 						showCustomNewsFeed: false,
 						customNewsFeedKey: String(this._getPanel().getProperty("customFeedKey")),
 						customNewsFeedFileName: String(this._getPanel().getProperty("customFileName")),
-						showDefaultNewsFeed: false
+						showDefaultNewsFeed: false,
+						showRssNewsFeed: this.rssNewsVisibility
 					}
 				}
 			});
@@ -410,24 +496,18 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 	 */
 	private addNewsURLSimpleForm(wrapperVBox: VBox): void {
 		const newsFeedURLSimpleFormId = `${this.getId()}-newsFeedURLSimpleForm`;
-		const showCustom = Boolean(this._getPanel().getProperty("showCustom"));
-		const showDefault = Boolean(this._getPanel().getProperty("showDefault"));
+		const showRss = this.checkNewsType(NewsType.NewsUrl);
+
 		const newsInputUrl = String(this._getPanel().getProperty("url"));
 		if (!this.controlMap.get(newsFeedURLSimpleFormId)) {
-			const newsFeedURLSimpleForm = new SimpleForm(`${this.getId()}-newsFeedURLSimpleForm`, {
-				content: [
-					new Label(`${this.getId()}-newsFeedURLLabel`, {
-						text: this._i18nBundle.getText("editNewsURL")
-					})
-				]
-			}).addStyleClass("sapContrastPlus");
+			const newsFeedURLSimpleForm = new SimpleForm(`${this.getId()}-newsFeedURLSimpleForm`).addStyleClass("sapContrastPlus");
 			const newsFeedURLInputId = `${this.getId()}-newsFeedURLInput`;
 			const newsFeedURLInput = new Input(newsFeedURLInputId, {
 				value: newsInputUrl !== DEFAULT_NEWS_URL ? newsInputUrl : "",
 				type: Library.InputType.Url,
 				change: this.onNewsUrlChange.bind(this),
 				liveChange: this.onUrlLiveChange.bind(this),
-				enabled: !showCustom && !showDefault
+				enabled: showRss
 			});
 			this.controlMap.set(newsFeedURLInputId, newsFeedURLInput);
 			newsFeedURLSimpleForm.addContent(newsFeedURLInput);
@@ -435,7 +515,6 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 		} else if (this.getCurrentKeyUserChange()) {
 			let inputUrlField = this.controlMap.get(`${this.getId()}-newsFeedURLInput`) as Input;
 			inputUrlField.setValue(newsInputUrl);
-			inputUrlField.setEnabled(!showCustom && !showDefault);
 		}
 		wrapperVBox.addItem(this.controlMap.get(newsFeedURLSimpleFormId) as SimpleForm);
 	}
@@ -508,14 +587,17 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 							changeType: CHANGE_TYPES.NEWS_FEED_URL,
 							content: {
 								oldNewsFeedUrl: String(this._getPanel().getProperty("url")),
-								oldShowCustomNewsFeed: Boolean(this._getPanel().getProperty("showCustom")),
+								oldShowCustomNewsFeed: this.checkNewsType(NewsType.Custom),
 								oldCustomNewsFeedKey: String(this._getPanel().getProperty("customFeedKey")),
-								oldshowDefaultNewsFeed: Boolean(this._getPanel().getProperty("showDefault")),
+								oldshowDefaultNewsFeed: this.checkNewsType(NewsType.Default),
+								oldShowRssNewsFeed: this.checkNewsType(NewsType.NewsUrl),
+
 								newsFeedURL: String(this._getPanel().getProperty("url")),
 								showCustomNewsFeed: true,
 								customNewsFeedKey: String(this._getPanel().getProperty("customFeedKey")),
 								customNewsFeedFileName: String(this._getPanel().getProperty("customFileName")),
-								showDefaultNewsFeed: this.defaultNewsVisibility
+								showDefaultNewsFeed: false,
+								showRssNewsFeed: false
 							}
 						}
 					});
@@ -536,14 +618,16 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 						changeType: CHANGE_TYPES.NEWS_FEED_URL,
 						content: {
 							oldNewsFeedUrl: String(this._getPanel().getProperty("url")),
-							oldShowCustomNewsFeed: Boolean(this._getPanel().getProperty("showCustom")),
+							oldShowCustomNewsFeed: this.checkNewsType(NewsType.Custom),
 							oldCustomNewsFeedKey: String(this._getPanel().getProperty("customFeedKey")),
-							oldshowDefaultNewsFeed: Boolean(this._getPanel().getProperty("showDefault")),
+							oldshowDefaultNewsFeed: this.checkNewsType(NewsType.Default),
+							oldShowRssNewsFeed: this.checkNewsType(NewsType.NewsUrl),
 							newsFeedURL: String(this._getPanel().getProperty("url")),
 							showCustomNewsFeed: true,
 							customNewsFeedKey: customKey,
 							customNewsFeedFileName: this.getFileUploader().getValue(),
-							showDefaultNewsFeed: this.defaultNewsVisibility
+							showDefaultNewsFeed: false,
+							showRssNewsFeed: false
 						}
 					}
 				});
@@ -612,13 +696,9 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 	private addCustomNewsUploadSimpleForm(wrapperVBox: VBox): void {
 		const customNewsUploadSimpleFormId = `${this.getId()}-customNewsUploadSimpleForm`;
 		if (!this.controlMap.get(customNewsUploadSimpleFormId)) {
-			const customNewsUploadSimpleForm = new SimpleForm(`${this.getId()}-customNewsUploadSimpleForm`, {
-				content: [
-					new Label(`${this.getId()}-customNewsUploadLabel`, {
-						text: this._i18nBundle.getText("customNewsFeed")
-					})
-				]
-			}).addStyleClass("sapContrastPlus");
+			const customNewsUploadSimpleForm = new SimpleForm(`${this.getId()}-customNewsUploadSimpleForm`).addStyleClass(
+				"sapContrastPlus"
+			);
 			const customNewsUploadVBox = new VBox(`${this.getId()}-customNewsUploadVBox`);
 			const customNewsUploadFileUploader = `${this.getId()}-customNewsUploadFileUploader`;
 			const newsPanel = this._getPanel() as NewsPanel;
@@ -633,7 +713,7 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 				sameFilenameAllowed: true,
 				afterDialogClose: this.handleFileDialogClose.bind(this),
 				value: String(this._getPanel().getProperty("customFileName")),
-				enabled: this._getPanel().getProperty("showCustom") as boolean
+				enabled: this.checkNewsType(NewsType.Custom)
 			});
 			this.controlMap.set(customNewsUploadFileUploader, customNewsUploadFileUploaderControl);
 			const customNewsUploadFileUploaderButtonId = `${this.getId()}-customNewsUploadFileUploaderButton`;
@@ -662,9 +742,11 @@ export default class KeyUserNewsSettingsPanel extends BaseSettingsPanel {
 		const wrapperVBox = this.controlMap.get(wrapperVBoxId) as VBox;
 		wrapperVBox.removeAllItems();
 		this.addMessageStrip(wrapperVBox);
-		this.addDefaultNewsFeedCheckBox(wrapperVBox);
-		this.addCustomNewsFeedCheckBox(wrapperVBox);
+		this.addNewsPaneLabel(wrapperVBox);
+		this.addDefaultNewsFeedRadioBtn(wrapperVBox);
+		this.addNewsUrlRadioBtn(wrapperVBox);
 		this.addNewsURLSimpleForm(wrapperVBox);
+		this.addCustomNewsFeedRadioBtn(wrapperVBox);
 		this.addCustomNewsUploadSimpleForm(wrapperVBox);
 	}
 }

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

@@ -17,7 +17,6 @@ declare module "sap/cux/home/Layout" {
         text: string;
     }
     interface UserActionProperties {
-        id: string;
         icon: string;
         text: string;
         tooltip: string;

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

@@ -1 +1 @@
-{"version":3,"file":"Layout.d.ts","sourceRoot":"../../../../..","sources":["src/sap/cux/home/Layout.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Layout.d.ts","sourceRoot":"../../../../..","sources":["src/sap/cux/home/Layout.ts"],"names":[],"mappings":"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"}

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

@@ -259,7 +259,6 @@ sap.ui.define(["sap/base/Log", "sap/ui/core/Element", "sap/ushell/api/S4MyHome",
 
               // Configure User Actions
               const userActions = [{
-                id: `${_this.getId()}-homeSettingsBtn`,
                 icon: "sap-icon://edit",
                 text: _this._i18nBundle.getText("myHomeSettings"),
                 tooltip: _this._i18nBundle.getText("myHomeSettings"),