@umbraco-cms/backoffice 17.4.0-rc2 → 18.0.0-beta1

package/dist-cms/packages/documents/documents/collection/views/table/column-layouts/document-table-column-property-value.element.js

@@ -6,8 +6,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UmbDocumentItemDataResolver } from '../../../../item/index.js';
 import { customElement, html, nothing, property, state, when } from '../../../../../../../external/lit/index.js';
+import { UmbDocumentVariantState } from '../../../../variant-state.js';
 import { UmbLitElement } from '../../../../../../core/lit-element/index.js';
-import { DocumentVariantStateModel } from '../../../../../../core/backend-api/index.js';
 let UmbDocumentTableColumnPropertyValueElement = class UmbDocumentTableColumnPropertyValueElement extends UmbLitElement {
     #resolver = new UmbDocumentItemDataResolver(this);
     set value(value) {
@@ -31,32 +31,32 @@ let UmbDocumentTableColumnPropertyValueElement = class UmbDocumentTableColumnPro
         const item = this.value.item;
         switch (alias) {
             case 'contentTypeAlias':
-                return item.documentType.alias;
+                return { value: item.documentType.alias };
             case 'createDate':
-                return this._createDate?.toLocaleString();
+                return { value: this._createDate?.toLocaleString() };
             case 'creator':
             case 'owner':
-                return item.creator;
+                return { value: item.creator };
             case 'published':
-                return this._state !== DocumentVariantStateModel.DRAFT ? 'True' : 'False';
+                return { value: this._state !== UmbDocumentVariantState.DRAFT ? 'True' : 'False' };
             case 'sortOrder':
-                return item.sortOrder;
+                return { value: item.sortOrder };
             case 'updateDate':
-                return this._updateDate?.toLocaleString();
+                return { value: this._updateDate?.toLocaleString() };
             case 'updater':
-                return item.updater;
+                return { value: item.updater };
             default: {
                 const culture = this.#resolver.getCulture();
                 const prop = item.values.find((x) => x.alias === alias && (!x.culture || x.culture === culture));
-                return prop?.value ?? '';
+                return { value: prop?.value ?? '', editorAlias: prop?.editorAlias };
             }
         }
     }
     render() {
         if (!this.value)
             return nothing;
-        const value = this.#getPropertyValueByAlias();
-        return when(this.column.labelTemplate, () => html `<umb-ufm-render inline .markdown=${this.column.labelTemplate} .value=${{ value }}></umb-ufm-render>`, () => html `${value}`);
+        const { value, editorAlias } = this.#getPropertyValueByAlias();
+        return when(this.column.labelTemplate, () => html `<umb-ufm-render inline .markdown=${this.column.labelTemplate} .value=${{ value }}></umb-ufm-render>`, () => editorAlias ? html `<umb-value-summary-extension .valueType=${editorAlias} .value=${value}></umb-value-summary-extension>` : value);
     }
 };
 __decorate([

package/dist-cms/packages/documents/documents/collection/views/table/column-layouts/document-table-column-state.element.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UmbDocumentItemDataResolver } from '../../../../item/index.js';
 import { customElement, html, property, state } from '../../../../../../../external/lit/index.js';
 import { fromCamelCase } from '../../../../../../core/utils/index.js';
-import { DocumentVariantStateModel } from '../../../../../../core/backend-api/index.js';
+import { UmbDocumentVariantState } from '../../../../variant-state.js';
 import { UmbLitElement } from '../../../../../../core/lit-element/index.js';
 let UmbDocumentTableColumnStateElement = class UmbDocumentTableColumnStateElement extends UmbLitElement {
     #resolver;
@@ -29,13 +29,13 @@ let UmbDocumentTableColumnStateElement = class UmbDocumentTableColumnStateElemen
     }
     #getStateTagConfig() {
         switch (this._state) {
-            case DocumentVariantStateModel.PUBLISHED:
+            case UmbDocumentVariantState.PUBLISHED:
                 return { color: 'positive', label: this.localize.term('content_published') };
-            case DocumentVariantStateModel.PUBLISHED_PENDING_CHANGES:
+            case UmbDocumentVariantState.PUBLISHED_PENDING_CHANGES:
                 return { color: 'warning', label: this.localize.term('content_publishedPendingChanges') };
-            case DocumentVariantStateModel.DRAFT:
+            case UmbDocumentVariantState.DRAFT:
                 return { color: 'default', label: this.localize.term('content_unpublished') };
-            case DocumentVariantStateModel.NOT_CREATED:
+            case UmbDocumentVariantState.NOT_CREATED:
                 return { color: 'danger', label: this.localize.term('content_notCreated') };
             default:
                 return { color: 'danger', label: fromCamelCase(this._state) };

package/dist-cms/packages/documents/documents/entity-actions/create-blueprint/repository/document-create-blueprint.repository.d.ts

@@ -9,7 +9,7 @@ export declare class UmbDocumentCreateBlueprintRepository extends UmbControllerB
         data: unknown;
         error?: undefined;
     } | {
-        error: import("../../../../../core/resources/index.js").UmbApiError | import("../../../../../core/resources/index.js").UmbCancelError;
+        error: import("../../../../../core/resources/index.js").UmbCancelError | import("../../../../../core/resources/index.js").UmbApiError;
         data?: undefined;
     }>;
 }

