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

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/Facet.fragment.xml

@@ -1,12 +1,11 @@
-<core:FragmentDefinition xmlns:core="sap.ui.core" xmlns:layout="sap.ui.layout"
-	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+<core:FragmentDefinition xmlns:core="sap.ui.core" xmlns:layout="sap.ui.layout" 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', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
 
 	<!-- @classdesc @name: Name: sap.suite.ui.generic.template.ObjectPage.view.fragments.Facet.fragment.xml
 		@param {UI.Facet} [facet] @param {edm.EntitySet} [entitySet] @param {edm.EntityType}
 		[entityType] -->
 	<template:with path="parameter>/variables" helper="AH.getNewVariable" var="objectPageTableSettings">
-		<template:if test="{:= ${objectPageTableSettings>}.set(${block>tableSettings})}"/>
+		<template:if test="{:= ${objectPageTableSettings>}.set(${block>tableSettings})}" />
 		<template:if test="{= ${objectPageTableSettings>value/type} !== 'TreeTable' || !${device>/system/phone}}">
 			<layout:Grid defaultSpan="XL12 L12 M12 S12" hSpacing="0" vSpacing="0" class="sapSmartTemplatesObjectPageSubSectionGrid">
 				<!--
@@ -16,42 +15,48 @@
 				-->
 				<template:if test="{path: 'facet>Target', formatter: 'AHModel.isMultiple'}">
 					<template:then>
-						<template:if test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.LineItem') > -1}">
-							<template:then>
-								<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartTable" type="XML"/>
-							</template:then>
-							<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.Communication.v1.Contact') > -1}">
-								<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.Contacts" type="XML"/>
-							</template:elseif>
-							<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.Chart') > -1}">
-								<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartChart" type="XML" />
-							</template:elseif>
-						</template:if>
+						<template:with path="facet>Target" helper="AHModel.gotoEntitySet" var="listEntitySet">
+							<template:with path="listEntitySet>entityType" helper="AHModel.gotoEntityType" var="listEntityType">
+								<template:if test="{parts:[{path: 'facet>Target/AnnotationPath'}, {path: 'listEntityType>'}], formatter: 'AH.checkFacetHasLineItemAnnotations'}">
+									<template:then>
+										<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartTable" type="XML" />
+									</template:then>
+									<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.Communication.v1.Contact') > -1}">
+										<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.Contacts" type="XML" />
+									</template:elseif>
+									<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.Chart') > -1}">
+										<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartChart" type="XML" />
+									</template:elseif>
+								</template:if>
+							</template:with>
+						</template:with>
 					</template:then>
