@sapui5/sap.cux.home 1.138.0 → 1.139.0

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

@@ -24,7 +24,7 @@ import NewsAndPagesContainer from "./NewsAndPagesContainer";
 import NewsGroup from "./NewsGroup";
 import NewsItem from "./NewsItem";
 import { NewsType } from "./library";
-import { DEFAULT_NEWS_BASE_URL, DEFAULT_NEWS_PLACEHOLDER, DEFAULT_NEWS_URL } from "./utils/Constants";
+import { DEFAULT_NEWS_PLACEHOLDER, DEFAULT_NEWS_URL } from "./utils/Constants";
 import { recycleId } from "./utils/DataFormatUtils";
 import { DeviceType } from "./utils/Device";
 import { addFESRId } from "./utils/FESRUtil";
@@ -132,6 +132,13 @@ const BASE_URL = "/sap/opu/odata4/ui2/insights_srv/srvd/ui2/",
 	NEWS_FEED_READ_API = BASE_URL + "insights_read_srv/0001/" + "NEWS_FEED",
 	NEWS_FEED_TRANSLATION_API = BASE_URL + "insights_read_srv/0001/" + "NewsFeedColumnTranslation",
 	DEFAULT_FEED_COUNT = 7,
+	NEWS_HEIGHT = {
+		LargeDesktop: "17rem",
+		XLargeDesktop: "17rem",
+		Desktop: "17rem",
+		Tablet: "14rem",
+		Mobile: "11rem"
+	},
 	fnImagePlaceholder = function (sPath: string, N: number) {
 		return Array.from({ length: N }, function (v, i) {
 			return sPath + "/" + (i + 1) + ".jpg";
@@ -201,6 +208,8 @@ export default class NewsPanel extends BaseNewsPanel {
 	private _defaultNewsPromise: Promise<ODataResponse> | null = null;
 	private fetchedFeedUrl!: string;
 	private defaultUrl!: string;
+	private _noUpdatesNewsFeed: boolean = false; // flag to check if no updates news tile is shown or not
+	private _endUserResponse!: ODataResponse;
 
 	static readonly metadata: MetadataOptions = {
 		library: "sap.cux.home",
@@ -214,13 +223,13 @@ export default class NewsPanel extends BaseNewsPanel {
 			/**
 			 * Type of the news item.
 			 *
-			 * @public
+			 * @private
 			 */
 			type: {
 				type: "sap.cux.home.NewsType",
 				group: "Misc",
-				visibility: "public",
-				defaultValue: NewsType.RSS
+				visibility: "hidden",
+				defaultValue: NewsType.Default
 			},
 			/**
 			 * The key of custom news feed.
@@ -234,19 +243,6 @@ export default class NewsPanel extends BaseNewsPanel {
 			 * @private
 			 */
 			customFileName: { type: "string", group: "Misc", defaultValue: "" },
-			/**
-			 * The flag for custom news feed is checked or not.
-			 *
-			 * @private
-			 */
-			showCustom: { type: "boolean", group: "Misc", defaultValue: false },
-
-			/**
-			 * Property to set default News.
-			 *
-			 * @private
-			 */
-			showDefault: { type: "boolean", group: "Misc", defaultValue: false },
 			/**
 			 * The flag to determine rss feed will load or not.
 			 *
@@ -289,11 +285,12 @@ export default class NewsPanel extends BaseNewsPanel {
 	 */
 	public init(): void {
 		super.init();
+		const deviceType = this.getDeviceType();
 
 		this.oNewsTile = new SlideTile(this.getId() + "--idNewsSlide", {
 			displayTime: 20000,
 			width: "100%",
-			height: "17rem",
+			height: NEWS_HEIGHT[deviceType as keyof typeof NEWS_HEIGHT],
 			tiles: [
 				new GenericTile(this.getId() + "--placeholder", {
 					state: "Loading",
@@ -326,43 +323,58 @@ export default class NewsPanel extends BaseNewsPanel {
 	 */
 	public async getData() {
 		let sUrl: string = this.getUrl();
-		let showCustom = this.getProperty("showCustom") as boolean;
-		// if no url and showCustom set as false, then set showDefault as true
-		if (!sUrl && !showCustom && !this.getProperty("showDefault")) {
-			this.setProperty("showDefault", true);
-		}
-		let showDefault = this.getProperty("showDefault") as boolean;
-		this.mandatoryNewsFeed = [];
+		let showCustom = this.getProperty("type") === NewsType.Custom;
+		let showDefault = this.getProperty("type") === NewsType.Default;
+		let showRssAtom = this.getProperty("type") === NewsType.NewsUrl;
 
+		this.mandatoryNewsFeed = [];
 		if (this.fetchedFeedUrl && this.fetchedFeedUrl === sUrl) {
 			return;
 		}
-		if (!this.persDataNewsFeed) {
-			await this.setPersDataNewsFeed(showDefault);
-		}
-		if (sUrl && !sUrl.includes(DEFAULT_NEWS_BASE_URL) && !showCustom) {
-			//rss feed scenario
-			this.oNewsModel = await this.initializeXmlModel(sUrl);
-			this.oNewsTile.setModel(this.oNewsModel);
-			this.oManageMenuItem.setVisible(false);
-		} else if (showDefault && !showCustom) {
-			// default news scenario, if url property is passed and showDefault is true
-			// check if url contains default news base url
-			this.defaultUrl = sUrl && sUrl.includes(DEFAULT_NEWS_BASE_URL) ? sUrl : DEFAULT_NEWS_URL;
-			this.bNewsLoad = this.bNewsLoad || false;
-			await this.setDefaultNews(showDefault);
-		} else if (this.getProperty("showCustom")) {
-			//custom news scenario
-			this.bNewsLoad = this.bNewsLoad || false;
-			this.oManageMenuItem.setVisible(true);
-			const sCustomNewsFeedKey = this.getCustomFeedKey();
-			if (sCustomNewsFeedKey) {
-				await this.setCustomNewsFeed(sCustomNewsFeedKey);
+		const endUserChange = (this.getParent() as NewsAndPagesContainer).getIsEndUserChange();
+		if (endUserChange.isEndUser) {
+			//url scenario (developer side)
+			const response = await fetch(sUrl);
+			if (!response.ok) {
+				throw new Error(`HTTP error! status: ${response.status}`);
+			}
+			const contentType = response.headers.get("content-type");
+			if (contentType && contentType.includes("application/json")) {
+				this._endUserResponse = (await response.json()) as ODataResponse;
+				await this.setNewsFeedFromUrl(this._endUserResponse?.value);
 			} else {
-				this.handleFeedError();
+				endUserChange.newsType = NewsType.NewsUrl;
+				this.oNewsModel = await this.initializeXmlModel(sUrl);
+				this.oNewsTile.setModel(this.oNewsModel);
+				this.oManageMenuItem.setVisible(false);
 			}
 		} else {
-			this.handleFeedError();
+			//key user scenarios
+			if (!this.persDataNewsFeed) {
+				await this.setPersDataNewsFeed(showDefault);
+			}
+			if (showDefault) {
+				//default news scenario
+				this.bNewsLoad = this.bNewsLoad || false;
+				await this.setDefaultNews();
+			} else if (sUrl && showRssAtom) {
+				//rss feed scenario
+				this.oNewsModel = await this.initializeXmlModel(sUrl);
+				this.oNewsTile.setModel(this.oNewsModel);
+				this.oManageMenuItem.setVisible(false);
+			} else if (showCustom) {
+				//custom news scenario
+				this.bNewsLoad = this.bNewsLoad || false;
+				this.oManageMenuItem.setVisible(true);
+				const sCustomNewsFeedKey = this.getCustomFeedKey();
+				if (sCustomNewsFeedKey) {
+					await this.setCustomNewsFeed(sCustomNewsFeedKey);
+				} else {
+					this.handleFeedError();
+				}
+			} else {
+				this.handleFeedError();
+			}
 		}
 		this.fireEvent("loaded");
 		this.adjustLayout();
@@ -374,23 +386,16 @@ export default class NewsPanel extends BaseNewsPanel {
 	 * @param {boolean} [isKeyUserChange=false] - Indicates if the change is made by a key user.
 	 * @private
 	 */
-	public async setDefaultNews(showDefault: boolean, isKeyUserChange: boolean = false) {
-		// default news scenario, if url property is passed and showDefault is true
-		// check if url contains default news base url
+	public async setDefaultNews() {
+		// default news scenario, if url property is passed or showDefault is true
 
 		let sUrl: string = this.getUrl();
-		this.defaultUrl = sUrl && sUrl.includes(DEFAULT_NEWS_BASE_URL) ? sUrl : DEFAULT_NEWS_URL;
+		const isEndUser = (this.getParent() as NewsAndPagesContainer).getIsEndUserChange().isEndUser;
+		this.defaultUrl = isEndUser ? sUrl : DEFAULT_NEWS_URL;
 		this.fetchedFeedUrl = this.defaultUrl;
-		this.setProperty("showDefault", showDefault);
 
 		//reset properties
-		this.setProperty("showCustom", false);
 		this.setProperty("newsAvailable", true);
-		// if user specifically set defaultNews true,
-		//  then even though url is available in key user settings url input, preference goes to showDefault
-		if (isKeyUserChange) {
-			this.setProperty("url", "");
-		}
 		this.generateErrorMessage().setVisible(false);
 		(this.getNewsWrapper()?.getParent() as FlexBox).setVisible(true);
 		this.oManageMenuItem.setVisible(true);
@@ -432,15 +437,32 @@ export default class NewsPanel extends BaseNewsPanel {
 		const newsGroups = this.getAggregation("newsGroup") as NewsGroup[] | undefined;
 		if (!Array.isArray(newsGroups)) return;
 
-		// Create a map for group details to avoid multiple iterations
+		// Build groupDetailsMap for group details to avoid multiple iterations and clean up descriptions by removing inline styles if any
 		const groupDetailsMap: IGroupDetailsMap = {};
+		const groupHasDescription: Record<string, boolean> = {};
+
 		(this._defaultNewsResponse.value || []).forEach((group) => {
+			// Clean group description
+			if (group?.description && group.description.trim().length > 0) {
+				group.description = this.removeInlineStylesFromDescription(group.description);
+			}
 			if (group?.group_id) {
-				groupDetailsMap[group.group_id] = group._group_to_article || [];
+				const articles = group._group_to_article || [];
+				// Clean article descriptions and check if any article has a valid description
+				let hasDescription = false;
+				articles.forEach((article: INewsFeed) => {
+					if (article?.description && article.description.trim().length > 0) {
+						article.description = this.removeInlineStylesFromDescription(article.description);
+						hasDescription = true;
+					}
+				});
+				groupDetailsMap[group.group_id] = articles;
+				groupHasDescription[group.group_id] = hasDescription;
 			}
 		});
 
 		const newsGroupMap: INewsGroupMap = {};
+		// Iterate through the news groups and map group IDs to NewsGroup instances
 		newsGroups
 			.filter((group) => group instanceof NewsGroup)
 			.forEach((group) => {
@@ -450,25 +472,26 @@ export default class NewsPanel extends BaseNewsPanel {
 				}
 			});
 
-		// Iterate through feeds and set pressEnabled property if no description in any of the news article within group._group_to_article
+		//  If no description is found in any of the articles within the group,
+		// 	disable the pressEnabled property for the news group to prevent user interaction.
 		feeds.forEach((feed) => {
 			if (!feed.group_id) return;
-
-			const groupArticles = groupDetailsMap[feed.group_id];
 			const newsGroup = newsGroupMap[feed.group_id];
-
-			if (groupArticles?.length && newsGroup) {
-				const hasDescription = groupArticles.some((article) => !!article.description && article.description.length > 0);
-
-				// If no description is found in any of the articles within the group,
-				// disable the pressEnabled property for the news group to prevent user interaction.
-				if (!hasDescription) {
-					newsGroup.getTile()?.setProperty("pressEnabled", false);
-				}
+			if (newsGroup && !groupHasDescription[feed.group_id]) {
+				newsGroup.getTile()?.setProperty("pressEnabled", false);
 			}
 		});
 	}
 
+	/**
+	 *
+	 * @param description - The description from which inline styles need to be removed.
+	 * @returns {string} The description with inline styles removed.
+	 */
+	private removeInlineStylesFromDescription(description: string): string {
+		return description.replace(/\s*style\s*=\s*(['"])[\s\S]*?\1/gi, "");
+	}
+
 	/**
 	 * Retrieves the current news group data based on the provided id.
 	 *
@@ -589,7 +612,7 @@ export default class NewsPanel extends BaseNewsPanel {
 	 * @returns {void}
 	 */
 	public handleFeedError(): void {
-		if (this.getProperty("showCustom") || this.getProperty("showDefault")) {
+		if (this.getNewsType() === NewsType.Custom || this.getNewsType() === NewsType.Default) {
 			this.generateErrorMessage().setVisible(true);
 			if (!this.isParentBaseLayout()) {
 				this.setManageNewsButtonVisibility(false);
@@ -603,7 +626,7 @@ export default class NewsPanel extends BaseNewsPanel {
 	}
 
 	public async setURL(url: string) {
-		this.setProperty("showCustom", false);
+		this.setProperty("type", NewsType.NewsUrl);
 		this.setProperty("newsAvailable", true);
 		this.generateErrorMessage().setVisible(false);
 		(this.getNewsWrapper()?.getParent() as FlexBox).setVisible(true);
@@ -618,12 +641,13 @@ export default class NewsPanel extends BaseNewsPanel {
 	 * @private
 	 */
 	public adjustLayout() {
-		if (this.getDeviceType() === DeviceType.Mobile) {
-			this.oNewsTile.setHeight("11rem");
+		const deviceType = this.getDeviceType();
+		this.oNewsTile.setHeight(NEWS_HEIGHT[deviceType as keyof typeof NEWS_HEIGHT]);
+
+		if (deviceType === DeviceType.Mobile) {
 			this.generateErrorMessage().setWidth("100%");
 			this.oNewsTile.removeStyleClass("sapUiSmallMarginTop");
 		} else {
-			this.oNewsTile.setHeight("17rem");
 			this.oNewsTile.addStyleClass("sapUiSmallMarginTop");
 			(this.getNewsWrapper()?.getParent() as FlexBox).setWidth("100%");
 		}
@@ -736,6 +760,9 @@ export default class NewsPanel extends BaseNewsPanel {
 			.catch(fnLoadPlaceholderImage);
 	}
 
+	public getNewsType(): NewsType {
+		return (this.getParent() as NewsAndPagesContainer)?.getIsEndUserChange?.()?.newsType || (this.getProperty("type") as NewsType);
+	}
 	/**
 	 * Checks if the custom file format is CSV based on the custom file name.
 	 *
@@ -760,6 +787,27 @@ export default class NewsPanel extends BaseNewsPanel {
 		this.persDataNewsFeed = (defaultFeed ? persData?.defaultNewsFeed : persData?.favNewsFeed) as IPersDataNewsFeed;
 	}
 
+	/**
+	 * Sets the news feed type (Default or Custom) based on the provided data structure.
+	 *
+	 * @param {INewsFeed[]} data - News feed data from the URL.
+	 * @returns {Promise<void>} Resolves after setting the appropriate feed.
+	 */
+	public async setNewsFeedFromUrl(data: INewsFeed[]): Promise<void> {
+		const item = data?.[0];
+
+		if (item && "group_id" in item && "title" in item) {
+			(this.getParent() as NewsAndPagesContainer).getIsEndUserChange().newsType = NewsType.Default;
+			await this.setDefaultNews();
+		} else if (item && "LineOfBusiness" in item) {
+			(this.getParent() as NewsAndPagesContainer).getIsEndUserChange().newsType = NewsType.Custom;
+			this.oManageMenuItem.setVisible(true);
+			await this.setCustomNewsFeed("");
+		} else {
+			this.handleFeedError();
+		}
+	}
+
 	/**
 	 * This method retrieves the count and feeds of the custom news feed asynchronously.
 	 * If the count is not zero, it loads the custom news feed data and returns the feeds.
@@ -771,7 +819,8 @@ export default class NewsPanel extends BaseNewsPanel {
 		try {
 			this.oNewsTile.setVisible(true);
 			this.generateErrorMessage().setVisible(false);
-			const isDefaultNews = !sFeedId;
+			const feedType = this.getNewsType();
+			const isDefaultNews = feedType === NewsType.Default;
 			await this.setPersDataNewsFeed(isDefaultNews);
 			const customFileName = this.getProperty("customFileName") as string;
 			const showAllPrepRequired = this.isCSVFileFormat(customFileName)
@@ -782,7 +831,7 @@ export default class NewsPanel extends BaseNewsPanel {
 				CUSTOM_NEWS_FEED.EXCLUDE_FIELDS.push("PreparationRequired");
 			}
 			const showPrep = isDefaultNews ? true : showAllPrepRequired;
-			let newsFeeds = await this.getCustomNewsFeed(sFeedId || "", showPrep);
+			let newsFeeds = await this.getCustomOrDefaultNewsFeed(sFeedId || "", showPrep);
 
 			if (newsFeeds.length === 0) {
 				throw new Error("Error: No news feed available");
@@ -893,12 +942,12 @@ export default class NewsPanel extends BaseNewsPanel {
 					subTitle = feed.subTitle || feed.description || "";
 					defaultNews.push({
 						title: title,
-						footer: feed.footer_text,
+						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") : ""
+						priority: feed?.priority == "1" ? Priority.Medium : Priority.None,
+						priorityText: feed?.priority == "1" ? this._i18nBundle.getText("criticalNews") : ""
 					});
 					defaultFeedDict[title] = title;
 				}
@@ -938,10 +987,10 @@ export default class NewsPanel extends BaseNewsPanel {
 
 	/**
 	 *
-	 * @returns {ODataResponse} The placeholder news group with enriched titles and descriptions.
+	 * @returns {ODataResponse} The no update placeholder news group with enriched titles and descriptions to show when there are no updates
 	 * @private
 	 */
-	private getPlaceholderNewsGroup(): ODataResponse {
+	private getNoUpdatesPlaceholder(): ODataResponse {
 		const placeholderTitle = this._i18nBundle.getText("placeholderNewsTitle") as string;
 		const placeholderDescription = this._i18nBundle.getText("placeholderNewsDescription");
 
@@ -954,13 +1003,22 @@ export default class NewsPanel extends BaseNewsPanel {
 				_group_to_article: group._group_to_article.map((article) => ({
 					...article,
 					title: placeholderTitle,
-					description: placeholderDescription
+					description: ""
 				}))
 			}))
 		};
 		return enrichedNewsPlaceholder;
 	}
 
+	/**
+	 * Returns if its a no updates new feed group or not
+	 * This indicates whether the news feed is a static no updates placeholder news feed.
+	 * @private
+	 */
+	public isNoUpdatesNewsFeed(): boolean {
+		return this._noUpdatesNewsFeed;
+	}
+
 	/**
 	 * Fetches the default news data from the server.
 	 * @returns {Promise<ODataResponse>} A promise that resolves to the fetched news data
@@ -979,16 +1037,21 @@ export default class NewsPanel extends BaseNewsPanel {
 				}
 			]);
 			if (supported) {
-				const response = await fetch(this.defaultUrl || DEFAULT_NEWS_URL);
+				if (this._endUserResponse) {
+					this._defaultNewsResponse = this._endUserResponse;
+				} else {
+					const response = await fetch(this.defaultUrl || DEFAULT_NEWS_URL);
 
-				if (!response.ok) {
-					throw new Error(`HTTP error! status: ${response.status}`);
+					if (!response.ok) {
+						throw new Error(`HTTP error! status: ${response.status}`);
+					}
+					this._defaultNewsResponse = (await response.json()) as ODataResponse;
 				}
-				this._defaultNewsResponse = (await response.json()) as ODataResponse;
 			}
 			// If the response is not supported or empty, set the default news response to placeholder news
 			if (!supported || !this._defaultNewsResponse?.value?.length) {
-				this._defaultNewsResponse = this.getPlaceholderNewsGroup();
+				this._defaultNewsResponse = this.getNoUpdatesPlaceholder();
+				this._noUpdatesNewsFeed = true;
 				this.oManageMenuItem.setVisible(false);
 			}
 
@@ -1009,8 +1072,9 @@ export default class NewsPanel extends BaseNewsPanel {
 	 * @returns {Promise<INewsFeed[]>} A promise that resolves to an array of custom news feed items.
 	 * @private
 	 */
-	public async getCustomNewsFeed(sFeedId: string, showAllPreparationRequired: boolean): Promise<INewsFeed[]> {
-		const isDefaultNews = !sFeedId;
+	public async getCustomOrDefaultNewsFeed(sFeedId: string, showAllPreparationRequired: boolean): Promise<INewsFeed[]> {
+		const feedType = this.getNewsType();
+		const isDefaultNews = feedType === NewsType.Default;
 		if (isDefaultNews) {
 			await this.getDefaultNewsResponse();
 			let aDefaultgroups = this.getDefaultNewsFeedDetails(this._defaultNewsResponse);
@@ -1030,7 +1094,9 @@ export default class NewsPanel extends BaseNewsPanel {
 	 */
 	private async getCustomFeedData(sFeedId: string, showAllPreparationRequired: boolean): Promise<INewsFeed[]> {
 		try {
-			const newsDetailUrl = this.getNewsFeedDetailsUrl({ changeId: sFeedId, showAllPreparationRequired });
+			let newsDetailUrl;
+			const isEnduser = (this.getParent() as NewsAndPagesContainer).getIsEndUserChange().isEndUser;
+			newsDetailUrl = isEnduser ? this.getUrl() : this.getNewsFeedDetailsUrl({ changeId: sFeedId, showAllPreparationRequired });
 			if (!this.customNewsFeedCache.has(newsDetailUrl)) {
 				this.customNewsFeedCache.set(newsDetailUrl, this.getAuthNewsFeed(newsDetailUrl));
 			}
@@ -1043,7 +1109,7 @@ export default class NewsPanel extends BaseNewsPanel {
 					if (!oFeedDict[title.value]) {
 						aFeeds.push({
 							title: title.value,
-							footer: (oFeed[CUSTOM_NEWS_FEED.VALIDITY] as INewsLink).value,
+							footer: (oFeed[CUSTOM_NEWS_FEED.VALIDITY] as INewsLink)?.value,
 							imageUrl: this.getCustomFeedImage(title.value)
 						});
 						oFeedDict[title.value] = title.value;
@@ -1171,7 +1237,7 @@ export default class NewsPanel extends BaseNewsPanel {
 
 		const fnFormattedLabel = (sLabel: string) => sLabel.replace(/([a-z0-9])([A-Z])/g, "$1 $2");
 		const [newsResponse, translationResponse] = await Promise.all([
-			HttpHelper.GetJSON(sUrl) as Promise<{ value: INewsFeed[] }>,
+			this._endUserResponse ? Promise.resolve(this._endUserResponse) : (HttpHelper.GetJSON(sUrl) as Promise<{ value: INewsFeed[] }>),
 			this.getTranslatedText(this.getCustomFeedKey())
 		]);
 		let aNews: INewsFeed[] = JSON.parse(JSON.stringify((newsResponse as INewsResponse).value || [])) as INewsFeed[];
@@ -1328,12 +1394,12 @@ export default class NewsPanel extends BaseNewsPanel {
 			const random = Math.floor(Math.random() * 15) + 1;
 			return `${sPrefix}/${random}.jpg`;
 		};
-		if (!groupImg || groupImg.image_id !== imgId || !groupImg?.bg_image) {
+		if (!groupImg || groupImg?.image_id !== imgId || !groupImg?.bg_image) {
 			return getRandomDefaultImage();
 		}
 
-		let mimeType = groupImg.mime_type;
-		const groupBgImg = groupImg.bg_image;
+		let mimeType = groupImg?.mime_type;
+		const groupBgImg = groupImg?.bg_image;
 
 		if (mimeType === "application/octet-stream") {
 			mimeType = "image/jpeg";

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;IAQ/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;QA4ClC;;;;WAIG;QACH,OAAO,CAAC,iBAAiB;QAKzB;;;WAGG;QACH,OAAO,CAAC,QAAQ;QAgChB;;;;WAIG;gBACW,oBAAoB;QAwBlC;;;;;;;;;WASG;QACH,OAAO,CAAC,sBAAsB;QA4B9B;;;;;;;;;;WAUG;QACH,OAAO,CAAC,qBAAqB;QAyB7B;;;;WAIG;QACU,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;KAS5C;CAEA"}
+{"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;IAS/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;KAY5C;CAEA"}

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

@@ -2,13 +2,14 @@
  * 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", "./utils/Accessibility", "./utils/Constants", "./utils/FESRUtil", "./utils/PersonalisationUtils", "./utils/UshellPersonalizer"], function (CheckBox, CustomListItem, HBox, Label, List, Switch, Text, Title, VBox, CustomData, __BaseSettingsPanel, ___utils_Accessibility, ___utils_Constants, ___utils_FESRUtil, __PersonalisationUtils, __UshellPersonalizer) {
+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) {
   "use strict";
 
   function _interopRequireDefault(obj) {
     return obj && obj.__esModule && typeof obj.default !== "undefined" ? obj.default : obj;
   }
   const BaseSettingsPanel = _interopRequireDefault(__BaseSettingsPanel);
+  const NewsType = ___library["NewsType"];
   const getInvisibleText = ___utils_Accessibility["getInvisibleText"];
   const SETTINGS_PANELS_KEYS = ___utils_Constants["SETTINGS_PANELS_KEYS"];
   const addFESRSemanticStepName = ___utils_FESRUtil["addFESRSemanticStepName"];
@@ -194,7 +195,8 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
         const _this2 = this;
         const selectedFeeds = [];
         const deselectedDefaultFeeds = [];
-        const showDefault = _this2.oNewsPanel.getProperty("showDefault");
+        const newsType = _this2.oNewsPanel?.getNewsType();
+        const showDefault = newsType === NewsType.Default;
         const customFileName = _this2.oNewsPanel.getProperty("customFileName");
         const feedKey = _this2.oNewsPanel.getCustomFeedKey();
         _this2.oList.getItems().forEach(item => {
@@ -251,7 +253,8 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
      */
     setItems: function _setItems(aItems) {
       this.oList.destroyAggregation("items", true);
-      let showDefault = this.oNewsPanel.getProperty("showDefault");
+      const newsType = this.oNewsPanel?.getNewsType();
+      let showDefault = newsType === NewsType.Default;
       (aItems || []).forEach((oItem, i) => {
         let oNewsListItemHbox = new HBox({
           id: `${this.getId()}--idCustNewsFeedItemContent--${i}`,
@@ -291,7 +294,8 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
         const _this3 = this;
         _this3.oNewsPanel = _this3._getPanel();
         const sFeedKey = _this3.oNewsPanel.getCustomFeedKey();
-        const showDefaultNewsFeed = _this3.oNewsPanel.getProperty("showDefault");
+        const newsType = _this3.oNewsPanel?.getNewsType();
+        const showDefaultNewsFeed = newsType === NewsType.Default;
         const customFileName = _this3.oNewsPanel.getProperty("customFileName");
         if (_this3.isCSVFileFormat(customFileName) || showDefaultNewsFeed) {
           _this3.oCustNewsSwitchContainer.setVisible(false);
@@ -300,7 +304,7 @@ 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.getCustomNewsFeed(showDefaultNewsFeed ? "" : sFeedKey, false)).then(function (aNewsFeed) {
+            return Promise.resolve(_this3.oNewsPanel.getCustomOrDefaultNewsFeed(showDefaultNewsFeed ? "" : sFeedKey, false)).then(function (aNewsFeed) {
               if (showDefaultNewsFeed) {
                 return _this3._handleDefaultNewsFeed(aNewsFeed, aPersNewsFeed);
               } else {
@@ -386,7 +390,7 @@ sap.ui.define(["sap/m/CheckBox", "sap/m/CustomListItem", "sap/m/HBox", "sap/m/La
         if (!newsPanel) {
           return Promise.resolve(false);
         }
-        return Promise.resolve(newsPanel.getShowCustom() || newsPanel.getProperty("showDefault"));
+        return Promise.resolve((newsPanel.getNewsType() === NewsType.Custom || newsPanel.getNewsType() === NewsType.Default) && !newsPanel.isNoUpdatesNewsFeed());
       } catch (e) {
         return Promise.reject(e);
       }