@openui5/sap.ui.fl 1.92.0 → 1.93.3

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/getEditorConfig.js

@@ -0,0 +1,209 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ *
+ * @private
+ * @experimental
+ */
+sap.ui.define([
+], function () {
+	"use strict";
+
+	return function(oCustomConfig) {
+		return {
+			context: "/",
+			properties: {
+				entityType: {
+					tags: ["general"],
+					label: "Entity Type",
+					path: "entityType",
+					type: "select",
+					items: (oCustomConfig.entityTypes || []).map(function(sEntityType) {
+						return {
+							key: sEntityType
+						};
+					})
+				},
+				name: {
+					tags: ["general"],
+					label: "Name",
+					path: "name",
+					type: "string"
+				},
+				label: {
+					tags: ["general"],
+					label: "Label",
+					path: "@Common.Label",
+					type: "string"
+				},
+				type: {
+					tags: ["general"],
+					label: "Type",
+					path: "type",
+					type: "select",
+					items: [
+						{
+							key: "cds.String",
+							title: "String"
+						},
+						{
+							key: "cds.Integer",
+							title: "Integer"
+						},
+						{
+							key: "cds.Decimal",
+							title: "Decimal"
+						},
+						{
+							key: "cds.Date",
+							title: "Date"
+						},
+						{
+							key: "cds.Time",
+							title: "Time"
+						},
+						{
+							key: "cds.DateTime",
+							title: "DateTime"
+						},
+						{
+							key: "cds.Boolean",
+							title: "Boolean"
+						}
+					]
+				},
+				numberPrecision: {
+					tags: ["general"],
+					label: "Precision",
+					path: "precision",
+					type: "number",
+					defaultValue: "",
+					visible: "{= ${/type} === 'cds.Decimal' }"
+				},
+				numberScale: {
+					tags: ["general"],
+					label: "Scale",
+					path: "scale",
+					type: "number",
+					defaultValue: "",
+					visible: "{= ${/type} === 'cds.Decimal' }"
+				},
+				stringLength: {
+					tags: ["general"],
+					label: "Length",
+					path: "length",
+					type: "number",
+					defaultValue: "",
+					visible: "{= ${/type} === 'cds.String' }"
+				},
+				defaultValue: {
+					tags: ["general"],
+					label: "Default",
+					path: "default/val",
+					defaultValue: "",
+					type: "{/type}" //"{path: '/type', formatter: '._getEditorForType'}"
+				},
+				readonly: {
+					tags: ["validation"],
+					label: "Readonly",
+					path: "@readonly",
+					type: "bool"
+				},
+				mandatory: {
+					tags: ["validation"],
+					label: "Mandatory",
+					path: "@mandatory",
+					type: "bool"
+				},
+				format: {
+					tags: ["validation"],
+					label: "Format",
+					path: "@assert.format",
+					type: "string",
+					defaultValue: "",
+					visible: "{= ${/type} === 'cds.String' }"
+				},
+				stringRange: {
+					tags: ["validation"],
+					label: "Allowed Values",
+					path: "@assert.range",
+					type: "list",
+					visible: "{= ${/type} === 'cds.String' }",
+					active: "{= ${/type} === 'cds.String' }"
+				},
+				arrayRange: {
+					tags: ["validation"],
+					label: "Range",
+					path: "@assert.range",
+					type: "range",
+					rangeType: "{/type}",
+					// TODO: Once expression bindings are supported, check for ordinal types differently
+					visible: "{= ${/type} === 'cds.Integer' || ${/type} === 'cds.Decimal' || ${/type} === 'cds.DateTime' || ${/type} === 'cds.Date' || ${/type} === 'cds.Time'}",
+					active: "{= ${/type} === 'cds.Integer' || ${/type} === 'cds.Decimal' || ${/type} === 'cds.DateTime' || ${/type} === 'cds.Date' || ${/type} === 'cds.Time'}"
+				},
+				annotations: {
+					tags: ["advanced"],
+					label: "Additional Annotations",
+					allowedTypes: ["string", "json"],
+					path: "annotations",
+					type: "annotations",
+					allowTypeChange: false
+				}
+			},
+			layout: {
+				form: {
+					groups: [
+						{
+							label: "General",
+							items: [
+								{
+									type: "tag",
+									value: "general"
+								}
+							]
+						},
+						{
+							label: "Input Validation",
+							items: [
+								{
+									type: "tag",
+									value: "validation"
+								}
+							]
+						},
+						{
+							label: "Advanced",
+							items: [
+								{
+									type: "tag",
+									value: "advanced"
+								}
+							]
+						}
+					]
+				}
+			},
+			propertyEditors: {
+				select: "sap/ui/integration/designtime/baseEditor/propertyEditor/selectEditor/SelectEditor",
+				string: "sap/ui/integration/designtime/baseEditor/propertyEditor/stringEditor/StringEditor",
+				integer: "sap/ui/integration/designtime/baseEditor/propertyEditor/integerEditor/IntegerEditor",
+				number: "sap/ui/integration/designtime/baseEditor/propertyEditor/numberEditor/NumberEditor",
+				map: "sap/ui/integration/designtime/baseEditor/propertyEditor/mapEditor/MapEditor",
+				annotations: "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/annotationsEditor/AnnotationsEditor",
+				list: "sap/ui/integration/designtime/baseEditor/propertyEditor/listEditor/ListEditor",
+				bool: "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor",
+				range: "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor",
+				json: "sap/ui/integration/designtime/baseEditor/propertyEditor/jsonEditor/JsonEditor",
+				// Re-register basic editors as a workaround for missing formatter support
+				"cds.String": "sap/ui/integration/designtime/baseEditor/propertyEditor/stringEditor/StringEditor",
+				"cds.Integer": "sap/ui/integration/designtime/baseEditor/propertyEditor/integerEditor/IntegerEditor",
+				"cds.Decimal": "sap/ui/integration/designtime/baseEditor/propertyEditor/numberEditor/NumberEditor",
+				"cds.Date": "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/dateEditor/DateEditor",
+				"cds.Time": "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor",
+				"cds.DateTime": "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/dateTimeEditor/DateTimeEditor",
+				"cds.Boolean": "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor"
+			}
+		};
+	};
+});

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/annotationsEditor/AnnotationsEditor.js