package/dist-cms/packages/documents/documents/entity-actions/duplicate/repository/document-duplicate.repository.d.ts

@@ -3,7 +3,7 @@ import { UmbRepositoryBase } from '../../../../../core/repository/index.js';
 export declare class UmbDuplicateDocumentRepository extends UmbRepositoryBase {
     #private;
     requestDuplicate(args: UmbDuplicateDocumentRequestArgs): Promise<{
-        error: import("../../../../../core/resources/index.js").UmbApiError | import("../../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../../core/resources/index.js").UmbCancelError | import("../../../../../core/resources/index.js").UmbApiError | undefined;
     }>;
 }
 export { UmbDuplicateDocumentRepository as api };

package/dist-cms/packages/documents/documents/entity-actions/move-to/repository/document-move.repository.d.ts

@@ -3,7 +3,7 @@ import { UmbRepositoryBase } from '../../../../../core/repository/index.js';
 export declare class UmbMoveDocumentRepository extends UmbRepositoryBase implements UmbMoveRepository {
     #private;
     requestMoveTo(args: UmbMoveToRequestArgs): Promise<{
-        error: import("../../../../../core/resources/index.js").UmbApiError | import("../../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../../core/resources/index.js").UmbCancelError | import("../../../../../core/resources/index.js").UmbApiError | undefined;
     }>;
 }
 export { UmbMoveDocumentRepository as api };

package/dist-cms/packages/documents/documents/entity-actions/notifications/repository/document-notifications.repository.d.ts

@@ -9,11 +9,11 @@ export declare class UmbDocumentNotificationsRepository extends UmbControllerBas
         data: import("../../../../../core/backend-api/index.js").DocumentNotificationResponseModel[];
         error?: undefined;
     } | {
-        error: import("../../../../../core/resources/index.js").UmbApiError | import("../../../../../core/resources/index.js").UmbCancelError;
+        error: import("../../../../../core/resources/index.js").UmbCancelError | import("../../../../../core/resources/index.js").UmbApiError;
         data?: undefined;
     }>;
     updateNotifications(unique: string, documentName: string, data: UpdateDocumentNotificationsRequestModel): Promise<{
-        error: import("../../../../../core/resources/index.js").UmbApiError | import("../../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../../core/resources/index.js").UmbCancelError | import("../../../../../core/resources/index.js").UmbApiError | undefined;
     }>;
 }
 export { UmbDocumentNotificationsRepository as api };

package/dist-cms/packages/documents/documents/index.d.ts

@@ -2,6 +2,7 @@ import './components/index.js';
 export * from './audit-log/index.js';
 export * from './components/index.js';
 export * from './constants.js';
+export * from './user-start-node/value-type/constants.js';
 export * from './entity-actions/index.js';
 export * from './entity.js';
 export * from './global-contexts/index.js';
@@ -10,12 +11,14 @@ export * from './modals/index.js';
 export * from './paths.js';
 export * from './publishing/index.js';
 export * from './recycle-bin/index.js';
+export * from './redirect-management/index.js';
 export * from './reference/index.js';
 export * from './repository/index.js';
 export * from './search/index.js';
 export * from './tree/index.js';
 export * from './url/index.js';
 export * from './user-permissions/index.js';
