From b2c9391177fa33bc424e76bf0a4f0b7fcf9d045f Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 7 Dec 2023 14:25:27 +0100 Subject: [PATCH] remove extension of server models --- .../src/packages/dictionary/dictionary/tree/types.ts | 5 ++--- .../src/packages/documents/document-types/tree/types.ts | 9 ++------- .../src/packages/documents/documents/tree/types.ts | 5 ++--- .../src/packages/media/media-types/tree/types.ts | 9 ++------- .../src/packages/media/media/tree/types.ts | 5 ++--- .../src/packages/members/member-groups/tree/types.ts | 5 ++--- .../src/packages/members/member-types/tree/types.ts | 5 ++--- .../src/packages/members/members/tree/types.ts | 5 ++--- .../src/packages/settings/relation-types/tree/types.ts | 5 ++--- 9 files changed, 18 insertions(+), 35 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/tree/types.ts index aa96afd3e6..93bdc519d3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/tree/types.ts @@ -1,6 +1,5 @@ -import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import type { UmbEntityTreeItemModel, UmbEntityTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbDictionaryTreeItemModel extends EntityTreeItemResponseModel, UmbEntityTreeItemModel {} +export interface UmbDictionaryTreeItemModel extends UmbEntityTreeItemModel {} // TODO: TREE STORE TYPE PROBLEM: -export interface UmbDictionaryTreeRootModel extends Omit, UmbEntityTreeRootModel {} +export interface UmbDictionaryTreeRootModel extends UmbEntityTreeRootModel {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/types.ts index 70468d2bed..103e4b6be3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/types.ts @@ -1,10 +1,5 @@ -import type { DocumentTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import type { UmbEntityTreeItemModel, UmbEntityTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbDocumentTypeTreeItemModel - extends Omit, - UmbEntityTreeItemModel {} +export interface UmbDocumentTypeTreeItemModel extends UmbEntityTreeItemModel {} // TODO: TREE STORE TYPE PROBLEM: -export interface UmbDocumentTypeTreeRootModel - extends Omit, 'icon'>, - UmbEntityTreeRootModel {} +export interface UmbDocumentTypeTreeRootModel extends UmbEntityTreeRootModel {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/types.ts index 93a15d41f9..384bb88d75 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/types.ts @@ -1,6 +1,5 @@ -import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import type { UmbEntityTreeItemModel, UmbEntityTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbDocumentTreeItemModel extends EntityTreeItemResponseModel, UmbEntityTreeItemModel {} +export interface UmbDocumentTreeItemModel extends UmbEntityTreeItemModel {} // TODO: TREE STORE TYPE PROBLEM: -export interface UmbDocumentTreeRootModel extends Omit, UmbEntityTreeRootModel {} +export interface UmbDocumentTreeRootModel extends UmbEntityTreeRootModel {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/types.ts index 27d6b93c94..5e4acd4229 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/types.ts @@ -1,10 +1,5 @@ -import type { MediaTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import type { UmbEntityTreeItemModel, UmbEntityTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbMediaTypeTreeItemModel - extends Omit, - UmbEntityTreeItemModel {} +export interface UmbMediaTypeTreeItemModel extends UmbEntityTreeItemModel {} // TODO: TREE STORE TYPE PROBLEM: -export interface UmbMediaTypeTreeRootModel - extends Omit, 'icon'>, - UmbEntityTreeRootModel {} +export interface UmbMediaTypeTreeRootModel extends UmbEntityTreeRootModel {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/types.ts index b88f8145d9..bef536828e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/types.ts @@ -1,6 +1,5 @@ -import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import type { UmbEntityTreeItemModel, UmbEntityTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbMediaTreeItemModel extends EntityTreeItemResponseModel, UmbEntityTreeItemModel {} +export interface UmbMediaTreeItemModel extends UmbEntityTreeItemModel {} // TODO: TREE STORE TYPE PROBLEM: -export interface UmbMediaTreeRootModel extends Omit, UmbEntityTreeRootModel {} +export interface UmbMediaTreeRootModel extends UmbEntityTreeRootModel {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/tree/types.ts index bbbb928b69..3d6e45e80a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/tree/types.ts @@ -1,6 +1,5 @@ -import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import type { UmbEntityTreeItemModel, UmbEntityTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbMemberGroupTreeItemModel extends EntityTreeItemResponseModel, UmbEntityTreeItemModel {} +export interface UmbMemberGroupTreeItemModel extends UmbEntityTreeItemModel {} // TODO: TREE STORE TYPE PROBLEM: -export interface UmbMemberGroupTreeRootModel extends Omit, UmbEntityTreeRootModel {} +export interface UmbMemberGroupTreeRootModel extends UmbEntityTreeRootModel {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/tree/types.ts index fb1be53b53..9bebed4b36 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/tree/types.ts @@ -1,6 +1,5 @@ -import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import type { UmbEntityTreeItemModel, UmbEntityTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbMemberTypeTreeItemModel extends EntityTreeItemResponseModel, UmbEntityTreeItemModel {} +export interface UmbMemberTypeTreeItemModel extends UmbEntityTreeItemModel {} // TODO: TREE STORE TYPE PROBLEM: -export interface UmbMemberTypeTreeRootModel extends Omit, UmbEntityTreeRootModel {} +export interface UmbMemberTypeTreeRootModel extends UmbEntityTreeRootModel {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/members/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/members/members/tree/types.ts index a6c8662ecc..110a447079 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/members/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/members/tree/types.ts @@ -1,6 +1,5 @@ -import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import type { UmbEntityTreeItemModel, UmbEntityTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbMemberTreeItemModel extends EntityTreeItemResponseModel, UmbEntityTreeItemModel {} +export interface UmbMemberTreeItemModel extends UmbEntityTreeItemModel {} // TODO: TREE STORE TYPE PROBLEM: -export interface UmbMemberTreeRootModel extends Omit, UmbEntityTreeRootModel {} +export interface UmbMemberTreeRootModel extends UmbEntityTreeRootModel {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/tree/types.ts index 53a5c45db4..be526a7aa5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/tree/types.ts @@ -1,6 +1,5 @@ -import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import type { UmbEntityTreeItemModel, UmbEntityTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbRelationTypeTreeItemModel extends EntityTreeItemResponseModel, UmbEntityTreeItemModel {} +export interface UmbRelationTypeTreeItemModel extends UmbEntityTreeItemModel {} // TODO: TREE STORE TYPE PROBLEM: -export interface UmbRelationTypeTreeRootModel extends Omit, UmbEntityTreeRootModel {} +export interface UmbRelationTypeTreeRootModel extends UmbEntityTreeRootModel {}