diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/duplicate-to-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/duplicate-to-modal.token.ts index 6ddd2a5dd8..a228dbd907 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/duplicate-to-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/duplicate-to-modal.token.ts @@ -1,9 +1,8 @@ import { UMB_DUPLICATE_TO_MODAL_ALIAS } from './constants.js'; +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; -export interface UmbDuplicateToModalData { - unique: string | null; - entityType: string; +export interface UmbDuplicateToModalData extends UmbEntityModel { treeAlias: string; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.token.ts index b23cb24834..d5b934779c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.token.ts @@ -1,9 +1,8 @@ import { UMB_SORT_CHILDREN_OF_MODAL_ALIAS } from './constants.js'; +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; -export interface UmbSortChildrenOfModalData { - unique: string | null; - entityType: string; +export interface UmbSortChildrenOfModalData extends UmbEntityModel { treeRepositoryAlias: string; sortChildrenOfRepositoryAlias: string; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.event.ts index 138b4a1381..d49ab78791 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.event.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.event.ts @@ -1,9 +1,7 @@ import { UmbControllerEvent } from '@umbraco-cms/backoffice/controller-api'; +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; -export interface UmbEntityActionEventArgs { - unique: string | null; - entityType: string; -} +export interface UmbEntityActionEventArgs extends UmbEntityModel {} export class UmbEntityActionEvent extends UmbControllerEvent { #args: UmbEntityActionEventArgs; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/types.ts index 909af23b20..445778b75a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/types.ts @@ -1,5 +1,5 @@ -export interface UmbEntityActionArgs { - entityType: string; - unique: string | null; +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; + +export interface UmbEntityActionArgs extends UmbEntityModel { meta: MetaArgsType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts index 97ed2f677b..2bb4c80182 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts @@ -1,7 +1,6 @@ -export interface UmbStructureItemModelBase { - unique: string | null; - entityType: string; -} +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; + +export interface UmbStructureItemModelBase extends UmbEntityModel {} export interface UmbStructureItemModel extends UmbStructureItemModelBase { name: string; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/modal/restore-from-recycle-bin-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/modal/restore-from-recycle-bin-modal.token.ts index 63b94f4451..b084a4c564 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/modal/restore-from-recycle-bin-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/modal/restore-from-recycle-bin-modal.token.ts @@ -1,3 +1,4 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import type { UmbPickerModalData, UmbPickerModalValue } from '@umbraco-cms/backoffice/modal'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; @@ -10,12 +11,7 @@ export interface UmbRestoreFromRecycleBinModalData { } export interface UmbRestoreFromRecycleBinModalValue { - destination: - | { - unique: string | null; - entityType: string; - } - | undefined; + destination: UmbEntityModel | undefined; } export const UMB_RESTORE_FROM_RECYCLE_BIN_MODAL = new UmbModalToken< diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/types.ts index 7f8469dde9..b4a8bddb39 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/types.ts @@ -1,13 +1,12 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; + export interface UmbTreeRootItemsRequestArgs { skip?: number; take?: number; } export interface UmbTreeChildrenOfRequestArgs { - parent: { - unique: string | null; - entityType: string; - }; + parent: UmbEntityModel; skip?: number; take?: number; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/modal/folder-create-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/modal/folder-create-modal.token.ts index 898e51318a..e7e5f7a643 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/modal/folder-create-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/modal/folder-create-modal.token.ts @@ -1,12 +1,10 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; import type { UmbFolderModel } from '@umbraco-cms/backoffice/tree'; export interface UmbFolderCreateModalData { folderRepositoryAlias: string; - parent: { - unique: string | null; - entityType: string; - }; + parent: UmbEntityModel; } export interface UmbFolderCreateModalValue { diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/modal/index.ts index acf6c03d35..a8fb4ee5e7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/modal/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/modal/index.ts @@ -1,10 +1,8 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbDataTypeCreateOptionsModalData { - parent: { - entityType: string; - unique: string | null; - }; + parent: UmbEntityModel; } export const UMB_DATA_TYPE_CREATE_OPTIONS_MODAL = new UmbModalToken( diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/entity-actions/create/modal/document-blueprint-options-create-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/entity-actions/create/modal/document-blueprint-options-create-modal.token.ts index 3ca912c321..6d261ca4c4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/entity-actions/create/modal/document-blueprint-options-create-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/entity-actions/create/modal/document-blueprint-options-create-modal.token.ts @@ -1,10 +1,8 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbDocumentBlueprintOptionsCreateModalData { - parent: { - unique: string | null; - entityType: string; - }; + parent: UmbEntityModel; } export interface UmbDocumentBlueprintOptionsCreateModalValue { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/index.ts index 0b916444d9..2a256bc68d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/index.ts @@ -1,10 +1,8 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbDocumentTypeCreateOptionsModalData { - parent: { - unique: string | null; - entityType: string; - }; + parent: UmbEntityModel; } export const UMB_DOCUMENT_TYPE_CREATE_OPTIONS_MODAL = new UmbModalToken( diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.token.ts index 0ecb35b561..e3e7d55634 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.token.ts @@ -1,10 +1,8 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbDocumentCreateOptionsModalData { - parent: { - unique: string | null; - entityType: string; - }; + parent: UmbEntityModel; documentType: { unique: string; } | null; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/modal/duplicate-document-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/modal/duplicate-document-modal.token.ts index 894b715948..ecd9639a4b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/modal/duplicate-document-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/modal/duplicate-document-modal.token.ts @@ -1,10 +1,8 @@ import { UMB_DUPLICATE_DOCUMENT_MODAL_ALIAS } from './constants.js'; +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; -export interface UmbDuplicateDocumentModalData { - unique: string | null; - entityType: string; -} +export interface UmbDuplicateDocumentModalData extends UmbEntityModel {} export interface UmbDuplicateDocumentModalValue { destination: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/modal/index.ts index 579a908682..bbfa4352ef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/modal/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/modal/index.ts @@ -1,10 +1,8 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbMediaTypeCreateOptionsModalData { - parent: { - unique: string | null; - entityType: string; - }; + parent: UmbEntityModel; } export const UMB_MEDIA_TYPE_CREATE_OPTIONS_MODAL = new UmbModalToken( diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/media-create-options-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/media-create-options-modal.token.ts index b2a7bab22e..ef56265205 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/media-create-options-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/media-create-options-modal.token.ts @@ -1,10 +1,8 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbMediaCreateOptionsModalData { - parent: { - unique: string | null; - entityType: string; - }; + parent: UmbEntityModel; mediaType: { unique: string; } | null; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/options-modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/options-modal/index.ts index 37f53a978d..90df4de9ea 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/options-modal/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/options-modal/index.ts @@ -1,10 +1,8 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbPartialViewCreateOptionsModalData { - parent: { - unique: string | null; - entityType: string; - }; + parent: UmbEntityModel; } export const UMB_PARTIAL_VIEW_CREATE_OPTIONS_MODAL = new UmbModalToken( diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.token.ts index 85498f9c73..fce26ee41d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.token.ts @@ -1,10 +1,8 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbCreatePartialViewFromSnippetModalData { - parent: { - unique: string | null; - entityType: string; - }; + parent: UmbEntityModel; } export const UMB_PARTIAL_VIEW_FROM_SNIPPET_MODAL = new UmbModalToken( diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/options-modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/options-modal/index.ts index c36fc34a8d..c104773ed0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/options-modal/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/options-modal/index.ts @@ -1,10 +1,8 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbScriptCreateOptionsModalData { - parent: { - unique: string | null; - entityType: string; - }; + parent: UmbEntityModel; } export const UMB_SCRIPT_CREATE_OPTIONS_MODAL = new UmbModalToken( diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/create/options-modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/create/options-modal/index.ts index 12ecad6881..a44683ac81 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/create/options-modal/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/create/options-modal/index.ts @@ -1,10 +1,8 @@ +import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbStylesheetCreateOptionsModalData { - parent: { - unique: string | null; - entityType: string; - }; + parent: UmbEntityModel; } export const UMB_STYLESHEET_CREATE_OPTIONS_MODAL = new UmbModalToken(