+export * from './variant-state.js';
 export { UMB_CONTENT_MENU_ALIAS } from './menu/manifests.js';
 export { UMB_DOCUMENT_COLLECTION_ALIAS } from './collection/constants.js';
 export type * from './types.js';

package/dist-cms/packages/documents/documents/index.js

@@ -2,6 +2,7 @@ import './components/index.js';
 export * from './audit-log/index.js';
 export * from './components/index.js';
 export * from './constants.js';
+export * from './user-start-node/value-type/constants.js';
 export * from './entity-actions/index.js';
 export * from './entity.js';
 export * from './global-contexts/index.js';
@@ -10,11 +11,13 @@ export * from './modals/index.js';
 export * from './paths.js';
 export * from './publishing/index.js';
 export * from './recycle-bin/index.js';
+export * from './redirect-management/index.js';
 export * from './reference/index.js';
 export * from './repository/index.js';
 export * from './search/index.js';
 export * from './tree/index.js';
 export * from './url/index.js';
 export * from './user-permissions/index.js';
+export * from './variant-state.js';
 export { UMB_CONTENT_MENU_ALIAS } from './menu/manifests.js';
 export { UMB_DOCUMENT_COLLECTION_ALIAS } from './collection/constants.js';

package/dist-cms/packages/documents/documents/item/document-item-data-resolver.d.ts

@@ -1,8 +1,8 @@
+import { UmbDocumentVariantState } from '../variant-state.js';
 import type { UmbDocumentItemModel } from './types.js';
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
 import type { UmbEntityFlag } from '../../../core/entity-flag/index.js';
-import type { DocumentVariantStateModel } from '../../../core/backend-api/index.js';
 import { type Observable } from '../../../../libs/observable-api/index.js';
 import type { UmbItemDataResolver } from '../../../core/entity-item/index.js';
 type UmbDocumentItemDataResolverModel = Omit<UmbDocumentItemModel, 'parent' | 'hasChildren'>;
@@ -21,7 +21,7 @@ export declare class UmbDocumentItemDataResolver<DocumentItemModel extends UmbDo
     readonly isTrashed: Observable<boolean | undefined>;
     readonly hasCollection: Observable<boolean>;
     readonly name: Observable<string | undefined>;
-    readonly state: Observable<DocumentVariantStateModel | null | undefined>;
+    readonly state: Observable<UmbDocumentVariantState | null | undefined>;
     readonly isDraft: Observable<boolean | undefined>;
     readonly createDate: Observable<Date | undefined>;
     readonly updateDate: Observable<Date | undefined>;
@@ -74,7 +74,7 @@ export declare class UmbDocumentItemDataResolver<DocumentItemModel extends UmbDo
      * @returns {Promise<string | undefined>} The state of the item
      * @memberof UmbDocumentItemDataResolver
      */