@@ -0,0 +1,49 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/ui/integration/designtime/baseEditor/propertyEditor/mapEditor/MapEditor"
+], function (
+	MapEditor
+) {
+	"use strict";
+
+	/**
+	 * @class
+	 * Constructor for a new <code>AnnotationsEditor</code>.
+	 *
+	 * @extends sap.ui.integration.designtime.baseEditor.propertyEditor.mapEditor.MapEditor
+	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.annotationsEditor.AnnotationsEditor
+	 * @author SAP SE
+	 * @since 1.93
+	 * @version 1.93.3
+	 *
+	 * @private
+	 * @experimental 1.93
+	 * @ui5-restricted sap.ui.fl
+	 */
+	var AnnotationsEditor = MapEditor.extend("sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.annotationsEditor.AnnotationsEditor", {
+		xmlFragment: "sap.ui.integration.designtime.baseEditor.propertyEditor.mapEditor.MapEditor",
+		metadata: {
+			library: "sap.ui.fl"
+		},
+		renderer: MapEditor.getMetadata().getRenderer().render
+	});
+
+	AnnotationsEditor.prototype.processInputValue = function(oValue) {
+		return {
+			value: oValue,
+			type: "json"
+		};
+	};
+
+	AnnotationsEditor.prototype._isValidItem = function() {
+		// Temporary fix, can be properly validated once the json type is registered in the MapEditor
+		return true;
+	};
+
+	return AnnotationsEditor;
+});

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor.fragment.xml

@@ -0,0 +1,6 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+>
+	<CheckBox select="_onChange" />
+</core:FragmentDefinition>

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor.js

