@sapui5/sap.suite.ui.generic.template 1.132.0 → 1.133.1

package/src/sap/suite/ui/generic/template/designtime/utils/designtimeHelper.js

@@ -56,7 +56,6 @@ sap.ui.define([
 	var mControlInfo = {};
 	var aViews = [];
 	// var oLogger = new FeLogger("designtime.utils.designTimeHelper").getLogger();
-	var RTA_MODE_URL_PARAM_KEY = "fiori-tools-rta-mode";
 	var oMutationObserver;
 	/**
 	 * get effective designtime for all controls on current active view
@@ -127,15 +126,6 @@ sap.ui.define([
 	function fnStopMutationObserver() {
 		oMutationObserver && oMutationObserver.disconnect();
 	}
-	/**
-	 * Parses the URL parameters and returns the value of RTA mode URL parameter (fiori-tools-rta-mode)
-	 * @returns {string | null} A promise which returns a value of RTA mode
-	 */
-	function getRtaModeValue() {
-		const oUrlParams = new URLSearchParams(window.location.search);
-		const sRtaModeValue = oUrlParams.get(RTA_MODE_URL_PARAM_KEY);
-		return sRtaModeValue;
-	}
 
 	/*
 	 * Returns the branch of the control tree as an array ordered from bottom to top, if the control is relevant (i.e. direct part of a template view). I.e. the first entry of the array is the
@@ -334,7 +324,7 @@ sap.ui.define([
 		return oResult;
 	}
 
-	function getViewDesignTime(mAllow, sFioriToolsRtaMode) {
+	function getViewDesignTime(mAllow) {
 		return loadBaseDesigntime().then(function () {
 
 			// provide propagation function for all controls contained allowing only what we want to allow
@@ -347,32 +337,35 @@ sap.ui.define([
 							var oReducedDesigntime = oElement.getMetadata().getElementName && getReducedDesignTime(oElement, mAllow[oElement.getMetadata().getElementName()]);
 
 							var oCustomDesigntime = {};
-							if (sFioriToolsRtaMode === FioriToolsRtaMode.ForAdaptation) {
-								switch (oElement.getMetadata().getElementName()) {
-									// objectpagelayout
-									case "sap.uxap.ObjectPageLayout":
-										oCustomDesigntime = ObjectPageLayoutDesigntimeHelper.getDesigntime(
-											oElement
-										);
-										break;
-									case "sap.ui.comp.smartfilterbar.SmartFilterBar":
-										oCustomDesigntime = SmartFilterBarDesigntimeHelper.getDesigntime(
-											oElement
-										);
-										break;
-									case "sap.ui.comp.smarttable.SmartTable":
-										oCustomDesigntime = SmartTableDesigntimeHelper.getDesigntime(
-											oElement
-										);
-										break;
-									case "sap.f.DynamicPage":
-										oCustomDesigntime = DynamicPageDesigntimeHelper.getDesigntime(
-											oElement
-										);
-										break;
-									default:
-										break;
-								}
+							switch (oElement.getMetadata().getElementName()) {
+								case "sap.uxap.ObjectPageLayout":
+									oCustomDesigntime = ObjectPageLayoutDesigntimeHelper.getDesigntime(
+										oElement
+									);
+									break;
+								case "sap.ui.comp.smartfilterbar.SmartFilterBar":
+								case "sap.suite.ui.generic.template.AnalyticalListPage.control.SmartFilterBarExt":
+								case "sap.suite.ui.generic.template.AnalyticalListPage.control.visualfilterbar.SmartVisualFilterBar":
+									oCustomDesigntime = SmartFilterBarDesigntimeHelper.getDesigntime(
+										oElement
+									);
+									break;
+								case "sap.ui.comp.smarttable.SmartTable":
+								case "sap.ui.table.Table":
+								case "sap.m.Table":
+								case "sap.ui.table.AnalyticalTable":
+									oCustomDesigntime = SmartTableDesigntimeHelper.getDesigntime(
+										oElement
+									);
+									break;
+								case "sap.f.DynamicPage":
+									oCustomDesigntime = DynamicPageDesigntimeHelper.getDesigntime(
+										oElement
+									);
+									break;
+								default:
+									break;
+
 							}
 							return merge(oReducedDesigntime, oCustomDesigntime);
 						}
@@ -418,16 +411,11 @@ sap.ui.define([
 			}
 		});
 	}
-	const FioriToolsRtaMode = {
-		True: "true",
-		ForAdaptation: "forAdaptation"
-	};
+
 
 	return {
 		getMergedAllowList: deepMergeWithArray,
 		getViewDesignTime: getViewDesignTime,
-		getRtaModeValue: getRtaModeValue,
-		stopMutationObserver: fnStopMutationObserver,
-		FioriToolsRtaMode
+		stopMutationObserver: fnStopMutationObserver
 	};
 });

package/src/sap/suite/ui/generic/template/designtime/utils/designtimeUtils.js

@@ -353,6 +353,7 @@ sap.ui.define([
 	 * @property {DesigntimeSetting[]} [writeObject] - An array of DesigntimeSetting objects.
 	 * @property {string} [writeObjectFor] - The value of the setting for which the Object should be constructed.
 	 * @property {boolean} [skipChange] - Indicates if the change should be skipped.
+	 * @property {boolean} [keyUser] - Indicates if the setting is allowed for key user.
 
 	* @typedef {string | boolean | string[] } PropertyValue
 
@@ -455,7 +456,16 @@ sap.ui.define([
 		return oSupportedGlobalManifestSettings;
 	}
 
-	function getAllowedDesigntimeSettings(oControl, aDesigntimeSettings) {
+	/**
+	 * Retrieves the allowed designtime settings for the given control based on the floorplan component name.
+	 * If the control is not restricted to a specific component, all settings are returned.
+	 * If the control is restricted to a specific component, only the settings for that component are returned.
+	 * @param {sap.ui.core.Control} oControl - The control.
+	 * @param {DesigntimeSetting[]} aDesigntimeSettings - The array of designtime settings.
+	 * @returns {DesigntimeSetting[]} - The allowed designtime settings.
+	 */
+
+	function filterDesigntimeSettingsByFloorPlan(oControl, aDesigntimeSettings) {
 		const sComponentName = getOwnerComponentFor(oControl).getMetadata().getComponentName();
 		return aDesigntimeSettings.filter(oSetting => !oSetting.restrictedTo || oSetting.restrictedTo.includes(sComponentName));
 	}
@@ -466,6 +476,38 @@ sap.ui.define([
 	getChanges = testableHelper.testableStatic(getChanges, "getChanges");
 	getChangeStructure = testableHelper.testableStatic(getChangeStructure, "getChangeStructure");
 
+	/**
+	 * Parses the URL parameters and returns the value of RTA mode URL parameter (fiori-tools-rta-mode)
+	 * @returns {string | null} A promise which returns a value of RTA mode
+	 */
+	function getRtaModeValue() {
+		var RTA_MODE_URL_PARAM_KEY = "fiori-tools-rta-mode";
+
+		const oUrlParams = new URLSearchParams(window.location.search);
+		const sRtaModeValue = oUrlParams.get(RTA_MODE_URL_PARAM_KEY);
+		return sRtaModeValue;
+	}
+
+	const FioriToolsRtaMode = {
+		True: "true",
+		ForAdaptation: "forAdaptation"
+	};
+
+	/**
+	 * Returns the allowed designtime settings based on the adaptation mode.
+	 * If the adaptation mode is not set, only key user settings are returned.
+	 * If the adaptation mode is set, all settings are returned.
+	 *
+	 * @param {DesigntimeSetting[]} aDesigntimeSettings
+	 * @returns {DesigntimeSetting[]}
+	 */
+	function getAllowedDesigntimeSettingsBasedOnAdaptationMode(aDesigntimeSettings) {
+		if (!getRtaModeValue()) {
+			return aDesigntimeSettings.filter(oSetting => oSetting.keyUser);
+		}
+		return aDesigntimeSettings;
+	}
+
 	return {
 		openAdaptionDialog: fnOpenAdaptionDialog,
 		getSettings,
@@ -476,6 +518,9 @@ sap.ui.define([
 		SettingScope,
 		ChangeType,
 		getSupportedGlobalManifestSettings,
-		getAllowedDesigntimeSettings
+		filterDesigntimeSettingsByFloorPlan,
+		getRtaModeValue,
+		FioriToolsRtaMode,
+		getAllowedDesigntimeSettingsBasedOnAdaptationMode
 	};
 });

package/src/sap/suite/ui/generic/template/fragments/DeterminingButton.fragment.xml

@@ -2,26 +2,24 @@
     xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper'}">
 
-    <template:with path="dataField>Action"
-		helper="AHModel.gotoFunctionImport"
-		var="action">
-	    <Button id="{parts: [{path: 'dataField>'}, {path: 'facet>'}], formatter: 'AH.getStableIdPartForDatafieldActionButton'}::Determining"
-			type="{path:'dataField>', formatter: 'AH.buildExpressionForButtonCriticality'}"
-	        text="{= ${path: 'dataField>Label', formatter: 'AHModel.format'}}"
-            visible="{parts: [{path: 'parameter>/treeNode'}, {path: 'action>sap:applicable-path'}, {path: 'dataField>'}], formatter: 'AH.actionControlDetermining'}"
+	<template:with path="dataField>Action" helper="AHModel.gotoFunctionImport" var="action">
+		<Button id="{parts: [{path: 'dataField>'}, {path: 'facet>'}], formatter: 'AH.getStableIdPartForDatafieldActionButton'}::Determining"
+			type="{path:'dataField>', formatter: 'AH.buildExpressionForButtonCriticality'}" text="{= ${path: 'dataField>Label', formatter: 'AHModel.format'}}"
+			visible="{parts: [{path: 'parameter>/treeNode'}, {path: 'action>sap:applicable-path'}, {path: 'dataField>'}], formatter: 'AH.actionControlDetermining'}"
 			press="{parts: [{path: 'parameter>/settings'}, {path: 'dataField>'}, {path: 'parameter>/manifest'}, {value: 'true'}], formatter: 'AH.getAnnotatedActionPress'}">
-	        <customData>
-	            <core:CustomData key="Action" value="{path: 'dataField>Action', formatter: 'AHModel.format'}" />
-	            <core:CustomData key="Label" value="{path: 'dataField>Label', formatter: 'AHModel.format'}" />
-	            <template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation'}">
-	                <core:CustomData key="SemanticObject" value="{path: 'dataField>SemanticObject', formatter: 'AHModel.format'}" />
-	                <core:CustomData key="RequiresContext" value="{path: 'dataField>RequiresContext', formatter: 'AHModel.format'}" />
-	            </template:if>
-	            <template:with path="dataField>Action" helper="AHModel.gotoFunctionImport" var="action">
-	            	<core:CustomData key="ActionFor" value="{action>sap:action-for}" />
-                </template:with>
-	        </customData>
-	    </Button>
-    </template:with>
+			<customData>
+				<core:CustomData key="Action" value="{path: 'dataField>Action', formatter: 'AHModel.format'}" />
+				<core:CustomData key="Label" value="{path: 'dataField>Label', formatter: 'AHModel.format'}" />
+				<core:CustomData key="ActionType" value="determining" />
+				<template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation'}">
+					<core:CustomData key="SemanticObject" value="{path: 'dataField>SemanticObject', formatter: 'AHModel.format'}" />
+					<core:CustomData key="RequiresContext" value="{path: 'dataField>RequiresContext', formatter: 'AHModel.format'}" />
+				</template:if>
+				<template:with path="dataField>Action" helper="AHModel.gotoFunctionImport" var="action">
+					<core:CustomData key="ActionFor" value="{action>sap:action-for}" />
+				</template:with>
+			</customData>
+		</Button>
+	</template:with>
 
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/fragments/DraftAdminDataPopover.fragment.xml

@@ -4,6 +4,7 @@
 			 ariaLabelledBy="objectNoDataText unsavedPopoverText lockedPopoverText objectChangedText"
 			 contentWidth="15.625rem"
 			 verticalScrolling="false"
+			 placement="Auto"
 			 class="sapSmartTemplatesListReportPopover sapUiContentPadding">
 		<endButton>
 				<Button icon="sap-icon://decline" tooltip="{i18n>CLOSE}" press="closeDraftAdminPopover" />

package/src/sap/suite/ui/generic/template/fragments/GridTableCells.fragment.xml

@@ -27,7 +27,7 @@
                <smartField:SmartField value="{path: 'dataField>Value', formatter: 'AHModel.simplePath'}" editable="false" contextEditable="false" fetchValueListReadOnly="false"
                     ariaLabelledBy="{columnId>id}">
                     <smartField:configuration>
-                        <smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}, {path: 'dataFieldTarget>Data'}], formatter: 'AH.getTextArrangementForSCFields'}"/>
+                        <smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}, {path: 'dataFieldTarget>Data'}], formatter: 'AH.getTextArrangementForSCFields'}"/>
                     </smartField:configuration>
                     <template:if test="{= ${dataField>Criticality}}">
                         <smartField:controlProposal>