-    getState(): Promise<DocumentVariantStateModel | null | undefined>;
+    getState(): Promise<UmbDocumentVariantState | null | undefined>;
     /**
      * Get the isDraft of the item
      * @returns {Promise<boolean>} The isDraft of the item

package/dist-cms/packages/documents/documents/item/document-item-data-resolver.js

@@ -1,4 +1,4 @@
-import { UmbDocumentVariantState } from '../types.js';
+import { UmbDocumentVariantState } from '../variant-state.js';
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
 import { UmbArrayState, UmbBasicState, UmbBooleanState, UmbObjectState, UmbStringState, } from '../../../../libs/observable-api/index.js';
 import { UMB_VARIANT_CONTEXT } from '../../../core/variant/index.js';

package/dist-cms/packages/documents/documents/item/document-item-ref.element.d.ts

@@ -17,8 +17,10 @@ export declare class UmbDocumentItemRefElement extends UmbLitElement {
     private _isTrashed;
     private _isDraft;
     private _editPath;
+    private _ancestorPath;
     constructor();
     render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    static styles: import("lit").CSSResult[];
 }
 export { UmbDocumentItemRefElement as element };
 declare global {

package/dist-cms/packages/documents/documents/item/document-item-ref.element.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js';
 import { UMB_EDIT_DOCUMENT_WORKSPACE_PATH_PATTERN } from '../paths.js';
 import { UmbDocumentItemDataResolver } from './document-item-data-resolver.js';
-import { customElement, html, ifDefined, nothing, property, state } from '../../../../external/lit/index.js';
+import { css, customElement, html, ifDefined, nothing, property, state } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../core/lit-element/index.js';
 import { UmbModalRouteRegistrationController } from '../../../core/router/index.js';
 import { UMB_WORKSPACE_MODAL } from '../../../core/workspace/index.js';
@@ -16,6 +16,14 @@ let UmbDocumentItemRefElement = class UmbDocumentItemRefElement extends UmbLitEl
     #item;
     set item(value) {
         this.#item.setData(value);
+        const ancestors = value?.ancestors;
+        this._ancestorPath =
+            ancestors?.length
+                ? ancestors
+                    .map((a) => a.variants[0]?.name ?? '(Untitled)')
+                    .filter(Boolean)
+                    .join(' / ')
+                : '';
     }
     get item() {
         return this.#item.getData();
@@ -35,6 +43,7 @@ let UmbDocumentItemRefElement = class UmbDocumentItemRefElement extends UmbLitEl
         this._isTrashed = false;
         this._isDraft = false;
         this._editPath = '';
+        this._ancestorPath = '';
         new UmbModalRouteRegistrationController(this, UMB_WORKSPACE_MODAL)
             .addUniquePaths(['unique'])
             .onSetup(() => {
@@ -80,6 +89,7 @@ let UmbDocumentItemRefElement = class UmbDocumentItemRefElement extends UmbLitEl
 				@deselected=${this.#onDeselected}>
 				<slot name="actions" slot="actions"></slot>
 				${this.#renderIcon()}${this.#renderIsDraft()} ${this.#renderIsTrashed()}
+				${this._ancestorPath ? html `<span slot="detail" class="ancestor-path">${this._ancestorPath}</span>` : nothing}
 			</uui-ref-node>
 		`;
     }
@@ -98,6 +108,18 @@ let UmbDocumentItemRefElement = class UmbDocumentItemRefElement extends UmbLitEl
             return nothing;
         return html `<uui-tag size="s" slot="tag" look="secondary" color="default">Draft</uui-tag>`;
     }
+    static { this.styles = [
+        css `
+			.ancestor-path {
+				display: block;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				direction: rtl;
+				text-align: left;
+			}
+		`,
+    ]; }
 };
 __decorate([
     property({ type: Object })
@@ -138,6 +160,9 @@ __decorate([
 __decorate([
     state()
 ], UmbDocumentItemRefElement.prototype, "_editPath", void 0);
+__decorate([
+    state()
+], UmbDocumentItemRefElement.prototype, "_ancestorPath", void 0);
 UmbDocumentItemRefElement = __decorate([
     customElement('umb-document-item-ref')
 ], UmbDocumentItemRefElement);

package/dist-cms/packages/documents/documents/item/repository/document-item.server.data-source.d.ts

@@ -17,6 +17,6 @@ export declare class UmbDocumentItemServerDataSource extends UmbItemServerDataSo
     constructor(host: UmbControllerHost);
     getItems(uniques: Array<string>): Promise<{
         data: UmbDocumentItemModel[] | undefined;
-        error: import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;
     }>;
 }

package/dist-cms/packages/documents/documents/item/repository/types.d.ts

@@ -1,7 +1,7 @@
+import type { UmbDocumentVariantState } from '../../variant-state.js';
 import type { UmbDocumentEntityType } from '../../entity.js';
 import type { UmbEntityUnique } from '../../../../core/entity/index.js';
 import type { UmbEntityFlag, UmbEntityWithFlags } from '../../../../core/entity-flag/index.js';
-import type { DocumentVariantStateModel } from '../../../../core/backend-api/index.js';
 import type { UmbReferenceByUnique } from '../../../../core/models/index.js';
 export interface UmbDocumentItemModel extends UmbEntityWithFlags {
     documentType: {
@@ -22,7 +22,7 @@ export interface UmbDocumentItemModel extends UmbEntityWithFlags {
 export interface UmbDocumentItemVariantModel {
     name: string;
     culture: string | null;
-    state: DocumentVariantStateModel | null;
+    state: UmbDocumentVariantState | null;
     createDate?: Date;
     updateDate?: Date;
     flags: Array<UmbEntityFlag>;

package/dist-cms/packages/documents/documents/manifests.js

@@ -1,3 +1,4 @@
+import { manifests as startNodeManifests } from './user-start-node/manifests.js';
 import { manifests as auditLogManifests } from './audit-log/manifests.js';
 import { manifests as collectionManifests } from './collection/manifests.js';
 import { manifests as entityActionManifests } from './entity-actions/manifests.js';
@@ -12,6 +13,7 @@ import { manifests as previewManifests } from './preview/manifests.js';
 import { manifests as propertyEditorManifests } from './property-editors/manifests.js';
 import { manifests as publishingManifests } from './publishing/manifests.js';
 import { manifests as recycleBinManifests } from './recycle-bin/manifests.js';
+import { manifests as redirectManagementManifests } from './redirect-management/manifests.js';
 import { manifests as repositoryManifests } from './repository/manifests.js';
 import { manifests as rollbackManifests } from './rollback/manifests.js';
 import { manifests as searchProviderManifests } from './search/manifests.js';
@@ -23,6 +25,7 @@ import { manifests as workspaceManifests } from './workspace/manifests.js';
 import { manifests as allowEditInvariantFromNonDefaultManifests } from './allow-edit-invariant-from-non-default/manifests.js';
 import * as entryPointModule from './entry-point.js';
 export const manifests = [
+    ...startNodeManifests,
     ...auditLogManifests,
     ...collectionManifests,
     ...entityActionManifests,
@@ -37,6 +40,7 @@ export const manifests = [
     ...propertyEditorManifests,
     ...publishingManifests,
     ...recycleBinManifests,
+    ...redirectManagementManifests,
     ...repositoryManifests,
     ...rollbackManifests,
     ...searchProviderManifests,

package/dist-cms/packages/documents/documents/modals/shared/document-variant-language-picker.element.d.ts

@@ -1,4 +1,4 @@
-import { type UmbDocumentVariantOptionModel } from '../../types.js';
+import type { UmbDocumentVariantOptionModel } from '../../types.js';
 import { type PropertyValues } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
 import type { UmbSelectionManager } from '../../../../core/utils/index.js';

package/dist-cms/packages/documents/documents/modals/shared/document-variant-language-picker.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 var _a;
 var UmbDocumentVariantLanguagePickerElement_1;
-import { UmbDocumentVariantState } from '../../types.js';
+import { UmbDocumentVariantState } from '../../variant-state.js';
 import { sortVariants } from '../../utils.js';
 import { css, customElement, html, nothing, property, repeat, state, } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';

package/dist-cms/packages/documents/documents/preview/workspace-action-menu-item/preview-option.action.js

@@ -1,4 +1,4 @@
-import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../workspace/document-workspace.context-token.js';
+import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../workspace/context/document-workspace.context-token.js';
 import { UmbWorkspaceActionBase } from '../../../../core/workspace/index.js';
 export class UmbDocumentSaveAndPreviewOptionWorkspaceAction extends UmbWorkspaceActionBase {
     async execute() {

package/dist-cms/packages/documents/documents/property-editors/document-picker/manifests.js

@@ -10,6 +10,7 @@ export const manifests = [
             propertyEditorSchemaAlias: 'Umbraco.ContentPicker',
             icon: 'icon-document',
             group: 'pickers',
+            keywords: ['select', 'page', 'link', 'reference', 'related', 'document', 'target', 'destination'],
             supportsReadOnly: true,
             settings: {
                 properties: [

package/dist-cms/packages/documents/documents/publishing/publish/entity-bulk-action/publish.bulk-action.d.ts

@@ -1,4 +1,4 @@
-import { type UmbDocumentVariantOptionModel } from '../../../types.js';
+import type { UmbDocumentVariantOptionModel } from '../../../types.js';
 import type { UmbDocumentItemModel } from '../../../item/types.js';
 import { UmbEntityBulkActionBase } from '../../../../../core/entity-bulk-action/index.js';
 import { type UmbLanguageDetailModel } from '../../../../../language/index.js';

package/dist-cms/packages/documents/documents/publishing/publish/entity-bulk-action/publish.bulk-action.js

@@ -1,5 +1,5 @@
 import { UmbDocumentPublishingRepository } from '../../index.js';
-import { UmbDocumentVariantState } from '../../../types.js';
+import { UmbDocumentVariantState } from '../../../variant-state.js';
 import { UMB_DOCUMENT_PUBLISH_MODAL } from '../../../constants.js';
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../../../entity.js';
 import { UmbPublishDocumentEntityAction } from '../entity-action/index.js';

package/dist-cms/packages/documents/documents/publishing/publish/modal/document-publish-modal.element.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UmbDocumentVariantState } from '../../../types.js';
+import { UmbDocumentVariantState } from '../../../variant-state.js';
 import { isNotPublishedMandatory } from '../../utils.js';
 import { css, customElement, html, state, when } from '../../../../../../external/lit/index.js';
 import { umbFocus } from '../../../../../core/lit-element/index.js';

package/dist-cms/packages/documents/documents/publishing/publish-with-descendants/modal/document-publish-with-descendants-modal.element.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UmbDocumentVariantState } from '../../../types.js';
+import { UmbDocumentVariantState } from '../../../variant-state.js';
 import { isNotPublishedMandatory } from '../../utils.js';
 import { css, customElement, html, state } from '../../../../../../external/lit/index.js';
 import { UmbModalBaseElement } from '../../../../../core/modal/index.js';

package/dist-cms/packages/documents/documents/publishing/repository/document-publishing.repository.d.ts

@@ -37,7 +37,7 @@ export declare class UmbDocumentPublishingRepository extends UmbRepositoryBase {
      * @memberof UmbDocumentPublishingRepository
      */
     publishWithDescendants(id: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean): Promise<{
-        error: import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;
     } | {
         error: null;
     }>;

