@umbraco-cms/backoffice 1.0.0-next.426eb58e → 1.0.0-next.47679773

package/modal.d.ts

@@ -4,12 +4,11 @@ import * as lit from 'lit';
 import { LitElement, TemplateResult } from 'lit';
 import * as lit_html from 'lit-html';
 import { UUIModalDialogElement, UUIModalSidebarElement, UUIModalSidebarSize } from '@umbraco-ui/uui';
-import { UmbControllerHostElement, UmbControllerInterface } from '@umbraco-cms/backoffice/controller';
+import { UmbControllerHostElement, UmbControllerInterface } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { Params } from '@umbraco-cms/backoffice/router';
-import { UmbModalToken as UmbModalToken$1, UmbModalConfig as UmbModalConfig$1, UmbPickerModalData as UmbPickerModalData$1 } from '@umbraco-cms/backoffice/modal';
-import { LanguageResponseModel, FolderReponseModel } from '@umbraco-cms/backoffice/backend-api';
-import { UserDetails } from '@umbraco-cms/backoffice/models';
+import { UmbModalToken as UmbModalToken$1, UmbModalConfig as UmbModalConfig$1, UmbTreePickerModalData as UmbTreePickerModalData$1, UmbPickerModalResult as UmbPickerModalResult$1, UmbPickerModalData as UmbPickerModalData$1 } from '@umbraco-cms/backoffice/modal';
+import { DocumentTreeItemResponseModel, EntityTreeItemResponseModel, LanguageResponseModel, ContentTreeItemResponseModel, UserResponseModel, FolderReponseModel, FolderTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
 declare class UmbSearchModalElement extends LitElement {
     #private;
@@ -27,38 +26,36 @@ declare global {
     }
 }
 
-declare class UmbModalToken<Data extends object = object, Result = unknown> {
+declare class UmbModalToken<ModalDataType extends object = object, ModalResultType = unknown> {
     protected alias: string;
     protected defaultConfig?: UmbModalConfig | undefined;
-    protected _desc?: string | undefined;
+    protected defaultData?: ModalDataType | undefined;
     /**
      * Get the data type of the token's data.
      *
      * @public
-     * @type      {Data}
+     * @type      {ModalDataType}
      * @memberOf  UmbModalToken
      * @example   `typeof MyModal.TYPE`
      * @returns   undefined
      */
-    readonly DATA: Data;
+    readonly DATA: ModalDataType;
     /**
      * Get the result type of the token
      *
      * @public
-     * @type      {Result}
+     * @type      {ModalResultType}
      * @memberOf  UmbModalToken
      * @example   `typeof MyModal.RESULT`
      * @returns   undefined
      */
-    readonly RESULT: Result;
+    readonly RESULT: ModalResultType;
     /**
      * @param alias   Unique identifier for the token,
      * @param defaultConfig  Default configuration for the modal,
-     * @param _desc   Description for the token,
-     *                used only for debugging purposes,
-     *                it should but does not need to be unique
+     * @param defaultData  Default data for the modal,
      */
-    constructor(alias: string, defaultConfig?: UmbModalConfig | undefined, _desc?: string | undefined);
+    constructor(alias: string, defaultConfig?: UmbModalConfig | undefined, defaultData?: ModalDataType | undefined);
     /**
      * This method must always return the unique alias of the token since that
      * will be used to look up the token in the injector.
@@ -67,6 +64,7 @@ declare class UmbModalToken<Data extends object = object, Result = unknown> {
      */
     toString(): string;
     getDefaultConfig(): UmbModalConfig | undefined;
+    getDefaultData(): ModalDataType | undefined;
 }
 
 /**
@@ -208,23 +206,13 @@ interface UmbContextDebuggerModalData {
 }
 declare const UMB_CONTEXT_DEBUGGER_MODAL: UmbModalToken$1<UmbContextDebuggerModalData, unknown>;
 
-interface UmbDocumentPickerModalData {
-    multiple?: boolean;
-    selection?: Array<string>;
-}
-interface UmbDocumentPickerModalResult {
-    selection: Array<string>;
-}
-declare const UMB_DOCUMENT_PICKER_MODAL: UmbModalToken$1<UmbDocumentPickerModalData, UmbDocumentPickerModalResult>;
+type UmbDocumentPickerModalData = UmbTreePickerModalData$1<DocumentTreeItemResponseModel>;
+type UmbDocumentPickerModalResult = UmbPickerModalResult$1;
+declare const UMB_DOCUMENT_PICKER_MODAL: UmbModalToken$1<UmbDocumentPickerModalData, UmbPickerModalResult$1>;
 
-interface UmbDocumentTypePickerModalData {
-    multiple?: boolean;
-    selection?: Array<string>;
-}
-interface UmbDocumentTypePickerModalResult {
-    selection: Array<string>;
-}
-declare const UMB_DOCUMENT_TYPE_PICKER_MODAL: UmbModalToken$1<UmbDocumentTypePickerModalData, UmbDocumentTypePickerModalResult>;
+type UmbDocumentTypePickerModalData = UmbTreePickerModalData$1<EntityTreeItemResponseModel>;
+type UmbDocumentTypePickerModalResult = UmbPickerModalResult$1;
+declare const UMB_DOCUMENT_TYPE_PICKER_MODAL: UmbModalToken$1<UmbDocumentTypePickerModalData, UmbPickerModalResult$1>;
 
 declare enum OEmbedStatus {
     NotSupported = 0,
@@ -289,11 +277,11 @@ declare const UMB_INVITE_USER_MODAL: UmbModalToken$1<object, unknown>;
 
 interface UmbLanguagePickerModalData {
     multiple?: boolean;
-    selection?: Array<string>;
+    selection?: Array<string | null>;
     filter?: (language: LanguageResponseModel) => boolean;
 }
 interface UmbLanguagePickerModalResult {
-    selection: Array<string>;
+    selection: Array<string | null>;
 }
 declare const UMB_LANGUAGE_PICKER_MODAL: UmbModalToken$1<UmbLanguagePickerModalData, UmbLanguagePickerModalResult>;
 
@@ -323,14 +311,9 @@ interface UmbLinkPickerConfig {
 }
 declare const UMB_LINK_PICKER_MODAL: UmbModalToken$1<UmbLinkPickerModalData, UmbLinkPickerModalResult>;
 
-interface UmbMediaPickerModalData {
-    multiple?: boolean;
-    selection: Array<string>;
-}
-interface UmbMediaPickerModalResult {
-    selection: Array<string>;
-}
-declare const UMB_MEDIA_PICKER_MODAL: UmbModalToken$1<UmbMediaPickerModalData, UmbMediaPickerModalResult>;
+type UmbMediaTreePickerModalData = UmbTreePickerModalData$1<ContentTreeItemResponseModel>;
+type UmbMediaTreePickerModalResult = UmbPickerModalResult$1;
+declare const UMB_MEDIA_TREE_PICKER_MODAL: UmbModalToken$1<UmbMediaTreePickerModalData, UmbPickerModalResult$1>;
 
 interface UmbPropertyEditorUIPickerModalData {
     selection?: Array<string>;
@@ -360,9 +343,12 @@ declare const UMB_SEARCH_MODAL: UmbModalToken$1<object, unknown>;
 
 interface UmbSectionPickerModalData {
     multiple: boolean;
-    selection: string[];
+    selection: Array<string | null>;
+}
+interface UmbSectionPickerModalResult {
+    selection: Array<string | null>;
 }
-declare const UMB_SECTION_PICKER_MODAL: UmbModalToken$1<UmbSectionPickerModalData, unknown>;
+declare const UMB_SECTION_PICKER_MODAL: UmbModalToken$1<UmbSectionPickerModalData, UmbSectionPickerModalResult>;
 
 interface UmbTemplateModalData {
     id: string;
@@ -373,18 +359,17 @@ interface UmbTemplateModalResult {
 }
 declare const UMB_TEMPLATE_MODAL: UmbModalToken$1<UmbTemplateModalData, UmbTemplateModalResult>;
 
-interface UmbTemplatePickerModalData {
-    multiple: boolean;
-    selection: string[];
-}
-interface UmbTemplatePickerModalResult {
-    selection: string[] | undefined;
-}
-declare const UMB_TEMPLATE_PICKER_MODAL: UmbModalToken$1<UmbTemplatePickerModalData, UmbTemplatePickerModalResult>;
+type UmbTemplatePickerModalData = UmbTreePickerModalData$1<EntityTreeItemResponseModel>;
+type UmbTemplatePickerModalResult = UmbPickerModalResult$1;
+declare const UMB_TEMPLATE_PICKER_MODAL: UmbModalToken$1<UmbTemplatePickerModalData, UmbPickerModalResult$1>;
 
-declare const UMB_USER_GROUP_PICKER_MODAL: UmbModalToken$1<UmbPickerModalData$1<UserDetails>, unknown>;
+declare const UMB_USER_GROUP_PICKER_MODAL: UmbModalToken$1<UmbPickerModalData$1<any>, unknown>;
 
-declare const UMB_USER_PICKER_MODAL: UmbModalToken$1<UmbPickerModalData$1<UserDetails>, unknown>;
+type UmbUserPickerModalData = UmbPickerModalData$1<UserResponseModel>;
+interface UmbUserPickerModalResult {
+    selection: Array<string | null>;
+}
+declare const UMB_USER_PICKER_MODAL: UmbModalToken$1<UmbUserPickerModalData, UmbUserPickerModalResult>;
 
 interface UmbFolderModalData {
     repositoryAlias: string;
@@ -395,22 +380,41 @@ interface UmbFolderModalResult {
 }
 declare const UMB_FOLDER_MODAL: UmbModalToken$1<UmbFolderModalData, UmbFolderModalResult>;
 
-interface UmbDataTypePickerModalData {
-    selection?: Array<string>;
-    multiple?: boolean;
+interface UmbPartialViewPickerModalData {
+    multiple: boolean;
+    selection: string[];
 }
-interface UmbDataTypePickerModalResult {
-    selection: Array<string>;
+interface UmbPartialViewPickerModalResult {
+    selection: Array<string | null> | undefined;
 }
-declare const UMB_DATA_TYPE_PICKER_MODAL: UmbModalToken$1<UmbDataTypePickerModalData, UmbDataTypePickerModalResult>;
+declare const UMB_PARTIAL_VIEW_PICKER_MODAL_ALIAS = "Umb.Modal.PartialViewPicker";
+declare const UMB_PARTIAL_VIEW_PICKER_MODAL: UmbModalToken$1<UmbPartialViewPickerModalData, UmbPartialViewPickerModalResult>;
 
-interface UmbPickerModalData<T> {
+interface UmbDictionaryItemPickerModalData {
     multiple: boolean;
-    selection: Array<string>;
-    filter?: (language: T) => boolean;
+    selection: string[];
 }
-interface UmbPickerModalResult<T> {
-    selection: Array<string>;
+interface UmbDictionaryItemPickerModalResult {
+    selection: Array<string | null>;
+}
+declare const UMB_DICTIONARY_ITEM_PICKER_MODAL_ALIAS = "Umb.Modal.DictionaryItemPicker";
+declare const UMB_DICTIONARY_ITEM_PICKER_MODAL: UmbModalToken$1<UmbDictionaryItemPickerModalData, UmbDictionaryItemPickerModalResult>;
+
+type UmbDataTypePickerModalData = UmbTreePickerModalData$1<FolderTreeItemResponseModel>;
+type UmbDataTypePickerModalResult = UmbPickerModalResult$1;
+declare const UMB_DATA_TYPE_PICKER_MODAL: UmbModalToken$1<UmbDataTypePickerModalData, UmbPickerModalResult$1>;
+
+interface UmbPickerModalData<ItemType> {
+    multiple?: boolean;
+    selection?: Array<string | null>;
+    filter?: (item: ItemType) => boolean;
+    pickableFilter?: (item: ItemType) => boolean;
+}
+interface UmbPickerModalResult {
+    selection: Array<string | null>;
+}
+interface UmbTreePickerModalData<TreeItemType> extends UmbPickerModalData<TreeItemType> {
+    treeAlias?: string;
 }
 
-export { OEmbedResult, OEmbedStatus, UMB_ALLOWED_DOCUMENT_TYPES_MODAL, UMB_CHANGE_PASSWORD_MODAL, UMB_CONFIRM_MODAL, UMB_CONTEXT_DEBUGGER_MODAL, UMB_CREATE_DICTIONARY_MODAL, UMB_CREATE_USER_MODAL, UMB_CURRENT_USER_MODAL, UMB_DATA_TYPE_PICKER_MODAL, UMB_DOCUMENT_PICKER_MODAL, UMB_DOCUMENT_TYPE_PICKER_MODAL, UMB_EMBEDDED_MEDIA_MODAL, UMB_EXAMINE_FIELDS_SETTINGS_MODAL, UMB_EXPORT_DICTIONARY_MODAL, UMB_FOLDER_MODAL, UMB_ICON_PICKER_MODAL, UMB_IMPORT_DICTIONARY_MODAL, UMB_INVITE_USER_MODAL, UMB_LANGUAGE_PICKER_MODAL, UMB_LINK_PICKER_MODAL, UMB_MEDIA_PICKER_MODAL, UMB_MODAL_CONTEXT_TOKEN, UMB_PROPERTY_EDITOR_UI_PICKER_MODAL, UMB_PROPERTY_SETTINGS_MODAL, UMB_SEARCH_MODAL, UMB_SECTION_PICKER_MODAL, UMB_TEMPLATE_MODAL, UMB_TEMPLATE_PICKER_MODAL, UMB_USER_GROUP_PICKER_MODAL, UMB_USER_PICKER_MODAL, UmbAllowedDocumentTypesModalData, UmbAllowedDocumentTypesModalResult, UmbChangePasswordModalData, UmbConfirmModalData, UmbConfirmModalResult, UmbContextDebuggerModalData, UmbCreateDictionaryModalData, UmbCreateDictionaryModalResult, UmbCreateDocumentModalResultData, UmbDataTypePickerModalData, UmbDataTypePickerModalResult, UmbDocumentPickerModalData, UmbDocumentPickerModalResult, UmbDocumentTypePickerModalData, UmbDocumentTypePickerModalResult, UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalResult, UmbExamineFieldsSettingsModalData, UmbExportDictionaryModalData, UmbExportDictionaryModalResult, UmbFolderModalData, UmbFolderModalResult, UmbIconPickerModalData, UmbIconPickerModalResult, UmbImportDictionaryModalData, UmbImportDictionaryModalResult, UmbLanguagePickerModalData, UmbLanguagePickerModalResult, UmbLinkPickerConfig, UmbLinkPickerLink, UmbLinkPickerModalData, UmbLinkPickerModalResult, UmbMediaPickerModalData, UmbMediaPickerModalResult, UmbModalConfig, UmbModalContext, UmbModalHandler, UmbModalHandlerClass, UmbModalRouteBuilder, UmbModalRouteRegistration, UmbModalRouteRegistrationController, UmbModalToken, UmbModalType, UmbPickerModalData, UmbPickerModalResult, UmbPropertyEditorUIPickerModalData, UmbPropertyEditorUIPickerModalResult, UmbPropertySettingsModalResult, UmbSectionPickerModalData, UmbTemplateModalData, UmbTemplateModalResult, UmbTemplatePickerModalData, UmbTemplatePickerModalResult };
+export { OEmbedResult, OEmbedStatus, UMB_ALLOWED_DOCUMENT_TYPES_MODAL, UMB_CHANGE_PASSWORD_MODAL, UMB_CONFIRM_MODAL, UMB_CONTEXT_DEBUGGER_MODAL, UMB_CREATE_DICTIONARY_MODAL, UMB_CREATE_USER_MODAL, UMB_CURRENT_USER_MODAL, UMB_DATA_TYPE_PICKER_MODAL, UMB_DICTIONARY_ITEM_PICKER_MODAL, UMB_DICTIONARY_ITEM_PICKER_MODAL_ALIAS, UMB_DOCUMENT_PICKER_MODAL, UMB_DOCUMENT_TYPE_PICKER_MODAL, UMB_EMBEDDED_MEDIA_MODAL, UMB_EXAMINE_FIELDS_SETTINGS_MODAL, UMB_EXPORT_DICTIONARY_MODAL, UMB_FOLDER_MODAL, UMB_ICON_PICKER_MODAL, UMB_IMPORT_DICTIONARY_MODAL, UMB_INVITE_USER_MODAL, UMB_LANGUAGE_PICKER_MODAL, UMB_LINK_PICKER_MODAL, UMB_MEDIA_TREE_PICKER_MODAL, UMB_MODAL_CONTEXT_TOKEN, UMB_PARTIAL_VIEW_PICKER_MODAL, UMB_PARTIAL_VIEW_PICKER_MODAL_ALIAS, UMB_PROPERTY_EDITOR_UI_PICKER_MODAL, UMB_PROPERTY_SETTINGS_MODAL, UMB_SEARCH_MODAL, UMB_SECTION_PICKER_MODAL, UMB_TEMPLATE_MODAL, UMB_TEMPLATE_PICKER_MODAL, UMB_USER_GROUP_PICKER_MODAL, UMB_USER_PICKER_MODAL, UmbAllowedDocumentTypesModalData, UmbAllowedDocumentTypesModalResult, UmbChangePasswordModalData, UmbConfirmModalData, UmbConfirmModalResult, UmbContextDebuggerModalData, UmbCreateDictionaryModalData, UmbCreateDictionaryModalResult, UmbCreateDocumentModalResultData, UmbDataTypePickerModalData, UmbDataTypePickerModalResult, UmbDictionaryItemPickerModalData, UmbDictionaryItemPickerModalResult, UmbDocumentPickerModalData, UmbDocumentPickerModalResult, UmbDocumentTypePickerModalData, UmbDocumentTypePickerModalResult, UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalResult, UmbExamineFieldsSettingsModalData, UmbExportDictionaryModalData, UmbExportDictionaryModalResult, UmbFolderModalData, UmbFolderModalResult, UmbIconPickerModalData, UmbIconPickerModalResult, UmbImportDictionaryModalData, UmbImportDictionaryModalResult, UmbLanguagePickerModalData, UmbLanguagePickerModalResult, UmbLinkPickerConfig, UmbLinkPickerLink, UmbLinkPickerModalData, UmbLinkPickerModalResult, UmbMediaTreePickerModalData, UmbMediaTreePickerModalResult, UmbModalConfig, UmbModalContext, UmbModalHandler, UmbModalHandlerClass, UmbModalRouteBuilder, UmbModalRouteRegistration, UmbModalRouteRegistrationController, UmbModalToken, UmbModalType, UmbPartialViewPickerModalData, UmbPartialViewPickerModalResult, UmbPickerModalData, UmbPickerModalResult, UmbPropertyEditorUIPickerModalData, UmbPropertyEditorUIPickerModalResult, UmbPropertySettingsModalResult, UmbSectionPickerModalData, UmbSectionPickerModalResult, UmbTemplateModalData, UmbTemplateModalResult, UmbTemplatePickerModalData, UmbTemplatePickerModalResult, UmbTreePickerModalData, UmbUserPickerModalData, UmbUserPickerModalResult };

package/models.d.ts

@@ -1,80 +1,11 @@
-import { EntityTreeItemResponseModel, FolderTreeItemResponseModel, PackageManifestResponseModel } from '@umbraco-cms/backoffice/backend-api';
-
-type HTMLElementConstructor<T = HTMLElement> = new (...args: any[]) => T;
-type ClassConstructor<T> = new (...args: any[]) => T;
-interface Entity {
-    id: string;
-    name: string;
-    icon: string;
-    type: string;
-    hasChildren: boolean;
-    parentId: string | null;
-}
 /** Tried to find a common base of our entities — used by Entity Workspace Context */
-type BaseEntity = {
+type UmbEntityBase = {
     id?: string;
     name?: string;
 };
-interface UserEntity extends Entity {
-    type: 'user';
-}
-type UserStatus = 'enabled' | 'inactive' | 'invited' | 'disabled';
-interface UserDetails extends UserEntity {
-    email: string;
-    status: UserStatus;
-    language: string;
-    lastLoginDate?: string;
-    lastLockoutDate?: string;
-    lastPasswordChangeDate?: string;
-    updateDate: string;
-    createDate: string;
-    failedLoginAttempts: number;
-    userGroups: Array<string>;
-    contentStartNodes: Array<string>;
-    mediaStartNodes: Array<string>;
-}
-interface UserGroupEntity extends Entity {
-    type: 'user-group';
-}
-interface UserGroupDetails extends UserGroupEntity {
-    sections: Array<string>;
-    contentStartNode?: string;
-    mediaStartNode?: string;
-    permissions: Array<string>;
-}
-interface MemberTypeDetails extends EntityTreeItemResponseModel {
-    id: string;
-    alias: string;
-    properties: [];
-}
-interface MediaTypeDetails extends FolderTreeItemResponseModel {
-    id: string;
-    alias: string;
-    properties: [];
-}
-interface MemberGroupDetails extends EntityTreeItemResponseModel {
-    id: string;
-}
-interface MemberDetails extends EntityTreeItemResponseModel {
-    id: string;
-}
-interface DocumentBlueprintDetails {
-    id: string;
-    name: string;
-    type: 'document-blueprint';
-    properties: Array<any>;
-    data: Array<any>;
-    icon: string;
-    documentTypeKey: string;
-}
-interface SwatchDetails {
+interface UmbSwatchDetails {
     label: string;
     value: string;
 }
-type UmbPackage = PackageManifestResponseModel;
-type PackageManifestResponse = UmbPackage[];
-type UmbPackageWithMigrationStatus = UmbPackage & {
-    hasPendingMigrations: boolean;
-};
 
-export { BaseEntity, ClassConstructor, DocumentBlueprintDetails, Entity, HTMLElementConstructor, MediaTypeDetails, MemberDetails, MemberGroupDetails, MemberTypeDetails, PackageManifestResponse, SwatchDetails, UmbPackage, UmbPackageWithMigrationStatus, UserDetails, UserEntity, UserGroupDetails, UserGroupEntity, UserStatus };
+export { UmbEntityBase, UmbSwatchDetails };

package/observable-api.d.ts

@@ -1,6 +1,6 @@
 import * as rxjs from 'rxjs';
 import { Observable, BehaviorSubject } from 'rxjs';
-import { UmbControllerInterface, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
+import { UmbControllerInterface, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 declare class UmbObserver<T> {
     #private;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@umbraco-cms/backoffice",
-	"version": "1.0.0-next.426eb58e",
+	"version": "1.0.0-next.47679773",
 	"license": "MIT",
 	"keywords": [
 		"umbraco",
@@ -26,7 +26,7 @@
 	],
 	"peerDependencies": {
 		"@types/uuid": "^9.0.1",
-		"@umbraco-ui/uui": "^1.2.0-rc.0",
+		"@umbraco-ui/uui": "1.2.1",
 		"rxjs": "^7.8.0"
 	},
 	"customElements": "custom-elements.json"

package/picker-input.d.ts

@@ -1,7 +1,7 @@
 import * as rxjs from 'rxjs';
 import { UmbItemRepository } from '@umbraco-cms/backoffice/repository';
-import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
-import { UmbModalToken, UmbModalContext } from '@umbraco-cms/backoffice/modal';
+import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
+import { UmbModalToken, UmbModalContext, UmbPickerModalData } from '@umbraco-cms/backoffice/modal';
 import { ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 
 declare class UmbPickerInputContext<ItemType extends ItemResponseModelBaseModel> {
@@ -10,6 +10,7 @@ declare class UmbPickerInputContext<ItemType extends ItemResponseModelBaseModel>
     modalAlias: string | UmbModalToken;
     repository?: UmbItemRepository<ItemType>;
     modalContext?: UmbModalContext;
+    pickableFilter?: (item: ItemType) => boolean;
     selection: rxjs.Observable<string[]>;
     selectedItems: rxjs.Observable<ItemType[]>;
     max: number;
@@ -17,7 +18,7 @@ declare class UmbPickerInputContext<ItemType extends ItemResponseModelBaseModel>
     constructor(host: UmbControllerHostElement, repositoryAlias: string, modalAlias: string | UmbModalToken, getUniqueMethod?: (entry: ItemType) => string | undefined);
     getSelection(): string[];
     setSelection(selection: string[]): void;
-    openPicker(pickerData?: any): void;
+    openPicker(pickerData?: Partial<UmbPickerModalData<ItemType>>): void;
     requestRemoveItem(unique: string): Promise<void>;
 }
 

package/repository.d.ts

@@ -1,6 +1,7 @@
-import { ApiError, CancelError, FolderReponseModel, CreateFolderRequestModel, UpdateFolderReponseModel, ProblemDetailsModel, FolderModelBaseModel, ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
+import { ApiError, CancelError, FolderReponseModel, CreateFolderRequestModel, UpdateFolderReponseModel, TreeItemPresentationModel, ProblemDetailsModel, FolderModelBaseModel, ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 import { DataSourceResponse as DataSourceResponse$1, UmbDataSourceErrorResponse as UmbDataSourceErrorResponse$1 } from '@umbraco-cms/backoffice/repository';
 import { Observable } from 'rxjs';
+import { UmbTreeRootModel, UmbTreeRootEntityModel } from '@umbraco-cms/backoffice/tree';
 
 interface DataSourceResponse<T = undefined> extends UmbDataSourceErrorResponse {
     data?: T;
@@ -9,10 +10,10 @@ interface UmbDataSourceErrorResponse {
     error?: ApiError | CancelError;
 }
 
-interface UmbDataSource<CreateRequestType, UpdateRequestType, ResponseType> {
+interface UmbDataSource<CreateRequestType, CreateResponseType, UpdateRequestType, ResponseType> {
     createScaffold(parentId: string | null): Promise<DataSourceResponse$1<CreateRequestType>>;
     get(unique: string): Promise<DataSourceResponse$1<ResponseType>>;
-    insert(data: CreateRequestType): Promise<any>;
+    insert(data: CreateRequestType): Promise<DataSourceResponse$1<CreateResponseType>>;
     update(unique: string, data: UpdateRequestType): Promise<DataSourceResponse$1<ResponseType>>;
     delete(unique: string): Promise<DataSourceResponse$1>;
 }
@@ -25,10 +26,39 @@ interface UmbFolderDataSource {
     delete(unique: string): Promise<DataSourceResponse>;
 }
 
-interface UmbTreeDataSource<PagedItemsType = any, ItemsType = any> {
-    getRootItems(): Promise<DataSourceResponse$1<PagedItemsType>>;
-    getChildrenOf(parentUnique: string): Promise<DataSourceResponse$1<PagedItemsType>>;
-    getItems(unique: Array<string>): Promise<DataSourceResponse$1<Array<ItemsType>>>;
+interface UmbPagedData<T> {
+    total: number;
+    items: Array<T>;
+}
+interface UmbTreeRepository<TreeItemType extends TreeItemPresentationModel, TreeRootType extends UmbTreeRootModel = UmbTreeRootEntityModel> {
+    requestTreeRoot: () => Promise<{
+        data?: TreeRootType;
+        error?: ProblemDetailsModel;
+    }>;
+    requestRootTreeItems: () => Promise<{
+        data?: UmbPagedData<TreeItemType>;
+        error?: ProblemDetailsModel;
+        asObservable?: () => Observable<TreeItemType[]>;
+    }>;
+    requestTreeItemsOf: (parentUnique: string | null) => Promise<{
+        data?: UmbPagedData<TreeItemType>;
+        error?: ProblemDetailsModel;
+        asObservable?: () => Observable<TreeItemType[]>;
+    }>;
+    requestItemsLegacy?: (uniques: string[]) => Promise<{
+        data?: Array<TreeItemType>;
+        error?: ProblemDetailsModel;
+        asObservable?: () => Observable<any[]>;
+    }>;
+    rootTreeItems: () => Promise<Observable<TreeItemType[]>>;
+    treeItemsOf: (parentUnique: string | null) => Promise<Observable<TreeItemType[]>>;
+    itemsLegacy?: (uniques: string[]) => Promise<Observable<any[]>>;
+}
+
+interface UmbTreeDataSource<ItemType = any, PagedItemType = UmbPagedData<ItemType>> {
+    getRootItems(): Promise<DataSourceResponse<PagedItemType>>;
+    getChildrenOf(parentUnique: string | null): Promise<DataSourceResponse<PagedItemType>>;
+    getItems(unique: Array<string>): Promise<DataSourceResponse<Array<any>>>;
 }
 
 interface UmbItemDataSource<ItemType> {
@@ -36,11 +66,16 @@ interface UmbItemDataSource<ItemType> {
 }
 
 interface UmbMoveDataSource {
-    move(unique: string, targetUnique: string): Promise<UmbDataSourceErrorResponse$1>;
+    move(unique: string, targetUnique: string | null): Promise<UmbDataSourceErrorResponse$1>;
 }
 
 interface UmbCopyDataSource {
-    copy(unique: string, targetUnique: string): Promise<DataSourceResponse$1<string>>;
+    copy(unique: string, targetUnique: string | null): Promise<DataSourceResponse$1<string>>;
+}
+
+interface UmbCollectionDataSource<ItemType = any, PagedItemType = UmbPagedData<ItemType>> {
+    getCollection(): Promise<DataSourceResponse<PagedItemType>>;
+    filterCollection(filter: any): Promise<DataSourceResponse<PagedItemType>>;
 }
 
 interface UmbRepositoryErrorResponse {
@@ -49,39 +84,15 @@ interface UmbRepositoryErrorResponse {
 interface UmbRepositoryResponse<T> extends UmbRepositoryErrorResponse {
     data?: T;
 }
-interface UmbDetailRepository<CreateRequestType = any, UpdateRequestType = any, ResponseType = any> {
+interface UmbDetailRepository<CreateRequestType = any, CreateResponseType = any, UpdateRequestType = any, ResponseType = any> {
     createScaffold(parentId: string | null): Promise<UmbRepositoryResponse<CreateRequestType>>;
     requestById(id: string): Promise<UmbRepositoryResponse<ResponseType>>;
-    create(data: CreateRequestType): Promise<UmbRepositoryErrorResponse>;
+    byId(id: string): Promise<Observable<ResponseType>>;
+    create(data: CreateRequestType): Promise<UmbRepositoryResponse<CreateResponseType>>;
     save(id: string, data: UpdateRequestType): Promise<UmbRepositoryErrorResponse>;
     delete(id: string): Promise<UmbRepositoryErrorResponse>;
 }
 
-interface UmbPagedData<T> {
-    total: number;
-    items: Array<T>;
-}
-interface UmbTreeRepository<ItemType = any, PagedItemType = UmbPagedData<ItemType>> {
-    requestRootTreeItems: () => Promise<{
-        data: PagedItemType | undefined;
-        error: ProblemDetailsModel | undefined;
-        asObservable?: () => Observable<ItemType[]>;
-    }>;
-    requestTreeItemsOf: (parentUnique: string | null) => Promise<{
-        data: PagedItemType | undefined;
-        error: ProblemDetailsModel | undefined;
-        asObservable?: () => Observable<ItemType[]>;
-    }>;
-    requestItemsLegacy?: (uniques: string[]) => Promise<{
-        data: Array<ItemType> | undefined;
-        error: ProblemDetailsModel | undefined;
-        asObservable?: () => Observable<ItemType[]>;
-    }>;
-    rootTreeItems: () => Promise<Observable<ItemType[]>>;
-    treeItemsOf: (parentUnique: string | null) => Promise<Observable<ItemType[]>>;
-    itemsLegacy?: (uniques: string[]) => Promise<Observable<ItemType[]>>;
-}
-
 interface UmbFolderRepository {
     createFolderScaffold(parentId: string | null): Promise<{
         data?: FolderReponseModel;
@@ -104,6 +115,10 @@ interface UmbFolderRepository {
     }>;
 }
 
+interface UmbCollectionRepository {
+    requestCollection(filter?: any): Promise<any>;
+}
+
 interface UmbItemRepository<ItemType extends ItemResponseModelBaseModel> {
     requestItems: (uniques: string[]) => Promise<{
         data?: Array<ItemType> | undefined;
@@ -121,4 +136,4 @@ interface UmbCopyRepository {
     copy(unique: string, targetUnique: string): Promise<UmbRepositoryResponse<string>>;
 }
 
-export { DataSourceResponse, UmbCopyDataSource, UmbCopyRepository, UmbDataSource, UmbDataSourceErrorResponse, UmbDetailRepository, UmbFolderDataSource, UmbFolderRepository, UmbItemDataSource, UmbItemRepository, UmbMoveDataSource, UmbMoveRepository, UmbPagedData, UmbRepositoryErrorResponse, UmbRepositoryResponse, UmbTreeDataSource, UmbTreeRepository };
+export { DataSourceResponse, UmbCollectionDataSource, UmbCollectionRepository, UmbCopyDataSource, UmbCopyRepository, UmbDataSource, UmbDataSourceErrorResponse, UmbDetailRepository, UmbFolderDataSource, UmbFolderRepository, UmbItemDataSource, UmbItemRepository, UmbMoveDataSource, UmbMoveRepository, UmbPagedData, UmbRepositoryErrorResponse, UmbRepositoryResponse, UmbTreeDataSource, UmbTreeRepository };

package/resources.d.ts

@@ -1,7 +1,6 @@
 import { UmbNotificationOptions } from '@umbraco-cms/backoffice/notification';
-import { UmbController, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
+import { UmbController, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { DataSourceResponse as DataSourceResponse$1 } from '@umbraco-cms/backoffice/repository';
-import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { ApiError, CancelError } from '@umbraco-cms/backoffice/backend-api';
 
 declare class UmbResourceController extends UmbController {
@@ -33,18 +32,6 @@ declare class UmbResourceController extends UmbController {
     destroy(): void;
 }
 
-/**
- * The base URL of the configured Umbraco server.
- * If the server is local, this will be an empty string.
- *
- * @remarks This is the base URL of the Umbraco server, not the base URL of the backoffice.
- *
- * @example https://localhost:44300
- * @example https://my-umbraco-site.com
- * @example ''
- */
-declare const UMB_SERVER_URL: UmbContextToken<string>;
-
 interface DataSourceResponse<T = undefined> extends UmbDataSourceErrorResponse {
     data?: T;
 }
@@ -56,4 +43,4 @@ declare function tryExecute<T>(promise: Promise<T>): Promise<DataSourceResponse<
 
 declare function tryExecuteAndNotify<T>(host: UmbControllerHostElement, resource: Promise<T>, options?: UmbNotificationOptions): Promise<DataSourceResponse<T>>;
 
-export { UMB_SERVER_URL, UmbResourceController, tryExecute, tryExecuteAndNotify };
+export { UmbResourceController, tryExecute, tryExecuteAndNotify };

package/router.d.ts

@@ -1,5 +1,5 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
+import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbModalRouteRegistration } from '@umbraco-cms/backoffice/modal';
 
 interface IRouterSlot<D = any, P = any> extends HTMLElement {
@@ -350,13 +350,6 @@ declare function toQueryString(query: Query): string;
  */
 declare function ensureAnchorHistory(): void;
 
-interface UmbRouteLocation {
-    name?: string;
-    params: {
-        [key: string]: string;
-    };
-}
-
 declare class UmbRouteContext {
     #private;
     private _onGotModals;
@@ -372,4 +365,4 @@ declare function generateRoutePathBuilder(path: string): (params: {
     [key: string]: string | number;
 }) => string;
 
-export { Guard, IComponentRoute, IRedirectRoute, IResolverRoute, IRoute, IRoutingInfo, PageComponent, Params, Query, UMB_ROUTE_CONTEXT_TOKEN, IRoute as UmbRoute, UmbRouteContext, UmbRouteLocation, addListener, attachCallback, basePath, constructAbsolutePath, constructPathWithBasePath, dispatchGlobalRouterEvent, dispatchRouteChangeEvent, ensureAnchorHistory, ensureHistoryEvents, ensureSlash, generateRoutePathBuilder, getFragments, handleRedirect, historyPatches, isPathActive, isRedirectRoute, isResolverRoute, matchRoute, matchRoutes, path, pathWithoutBasePath, query, queryParentRoots, queryParentRouterSlot, queryString, removeListeners, resolvePageComponent, saveNativeFunction, shouldNavigate, slashify, stripSlash, stripStart, toQuery, toQueryString, traverseRouterTree };
+export { Guard, IComponentRoute, IRedirectRoute, IResolverRoute, IRoutingInfo, PageComponent, Params, Query, UMB_ROUTE_CONTEXT_TOKEN, IRoute as UmbRoute, UmbRouteContext, addListener, attachCallback, basePath, constructAbsolutePath, constructPathWithBasePath, dispatchGlobalRouterEvent, dispatchRouteChangeEvent, ensureAnchorHistory, ensureHistoryEvents, ensureSlash, generateRoutePathBuilder, getFragments, handleRedirect, historyPatches, isPathActive, isRedirectRoute, isResolverRoute, matchRoute, matchRoutes, path, pathWithoutBasePath, query, queryParentRoots, queryParentRouterSlot, queryString, removeListeners, resolvePageComponent, saveNativeFunction, shouldNavigate, slashify, stripSlash, stripStart, toQuery, toQueryString, traverseRouterTree };

package/section.d.ts

@@ -0,0 +1,29 @@
+import * as rxjs from 'rxjs';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
+import { ManifestSection } from '@umbraco-cms/backoffice/extension-registry';
+
+declare class UmbSectionSidebarContext {
+    #private;
+    contextMenuIsOpen: rxjs.Observable<boolean>;
+    entityType: rxjs.Observable<string | undefined>;
+    unique: rxjs.Observable<string | null | undefined>;
+    headline: rxjs.Observable<string | undefined>;
+    constructor(host: UmbControllerHostElement);
+    toggleContextMenu(entityType: string, unique: string | null | undefined, headline: string): void;
+    openContextMenu(entityType: string, unique: string | null | undefined, headline: string): void;
+    closeContextMenu(): void;
+}
+declare const UMB_SECTION_SIDEBAR_CONTEXT_TOKEN: UmbContextToken<UmbSectionSidebarContext>;
+
+declare class UmbSectionContext {
+    #private;
+    readonly alias: rxjs.Observable<string | undefined>;
+    readonly pathname: rxjs.Observable<string | undefined>;
+    readonly label: rxjs.Observable<string | undefined>;
+    constructor(manifest: ManifestSection);
+    setManifest(manifest?: ManifestSection): void;
+}
+declare const UMB_SECTION_CONTEXT_TOKEN: UmbContextToken<UmbSectionContext>;
+
+export { UMB_SECTION_CONTEXT_TOKEN, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, UmbSectionContext, UmbSectionSidebarContext };

package/sorter.d.ts

@@ -1,4 +1,4 @@
-import { UmbControllerInterface, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
+import { UmbControllerInterface, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 type INTERNAL_UmbSorterConfig<T> = {
     compareElementToModel: (el: HTMLElement, modelEntry: T) => boolean;

package/store.d.ts

@@ -1,6 +1,6 @@
 import * as rxjs from 'rxjs';
 import { Observable } from 'rxjs';
-import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
+import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
 import { EntityTreeItemResponseModel, FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbStoreBase as UmbStoreBase$1, UmbTreeStore as UmbTreeStore$1 } from '@umbraco-cms/backoffice/store';
@@ -97,7 +97,7 @@ declare class UmbEntityTreeStore extends UmbStoreBase$1<EntityTreeItemResponseMo
      * @return {*}
      * @memberof UmbEntityTreeStore
      */
-    items(ids: Array<string>): rxjs.Observable<EntityTreeItemResponseModel[]>;
+    items(ids: Array<string | null>): rxjs.Observable<EntityTreeItemResponseModel[]>;
 }
 
 /**