@sapui5/sap.cux.home 1.138.0 → 1.139.1

package/src/sap/cux/home/KeyUserNewsSettingsPanel.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/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "sap/m/MessageBox", "sap/m/MessageStrip", "sap/m/MessageToast", "sap/m/Toolbar", "sap/m/VBox", "sap/m/library", "sap/ui/core/EventBus", "sap/ui/core/message/MessageType", "sap/ui/layout/form/SimpleForm", "sap/ui/unified/FileUploader", "sap/ushell/Container", "./BaseSettingsPanel", "./flexibility/Layout.flexibility", "./utils/Constants", "./utils/HttpHelper"], function (Button, CheckBox, Input, Label, MessageBox, MessageStrip, MessageToast, Toolbar, VBox, Library, EventBus, MessageType, SimpleForm, FileUploader, Container, __BaseSettingsPanel, ___flexibility_Layoutflexibility, ___utils_Constants, __HttpHelper) {
+sap.ui.define(["sap/m/Button", "sap/m/Input", "sap/m/Label", "sap/m/MessageBox", "sap/m/MessageStrip", "sap/m/MessageToast", "sap/m/RadioButton", "sap/m/Toolbar", "sap/m/VBox", "sap/m/library", "sap/ui/core/EventBus", "sap/ui/core/message/MessageType", "sap/ui/layout/form/SimpleForm", "sap/ui/unified/FileUploader", "sap/ushell/Container", "./BaseSettingsPanel", "./flexibility/Layout.flexibility", "./library", "./utils/Constants", "./utils/HttpHelper"], function (Button, Input, Label, MessageBox, MessageStrip, MessageToast, RadioButton, Toolbar, VBox, Library, EventBus, MessageType, SimpleForm, FileUploader, Container, __BaseSettingsPanel, ___flexibility_Layoutflexibility, ___library, ___utils_Constants, __HttpHelper) {
   "use strict";
 
   function _interopRequireDefault(obj) {
@@ -21,6 +21,7 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
   }
   const BaseSettingsPanel = _interopRequireDefault(__BaseSettingsPanel);
   const CHANGE_TYPES = ___flexibility_Layoutflexibility["CHANGE_TYPES"];
+  const NewsType = ___library["NewsType"];
   const DEFAULT_NEWS_URL = ___utils_Constants["DEFAULT_NEWS_URL"];
   const KEYUSER_SETTINGS_PANELS_KEYS = ___utils_Constants["KEYUSER_SETTINGS_PANELS_KEYS"];
   const HttpHelper = _interopRequireDefault(__HttpHelper);
@@ -94,18 +95,22 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
       this.controlMap.set(wrapperVBoxId, wrapperVBox);
       return wrapperVBox;
     },
+    checkNewsType: function _checkNewsType(type) {
+      if (this._getPanel().getProperty("type") === type) return true;
+      return false;
+    },
     isValidChanges: function _isValidChanges(newsVisible) {
       try {
         const _this = this;
-        function _temp4() {
+        function _temp5() {
           return _this.validChanges;
         }
         _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 _temp3 = function () {
+        const showCustom = _this.customNewsVisibility ?? !!_this.checkNewsType(NewsType.Custom);
+        const showDefault = _this.defaultNewsVisibility ?? !!_this.checkNewsType(NewsType.Default);
+        const _temp4 = function () {
           if (_this.getNewsFeedUploadBtn().getEnabled()) {
             if (showCustom) {
               MessageBox.error(String(_this._i18nBundle.getText("newsFeedSaveUploadChanges")));
@@ -116,24 +121,32 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
               }
             }
           } else {
-            const _temp2 = function () {
+            const _temp3 = function () {
               if (showCustom && fileUploader.getValue() === "" && newsVisible) {
                 _this.showMessageStrip(true, MessageType.Error, "noNewsFileError");
                 _this.validChanges = false;
               } else {
-                const _temp = function () {
+                const _temp2 = function () {
                   if (!showCustom && !showDefault && newsVisible && !_this.getMessageStrip().getVisible()) {
                     const newsUrl = keyUserChangeContent.newsFeedURL;
-                    return Promise.resolve(_this._getPanel().setURL(String(newsUrl))).then(function () {});
+                    const _temp = function () {
+                      if (!newsUrl?.trim()) {
+                        _this.showMessageStrip(true, MessageType.Error, "invalidNewsUrl");
+                        _this.validChanges = false;
+                      } else {
+                        return Promise.resolve(_this._getPanel().setURL(String(newsUrl))).then(function () {});
+                      }
+                    }();
+                    if (_temp && _temp.then) return _temp.then(function () {});
                   }
                 }();
-                if (_temp && _temp.then) return _temp.then(function () {});
+                if (_temp2 && _temp2.then) return _temp2.then(function () {});
               }
             }();
-            if (_temp2 && _temp2.then) return _temp2.then(function () {});
+            if (_temp3 && _temp3.then) return _temp3.then(function () {});
           }
         }();
-        return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3));
+        return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp5) : _temp5(_temp4));
       } catch (e) {
         return Promise.reject(e);
       }
@@ -144,12 +157,14 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
       const newsUrlInput = this.controlMap.get(`${this.getId()}-newsFeedURLInput`);
       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`).setEnabled(this.customNewsVisibility);
-      this.controlMap.get(`${this.getId()}-newsFeedURLInput`).setEnabled(!this.customNewsVisibility);
-      this.controlMap.get(`${this.getId()}-customNewsFeedCheckBox`).setSelected(this.customNewsVisibility);
-      this.controlMap.get(`${this.getId()}-defaultNewsFeedCheckBox`).setSelected(this.defaultNewsVisibility);
+      this.controlMap.get(`${this.getId()}-newsFeedURLInput`).setEnabled(this.rssNewsVisibility);
+      this.controlMap.get(`${this.getId()}-customNewsFeedRadioBtn`).setSelected(this.customNewsVisibility);
+      this.controlMap.get(`${this.getId()}-defaultNewsFeedRadioBtn`).setSelected(this.defaultNewsVisibility);
+      this.controlMap.get(`${this.getId()}-newsUrlRadioBtn`).setSelected(this.rssNewsVisibility);
       this.getFileUploader().setValue(String(newsPanel.getProperty("customFileName")));
       this.clearKeyUserChanges();
     },
@@ -175,10 +190,9 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
       wrapperVBox.addItem(this.controlMap.get(keyUserNewsPanelToolbarId));
     },
     handleSelectCustomNewsFeed: function _handleSelectCustomNewsFeed(oEvent) {
-      this.customNewsVisibility = oEvent.getSource().getSelected();
+      this.customNewsVisibility = oEvent.getParameter("selected");
       this.controlMap.get(`${this.getId()}-customNewsUploadFileUploader`).setEnabled(this.customNewsVisibility);
       this.controlMap.get(`${this.getId()}-newsFeedURLInput`).setEnabled(!this.customNewsVisibility);
-      this.controlMap.get(`${this.getId()}-defaultNewsFeedCheckBox`).setEnabled(!this.customNewsVisibility);
       const newsPanel = this._getPanel();
       const newsPageContainer = newsPanel.getParent();
       const layout = newsPageContainer.getParent();
@@ -190,14 +204,16 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
             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
             }
           }
         });
@@ -214,63 +230,124 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
       });
     },
     /**
-     * Add CheckBox for Custom News Feed.
+     * Add Radio Button for Custom News Feed.
      *
      * @private
      */
-    addCustomNewsFeedCheckBox: function _addCustomNewsFeedCheckBox(wrapperVBox) {
-      const customNewsFeedCheckBoxId = `${this.getId()}-customNewsFeedCheckBox`;
-      const showCustom = Boolean(this._getPanel().getProperty("showCustom"));
-      const showDefault = this._getPanel().getProperty("showDefault");
-      if (!this.controlMap.get(customNewsFeedCheckBoxId)) {
-        const customNewsFeedCheckBox = new CheckBox(`${this.getId()}-customNewsFeedCheckBox`, {
+    addCustomNewsFeedRadioBtn: function _addCustomNewsFeedRadioBtn(wrapperVBox) {
+      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`);
-        customCheckbox.setSelected(showCustom);
-        customCheckbox.setEnabled(!showDefault);
+        let customRadioBtn = this.controlMap.get(`${this.getId()}-customNewsFeedRadioBtn`);
+        customRadioBtn.setSelected(showCustom);
+        this.controlMap.get(`${this.getId()}-customNewsUploadFileUploader`).setEnabled(showCustom);
       }