package/dist-cms/packages/documents/documents/publishing/repository/document-publishing.server.data-source.d.ts

@@ -48,7 +48,7 @@ export declare class UmbDocumentPublishingServerDataSource {
      * @memberof UmbDocumentPublishingServerDataSource
      */
     publishWithDescendants(unique: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean): Promise<{
-        error: import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;
     } | {
         error: null;
     }>;

package/dist-cms/packages/documents/documents/publishing/schedule-publish/modal/document-schedule-modal.element.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UmbDocumentVariantState } from '../../../types.js';
+import { UmbDocumentVariantState } from '../../../variant-state.js';
 import { isNotPublishedMandatory } from '../../utils.js';
 import { UmbDocumentVariantLanguagePickerElement } from '../../../modals/index.js';
 import { css, customElement, html, ref, repeat, state, when } from '../../../../../../external/lit/index.js';

package/dist-cms/packages/documents/documents/publishing/unpublish/modal/document-unpublish-modal.element.d.ts

@@ -1,4 +1,4 @@
-import { type UmbDocumentVariantOptionModel } from '../../../types.js';
+import type { UmbDocumentVariantOptionModel } from '../../../types.js';
 import type { UmbDocumentUnpublishModalData, UmbDocumentUnpublishModalValue } from './document-unpublish-modal.token.js';
 import { UmbModalBaseElement } from '../../../../../core/modal/index.js';
 import { UmbSelectionManager } from '../../../../../core/utils/index.js';