-					<template:elseif test="{= ${facet>RecordType}.indexOf('com.sap.vocabularies.UI.v1.CollectionFacet') > -1 ||
-												(${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.FieldGroup') > -1
-											     || ${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.Identification') > -1) }">
-						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML"/>
+					<template:elseif test="{= ${facet>RecordType}.indexOf('com.sap.vocabularies.UI.v1.CollectionFacet') > -1
+							|| (${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.FieldGroup') > -1
+							|| ${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.Identification') > -1) }">
+						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML" />
 					</template:elseif>
 					<template:elseif test="{= ${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.DataPoint') > -1 }">
 						<template:with path="facet>Target" helper="AHModel.resolvePath" var="dataPoint">
-							<template:if test="{= ${dataPoint>Visualization/EnumMember}.indexOf('com.sap.vocabularies.UI.v1.VisualizationType/Rating') = -1 }">
+							<template:if test="{= ${dataPoint>Visualization/EnumMember}.indexOf('com.sap.vocabularies.UI.v1.VisualizationType/Rating') === -1 }">
 								<template:then>
-									<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML"/>
+									<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML" />
 								</template:then>
 							</template:if>
 						</template:with>
 					</template:elseif>
 					<template:elseif test="{= ${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.Communication.v1.Address') > -1 }">
 						<!-- Be aware: variable facet is not always provided (in case of SmartForm it is not meaningful, as the SmartForm actually shows multiple facets).
-								 Thus, it does not make sense to create facetId globally (for this fragment). In fact, doing this would lead to console errors for not provided mandatory parameter
-								 sRecordType when trying to build the id. 
+								 Thus, it does not make sense to create facetId globally (for this fragment). In fact, doing this would lead to console errors for not provided mandatory
+						parameter
+								 sRecordType when trying to build the id.
 								 AddressFacet is the only case, where facetId is used, so we create it only here. In this case, facet obviously is provided.
 						 -->
 						<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="facetId">
-							<template:if test="{= ${facetId>}.buildStableId({ type:'ObjectPage', subType:'StandardFacet', sRecordType: ${facet>RecordType}, sAnnotationPath: ${facet>Target/AnnotationPath} , sAnnotationId: ${facet>ID/String} }) }"/>
+							<template:if
+								test="{= ${facetId>}.buildStableId({ type:'ObjectPage', subType:'StandardFacet', sRecordType: ${facet>RecordType}, sAnnotationPath: ${facet>Target/AnnotationPath} , sAnnotationId: ${facet>ID/String} }) }" />
 							<template:with path="facet>Target" helper="AHModel.resolvePath" var="address">
-								<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.AddressFacet" type="XML"/>
+								<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.AddressFacet" type="XML" />
 							</template:with>
 						</template:with>
 					</template:elseif>
@@ -59,12 +64,12 @@
 					<!-- better: check for <template:elseif test="{= ${block>additionalData/type} === 'SmartForm'}">
 								but currently this is not (yet) supplied in case of mixed reference facets on 3rd level  -->
 					<template:else>
-						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML"/>
-						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.StreamSupport" type="XML"/>
+						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML" />
+						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.StreamSupport" type="XML" />
 					</template:else>
 				</template:if>
 
 			</layout:Grid>
 		</template:if>
 	</template:with>
-</core:FragmentDefinition>
+</core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SmartTable.fragment.xml

@@ -8,7 +8,7 @@
 	<template:with path="facet>Target" var="target">
 		<template:with path="target>" helper="AHModel.gotoEntitySet" var="listEntitySet">
 			<template:with path="listEntitySet>entityType" helper="AHModel.gotoEntityType" var="listEntityType">
-				<template:with path="target>" helper="AHModel.resolvePath" var="collection">
+				<template:with path="target>" helper="AH.getListItemCollection" var="collection">
 					<template:with path="listEntityType>com.sap.vocabularies.UI.v1.HeaderInfo" var="header">
 						<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="smartControlId">
 							<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="facetId">
@@ -62,18 +62,14 @@
 										<core:CustomData key="dateFormatSettings"
 											value='\{"UTC":true,"style":"medium"\}' />
 										<core:CustomData key="useUTCDateTime" value="true" />
-										<template:if test="{= ${facet>Target/AnnotationPath}.split('#')[1]}">
+										<template:if test="{= ${objectPageTableSettings>value/lineItemQualifier}}">
 											<core:CustomData key="lineItemQualifier"
-												value="{= ${facet>Target/AnnotationPath}.split('#')[1]}" />
+												value="{= ${objectPageTableSettings>value/lineItemQualifier}}" />
+										</template:if>
+										<template:if test="{= ${objectPageTableSettings>value/lineItemSortOrder}}">
+											<core:CustomData key="TemplateSortOrder"
+												value="{= ${objectPageTableSettings>value/lineItemSortOrder}}" />
 										</template:if>
-										<template:with
-											path="listEntityType>com.sap.vocabularies.UI.v1.PresentationVariant"
-											var="variant">
-											<template:if test="{= ${variant>SortOrder}}">
-												<core:CustomData key="TemplateSortOrder"
-													value="{path: 'variant>SortOrder', formatter: 'AH.getSortOrder'}" />
-											</template:if>
-										</template:with>
 									</st:customData>
 									<st:semanticObjectController>
 										<!-- Fragment SemanticObjectControllerForDataField uses variable 'entitySet to address the entoty set. Currently entitySet points to the entity set of whole OP. Reset pointer to the entity set of the table.-->
@@ -198,7 +194,7 @@
 												delete="._templateEventHandlers.deleteEntry"
 												itemPress="._templateEventHandlers.onListNavigate"
 												updateFinished="._templateEventHandlers.checkUpdateFinished"
-												sticky="ColumnHeaders,HeaderToolbar,InfoToolbar"
+												sticky="ColumnHeaders,HeaderToolbar,InfoToolbar,GroupHeaders"
 												rememberSelections="false"
 												multiSelectMode="{= (${objectPageTableSettings>value/multiSelect} &amp;&amp; ${objectPageTableSettings>value/selectAll}) ? 'SelectAll' : 'ClearAll'}">
 												<template:with path="objectPageTableSettings>value" var="tableSettings">

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.132.0"
+			"version": "1.134.1"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.132.0"
+		"version": "1.134.1"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/designtime/controls/DynamicPage.designtime.js

@@ -13,6 +13,9 @@ sap.ui.define([
 	function (deepClone, designtimeUtils, ObjectPath, testableHelper) {
 		"use strict";
 
+		const LIST_REPORT_COMPONENT_NAME = "sap.suite.ui.generic.template.ListReport";
+		const ALP_COMPONENT_NAME = "sap.suite.ui.generic.template.AnalyticalListPage";
+
 		/**
 		 * @typedef {Object} DesigntimeSetting
 		 * @property {string} id - The ID of the designtime setting.
@@ -27,7 +30,7 @@ sap.ui.define([
 		 * @property {Partial<DesigntimeSetting>[]} [writeObject] - An array of DesigntimeSetting objects.
 		 * @property {string} [writeObjectFor] - The value for which the writeObject should be applied.
 		 * @property {boolean} [skipChange] - Indicates if the change should be skipped.
-
+		 * @property {boolean} keyUser - Indicates if the setting is allowed for key user.
 		===============================================
 		 * @typedef {Object} ChangeParameters - Descriptor change parameters.
 		 * @property {string} [sScope] - The scope of the manifest setting.
@@ -66,7 +69,7 @@ sap.ui.define([
 				name: "Variant Management",
 				description: "Enable Smart Variant Management",
 				type: "booleanOrString",
-				value: "true",
+				value: true,
 				enums: [
 					{
 						id: "true",
@@ -77,7 +80,8 @@ sap.ui.define([
 						name: "Per Control"
 					}
 				],
-				getPath: () => getSettingsPath("smartVariantManagement")
+				getPath: () => getSettingsPath("smartVariantManagement"),
+				keyUser: true
 
 			};
 
@@ -90,7 +94,9 @@ sap.ui.define([
 				description: "Hide Variant Management",
 				type: "boolean",
 				value: false,
-				getPath: () => getSettingsPath("variantManagementHidden")
+				getPath: () => getSettingsPath("variantManagementHidden"),
+				restrictedTo: [LIST_REPORT_COMPONENT_NAME],
+				keyUser: true
 			};
 
 			/**
@@ -102,7 +108,8 @@ sap.ui.define([
 				description: "Enable Table Filter in Page Variant",
 				type: "boolean",
 				value: false,
-				getPath: () => getSettingsPath("enableTableFilterInPageVariant")
+				getPath: () => getSettingsPath("enableTableFilterInPageVariant"),
+				keyUser: false
 			};
 
 
@@ -130,7 +137,8 @@ sap.ui.define([
 						name: "Disabled"
 					}
 				],
-				getPath: () => "component/settings/dataLoadSettings/loadDataOnAppLaunch"
+				getPath: () => "component/settings/dataLoadSettings/loadDataOnAppLaunch",
+				keyUser: true
 			};
 
 			/**
@@ -147,17 +155,48 @@ sap.ui.define([
 					{ id: "direct", name: "true" },
 					{ id: "display", name: "false" }
 
-				]
+				],
+				restrictedTo: [LIST_REPORT_COMPONENT_NAME],
+				keyUser: true
 			};
 
+			/**
+			 * @type {DesigntimeSetting}
+			 */
+
+			const defaultContentView = {
+				id: "defaultContentView",
+				name: "Default Content View",
+				description: "Default Content View",
+				type: "string",
+				value: "chart",
+				enums: [
+					{
+						id: "charttable",
+						name: "Hybrid"
+					},
+					{
+						id: "chart",
+						name: "Chart"
+					},
+					{
+						id: "table",
+						name: "Table"
+					}
 
+				],
+				getPath: () => getSettingsPath("defaultContentView"),
+				restrictedTo:[ALP_COMPONENT_NAME],
+				keyUser: true
+			};
 
 			return [
 				smartVariantManagement,
 				hideVariantManagement,
 				enableTableFilterInPageVariant,
 				initialLoad,
-				openInEditMode
+				openInEditMode,
+				defaultContentView
 			];
 
 		}
@@ -183,19 +222,22 @@ sap.ui.define([
 				const sProperty = oSetting.id;
 				switch (sProperty) {
 					case "smartVariantManagement":
-						mPropertyValues[sProperty] = mLrOrALPSettings.smartVariantManagement || oSetting.value;
+						mPropertyValues[sProperty] = mLrOrALPSettings.smartVariantManagement ?? oSetting.value;
 						break;
 					case "variantManagementHidden":
-						mPropertyValues[sProperty] = mLrOrALPSettings.variantManagementHidden || oSetting.value;
+						mPropertyValues[sProperty] = mLrOrALPSettings.variantManagementHidden ?? oSetting.value;
 						break;
 					case "enableTableFilterInPageVariant":
-						mPropertyValues[sProperty] = mLrOrALPSettings.enableTableFilterInPageVariant || oSetting.value;
+						mPropertyValues[sProperty] = mLrOrALPSettings.enableTableFilterInPageVariant ?? oSetting.value;
 						break;
 					case "loadDataOnAppLaunch":
-						mPropertyValues[sProperty] = ObjectPath.get("dataLoadSettings.loadDataOnAppLaunch", mLrOrALPSettings) || oSetting.value;
+						mPropertyValues[sProperty] = ObjectPath.get("dataLoadSettings.loadDataOnAppLaunch", mLrOrALPSettings) ?? oSetting.value;
 						break;
 					case "editFlow":
-						mPropertyValues[sProperty] = mLrOrALPSettings.editFlow || oSetting.value;
+						mPropertyValues[sProperty] = mLrOrALPSettings.editFlow ?? oSetting.value;
+						break;
+					case "defaultContentView":
+						mPropertyValues[sProperty] = mLrOrALPSettings.defaultContentView ?? oSetting.value;
 						break;
 					default:
 						break;
@@ -216,8 +258,21 @@ sap.ui.define([
 		async function fnOpenTableConfigurationDialog(oControl, mPropertyBag) {
 			const oResourceModel = oControl.getModel("i18n");
 			const oComponent = designtimeUtils.getOwnerComponentFor(oControl);
+			const sComponentName = oComponent.getMetadata().getComponentName();
 			const mLrOrALPSettings = oComponent.mProperties;
-			const aAllowedDesigntimeSettings = getAllDesigntimeSettings(oControl);
+
+			// Get all the designtime settings
+			const aAllDesigntimeSettings = getAllDesigntimeSettings(oControl);
+			// Get the allowed designtime settings based on the floorplan
+
+			/**
+			 * @type {DesigntimeSetting[]}
+			 */
+			let aAllowedDesigntimeSettings = designtimeUtils.filterDesigntimeSettingsByFloorPlan(oControl, aAllDesigntimeSettings);
+
+			// Get the allowed designtime settings based on the adaptation mode (key user or Designtime)
+			aAllowedDesigntimeSettings = designtimeUtils.getAllowedDesigntimeSettingsBasedOnAdaptationMode(aAllowedDesigntimeSettings, oComponent);
+
 
 			// Get the current values of the properties
 			const mRuntimeAdaptationPropertyValues = getRuntimeAdapationProperties(aAllowedDesigntimeSettings, mLrOrALPSettings);
@@ -226,9 +281,11 @@ sap.ui.define([
 			// Get the settings of the dialog from the designtime settings using which the dialog will be created
 			const aItems = designtimeUtils.getSettings(mRuntimeAdaptationPropertyValues, aAllowedDesigntimeSettings);
 
-			// disable the scope control if there is only one option
-
-			const mPropertyValuesEntered = await designtimeUtils.openAdaptionDialog([...aItems], mRuntimeAdaptationPropertyValues, mUnchangedData, "{i18n>RTA_CONFIGURATION_TITLE_LIST_REPORT}", { width: "650px", height: "800px" }, oResourceModel);
+			let sDialogTitle = "{i18n>RTA_CONFIGURATION_TITLE_LIST_REPORT}";
+			if (sComponentName === "sap.suite.ui.generic.template.AnalyticalListPage") {
+				sDialogTitle = "{i18n>RTA_CONFIGURATION_TITLE_ANALYTICAL_LIST_PAGE}";
+			}
+			const mPropertyValuesEntered = await designtimeUtils.openAdaptionDialog([...aItems], mRuntimeAdaptationPropertyValues, mUnchangedData, sDialogTitle, { width: "650px", height: "800px" }, oResourceModel);
 
 
 			/**

package/src/sap/suite/ui/generic/template/designtime/controls/ObjectPageLayout.designtime.js

@@ -27,6 +27,7 @@ sap.ui.define([
 		 * @property {Partial<DesigntimeSetting>[]} [writeObject] - An array of DesigntimeSetting objects.
 		 * @property {string} [writeObjectFor] - The value for which the writeObject should be applied.
 		 * @property {boolean} [skipChange] - Indicates if the change should be skipped.
+		 * @property {boolean} keyUser - Indicates if the setting is allowed for key user.
 
 		===============================================
 		 * @typedef {Object} ChangeParameters - Descriptor change parameters.
@@ -56,20 +57,23 @@ sap.ui.define([
 	 * @param {Object} mSettings - The global manifest settings object.
 	 * @returns {Object} - The object containing the runtime adaptation properties.
 	 */
-		function getRuntimeAdapationProperties(aAllowedDesigntimeSettings, mSettings) {
+		function getRuntimeAdaptationProperties(aAllowedDesigntimeSettings, mSettings) {
 			const mPropertyValues = {};
 
 			aAllowedDesigntimeSettings.forEach(oSetting => {
 				const sProperty = oSetting.id;
 				switch (sProperty) {
 					case "editableHeaderContent":
-						mPropertyValues[sProperty] = mSettings[sProperty] || oSetting.value;
+						mPropertyValues[sProperty] = mSettings[sProperty] ?? oSetting.value;
 						break;
 					case "tableVariantManagement":
-						mPropertyValues[sProperty] = mSettings[sProperty] || oSetting.value;
+						mPropertyValues[sProperty] = mSettings[sProperty] ?? oSetting.value;
+						break;
+					case "chartVariantManagement":
+						mPropertyValues[sProperty] = mSettings[sProperty] ?? oSetting.value;
 						break;
 					case "showRelatedApps":
-						mPropertyValues[sProperty] = mSettings[sProperty] || oSetting.value;
+						mPropertyValues[sProperty] = mSettings[sProperty] ?? oSetting.value;
 						break;
 					default:
 						break;
@@ -94,18 +98,32 @@ sap.ui.define([
 				description: "Decide whether the header content is editable",
 				value: false,
 				getPath: () => 'component/settings/editableHeaderContent',
-				type: "boolean"
+				type: "boolean",
+				keyUser: true
 			};
 			/**
 			 * @type {DesigntimeSetting}
 			 */
 			const tableVariantManagement = {
-				id: "variantManagement",
+				id: "tableVariantManagement",
 				name: "Table Variant Management",
-				description: "Decide whether Variant Management is used",
-				value: false,
+				description: "Decide whether the variant management is enabled for tables",
+				value: true, // The default value is true
 				getPath: () => 'component/settings/tableSettings/variantManagement',
-				type: "boolean"
+				type: "boolean",
+				keyUser: true
+			};
+			/**
+			 * @type {DesigntimeSetting}
+			 */
+			const chartVariantManagement = {
+				id: "chartVariantManagement",
+				name: "Chart Variant Management",
+				description: "Decide whether the variant management is enabled for charts",
+				value: true, // The default value is true
+				getPath: () => 'component/settings/chartSettings/variantManagement',
+				type: "boolean",
+				keyUser: true
 			};
 
 			/**
@@ -117,12 +135,14 @@ sap.ui.define([
 				description: "Decide whether Related Apps are shown",
 				value: false,
 				getPath: () => 'component/settings/showRelatedApps',
-				type: "boolean"
+				type: "boolean",
+				keyUser: true
 			};
 
 			return [
 				editableHeaderContent,
 				tableVariantManagement,
+				chartVariantManagement,
 				showRelatedApps
 			];
 
@@ -133,7 +153,8 @@ sap.ui.define([
 		function getObjectPageSettings(oComponent) {
 			return {
 				editableHeaderContent: JSON.parse(oComponent.getEditableHeaderContent()),
-				tableVariantManagement: !!(ObjectPath.get(["tableVariantManagement"], oComponent.getTableSettings())),
+				tableVariantManagement: ObjectPath.get(["variantManagement"], oComponent.getTableSettings()),
+				chartVariantManagement: ObjectPath.get(["variantManagement"], oComponent.getChartSettings()),
 				showRelatedApps: JSON.parse(oComponent.getShowRelatedApps())
 			};
 		}
@@ -147,7 +168,7 @@ sap.ui.define([
 		 * @param {object} mPropertyBag - The property bag.
 		 * @returns {Promise<ControlChangeParams[]>} - The changes.
 		 */
-		async function fnOpenTableConfigurationDialog(oControl, mPropertyBag) {
+		async function fnOpenObjectPageConfigurationDialog(oControl, mPropertyBag) {
 			const oResourceModel = oControl.getModel("i18n");
 			const oComponent = designtimeUtils.getOwnerComponentFor(oControl);
 
@@ -156,10 +177,17 @@ sap.ui.define([
 			// Get all the designtime settings
 			const aAllDesigntimeSettings = getAllDesigntimeSettings(oControl);
 			// Get the allowed designtime settings based on the floorplan
-			const aAllowedDesigntimeSettings = designtimeUtils.getAllowedDesigntimeSettings(oControl, aAllDesigntimeSettings);
+			/**
+			 * @type {DesigntimeSetting[]}
+			 */
+			let aAllowedDesigntimeSettings = designtimeUtils.filterDesigntimeSettingsByFloorPlan(oControl, aAllDesigntimeSettings);
+
+			// Get the allowed designtime settings based on the adaptation mode (key user or Designtime)
+			aAllowedDesigntimeSettings = designtimeUtils.getAllowedDesigntimeSettingsBasedOnAdaptationMode(aAllowedDesigntimeSettings, oComponent);
+
 
 			// Get the current values of the properties
-			const mRuntimeAdaptationPropertyValues = getRuntimeAdapationProperties(aAllowedDesigntimeSettings, mObjectPageSettings);
+			const mRuntimeAdaptationPropertyValues = getRuntimeAdaptationProperties(aAllowedDesigntimeSettings, mObjectPageSettings);
 			// Save the unchanged data to compare later
 			const mUnchangedData = deepClone(mRuntimeAdaptationPropertyValues);
 			// Get the settings of the dialog from the designtime settings using which the dialog will be created
@@ -181,7 +209,7 @@ sap.ui.define([
 		}
 
 		// Expose the functions for QUnit tests
-		testableHelper.testableStatic(fnOpenTableConfigurationDialog, "fnOpenTableConfigurationDialog");
+		testableHelper.testableStatic(fnOpenObjectPageConfigurationDialog, "fnOpenObjectPageConfigurationDialog");
 
 
 		const oHelper = {
@@ -192,7 +220,7 @@ sap.ui.define([
 							fe: {
 								name: "Configuration",
 								icon: "sap-icon://developer-settings",
-								handler: fnOpenTableConfigurationDialog
+								handler: fnOpenObjectPageConfigurationDialog
 							}
 						}
 					}