From 430eb42f09a84a92bb4de4065a2b6abe00bba057 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 1 May 2024 11:15:36 +0200
Subject: [PATCH] make name more specific

---
 ...-type-composition-data-source.interface.ts | 26 +++++++------------
 ...t-type-composition-repository.interface.ts |  4 +--
 .../core/content-type/composition/types.ts    |  2 +-
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/content-type-composition-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/content-type-composition-data-source.interface.ts
index e0a2c35635..4579915e98 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/content-type-composition-data-source.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/content-type-composition-data-source.interface.ts
@@ -1,23 +1,17 @@
 import type {
 	UmbContentTypeCompositionCompatibleModel,
 	UmbContentTypeCompositionReferenceModel,
-	UmbContentTypeCompositionRequestModel,
+	UmbContentTypeAvailableCompositionRequestModel,
 } from './types.js';
-import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbDataSourceResponse } from '@umbraco-cms/backoffice/repository';
 
-export interface UmbContentTypeCompositionDataSourceConstructor {
-	new (host: UmbControllerHost): UmbContentTypeCompositionDataSource;
-}
-
-export interface UmbContentTypeCompositionDataSource {
-	availableCompositions<
-		ResponseType extends UmbContentTypeCompositionCompatibleModel,
-		ArgsType extends UmbContentTypeCompositionRequestModel,
-	>(
-		args: ArgsType,
-	): Promise<UmbDataSourceResponse<Array<ResponseType>>>;
-	getReferences<ResponseType extends UmbContentTypeCompositionReferenceModel>(
-		unique: string,
-	): Promise<UmbDataSourceResponse<Array<ResponseType>>>;
+export interface UmbContentTypeCompositionDataSource<
+	CompositionReferenceModelType extends UmbContentTypeCompositionReferenceModel,
+	CompositionCompatibleModelType extends UmbContentTypeCompositionCompatibleModel,
+	AvailableCompositionsRequestType extends UmbContentTypeAvailableCompositionRequestModel,
+> {
+	getReferences(unique: string): Promise<UmbDataSourceResponse<Array<CompositionReferenceModelType>>>;
+	availableCompositions(
+		args: AvailableCompositionsRequestType,
+	): Promise<UmbDataSourceResponse<Array<CompositionCompatibleModelType>>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/content-type-composition-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/content-type-composition-repository.interface.ts
index ac9fb7ce59..c9713a945d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/content-type-composition-repository.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/content-type-composition-repository.interface.ts
@@ -1,7 +1,7 @@
 import type {
 	UmbContentTypeCompositionCompatibleModel,
 	UmbContentTypeCompositionReferenceModel,
-	UmbContentTypeCompositionRequestModel,
+	UmbContentTypeAvailableCompositionRequestModel,
 } from './types.js';
 import type { UmbRepositoryResponse } from '@umbraco-cms/backoffice/repository';
 
@@ -11,7 +11,7 @@ export interface UmbContentTypeCompositionRepository {
 	): Promise<UmbRepositoryResponse<Array<ResponseType>>>;
 	availableCompositions<
 		ResponseType extends UmbContentTypeCompositionCompatibleModel,
-		ArgsType extends UmbContentTypeCompositionRequestModel,
+		ArgsType extends UmbContentTypeAvailableCompositionRequestModel,
 	>(
 		args: ArgsType,
 	): Promise<UmbRepositoryResponse<Array<ResponseType>>>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/types.ts
index d6530f961d..4fcd9f44f1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/composition/types.ts
@@ -4,7 +4,7 @@ export interface UmbContentTypeCompositionReferenceModel {
 	icon: string;
 }
 
-export interface UmbContentTypeCompositionRequestModel {
+export interface UmbContentTypeAvailableCompositionRequestModel {
 	unique: string | null;
 	currentPropertyAliases: Array<string>;
 	currentCompositeUniques: Array<string>;