package/dist-cms/packages/documents/documents/publishing/unpublish/modal/document-unpublish-modal.element.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UmbDocumentVariantState } from '../../../types.js';
+import { UmbDocumentVariantState } from '../../../variant-state.js';
 import { UMB_DOCUMENT_ITEM_REPOSITORY_ALIAS, UMB_DOCUMENT_REFERENCE_REPOSITORY_ALIAS } from '../../../constants.js';
 import { UMB_DOCUMENT_CONFIGURATION_CONTEXT } from '../../../global-contexts/index.js';
 import { css, customElement, html, nothing, state, when } from '../../../../../../external/lit/index.js';

package/dist-cms/packages/documents/documents/publishing/utils.d.ts

@@ -1,4 +1,4 @@
-import { type UmbDocumentVariantOptionModel } from '../types.js';
+import type { UmbDocumentVariantOptionModel } from '../types.js';
 /**
  * @function isNotPublishedMandatory
  * @param {UmbDocumentVariantOptionModel} option - the option to check.

package/dist-cms/packages/documents/documents/publishing/utils.js

@@ -1,4 +1,4 @@
-import { UmbDocumentVariantState } from '../types.js';
+import { UmbDocumentVariantState } from '../variant-state.js';
 /**
  * @function isNotPublishedMandatory
  * @param {UmbDocumentVariantOptionModel} option - the option to check.

package/dist-cms/packages/documents/documents/publishing/workspace-context/document-publishing.workspace-context.js

@@ -1,6 +1,7 @@
-import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../workspace/document-workspace.context-token.js';
+import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../workspace/context/document-workspace.context-token.js';
 import { UmbDocumentPublishingRepository } from '../repository/index.js';
 import { UmbDocumentPublishedPendingChangesManager } from '../pending-changes/index.js';
+import { UmbDocumentVariantState } from '../../variant-state.js';
 import { UMB_DOCUMENT_SCHEDULE_MODAL } from '../schedule-publish/constants.js';
 import { UMB_DOCUMENT_PUBLISH_WITH_DESCENDANTS_MODAL } from '../publish-with-descendants/constants.js';
 import { UMB_DOCUMENT_PUBLISH_MODAL } from '../publish/constants.js';
@@ -11,7 +12,6 @@ import { UMB_DOCUMENT_PUBLISHING_SHORTCUT_UNIQUE } from './constants.js';
 import { firstValueFrom } from '../../../../../external/rxjs/index.js';
 import { observeMultiple } from '../../../../../libs/observable-api/index.js';
 import { umbOpenModal } from '../../../../core/modal/index.js';
-import { DocumentVariantStateModel } from '../../../../core/backend-api/index.js';
 import { UmbContextBase } from '../../../../../libs/class-api/index.js';
 import { UmbLocalizationController } from '../../../../../libs/localization-api/index.js';
 import { UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '../../../../core/entity-action/index.js';
@@ -421,10 +421,9 @@ export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
     #hasPublishedVariant() {
         // Use persisted data (falls back to current) because this may be called
         // from the persistedData observer before setCurrent has run.
-        const variants = this.#documentWorkspaceContext?.getPersistedData()?.variants
-            ?? this.#documentWorkspaceContext?.getVariants();
-        return (variants?.some((variant) => variant.state === DocumentVariantStateModel.PUBLISHED ||
-            variant.state === DocumentVariantStateModel.PUBLISHED_PENDING_CHANGES) ?? false);
+        const variants = this.#documentWorkspaceContext?.getPersistedData()?.variants ?? this.#documentWorkspaceContext?.getVariants();
+        return (variants?.some((variant) => variant.state === UmbDocumentVariantState.PUBLISHED ||
+            variant.state === UmbDocumentVariantState.PUBLISHED_PENDING_CHANGES) ?? false);
     }
     async #loadAndProcessLastPublished() {
         if (!this.#documentWorkspaceContext)

package/dist-cms/packages/documents/documents/recycle-bin/repository/document-recycle-bin.server.data-source.d.ts

@@ -24,7 +24,7 @@ export declare class UmbDocumentRecycleBinServerDataSource implements UmbRecycle
         } | null;
         error?: undefined;
     } | {
-        error: import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;
         data?: undefined;
     }>;
 }

package/dist-cms/packages/documents/documents/recycle-bin/tree/constants.d.ts

@@ -1,8 +1,3 @@
 export declare const UMB_DOCUMENT_RECYCLE_BIN_TREE_REPOSITORY_ALIAS = "Umb.Repository.Document.RecycleBin.Tree";
-/**
- * @deprecated Use {@link UMB_DOCUMENT_RECYCLE_BIN_TREE_REPOSITORY_ALIAS} instead. This will be removed in Umbraco 18.
- */
-export declare const UMB_DOCUMENT_RECYCLE_BIN_TREE_STORE_ALIAS = "Umb.Store.Document.RecycleBin.Tree";
 export declare const UMB_DOCUMENT_RECYCLE_BIN_TREE_ALIAS = "Umb.Tree.Document.RecycleBin";
