From d391cff254f4a897d7f94178ebbc82bf07b8a315 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 16 Apr 2025 11:22:49 +0200
Subject: [PATCH] move

---
 .../content/manager/content-data-manager.ts        | 14 --------------
 .../content/manager/element-data-manager.ts        |  9 +++++++++
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/content/manager/content-data-manager.ts b/src/Umbraco.Web.UI.Client/src/packages/content/content/manager/content-data-manager.ts
index 9dbd65d3b8..3f9086dc02 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/content/content/manager/content-data-manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/content/content/manager/content-data-manager.ts
@@ -157,18 +157,4 @@ export class UmbContentWorkspaceDataManager<
 				.map((x) => new UmbVariantId(x.culture, x.segment)) ?? []
 		);
 	}
-
-	override async constructData(selectedVariantIds: Array<UmbVariantId>) {
-		let selection = selectedVariantIds;
-
-		// If we vary by segment we need to save all segments for a selected culture.
-		if (this._variesBySegment === true) {
-			const dataVariants = this.getCurrent()?.variants ?? [];
-			const selectedCultures = selectedVariantIds.map((x) => x.culture);
-			const selectedCulturesIncludingSegments = dataVariants.filter((x) => selectedCultures.includes(x.culture));
-			selection = selectedCulturesIncludingSegments.map((x) => UmbVariantId.Create(x));
-		}
-
-		return super.constructData(selection);
-	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/content/manager/element-data-manager.ts b/src/Umbraco.Web.UI.Client/src/packages/content/content/manager/element-data-manager.ts
index df89737a06..6001d3e4e9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/content/content/manager/element-data-manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/content/content/manager/element-data-manager.ts
@@ -84,6 +84,15 @@ export class UmbElementWorkspaceDataManager<ModelType extends UmbElementDetailMo
 			variantsToStore = [...selectedVariants, invariantVariantId];
 		}
 
+		// If we vary by segment we need to save all segments for a selected culture.
+		if (this._variesBySegment === true) {
+			const dataSegments = this.getCurrent()!.values.map((x) => x.segment);
+			variantsToStore = [
+				...variantsToStore,
+				...dataSegments.flatMap((segment) => variantsToStore.map((variant) => variant.toSegment(segment))),
+			];
+		}
+
 		const data = this.getCurrent();
 		if (!data) throw new Error('Current data is missing');
 		//if (!data.unique) throw new Error('Unique of current data is missing');