Merge "[INTERNAL][FIX] sap.ui.rta: Page variant is not properly applied"

SAP · Sep 3, 2024 · 1993bac · 1993bac
2 parents 4c310ae + 4fc5e14
commit 1993bac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/sap.ui.fl/src/sap/ui/fl/variants/VariantModel.js b/src/sap.ui.fl/src/sap/ui/fl/variants/VariantModel.js
@@ -1556,8 +1556,10 @@ sap.ui.define([
 			return mCurrentVariant.controlChanges;
 		})
 		.flat();
+		const oLiveDependencyMap = FlexObjectState.getLiveDependencyMap(this.sFlexReference);
 		aVariantDependentControlChanges.forEach((oChange) => {
-			this.oChangePersistence.removeChange(oChange);
+			DependencyHandler.removeChangeFromMap(oLiveDependencyMap, oChange.getId());
+			DependencyHandler.removeChangeFromDependencies(oLiveDependencyMap, oChange.getId());
 		});
 
 		this.oDataSelector.removeUpdateListener(this.fnUpdateListener);

diff --git a/src/sap.ui.fl/test/sap/ui/fl/qunit/variants/VariantModel.qunit.js b/src/sap.ui.fl/test/sap/ui/fl/qunit/variants/VariantModel.qunit.js
@@ -2433,9 +2433,10 @@ sap.ui.define([
 			});
 			FlexObjectManager.addDirtyFlexObjects(this.oModel.sFlexReference, [oUIChange]);
 			this.oModel.destroy();
+			const oFlexObjects = FlexState.getFlexObjectsDataSelector().get({ reference: sReference });
+			assert.strictEqual(oFlexObjects[0].getId(), "newUIChange", "then the change was not removed from the flex state");
 			assert.strictEqual(oAddRuntimeOnlySpy.callCount, 1, "then the fake Standard variant is added to the runtimeOnlyData");
 
-			stubFlexObjectsSelector([oUIChange]);
 			this.oModel = new VariantModel({}, {
 				flexController: this.oFlexController,
 				appComponent: this.oComponent