-export { UMB_DOCUMENT_RECYCLE_BIN_TREE_STORE_CONTEXT } from './data/document-recycle-bin-tree.store.context-token.js';
 export * from './tree-item-children/constants.js';

package/dist-cms/packages/documents/documents/recycle-bin/tree/constants.js

@@ -1,8 +1,3 @@
 export const UMB_DOCUMENT_RECYCLE_BIN_TREE_REPOSITORY_ALIAS = 'Umb.Repository.Document.RecycleBin.Tree';
-/**
- * @deprecated Use {@link UMB_DOCUMENT_RECYCLE_BIN_TREE_REPOSITORY_ALIAS} instead. This will be removed in Umbraco 18.
- */
-export const UMB_DOCUMENT_RECYCLE_BIN_TREE_STORE_ALIAS = 'Umb.Store.Document.RecycleBin.Tree';
 export const UMB_DOCUMENT_RECYCLE_BIN_TREE_ALIAS = 'Umb.Tree.Document.RecycleBin';
-export { UMB_DOCUMENT_RECYCLE_BIN_TREE_STORE_CONTEXT } from './data/document-recycle-bin-tree.store.context-token.js';
 export * from './tree-item-children/constants.js';

package/dist-cms/packages/documents/documents/recycle-bin/tree/data/document-recycle-bin-tree.repository.js