@@ -0,0 +1,41 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([
+	"sap/ui/integration/designtime/baseEditor/propertyEditor/BasePropertyEditor"
+], function (
+	BasePropertyEditor
+) {
+	"use strict";
+
+	/**
+	 * @class
+	 * Constructor for a new <code>BooleanEditor</code>.
+	 *
+	 * @extends sap.ui.integration.designtime.baseEditor.propertyEditor.BasePropertyEditor
+	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.booleanEditor.BooleanEditor
+	 * @author SAP SE
+	 * @since 1.93
+	 * @version 1.93.3
+	 *
+	 * @private
+	 * @experimental 1.93
+	 * @ui5-restricted sap.ui.fl
+	 */
+	var BooleanEditor = BasePropertyEditor.extend("sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.booleanEditor.BooleanEditor", {
+		xmlFragment: "sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.booleanEditor.BooleanEditor",
+		metadata: {
+			library: "sap.ui.fl"
+		},
+		renderer: BasePropertyEditor.getMetadata().getRenderer().render
+	});
+
+	BooleanEditor.prototype._onChange = function(oEvent) {
+		var bValue = !!oEvent.getParameter("selected");
+		this.setValue(bValue);
+	};
+
+	return BooleanEditor;
+});

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/dateEditor/DateEditor.js

@@ -0,0 +1,43 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Customization of the default date editor to support custom output formats
+// To be implemented in base class
+
+sap.ui.define([
+	"sap/ui/integration/designtime/baseEditor/propertyEditor/dateEditor/DateEditor",
+	"sap/ui/core/format/DateFormat"
+], function (
+	BaseDateEditor,
+	DateFormat
+) {
+	"use strict";
+
+	var DateEditor = BaseDateEditor.extend("sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.dateEditor.DateEditor", {
+		xmlFragment: "sap.ui.integration.designtime.baseEditor.propertyEditor.dateEditor.DateEditor",
+		metadata: {
+			library: "sap.ui.fl"
+		},
+		renderer: BaseDateEditor.getMetadata().getRenderer().render
+	});
+
+	DateEditor.prototype._parse = function (sValue) {
+		if (sValue === "") {
+			return undefined;
+		}
+		var sParsedDate = new Date(sValue);
+
+		// TODO: For now use a hardcoded format, move to default config later
+		var oDateFormatterInstance = DateFormat.getDateInstance({
+			pattern: "yyyy-MM-dd"
+		});
+		return this._isValidDate(sParsedDate)
+			? oDateFormatterInstance.format(sParsedDate)
+			: sValue;
+	};
+
+	return DateEditor;
+});

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/dateTimeEditor/DateTimeEditor.js

@@ -0,0 +1,38 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Customization of the default datetime editor to support custom output formats
+// To be implemented in base class
+
+sap.ui.define([
+	"sap/ui/integration/designtime/baseEditor/propertyEditor/dateTimeEditor/DateTimeEditor"
+], function (
+	BaseDateTimeEditor
+) {
+	"use strict";
+
+	var DateTimeEditor = BaseDateTimeEditor.extend("sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.dateTimeEditor.DateTimeEditor", {
+		xmlFragment: "sap.ui.integration.designtime.baseEditor.propertyEditor.dateTimeEditor.DateTimeEditor",
+		metadata: {
+			library: "sap.ui.fl"
+		},
+		renderer: BaseDateTimeEditor.getMetadata().getRenderer().render
+	});
+
+	DateTimeEditor.prototype._parse = function (sValue) {
+		if (sValue === "") {
+			return undefined;
+		}
+		var sParsedDate = new Date(sValue);
+
+		// TODO: For now use a hardcoded format, move to default config later
+		return this._isValidDate(sParsedDate)
+			? sParsedDate.toISOString().split(".")[0] + "Z" // Cut ms
+			: sValue;
+	};
+
+	return DateTimeEditor;
+});

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor.fragment.xml

@@ -0,0 +1,22 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:baseEditor="sap.ui.integration.designtime.baseEditor"
+>
+	<HBox>
+		<baseEditor:PropertyEditor
+			init="wrapperInit"
+			config="{contentModel>/0/config}"
+			value="{contentModel>/0/value}"
+			renderLabel="false"
+			valueChange="_onChange"
+		/>
+		<baseEditor:PropertyEditor
+			init="wrapperInit"
+			config="{contentModel>/1/config}"
+			value="{contentModel>/1/value}"
+			renderLabel="false"
+			valueChange="_onChange"
+		/>
+	</HBox>
+</core:FragmentDefinition>

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor.js