@@ -55,7 +55,7 @@
                         <core:CustomData key="Target" value="{dataField>Target/NavigationPropertyPath}" />
                     </smartField:customData>
                     <smartField:configuration>
-					<smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
+					<smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
 				</smartField:configuration>
                 </smartField:SmartField>
             </template:elseif>
@@ -84,7 +84,7 @@
 						  <RatingIndicator
 								enabled="true" editable="false" maxValue="{path: 'dataFieldTarget>TargetValue', formatter: 'AHModel.format'}"
 								binding="{= ${ path: 'dataField>Target/AnnotationPath'}.indexOf('/') > -1 ? '{' + ${path: 'dataField>Target/AnnotationPath'}.slice(0, ${ path: 'dataField>Target/AnnotationPath'}.indexOf('/')) + '}' : null}"
-								value="{path: 'dataFieldTarget>Value', formatter: 'AHModel.format'}" width="16px" />
+								value="{path: 'dataFieldTarget>Value', formatter: 'AHModel.format'}" iconSize="16px" />
 					   </template:with>
 					</template:elseif>
                     <template:elseif test="{= ${dataFieldTarget>Visualization/EnumMember} === 'com.sap.vocabularies.UI.v1.VisualizationType/Progress'}">
@@ -99,7 +99,7 @@
                                         state="{path:'dataFieldTarget>', formatter: 'AH.buildExpressionForProgressIndicatorCriticality'}">
                                 <customData>
                                     <core:CustomData key="Target" value="{= ${path: 'dataFieldTarget>TargetValue', formatter: 'AHModel.format'} }" />