@@ -1,13 +1,12 @@
 import { UMB_DOCUMENT_RECYCLE_BIN_ROOT_ENTITY_TYPE } from '../../constants.js';
 import { UmbDocumentRecycleBinTreeServerDataSource } from './document-recycle-bin-tree.server.data-source.js';
-import { UMB_DOCUMENT_RECYCLE_BIN_TREE_STORE_CONTEXT } from './document-recycle-bin-tree.store.context-token.js';
 import { UmbTreeRepositoryBase } from '../../../../../core/tree/index.js';
 export class UmbDocumentRecycleBinTreeRepository extends UmbTreeRepositoryBase {
     constructor(host) {
-        super(host, UmbDocumentRecycleBinTreeServerDataSource, UMB_DOCUMENT_RECYCLE_BIN_TREE_STORE_CONTEXT);
+        super(host, UmbDocumentRecycleBinTreeServerDataSource);
     }
     async requestTreeRoot() {
-        const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 0 });
+        const { data: treeRootData } = await this._treeSource.getRootItems({ paging: { skip: 0, take: 0 } });
         const hasChildren = treeRootData ? treeRootData.total > 0 : false;
         const data = {
             unique: null,

package/dist-cms/packages/documents/documents/recycle-bin/tree/data/document-recycle-bin-tree.server.data-source.js

@@ -22,18 +22,25 @@ export class UmbDocumentRecycleBinTreeServerDataSource extends UmbTreeServerData
         });
     }
 }
-const getRootItems = (args) => 
-// eslint-disable-next-line local-rules/no-direct-api-import
-DocumentService.getRecycleBinDocumentRoot({ query: { skip: args.skip, take: args.take } });
-const getChildrenOf = (args) => {
+const getRootItems = async (args) => {
+    const { skip = 0, take = 100 } = (args.paging ?? {});
+    // eslint-disable-next-line local-rules/no-direct-api-import
+    const { data, ...rest } = await DocumentService.getRecycleBinDocumentRoot({
+        query: { skip, take },
+    });
+    return { data: { ...data, totalBefore: skip, totalAfter: Math.max(data.total - skip - data.items.length, 0) }, ...rest };
+};
+const getChildrenOf = async (args) => {
     if (args.parent.unique === null) {
         return getRootItems(args);
     }
     else {
+        const { skip = 0, take = 100 } = (args.paging ?? {});
         // eslint-disable-next-line local-rules/no-direct-api-import
-        return DocumentService.getRecycleBinDocumentChildren({
-            query: { parentId: args.parent.unique, skip: args.skip, take: args.take },
+        const { data, ...rest } = await DocumentService.getRecycleBinDocumentChildren({
+            query: { parentId: args.parent.unique, skip, take },
         });
+        return { data: { ...data, totalBefore: skip, totalAfter: Math.max(data.total - skip - data.items.length, 0) }, ...rest };
     }
 };
 const getAncestorsOf = (args) => 

package/dist-cms/packages/documents/documents/recycle-bin/tree/data/index.d.ts

@@ -1,2 +1 @@
 export { UmbDocumentRecycleBinTreeRepository } from './document-recycle-bin-tree.repository.js';
-export { type UmbDocumentRecycleBinTreeStore } from './document-recycle-bin-tree.store.js';

package/dist-cms/packages/documents/documents/recycle-bin/tree/data/index.js

@@ -1,2 +1 @@
 export { UmbDocumentRecycleBinTreeRepository } from './document-recycle-bin-tree.repository.js';
-export {} from './document-recycle-bin-tree.store.js';