-      wrapperVBox.addItem(this.controlMap.get(customNewsFeedCheckBoxId));
+      wrapperVBox.addItem(this.controlMap.get(customNewsFeedRadioBtnId));
     },
     /**
-     * Add CheckBox for Manage News Feed.
+     * Add Radio Button for Manage News Feed.
      *
      * @private
      */
-    addDefaultNewsFeedCheckBox: function _addDefaultNewsFeedCheckBox(wrapperVBox) {
-      const defaultNewsFeedCheckBoxId = `${this.getId()}-defaultNewsFeedCheckBox`;
-      const showDefault = Boolean(this._getPanel().getProperty("showDefault"));
-      const showCustom = this._getPanel().getProperty("showCustom");
-      if (!this.controlMap.get(defaultNewsFeedCheckBoxId)) {
-        const defaultNewsFeedCheckBox = new CheckBox(`${this.getId()}-defaultNewsFeedCheckBox`, {
+    addDefaultNewsFeedRadioBtn: function _addDefaultNewsFeedRadioBtn(wrapperVBox) {
+      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(defaultNewsFeedCheckBoxId, defaultNewsFeedCheckBox);
+        this.controlMap.set(defaultNewsFeedRadioBtnId, defaultNewsFeedRadioBtn);
       } else if (!this.getCurrentKeyUserChange()) {
-        let checkbox = this.controlMap.get(`${this.getId()}-defaultNewsFeedCheckBox`);
-        checkbox.setSelected(showDefault);
-        checkbox.setEnabled(!showCustom);
+        let defaultRadioBtn = this.controlMap.get(`${this.getId()}-defaultNewsFeedRadioBtn`);
+        defaultRadioBtn.setSelected(showDefault);
+      }
+      wrapperVBox.addItem(this.controlMap.get(defaultNewsFeedRadioBtnId));
+    },
+    addNewsPaneLabel: function _addNewsPaneLabel(wrapperVBox) {
+      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(defaultNewsFeedCheckBoxId));
+      wrapperVBox.addItem(this.controlMap.get(newsPanelLabelId));
+    },
+    handleSelectRssNewsFeed: function _handleSelectRssNewsFeed(oEvent) {
+      this.rssNewsVisibility = oEvent.getParameter("selected");
+      this.controlMap.get(`${this.getId()}-customNewsUploadFileUploader`).setEnabled(!this.rssNewsVisibility);
+      this.controlMap.get(`${this.getId()}-newsFeedURLInput`).setEnabled(this.rssNewsVisibility);
+      const newsPanel = this._getPanel();
+      const newsPageContainer = newsPanel.getParent();
+      const layout = newsPageContainer.getParent();
+      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()
+      });
+    },
+    addNewsUrlRadioBtn: function _addNewsUrlRadioBtn(wrapperVBox) {
+      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(newsUrlRadioBtnId, newsUrlRadioBtn);
+      } else if (!this.getCurrentKeyUserChange()) {
+        let rssRadioBtn = this.controlMap.get(`${this.getId()}-newsUrlRadioBtn`);
+        rssRadioBtn.setSelected(showRss);
+        this.controlMap.get(`${this.getId()}-newsFeedURLInput`).setEnabled(showRss);
+      }
+      wrapperVBox.addItem(this.controlMap.get(newsUrlRadioBtnId));
     },
     /**
-     * Handle the selection of the Manage News Feed checkbox.
+     * Handle the selection of the Manage News Feed Radio Button.
      *
      * @private
      */
     handleselectDefaultNewsFeed: function _handleselectDefaultNewsFeed(oEvent) {
-      this.defaultNewsVisibility = oEvent.getSource().getSelected();
+      this.defaultNewsVisibility = oEvent.getParameter("selected");
       this.controlMap.get(`${this.getId()}-customNewsUploadFileUploader`).setEnabled(!this.defaultNewsVisibility);
       this.controlMap.get(`${this.getId()}-newsFeedURLInput`).setEnabled(!this.defaultNewsVisibility);
-      this.controlMap.get(`${this.getId()}-customNewsFeedCheckBox`).setEnabled(!this.defaultNewsVisibility);
       const newsPanel = this._getPanel();
       const newsPageContainer = newsPanel.getParent();
       const layout = newsPageContainer.getParent();
@@ -283,14 +360,16 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
             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
             }
           }
         });