-                                    <core:CustomData key="UoM" value="{= ${path: 'valueProperty>Org.OData.Measures.V1.Unit', formatter: 'AHModel.format'} }" />
+                                    <core:CustomData key="UoM" value="{= ${path: 'value>Org.OData.Measures.V1.Unit', formatter: 'AHModel.format'} }" />
                                 </customData>
                             </ProgressIndicator>
                         </template:with>

package/src/sap/suite/ui/generic/template/fragments/HeaderDataPointContent.fragment.xml

@@ -18,7 +18,7 @@
 			</sfi:semanticObjectController>
 			<sfi:configuration>
 				<sfi:Configuration
-						displayBehaviour="{parts: [{path: 'dataPoint>'}, {path: 'annotation>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
+						displayBehaviour="{parts: [{path: 'dataPoint>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
 			</sfi:configuration>
 			<template:if test="{= ${dataPoint>Criticality} }">
 				<sfi:controlProposal>

package/src/sap/suite/ui/generic/template/fragments/HeaderFormDataField.fragment.xml

@@ -77,7 +77,7 @@
 						editable="{ui>/editable}" linkPress="._templateEventHandlers.onDataFieldWithNavigationPath">
 						<sfi:configuration>
 							<sfi:Configuration
-								displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
+								displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
 						</sfi:configuration>
 						<sfi:customData>
 							<core:CustomData key="defaultTextInEditModeSource" value="{path: 'dataFieldValue>', formatter: 'AH.setValidationForValueList'}" />