@@ -0,0 +1,84 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([
+	"sap/ui/integration/designtime/baseEditor/propertyEditor/BasePropertyEditor",
+	"sap/ui/model/json/JSONModel"
+], function (
+	BasePropertyEditor,
+	JSONModel
+) {
+	"use strict";
+
+	/**
+	 * @class
+	 * Constructor for a new <code>RangeEditor</code>.
+	 *
+	 * @extends sap.ui.integration.designtime.baseEditor.propertyEditor.BasePropertyEditor
+	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.rangeEditor.RangeEditor
+	 * @author SAP SE
+	 * @since 1.93
+	 * @version 1.93.3
+	 *
+	 * @private
+	 * @experimental 1.93
+	 * @ui5-restricted sap.ui.fl
+	 */
+	var RangeEditor = BasePropertyEditor.extend("sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.rangeEditor.RangeEditor", {
+		xmlFragment: "sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.rangeEditor.RangeEditor",
+		metadata: {
+			library: "sap.ui.fl"
+		},
+		renderer: BasePropertyEditor.getMetadata().getRenderer().render
+	});
+
+	RangeEditor.configMetadata = Object.assign({}, BasePropertyEditor.configMetadata, {
+		rangeType: {
+			defaultValue: "string"
+		}
+	});
+
+	RangeEditor.prototype.init = function() {
+		BasePropertyEditor.prototype.init.apply(this, arguments);
+		this._oContentModel = new JSONModel();
+		this._oContentModel.setDefaultBindingMode("OneWay");
+		this.setModel(this._oContentModel, "contentModel");
+	};
+
+	RangeEditor.prototype.getExpectedWrapperCount = function () {
+		return 2;
+	};
+
+	RangeEditor.prototype.setConfig = function() {
+		// RangeType might change, make sure to update nested editors
+		BasePropertyEditor.prototype.setConfig.apply(this, arguments);
+		this.setValue(this.getValue());
+	};
+
+	RangeEditor.prototype.setValue = function(aValues) {
+		BasePropertyEditor.prototype.setValue.apply(this, arguments);
+		var oConfig = {
+			type: this.getConfig().rangeType
+		};
+		var aRangeValues = Array.isArray(aValues) ? aValues : [];
+		this._oContentModel.setData([{
+			value: aRangeValues[0],
+			config: Object.assign({ index: 0 }, oConfig)
+		}, {
+			value: aRangeValues[1],
+			config: Object.assign({ index: 1 }, oConfig)
+		}]);
+	};
+
+	RangeEditor.prototype._onChange = function(oEvent) {
+		var vValue = oEvent.getParameter("value");
+		var iIndex = oEvent.getSource().getConfig().index;
+		var aNewValue = (this.getValue() || []).slice();
+		aNewValue[iIndex] = vValue;
+		this.setValue(aNewValue);
+	};
+
+	return RangeEditor;
+});

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.fragment.xml

@@ -0,0 +1,10 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+>
+	<TimePicker
+		value="{displayValue}"
+		valueFormat="HH:mm:ss"
+		change="_onChange"
+	/>
+</core:FragmentDefinition>

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.js