@@ -299,6 +378,7 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
         });
       } else if (keyUserChangeContent.showDefaultNewsFeed !== this.defaultNewsVisibility) {
         keyUserChangeContent.showDefaultNewsFeed = this.defaultNewsVisibility;
+        keyUserChangeContent.showCustomNewsFeed = false;
       }
       this.removeUrlMesageStrip();
       this._eventBus.publish("KeyUserChanges", "disabledSaveBtn", {
@@ -325,14 +405,16 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
             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
             }
           }
         });
@@ -390,22 +472,17 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
      */
     addNewsURLSimpleForm: function _addNewsURLSimpleForm(wrapperVBox) {
       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);
@@ -413,7 +490,6 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
       } else if (this.getCurrentKeyUserChange()) {
         let inputUrlField = this.controlMap.get(`${this.getId()}-newsFeedURLInput`);
         inputUrlField.setValue(newsInputUrl);
-        inputUrlField.setEnabled(!showCustom && !showDefault);
       }
       wrapperVBox.addItem(this.controlMap.get(newsFeedURLSimpleFormId));
     },
@@ -488,14 +564,16 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
                       changeType: CHANGE_TYPES.NEWS_FEED_URL,
                       content: {
                         oldNewsFeedUrl: String(_this2._getPanel().getProperty("url")),
-                        oldShowCustomNewsFeed: Boolean(_this2._getPanel().getProperty("showCustom")),
+                        oldShowCustomNewsFeed: _this2.checkNewsType(NewsType.Custom),
                         oldCustomNewsFeedKey: String(_this2._getPanel().getProperty("customFeedKey")),
-                        oldshowDefaultNewsFeed: Boolean(_this2._getPanel().getProperty("showDefault")),
+                        oldshowDefaultNewsFeed: _this2.checkNewsType(NewsType.Default),
+                        oldShowRssNewsFeed: _this2.checkNewsType(NewsType.NewsUrl),
                         newsFeedURL: String(_this2._getPanel().getProperty("url")),
                         showCustomNewsFeed: true,
                         customNewsFeedKey: String(_this2._getPanel().getProperty("customFeedKey")),
                         customNewsFeedFileName: String(_this2._getPanel().getProperty("customFileName")),
-                        showDefaultNewsFeed: _this2.defaultNewsVisibility
+                        showDefaultNewsFeed: false,
+                        showRssNewsFeed: false
                       }
                     }
                   });
