From 6d3412609dbfa7d53d9cd0b5856436151b536663 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 13 May 2024 14:36:45 +0200 Subject: [PATCH] remove unique from name --- .../modal/sort-children-of-modal.element.ts | 12 ++++++------ .../menu-tree-structure-workspace-context-base.ts | 9 +++++---- .../core/tree/data/tree-data-source.interface.ts | 6 +++--- .../packages/core/tree/data/tree-repository-base.ts | 6 +++--- .../core/tree/data/tree-repository.interface.ts | 6 +++--- .../core/tree/data/tree-server-data-source-base.ts | 4 ++-- .../src/packages/core/tree/data/unique-tree-store.ts | 9 +++------ .../core/tree/default/default-tree.context.ts | 4 ++-- .../core/tree/default/default-tree.element.ts | 4 ++-- .../tree-item-base/tree-item-context-base.ts | 4 ++-- .../tree-item-default/tree-item-default.context.ts | 4 ++-- .../tree-item-default/tree-item-default.element.ts | 4 ++-- .../src/packages/core/tree/types.ts | 4 ++-- .../data-type/modals/data-type-picker-modal.token.ts | 4 ++-- .../src/packages/data-type/tree/types.ts | 6 +++--- .../modals/dictionary-picker-modal.token.ts | 4 ++-- .../src/packages/dictionary/tree/types.ts | 6 +++--- .../documents/document-blueprints/tree/types.ts | 6 +++--- .../packages/documents/document-types/tree/types.ts | 6 +++--- .../documents/documents/recycle-bin/tree/types.ts | 4 ++-- .../src/packages/documents/documents/tree/types.ts | 6 +++--- .../tree/media-type-picker-modal.token.ts | 4 ++-- .../src/packages/media/media-types/tree/types.ts | 6 +++--- .../packages/media/media/recycle-bin/tree/types.ts | 4 ++-- .../src/packages/media/media/tree/types.ts | 6 +++--- .../modal/member-type-picker-modal.token.ts | 8 ++------ .../src/packages/members/member-type/tree/types.ts | 6 +++--- .../src/packages/static-file/tree/types.ts | 6 +++--- .../packages/templating/partial-views/tree/types.ts | 12 ++++++++---- .../src/packages/templating/scripts/tree/types.ts | 6 +++--- .../packages/templating/stylesheets/tree/types.ts | 6 +++--- .../src/packages/templating/templates/tree/types.ts | 6 +++--- 32 files changed, 93 insertions(+), 95 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.element.ts index 4b878b39fe..fee3a27755 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.element.ts @@ -5,7 +5,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; import { UmbSorterController } from '@umbraco-cms/backoffice/sorter'; import { createExtensionApiByAlias } from '@umbraco-cms/backoffice/extension-registry'; -import type { UmbTreeRepository, UmbUniqueTreeItemModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeRepository, UmbTreeItemModel } from '@umbraco-cms/backoffice/tree'; import { UmbPaginationManager } from '@umbraco-cms/backoffice/utils'; import { observeMultiple } from '@umbraco-cms/backoffice/observable-api'; @@ -17,7 +17,7 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement< UmbSortChildrenOfModalValue > { @state() - _children: Array = []; + _children: Array = []; @state() _currentPage = 1; @@ -27,7 +27,7 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement< #pagination = new UmbPaginationManager(); #sortedUniques = new Set(); - #sorter?: UmbSorterController; + #sorter?: UmbSorterController; constructor() { super(); @@ -52,7 +52,7 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement< if (!this.data?.unique === undefined) throw new Error('unique is required'); if (!this.data?.treeRepositoryAlias) throw new Error('treeRepositoryAlias is required'); - const treeRepository = await createExtensionApiByAlias>( + const treeRepository = await createExtensionApiByAlias>( this, this.data.treeRepositoryAlias, ); @@ -80,7 +80,7 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement< #initSorter() { if (this.#sorter) return; - this.#sorter = new UmbSorterController(this, { + this.#sorter = new UmbSorterController(this, { getUniqueOfElement: (element) => { return element.dataset.unique; }, @@ -177,7 +177,7 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement< `; } - #renderChild(item: UmbUniqueTreeItemModel) { + #renderChild(item: UmbTreeItemModel) { return html``; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-tree-structure-workspace-context-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-tree-structure-workspace-context-base.ts index cf97cd2c10..397cb8f79b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-tree-structure-workspace-context-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-tree-structure-workspace-context-base.ts @@ -1,5 +1,5 @@ import type { UmbStructureItemModel } from './types.js'; -import type { UmbTreeRepository, UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeRepository, UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; import { createExtensionApiByAlias } from '@umbraco-cms/backoffice/extension-registry'; import { UmbContextBase } from '@umbraco-cms/backoffice/class-api'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; @@ -36,9 +36,10 @@ export abstract class UmbMenuTreeStructureWorkspaceContextBase extends UmbContex async #requestStructure() { let structureItems: Array = []; - const treeRepository = await createExtensionApiByAlias< - UmbTreeRepository - >(this, this.#args.treeRepositoryAlias); + const treeRepository = await createExtensionApiByAlias>( + this, + this.#args.treeRepositoryAlias, + ); const { data: root } = await treeRepository.requestTreeRoot(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-data-source.interface.ts index 366855833a..18f76771fd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-data-source.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-data-source.interface.ts @@ -1,4 +1,4 @@ -import type { UmbUniqueTreeItemModel } from '../types.js'; +import type { UmbTreeItemModel } from '../types.js'; import type { UmbTreeAncestorsOfRequestArgs, UmbTreeChildrenOfRequestArgs, @@ -13,7 +13,7 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; * @interface UmbTreeDataSourceConstructor * @template TreeItemType */ -export interface UmbTreeDataSourceConstructor { +export interface UmbTreeDataSourceConstructor { new (host: UmbControllerHost): UmbTreeDataSource; } @@ -23,7 +23,7 @@ export interface UmbTreeDataSourceConstructor { +export interface UmbTreeDataSource { /** * Gets the root items of the tree. * @return {*} {Promise>>} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-repository-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-repository-base.ts index 06e1e54689..bbb20fe312 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-repository-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-repository-base.ts @@ -1,4 +1,4 @@ -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '../types.js'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '../types.js'; import type { UmbTreeStore } from './tree-store.interface.js'; import type { UmbTreeRepository } from './tree-repository.interface.js'; import type { UmbTreeDataSource, UmbTreeDataSourceConstructor } from './tree-data-source.interface.js'; @@ -25,8 +25,8 @@ import type { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; * @template TreeRootType */ export abstract class UmbTreeRepositoryBase< - TreeItemType extends UmbUniqueTreeItemModel, - TreeRootType extends UmbUniqueTreeRootModel, + TreeItemType extends UmbTreeItemModel, + TreeRootType extends UmbTreeRootModel, > extends UmbRepositoryBase implements UmbTreeRepository, UmbApi diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-repository.interface.ts index 9ba02b296a..17903eb7e1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-repository.interface.ts @@ -1,4 +1,4 @@ -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '../types.js'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '../types.js'; import type { UmbTreeChildrenOfRequestArgs, UmbTreeAncestorsOfRequestArgs, @@ -18,8 +18,8 @@ import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; * @template TreeRootType */ export interface UmbTreeRepository< - TreeItemType extends UmbUniqueTreeItemModel = UmbUniqueTreeItemModel, - TreeRootType extends UmbUniqueTreeRootModel = UmbUniqueTreeRootModel, + TreeItemType extends UmbTreeItemModel = UmbTreeItemModel, + TreeRootType extends UmbTreeRootModel = UmbTreeRootModel, > extends UmbApi { /** * Requests the root of the tree. diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-server-data-source-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-server-data-source-base.ts index eeffac2cdb..c95af216a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-server-data-source-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/tree-server-data-source-base.ts @@ -1,4 +1,4 @@ -import type { UmbTreeItemModelBase, UmbUniqueTreeItemModel } from '../types.js'; +import type { UmbTreeItemModelBase, UmbTreeItemModel } from '../types.js'; import type { UmbTreeDataSource } from './tree-data-source.interface.js'; import type { UmbTreeAncestorsOfRequestArgs, @@ -27,7 +27,7 @@ export interface UmbTreeServerDataSourceBaseArgs< */ export abstract class UmbTreeServerDataSourceBase< ServerTreeItemType extends { hasChildren: boolean }, - ClientTreeItemType extends UmbUniqueTreeItemModel, + ClientTreeItemType extends UmbTreeItemModel, > implements UmbTreeDataSource { #host; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/unique-tree-store.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/unique-tree-store.ts index 6b243772ba..5a6f94e720 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/unique-tree-store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data/unique-tree-store.ts @@ -1,4 +1,4 @@ -import type { UmbUniqueTreeItemModel } from '../types.js'; +import type { UmbTreeItemModel } from '../types.js'; import type { UmbTreeStore } from './tree-store.interface.js'; import { UmbStoreBase } from '@umbraco-cms/backoffice/store'; import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; @@ -11,12 +11,9 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; * @extends {UmbStoreBase} * @description - Entity Tree Store */ -export class UmbUniqueTreeStore - extends UmbStoreBase - implements UmbTreeStore -{ +export class UmbUniqueTreeStore extends UmbStoreBase implements UmbTreeStore { constructor(host: UmbControllerHost, storeAlias: string) { - super(host, storeAlias, new UmbArrayState([], (x) => x.unique)); + super(host, storeAlias, new UmbArrayState([], (x) => x.unique)); } /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.context.ts index 085bfb1886..1895caff16 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.context.ts @@ -1,5 +1,5 @@ import { UmbRequestReloadTreeItemChildrenEvent } from '../reload-tree-item-children/index.js'; -import type { UmbUniqueTreeItemModel } from '../types.js'; +import type { UmbTreeItemModel } from '../types.js'; import type { UmbTreeRepository } from '../data/tree-repository.interface.js'; import type { UmbTreeContext } from '../tree-context.interface.js'; import { type UmbActionEventContext, UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action'; @@ -17,7 +17,7 @@ import { UmbArrayState, UmbObjectState } from '@umbraco-cms/backoffice/observabl import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; -export class UmbDefaultTreeContext +export class UmbDefaultTreeContext extends UmbContextBase> implements UmbTreeContext { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.element.ts index e2755b90a9..97be98ad0d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.element.ts @@ -1,4 +1,4 @@ -import type { UmbTreeItemModelBase, UmbTreeSelectionConfiguration, UmbUniqueTreeItemModel } from '../types.js'; +import type { UmbTreeItemModelBase, UmbTreeSelectionConfiguration, UmbTreeItemModel } from '../types.js'; import type { UmbDefaultTreeContext } from './default-tree.context.js'; import { UMB_DEFAULT_TREE_CONTEXT } from './default-tree.context.js'; import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit'; @@ -40,7 +40,7 @@ export class UmbDefaultTreeElement extends UmbLitElement { @state() private _totalPages = 1; - #treeContext?: UmbDefaultTreeContext; + #treeContext?: UmbDefaultTreeContext; #init: Promise; constructor() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts index 6bf07b6a31..7f6ebe291b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts @@ -1,6 +1,6 @@ import type { UmbTreeItemContext } from '../tree-item-context.interface.js'; import { UMB_DEFAULT_TREE_CONTEXT, type UmbDefaultTreeContext } from '../../default/default-tree.context.js'; -import type { UmbUniqueTreeItemModel } from '../../types.js'; +import type { UmbTreeItemModel } from '../../types.js'; import { UmbRequestReloadTreeItemChildrenEvent } from '../../reload-tree-item-children/index.js'; import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { UMB_SECTION_CONTEXT, UMB_SECTION_SIDEBAR_CONTEXT } from '@umbraco-cms/backoffice/section'; @@ -17,7 +17,7 @@ import type { UmbEntityActionEvent } from '@umbraco-cms/backoffice/entity-action import { UmbPaginationManager, debounce } from '@umbraco-cms/backoffice/utils'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; -export abstract class UmbTreeItemContextBase +export abstract class UmbTreeItemContextBase extends UmbContextBase> implements UmbTreeItemContext { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/tree-item-default.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/tree-item-default.context.ts index 37fc55850e..600edd24c1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/tree-item-default.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/tree-item-default.context.ts @@ -1,9 +1,9 @@ import { UmbTreeItemContextBase } from '../tree-item-base/index.js'; -import type { UmbUniqueTreeItemModel } from '../../types.js'; +import type { UmbTreeItemModel } from '../../types.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbDefaultTreeItemContext< - TreeItemModelType extends UmbUniqueTreeItemModel, + TreeItemModelType extends UmbTreeItemModel, > extends UmbTreeItemContextBase { constructor(host: UmbControllerHost) { super(host); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/tree-item-default.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/tree-item-default.element.ts index f512cc5f2c..b00ecb48a1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/tree-item-default.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/tree-item-default.element.ts @@ -1,9 +1,9 @@ import { UmbTreeItemElementBase } from '../tree-item-base/index.js'; -import type { UmbUniqueTreeItemModel } from '../../types.js'; +import type { UmbTreeItemModel } from '../../types.js'; import { customElement } from '@umbraco-cms/backoffice/external/lit'; @customElement('umb-default-tree-item') -export class UmbDefaultTreeItemElement extends UmbTreeItemElementBase {} +export class UmbDefaultTreeItemElement extends UmbTreeItemElementBase {} export default UmbDefaultTreeItemElement; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts index 2e277a93b3..71c7962c3a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts @@ -6,7 +6,7 @@ export interface UmbTreeItemModelBase { icon?: string | null; } -export interface UmbUniqueTreeItemModel extends UmbTreeItemModelBase { +export interface UmbTreeItemModel extends UmbTreeItemModelBase { unique: string; parent: { unique: string | null; @@ -14,7 +14,7 @@ export interface UmbUniqueTreeItemModel extends UmbTreeItemModelBase { }; } -export interface UmbUniqueTreeRootModel extends UmbTreeItemModelBase { +export interface UmbTreeRootModel extends UmbTreeItemModelBase { unique: null; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-modal.token.ts index d3b0d87e26..4797592b51 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-modal.token.ts @@ -1,12 +1,12 @@ import { type UmbTreePickerModalValue, type UmbTreePickerModalData, - type UmbUniqueTreeItemModel, + type UmbTreeItemModel, UMB_TREE_PICKER_MODAL_ALIAS, } from '@umbraco-cms/backoffice/tree'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; -export type UmbDataTypePickerModalData = UmbTreePickerModalData; +export type UmbDataTypePickerModalData = UmbTreePickerModalData; export type UmbDataTypePickerModalValue = UmbTreePickerModalValue; export const UMB_DATA_TYPE_PICKER_MODAL = new UmbModalToken( diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/types.ts index b3a44373f3..1594072a69 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/types.ts @@ -1,10 +1,10 @@ import type { UmbDataTypeEntityType, UmbDataTypeFolderEntityType, UmbDataTypeRootEntityType } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbDataTypeTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbDataTypeTreeItemModel extends UmbTreeItemModel { entityType: UmbDataTypeEntityType | UmbDataTypeFolderEntityType; } -export interface UmbDataTypeTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbDataTypeTreeRootModel extends UmbTreeRootModel { entityType: UmbDataTypeRootEntityType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/modals/dictionary-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/modals/dictionary-picker-modal.token.ts index e967c0a391..a8d6622e58 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/modals/dictionary-picker-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/modals/dictionary-picker-modal.token.ts @@ -1,4 +1,4 @@ -import type { UmbUniqueTreeItemModel } from '../../core/tree/types.js'; +import type { UmbTreeItemModel } from '../../core/tree/types.js'; import { UmbModalToken } from '../../core/modal/token/modal-token.js'; import { type UmbTreePickerModalValue, @@ -6,7 +6,7 @@ import { UMB_TREE_PICKER_MODAL_ALIAS, } from '@umbraco-cms/backoffice/tree'; -export type UmbDictionaryPickerModalData = UmbTreePickerModalData; +export type UmbDictionaryPickerModalData = UmbTreePickerModalData; export type UmbDictionaryPickerModalValue = UmbTreePickerModalValue; export const UMB_DICTIONARY_PICKER_MODAL = new UmbModalToken< diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/types.ts index dff0fc223b..ab7600d2a6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/types.ts @@ -1,10 +1,10 @@ import type { UmbDictionaryEntityType, UmbDictionaryRootEntityType } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbDictionaryTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbDictionaryTreeItemModel extends UmbTreeItemModel { entityType: UmbDictionaryEntityType; } -export interface UmbDictionaryTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbDictionaryTreeRootModel extends UmbTreeRootModel { entityType: UmbDictionaryRootEntityType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/types.ts index fbe951351d..4c3b9491b5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/types.ts @@ -1,8 +1,8 @@ import type { UmbDocumentBlueprintEntityType, UmbDocumentBlueprintFolderEntityType } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbDocumentBlueprintTreeRootModel extends UmbUniqueTreeRootModel {} +export interface UmbDocumentBlueprintTreeRootModel extends UmbTreeRootModel {} -export interface UmbDocumentBlueprintTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbDocumentBlueprintTreeItemModel extends UmbTreeItemModel { entityType: UmbDocumentBlueprintEntityType | UmbDocumentBlueprintFolderEntityType; } 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 a404aca3ff..24d72d14ff 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 @@ -3,13 +3,13 @@ import type { UmbDocumentTypeFolderEntityType, UmbDocumentTypeRootEntityType, } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbDocumentTypeTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbDocumentTypeTreeItemModel extends UmbTreeItemModel { entityType: UmbDocumentTypeEntityType | UmbDocumentTypeFolderEntityType; isElement: boolean; } -export interface UmbDocumentTypeTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbDocumentTypeTreeRootModel extends UmbTreeRootModel { entityType: UmbDocumentTypeRootEntityType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/types.ts index d84c7821f1..1f1d38718b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/types.ts @@ -1,6 +1,6 @@ import type { UmbDocumentTreeItemModel } from '../../tree/index.js'; -import type { UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; export interface UmbDocumentRecycleBinTreeItemModel extends UmbDocumentTreeItemModel {} -export interface UmbDocumentRecycleBinTreeRootModel extends UmbUniqueTreeRootModel {} +export interface UmbDocumentRecycleBinTreeRootModel extends UmbTreeRootModel {} 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 e31730d723..e97a5168ce 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,9 +1,9 @@ import type { UmbDocumentEntityType, UmbDocumentRootEntityType } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; import type { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbReferenceByUnique } from '@umbraco-cms/backoffice/models'; -export interface UmbDocumentTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbDocumentTreeItemModel extends UmbTreeItemModel { entityType: UmbDocumentEntityType; noAccess: boolean; isTrashed: boolean; @@ -16,7 +16,7 @@ export interface UmbDocumentTreeItemModel extends UmbUniqueTreeItemModel { variants: Array; } -export interface UmbDocumentTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbDocumentTreeRootModel extends UmbTreeRootModel { entityType: UmbDocumentRootEntityType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-picker-modal.token.ts index c6ecbe0509..e6079fb4ad 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-picker-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-picker-modal.token.ts @@ -2,11 +2,11 @@ import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; import { type UmbTreePickerModalValue, type UmbTreePickerModalData, - type UmbUniqueTreeItemModel, + type UmbTreeItemModel, UMB_TREE_PICKER_MODAL_ALIAS, } from '@umbraco-cms/backoffice/tree'; -export type UmbMediaTypePickerModalData = UmbTreePickerModalData; +export type UmbMediaTypePickerModalData = UmbTreePickerModalData; export type UmbMediaTypePickerModalValue = UmbTreePickerModalValue; export const UMB_MEDIA_TYPE_PICKER_MODAL = new UmbModalToken( 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 83e715ea89..daf75873c1 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,10 @@ import type { UmbMediaTypeEntityType, UmbMediaTypeFolderEntityType, UmbMediaTypeRootEntityType } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbMediaTypeTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbMediaTypeTreeItemModel extends UmbTreeItemModel { entityType: UmbMediaTypeEntityType | UmbMediaTypeFolderEntityType; } -export interface UmbMediaTypeTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbMediaTypeTreeRootModel extends UmbTreeRootModel { entityType: UmbMediaTypeRootEntityType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/tree/types.ts index b09498103f..cc6ea5b8ef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/tree/types.ts @@ -1,6 +1,6 @@ import type { UmbMediaTreeItemModel } from '../../tree/index.js'; -import type { UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; export interface UmbMediaRecycleBinTreeItemModel extends UmbMediaTreeItemModel {} -export interface UmbMediaRecycleBinTreeRootModel extends UmbUniqueTreeRootModel {} +export interface UmbMediaRecycleBinTreeRootModel extends UmbTreeRootModel {} 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 8c872803cc..ff270f525c 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,8 +1,8 @@ import type { UmbMediaEntityType, UmbMediaRootEntityType } from '../entity.js'; import type { UmbReferenceByUnique } from '@umbraco-cms/backoffice/models'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbMediaTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbMediaTreeItemModel extends UmbTreeItemModel { entityType: UmbMediaEntityType; noAccess: boolean; isTrashed: boolean; @@ -14,7 +14,7 @@ export interface UmbMediaTreeItemModel extends UmbUniqueTreeItemModel { variants: Array; } -export interface UmbMediaTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbMediaTreeRootModel extends UmbTreeRootModel { entityType: UmbMediaRootEntityType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/modal/member-type-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/modal/member-type-picker-modal.token.ts index d6df51fe11..4f6c5c71fb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/modal/member-type-picker-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/modal/member-type-picker-modal.token.ts @@ -1,12 +1,8 @@ import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; import { UMB_TREE_PICKER_MODAL_ALIAS } from '@umbraco-cms/backoffice/tree'; -import type { - UmbTreePickerModalValue, - UmbTreePickerModalData, - UmbUniqueTreeItemModel, -} from '@umbraco-cms/backoffice/tree'; +import type { UmbTreePickerModalValue, UmbTreePickerModalData, UmbTreeItemModel } from '@umbraco-cms/backoffice/tree'; -export type UmbMemberTypePickerModalData = UmbTreePickerModalData; +export type UmbMemberTypePickerModalData = UmbTreePickerModalData; export type UmbMemberTypePickerModalValue = UmbTreePickerModalValue; export const UMB_MEMBER_TYPE_PICKER_MODAL = new UmbModalToken< diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/types.ts index fd2bc07f54..a453e96de1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/types.ts @@ -1,10 +1,10 @@ import type { UmbMemberTypeEntityType, UmbMemberTypeRootEntityType } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbMemberTypeTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbMemberTypeTreeItemModel extends UmbTreeItemModel { entityType: UmbMemberTypeEntityType; } -export interface UmbMemberTypeTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbMemberTypeTreeRootModel extends UmbTreeRootModel { entityType: UmbMemberTypeRootEntityType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/types.ts index 7f7705632d..4c7b7a701b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/types.ts @@ -1,10 +1,10 @@ import type { UmbStaticFileEntityType, UmbStaticFileFolderEntityType, UmbStaticFileRootEntityType } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbStaticFileTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbStaticFileTreeItemModel extends UmbTreeItemModel { entityType: UmbStaticFileEntityType | UmbStaticFileFolderEntityType; } -export interface UmbStaticFileTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbStaticFileTreeRootModel extends UmbTreeRootModel { entityType: UmbStaticFileRootEntityType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/types.ts index 25e76b711e..a76f5c4cb0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/types.ts @@ -1,10 +1,14 @@ -import type { UmbPartialViewEntityType, UmbPartialViewFolderEntityType, UmbPartialViewRootEntityType } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { + UmbPartialViewEntityType, + UmbPartialViewFolderEntityType, + UmbPartialViewRootEntityType, +} from '../entity.js'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbPartialViewTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbPartialViewTreeItemModel extends UmbTreeItemModel { entityType: UmbPartialViewEntityType | UmbPartialViewFolderEntityType; } -export interface UmbPartialViewTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbPartialViewTreeRootModel extends UmbTreeRootModel { entityType: UmbPartialViewRootEntityType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/types.ts index d7496433d0..f5ba5a49a3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/types.ts @@ -1,10 +1,10 @@ import type { UmbScriptEntityType, UmbScriptFolderEntityType, UmbScriptRootEntityType } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbScriptTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbScriptTreeItemModel extends UmbTreeItemModel { entityType: UmbScriptEntityType | UmbScriptFolderEntityType; } -export interface UmbScriptTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbScriptTreeRootModel extends UmbTreeRootModel { entityType: UmbScriptRootEntityType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/types.ts index f8a05f6783..db57dc554b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/types.ts @@ -1,10 +1,10 @@ import type { UmbStylesheetEntityType, UmbStylesheetFolderEntityType, UmbStylesheetRootEntityType } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbStylesheetTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbStylesheetTreeItemModel extends UmbTreeItemModel { entityType: UmbStylesheetEntityType | UmbStylesheetFolderEntityType; } -export interface UmbStylesheetTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbStylesheetTreeRootModel extends UmbTreeRootModel { entityType: UmbStylesheetRootEntityType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/types.ts index 67e6f03d6f..f780256ff3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/types.ts @@ -1,10 +1,10 @@ import type { UmbTemplateEntityType, UmbTemplateRootEntityType } from '../entity.js'; -import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; +import type { UmbTreeItemModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; -export interface UmbTemplateTreeItemModel extends UmbUniqueTreeItemModel { +export interface UmbTemplateTreeItemModel extends UmbTreeItemModel { entityType: UmbTemplateEntityType; } -export interface UmbTemplateTreeRootModel extends UmbUniqueTreeRootModel { +export interface UmbTemplateTreeRootModel extends UmbTreeRootModel { entityType: UmbTemplateRootEntityType; }