@@ -113,7 +113,7 @@
 							</sfi:semanticObjectController>
 							<sfi:configuration>
 								<sfi:Configuration
-										displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'annotation>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
+										displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
 							</sfi:configuration>
 							<template:if test="{= ${dataField>Criticality} }">
 								<sfi:controlProposal>

package/src/sap/suite/ui/generic/template/fragments/MessagePopover.fragment.xml

@@ -2,8 +2,9 @@
 		xmlns="sap.m"
 		xmlns:core="sap.ui.core">
 	<MessagePopover groupItems="true" items="{msg>/}" activeTitlePress="titlePressed" beforeOpen="beforeOpen" afterClose="afterClose" >
-		<MessageItem  description="{msg>description}" type="{msg>type}"  title="{msg>message}"
+		<MessageItem  type="{msg>type}"  title="{msg>message}"
 					subtitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>additionalText'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getSubtitle'}"
+					description="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>description'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getDescription'}"
 					longtextUrl="{msg>descriptionUrl}"
 					markupDescription="{helper>/isAIErrorExplanationEnabled}"
 					activeTitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'helper>/isPopoverOpen'}], formatter: '.isPositionable'}"

package/src/sap/suite/ui/generic/template/fragments/TableCell.fragment.xml

@@ -12,7 +12,7 @@
 						<smartField:SmartField value="{path: 'dataField>Value', formatter: 'AHModel.simplePath'}" editable="{= ${parameter>/treeNode/level} > 0 ? '{ui>/editable}' : 'false'}" contextEditable="{= ${parameter>/treeNode/level} > 0}" fetchValueListReadOnly="{= ${parameter>/treeNode/level} > 0}"
 												ariaLabelledBy="{columnId>id}">
 							<smartField:configuration>
