From b325239f3a97a84362f32f60231ffd65b00001d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Tue, 30 Jan 2024 16:18:31 +0100
Subject: [PATCH] use UmbPropertyTypeContainerModel

---
 ...ntent-type-container-structure-helper.class.ts | 15 +++++++--------
 .../document-type-detail.server.data-source.ts    |  3 ++-
 .../media-type-detail.server.data-source.ts       |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-container-structure-helper.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-container-structure-helper.class.ts
index cc662c5d20..b31fb3546c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-container-structure-helper.class.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-container-structure-helper.class.ts
@@ -1,6 +1,5 @@
 import type { UmbContentTypePropertyStructureManager } from './content-type-structure-manager.class.js';
-import type { UmbContentTypeModel, UmbPropertyContainerTypes } from './types.js';
-import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
+import type { UmbContentTypeModel, UmbPropertyContainerTypes, UmbPropertyTypeContainerModel } from './types.js';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbArrayState, UmbBooleanState, UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
 
@@ -23,12 +22,12 @@ export class UmbContentTypeContainerStructureHelper<T extends UmbContentTypeMode
 
 	// Containers defined in data might be more than actual containers to display as we merge them by name.
 	// Direct containers are the containers defining the total of this container(Multiple containers with the same name and type)
-	private _ownerAlikeContainers: PropertyTypeContainerModelBaseModel[] = [];
+	private _ownerAlikeContainers: UmbPropertyTypeContainerModel[] = [];
 	// Owner containers are containers owned by the owner Content Type (The specific one up for editing)
-	private _ownerContainers: PropertyTypeContainerModelBaseModel[] = [];
+	private _ownerContainers: UmbPropertyTypeContainerModel[] = [];
 
 	// State containing the merged containers (only one pr. name):
-	#containers = new UmbArrayState<PropertyTypeContainerModelBaseModel>([], (x) => x.id);
+	#containers = new UmbArrayState<UmbPropertyTypeContainerModel>([], (x) => x.id);
 	readonly containers = this.#containers.asObservable();
 
 	#hasProperties = new UmbBooleanState(false);
@@ -170,7 +169,7 @@ export class UmbContentTypeContainerStructureHelper<T extends UmbContentTypeMode
 		);
 	}
 
-	private _insertGroupContainers = (groupContainers: PropertyTypeContainerModelBaseModel[]) => {
+	private _insertGroupContainers = (groupContainers: UmbPropertyTypeContainerModel[]) => {
 		groupContainers.forEach((group) => {
 			if (group.name !== null && group.name !== undefined) {
 				if (!this.#containers.getValue().find((x) => x.name === group.name)) {
@@ -205,7 +204,7 @@ export class UmbContentTypeContainerStructureHelper<T extends UmbContentTypeMode
 
 	/** Manipulate methods: */
 
-	async insertContainer(container: PropertyTypeContainerModelBaseModel, sortOrder = 0) {
+	async insertContainer(container: UmbPropertyTypeContainerModel, sortOrder = 0) {
 		await this.#init;
 		if (!this.#structure) return false;
 
@@ -229,7 +228,7 @@ export class UmbContentTypeContainerStructureHelper<T extends UmbContentTypeMode
 		return true;
 	}
 
-	async partialUpdateContainer(containerId: string, partialUpdate: Partial<PropertyTypeContainerModelBaseModel>) {
+	async partialUpdateContainer(containerId: string, partialUpdate: Partial<UmbPropertyTypeContainerModel>) {
 		await this.#init;
 		if (!this.#structure || !containerId || !partialUpdate) return;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts
index 47fbbe5a62..5e998568a0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts
@@ -9,6 +9,7 @@ import type {
 import { DocumentTypeResource } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
+import type { UmbPropertyTypeContainerModel } from '@umbraco-cms/backoffice/content-type';
 
 /**
  * A data source for the Document Type that fetches data from the server
@@ -109,7 +110,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc
 					appearance: property.appearance,
 				};
 			}),
-			containers: data.containers,
+			containers: data.containers as UmbPropertyTypeContainerModel[],
 			allowedContentTypes: data.allowedDocumentTypes.map((allowedDocumentType) => {
 				return {
 					contentType: { unique: allowedDocumentType.documentType.id },
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts
index 70336a6464..dfffd71962 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts
@@ -6,6 +6,7 @@ import type { CreateMediaTypeRequestModel, UpdateMediaTypeRequestModel } from '@
 import { MediaTypeResource } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
+import type { UmbPropertyTypeContainerModel } from '@umbraco-cms/backoffice/content-type';
 
 /**
  * A data source for the Media Type that fetches data from the server
@@ -96,7 +97,7 @@ export class UmbMediaTypeServerDataSource implements UmbDetailDataSource<UmbMedi
 					appearance: property.appearance,
 				};
 			}),
-			containers: data.containers,
+			containers: data.containers as UmbPropertyTypeContainerModel[],
 			allowedContentTypes: data.allowedMediaTypes.map((allowedMediaType) => {
 				return {
 					contentType: { unique: allowedMediaType.mediaType.id },