@@ -514,14 +592,16 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
                     changeType: CHANGE_TYPES.NEWS_FEED_URL,
                     content: {
                       oldNewsFeedUrl: String(_this2._getPanel().getProperty("url")),
-                      oldShowCustomNewsFeed: Boolean(_this2._getPanel().getProperty("showCustom")),
+                      oldShowCustomNewsFeed: _this2.checkNewsType(NewsType.Custom),
                       oldCustomNewsFeedKey: String(_this2._getPanel().getProperty("customFeedKey")),
-                      oldshowDefaultNewsFeed: Boolean(_this2._getPanel().getProperty("showDefault")),
+                      oldshowDefaultNewsFeed: _this2.checkNewsType(NewsType.Default),
+                      oldShowRssNewsFeed: _this2.checkNewsType(NewsType.NewsUrl),
                       newsFeedURL: String(_this2._getPanel().getProperty("url")),
                       showCustomNewsFeed: true,
                       customNewsFeedKey: customKey,
                       customNewsFeedFileName: _this2.getFileUploader().getValue(),
-                      showDefaultNewsFeed: _this2.defaultNewsVisibility
+                      showDefaultNewsFeed: false,
+                      showRssNewsFeed: false
                     }
                   }
                 });
@@ -592,11 +672,7 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
     addCustomNewsUploadSimpleForm: function _addCustomNewsUploadSimpleForm(wrapperVBox) {
       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();
@@ -611,7 +687,7 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
           sameFilenameAllowed: true,
           afterDialogClose: this.handleFileDialogClose.bind(this),
           value: String(this._getPanel().getProperty("customFileName")),
-          enabled: this._getPanel().getProperty("showCustom")
+          enabled: this.checkNewsType(NewsType.Custom)
         });
         this.controlMap.set(customNewsUploadFileUploader, customNewsUploadFileUploaderControl);
         const customNewsUploadFileUploaderButtonId = `${this.getId()}-customNewsUploadFileUploaderButton`;
@@ -639,9 +715,11 @@ sap.ui.define(["sap/m/Button", "sap/m/CheckBox", "sap/m/Input", "sap/m/Label", "
       const wrapperVBox = this.controlMap.get(wrapperVBoxId);
       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);
     }
   });