-								<smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}, {path: 'dataFieldTarget>Data'}], formatter: 'AH.getTextArrangementForSCFields'}"/>
+								<smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}, {path: 'dataFieldTarget>Data'}], formatter: 'AH.getTextArrangementForSCFields'}"/>
 							</smartField:configuration>
 							<template:if test="{= ${dataField>Criticality}}">
 								<smartField:controlProposal>
@@ -128,7 +128,7 @@
 				</smartField:customData>
 				<smartField:configuration>
 					<smartField:Configuration
-						displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
+						displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
 				</smartField:configuration>
 			</smartField:SmartField>
 		</template:elseif>

package/src/sap/suite/ui/generic/template/fragments/TreeTableColumns.fragment.xml

@@ -123,7 +123,7 @@
 									</smartField:customData>
 									<smartField:configuration>
 										<smartField:Configuration
-											displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
+											displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
 									</smartField:configuration>
 								</smartField:SmartField>
 							</table:template>

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper.js

@@ -105,8 +105,10 @@ sap.ui.define([
 				oControl.attachAfterVariantInitialise(function() {
 					//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
 					//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
-					if (sVariantId !== '*standard*' && oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
-						oControl.setCurrentVariantId(sVariantId);
+					if (sVariantId !== '*standard*') {
+						if (oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
+							oControl.setCurrentVariantId(sVariantId);
+						}
 						oSmartVariantManagement.setModified(false);
 					}
 				});

package/src/sap/suite/ui/generic/template/genericUtilities/filterHelper.js

@@ -204,10 +204,12 @@ sap.ui.define([
 		}
 		var sRet = aFiltersForProperty.map(function (oFilter) {
 			var bCaseSensitive = true;
+			// Define the date range operations that need date formatting
+			var dateRangeOperations = ["DATE", "DATERANGE", "DATETIMERANGE", "FROM", "TO"];
 			if (oFilter.bCaseSensitive === undefined) {
 				bCaseSensitive = true;
 			}
-			if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation !== "DATE") {
+			if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo && !dateRangeOperations.includes(oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation)) {
 				if (!DynamicDateUtil.getAllOptionKeys().includes(oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation)) {
 					oParams.bIsStatic = true;
 					return;

package/src/sap/suite/ui/generic/template/js/AnnotationHelper.js

@@ -353,20 +353,20 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			return false;
 		},
 
-		getValueListReadOnly: function (oInterface, sEntityType, oDataField) {
+		getValueListReadOnly: function (oInterface, vEntityType, oDataField) {
 			var oMetaModel = oInterface.getInterface(1).getModel();
 			var sPath = oInterface.getInterface(1).getPath() + '/Value';
 			var sTargetPropertyPath = AnnotationHelperModel.resolvePath(oMetaModel.getContext(sPath));
-			var oDataFieldValue = oMetaModel.getObject(sTargetPropertyPath);
-			if (oDataFieldValue['com.sap.vocabularies.UI.v1.TextArrangement']) {
+			var oDataFieldValue = sTargetPropertyPath && oMetaModel.getObject(sTargetPropertyPath);
+			if (oDataFieldValue?.['com.sap.vocabularies.UI.v1.TextArrangement']) {
 				// case 1 - text arrangement defined at property level
 				return oDataFieldValue['com.sap.vocabularies.UI.v1.TextArrangement'].EnumMember !== 'com.sap.vocabularies.UI.v1.TextArrangementType/TextSeparate';
-			} else if (oDataFieldValue['com.sap.vocabularies.Common.v1.Text']) {
+			} else if (oDataFieldValue?.['com.sap.vocabularies.Common.v1.Text']) {
 				// case 2 - text arrangement defined for property via sap:text
 				return true;
 			} else {
 				// case 3 - text arrangement defined at entity level
-				var oEntityType = oMetaModel.getODataEntityType(sEntityType);
+				var oEntityType = typeof vEntityType === "object" ? vEntityType : oMetaModel.getODataEntityType(vEntityType); // vEntityType can be object or string.
 				if (oEntityType['com.sap.vocabularies.UI.v1.TextArrangement']) {
 					return oEntityType['com.sap.vocabularies.UI.v1.TextArrangement'].EnumMember !== 'com.sap.vocabularies.UI.v1.TextArrangementType/TextSeparate';
 				}
@@ -1106,7 +1106,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 		// builds the expression for the Rating Indicator aggregate Count
 		buildRatingIndicatorAggregateCountExpression: function (mValue) {
-			return "{parts: [{path: '" + mValue.Path + "'}], formatter: 'RuntimeFormatters.formatRatingIndicatorAggregateCount.bind($control)'}";
+			return "{parts: [{path: '" + mValue?.Path + "'}], formatter: 'RuntimeFormatters.formatRatingIndicatorAggregateCount.bind($control)'}";
 		},
 
 		getIdForMoreBlockContent: function (oFacet) {
@@ -1264,7 +1264,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		},
 
 		formatHeaderImage: function (oInterface, oHeaderInfo, sAppComponentName) {
-			return oAnnotationHelper.formatImageOrTypeUrl(oInterface, oHeaderInfo.ImageUrl, oHeaderInfo.TypeImageUrl, sAppComponentName, true);
+			return oAnnotationHelper.formatImageOrTypeUrl(oInterface, oHeaderInfo?.ImageUrl, oHeaderInfo?.TypeImageUrl, sAppComponentName, true);
 		},
 
 		getPathWithExpandFromHeader: function (oInterface, oEntitySet, sNavigationProperty, oInputImageUrl, oTypeImageUrl) {
@@ -2638,7 +2638,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		getColumnListItemType: function (oListEntitySet, aSubPages, oManifest, oTreeNode, bIsDraftEnabled, sAnnotationPath) {
 			var bIsRoot = !oTreeNode.level; // information, whether we are on the root page
 			// check for special feature: navigation from list report to object page via navigationProperty
-			var bIsListWithNavigationProperty = bIsRoot && aSubPages.some(function (oSubPage) {
+			var bIsListWithNavigationProperty = bIsRoot && aSubPages && aSubPages.some(function (oSubPage) {
 				return oSubPage.navigationProperty;
 			});
 			var bAllowsNavigationInEditMode = bIsDraftEnabled || bIsRoot; // in non-draft mode forward navigation is disabled in edit mode
@@ -2944,19 +2944,13 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			return sTextArrangement;
 		},
 
-		getTextArrangementForSmartControl: function (oInterface, oField, refEntitySet, oEntitySet) {
+		getTextArrangementForSmartControl: function (oInterface, oField, oEntitySet) {
 			oInterface = oInterface.getInterface(0);
-			var oEntityType;
 			var oMetaModel = oInterface.getModel();
-
-			if (refEntitySet.name == undefined) {
-				oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
-			} else {
-				oEntityType = oMetaModel.getODataEntityType(refEntitySet.entityType);
-			}
-
+			var oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
+			
 			var sTextArrangement = "descriptionAndId";
-			if (oMetaModel.getODataProperty(oEntityType, oField.Value.Path)) {
+			if (oField?.Value?.Path && oMetaModel.getODataProperty(oEntityType, oField.Value.Path)) {
 				var oPropertyTextModel = oMetaModel.getODataProperty(oEntityType, oField.Value.Path)["com.sap.vocabularies.Common.v1.Text"];
 				// 1. check TextArrangement definition for property
 				if (oPropertyTextModel && oPropertyTextModel["com.sap.vocabularies.UI.v1.TextArrangement"] && oPropertyTextModel["com.sap.vocabularies.UI.v1.TextArrangement"].EnumMember) {
@@ -3891,12 +3885,14 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					break;
 				}
 			}
+
+			aConnectedDataFields = aConnectedDataFields || [];
 			for (var j = 0; j < aConnectedDataFields.length; j++) {
 				if (aConnectedDataFields[j].RecordType === "com.sap.vocabularies.UI.v1.DataField" && aConnectedDataFields[j].Value.Path === sDescriptionField) {
 					return "idOnly";
 				}
 			}
-			sTextArrangement = oAnnotationHelper.getTextArrangementForSmartControl(oInterface, oField, {}, oEntitySet);
+			sTextArrangement = oAnnotationHelper.getTextArrangementForSmartControl(oInterface, oField, oEntitySet);
 			return sTextArrangement;
 		},
 

package/src/sap/suite/ui/generic/template/js/AnnotationHelperStreamSupport.js

@@ -114,6 +114,9 @@ sap.ui.define([
 		getAcceptableMimeTypes: function(oInterface, oEntitySet){
 			var oEntityType = oInterface.getModel(0).getODataEntityType(oEntitySet.entityType);
 			var aAcceptableMediaTypes = oEntityType["Org.OData.Core.V1.AcceptableMediaTypes"];
+			if (!aAcceptableMediaTypes) {
+				return "";
+			}
 			var sAcceptableMimeType = new String();
 			for (var i = 0; i < aAcceptableMediaTypes.length; i++) {
 				sAcceptableMimeType = sAcceptableMimeType.concat(aAcceptableMediaTypes[i].String).concat(",");

package/src/sap/suite/ui/generic/template/js/QuickTemplates/QuickTemplateComponentFactory.js

@@ -3,7 +3,7 @@ sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/ui/core/UIComponent",
 	"sap/ui/model/resource/ResourceModel",
-	"sap/ui/core/library",
+	"sap/ui/core/mvc/ViewType",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/generic/app/ApplicationController",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
@@ -15,7 +15,7 @@ sap.ui.define([
 	BaseObject,
 	UIComponent,
 	ResourceModel,
-	coreLibrary,
+	ViewType,
 	JSONModel,
 	ApplicationController,
 	FeLogger,
@@ -27,7 +27,6 @@ sap.ui.define([
 		"use strict";
 
 		var oLogger = new FeLogger("js.QuickTemplates.QuickTemplateComponentFactory").getLogger();
-		var ViewType = coreLibrary.mvc.ViewType;
 
 		var factory = BaseObject.extend("sap.suite.ui.generic.template.js.QuickTemplates.QuickTemplateComponentFactory");