From cd01e57cb24646edafa6af1996418efafe8fe11b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Tue, 6 Jun 2023 13:46:24 +0200
Subject: [PATCH] working save

---
 .../repository/document-type.repository.ts    |  1 -
 .../sources/document-type.server.data.ts      | 56 ++++++++-----------
 2 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.repository.ts
index 263c843273..388e413721 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.repository.ts
@@ -13,7 +13,6 @@ import {
 	UpdateDocumentTypeRequestModel,
 } from '@umbraco-cms/backoffice/backend-api';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
-import { UmbId } from '@umbraco-cms/backoffice/id';
 
 type ItemType = DocumentTypeResponseModel & {$type: string};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/sources/document-type.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/sources/document-type.server.data.ts
index 72a3cf9063..92c9b73881 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/sources/document-type.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/sources/document-type.server.data.ts
@@ -49,12 +49,13 @@ export class UmbDocumentTypeServerDataSource implements UmbDataSource<CreateDocu
 	 */
 	async createScaffold(parentId: string | null) {
 		// TODO: Type hack to append $type and parentId to the DocumentTypeResponseModel.
-		const data: DocumentTypeResponseModel & {$type: string, parentId: string | null} = {
-			$type: '',
+		//, parentId: string | null
+		const data: DocumentTypeResponseModel & {$type: string} = {
+			$type: 'string',
 			id: UmbId.new(),
-			parentId: parentId,
+			//parentId: parentId,
 			name: '',
-			alias: '',
+			alias: 'new-document-type',
 			description: '',
 			icon: 'umb:document',
 			allowedAsRoot: false,
@@ -77,53 +78,44 @@ export class UmbDocumentTypeServerDataSource implements UmbDataSource<CreateDocu
 		return { data };
 	}
 
+
+
+
 	/**
-	 * Inserts a new Document on the server
-	 * @param {Document} document
+	 * Inserts a new Document Type on the server
+	 * @param {CreateDocumentTypeRequestModel} documentType
 	 * @return {*}
 	 * @memberof UmbDocumentTypeServerDataSource
 	 */
-	async insert(document: CreateDocumentTypeRequestModel) {
-		if (!document) throw new Error('Document is missing');
+	async insert(documentType: CreateDocumentTypeRequestModel) {
+		if (!documentType) throw new Error('Document is missing');
 		//if (!document.id) throw new Error('ID is missing');
 
+		documentType = {...documentType};
+
+		// TODO: Hack to remove some props that ruins the document-type post end-point.
+		(documentType as any).$type = undefined;
+		(documentType as any).id = undefined;
+
 		return tryExecuteAndNotify(
 			this.#host,
 			DocumentTypeResource.postDocumentType({
-				requestBody: document,
+				requestBody: documentType,
 			})
 		);
 	}
 
 	/**
-	 * Updates a Document on the server
-	 * @param {Document} Document
+	 * Updates a Document Type on the server
+	 * @param {string} id
+	 * @param {Document} documentType
 	 * @return {*}
 	 * @memberof UmbDocumentTypeServerDataSource
 	 */
-	async update(id: string, document: any) {
+	async update(id: string, documentType: UpdateDocumentTypeRequestModel) {
 		if (!id) throw new Error('Id is missing');
 
-		let body: string;
-
-		try {
-			body = JSON.stringify(document);
-		} catch (error) {
-			console.error(error);
-			return Promise.reject();
-		}
-
-		// TODO: use resources when end point is ready:
-		return tryExecuteAndNotify<DocumentTypeResponseModel>(
-			this.#host,
-			fetch(`/umbraco/management/api/v1/document-type/${document.id}`, {
-				method: 'PUT',
-				body: body,
-				headers: {
-					'Content-Type': 'application/json',
-				},
-			}) as any
-		);
+		return tryExecuteAndNotify(this.#host, DocumentTypeResource.putDocumentTypeById({ id, requestBody: documentType }));
 	}
 
 	/**