@@ -0,0 +1,70 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([
+	"sap/ui/integration/designtime/baseEditor/propertyEditor/BasePropertyEditor",
+	"sap/ui/integration/designtime/baseEditor/propertyEditor/dateEditor/DateEditor",
+	"sap/ui/core/format/DateFormat"
+], function (
+	BasePropertyEditor,
+	DateEditor,
+	DateFormat
+) {
+	"use strict";
+
+	/**
+	 * @class
+	 * Constructor for a new <code>TimeEditor</code>.
+	 *
+	 * @extends sap.ui.integration.designtime.baseEditor.propertyEditor.dateEditor.DateEditor
+	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.timeEditor.TimeEditor
+	 * @author SAP SE
+	 * @since 1.93
+	 * @version 1.93.3
+	 *
+	 * @private
+	 * @experimental 1.93
+	 * @ui5-restricted sap.ui.fl
+	 */
+	var TimeEditor = DateEditor.extend("sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.timeEditor.TimeEditor", {
+		xmlFragment: "sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.timeEditor.TimeEditor",
+		metadata: {
+			library: "sap.ui.fl"
+		},
+		renderer: BasePropertyEditor.getMetadata().getRenderer().render
+	});
+
+	TimeEditor.prototype.getDefaultValidators = function () {
+		return Object.assign(
+			{},
+			BasePropertyEditor.prototype.getDefaultValidators.call(this)
+		);
+	};
+
+	TimeEditor.prototype.formatValue = function (sValue) {
+		return sValue;
+	};
+
+	TimeEditor.prototype._parse = function (sValue) {
+		if (sValue === "") {
+			return undefined;
+		}
+
+		// For now use a hardcoded format, move to default config later
+		var oTimeFormatterInstance = DateFormat.getTimeInstance({
+			pattern: "HH:mm:ss"
+		});
+		var oParsedDate = oTimeFormatterInstance.parse(sValue);
+		return this._isValidDate(oParsedDate)
+			? oTimeFormatterInstance.format(oParsedDate)
+			: sValue;
+	};
+
+	TimeEditor.prototype.getFormatterInstance = function () {
+		return DateFormat.getTimeInstance();
+	};
+
+	return TimeEditor;
+});

package/src/sap/ui/fl/write/_internal/flexState/FlexObjectState.js

@@ -10,6 +10,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/apply/_internal/ChangesController",
 	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
+	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/Utils",
@@ -20,6 +21,7 @@ sap.ui.define([
 	ManifestUtils,
 	ChangesController,
 	CompVariantState,
+	CompVariantMerger,
 	ChangePersistenceFactory,
 	LayerUtils,
 	CompVariantsUtils,
@@ -30,7 +32,7 @@ sap.ui.define([
 	/**
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -50,6 +52,17 @@ sap.ui.define([
 	function getCompVariantEntities(mPropertyBag) {
 		var mCompEntities = FlexState.getCompVariantsMap(mPropertyBag.reference);
 		var aEntities = [];
+		//Enhance CompVariantsMap with external data and standard variant after FlexState has been cleared and reinitialized
+		if (mPropertyBag.invalidateCache) {
+			var oDataToRestore = FlexState.getInitialNonFlCompVariantData(mPropertyBag.reference);
+			if (oDataToRestore) {
+				Object.keys(oDataToRestore).forEach(function(sPersistencyKey) {
+					mCompEntities._initialize(sPersistencyKey, oDataToRestore[sPersistencyKey].variants);
+					CompVariantMerger.merge(sPersistencyKey, mCompEntities[sPersistencyKey], oDataToRestore[sPersistencyKey].standardVariant);
+				});
+			}
+		}
+
 		for (var sPersistencyKey in mCompEntities) {
 			var mCompVariantsOfPersistencyKey = mCompEntities[sPersistencyKey];
 			for (var sId in mCompVariantsOfPersistencyKey.byId) {
@@ -108,15 +121,8 @@ sap.ui.define([
 	FlexObjectState.getFlexObjects = function (mPropertyBag) {
 		return initFlexStateAndSetReference(mPropertyBag)
 			.then(function () {
-				var aCompVariantEntities = getCompVariantEntities(mPropertyBag);
-				var aChangePersistenceEntities = getChangePersistenceEntities(mPropertyBag);
-
-				return Promise.all([
-					aCompVariantEntities,
-					aChangePersistenceEntities
-				]).then(function (aEntities) {
-					return aEntities[0] // compVariant entities (changes of type defaultVariant / standardVariant, variant)
-						.concat(aEntities[1]); // ChangePersistence entities (change, ctrl_variant, ctrl_variant_change, ctrl_variant_management_change)
+				return getChangePersistenceEntities(mPropertyBag).then(function (aChangePersistenceEntities) {
+					return getCompVariantEntities(mPropertyBag).concat(aChangePersistenceEntities);
 				});
 			});
 	};