From 699aa83295aaf15653a83468615920a360deabb6 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 29 Jan 2024 11:37:49 +0100
Subject: [PATCH] mapping

---
 .../document-detail.server.data-source.ts     | 16 +++++++++++--
 .../detail/media-detail.server.data-source.ts | 23 ++++++++++++++-----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts
index a287d1f9fc..9dbcec6d84 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts
@@ -35,6 +35,7 @@ export class UmbDocumentServerDataSource implements UmbDetailDataSource<UmbDocum
 		const data: UmbDocumentDetailModel = {
 			entityType: UMB_DOCUMENT_ENTITY_TYPE,
 			unique: UmbId.new(),
+			parentUnique: parentUnique,
 			urls: [],
 			template: null,
 			documentType: {
@@ -77,8 +78,19 @@ export class UmbDocumentServerDataSource implements UmbDetailDataSource<UmbDocum
 		const document: UmbDocumentDetailModel = {
 			entityType: UMB_DOCUMENT_ENTITY_TYPE,
 			unique: data.id,
+			parentUnique: null, // TODO: this is not correct. It will be solved when we know where to get the parent from
 			values: data.values,
-			variants: data.variants,
+			variants: data.variants.map((variant) => {
+				return {
+					state: variant.state,
+					culture: variant.culture || null,
+					segment: variant.segment || null,
+					name: variant.name,
+					publishDate: variant.publishDate || null,
+					createDate: variant.createDate,
+					updateDate: variant.updateDate,
+				};
+			}),
 			urls: data.urls,
 			template: data.template ? { id: data.template.id } : null,
 			documentType: { unique: data.documentType.id },
@@ -101,7 +113,7 @@ export class UmbDocumentServerDataSource implements UmbDetailDataSource<UmbDocum
 		// TODO: make data mapper to prevent errors
 		const requestBody: CreateDocumentRequestModel = {
 			id: model.unique,
-			parent: model.parentUnique,
+			parent: model.parentUnique ? { id: model.parentUnique } : null,
 			documentType: { id: model.documentType.unique },
 			template: model.template,
 			values: model.values,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts
index 5f575c80f5..de473acc85 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts
@@ -35,6 +35,7 @@ export class UmbMediaServerDataSource implements UmbDetailDataSource<UmbMediaDet
 		const data: UmbMediaDetailModel = {
 			entityType: UMB_MEDIA_ENTITY_TYPE,
 			unique: UmbId.new(),
+			parentUnique,
 			urls: [],
 			mediaType: {
 				unique: 'mediaTypeId',
@@ -73,17 +74,28 @@ export class UmbMediaServerDataSource implements UmbDetailDataSource<UmbMediaDet
 		}
 
 		// TODO: make data mapper to prevent errors
-		const document: UmbMediaDetailModel = {
+		const media: UmbMediaDetailModel = {
 			entityType: UMB_MEDIA_ENTITY_TYPE,
 			unique: data.id,
+			parentUnique: null, // TODO: this is not correct. It will be solved when we know where to get the parent from
 			values: data.values,
-			variants: data.variants,
+			variants: data.variants.map((variant) => {
+				return {
+					state: null,
+					culture: variant.culture || null,
+					segment: variant.segment || null,
+					name: variant.name,
+					publishDate: null,
+					createDate: variant.createDate,
+					updateDate: variant.updateDate,
+				};
+			}),
 			urls: data.urls,
 			mediaType: { unique: data.mediaType.id },
 			isTrashed: data.isTrashed,
 		};
 
-		return { data: document };
+		return { data: media };
 	}
 
 	/**
@@ -99,9 +111,8 @@ export class UmbMediaServerDataSource implements UmbDetailDataSource<UmbMediaDet
 		// TODO: make data mapper to prevent errors
 		const requestBody: CreateMediaRequestModel = {
 			id: model.unique,
-			parent: model.parentUnique,
-			documentType: { id: model.documentType.unique },
-			template: model.template,
+			parent: model.parentUnique ? { id: model.parentUnique } : null,
+			mediaType: { id: model.mediaType.unique },
 			values: model.values,
 			variants: model.variants,
 		};