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

package/dist-cms/packages/library/umbraco-package.d.ts

@@ -0,0 +1,7 @@
+export declare const name = "Umbraco.Core.Library";
+export declare const extensions: {
+    name: string;
+    alias: string;
+    type: string;
+    js: () => Promise<typeof import("./manifests.js")>;
+}[];

package/dist-cms/packages/library/umbraco-package.js

@@ -0,0 +1,9 @@
+export const name = 'Umbraco.Core.Library';
+export const extensions = [
+    {
+        name: 'Umbraco Library Bundle',
+        alias: 'Umb.Bundle.Library',
+        type: 'bundle',
+        js: () => import('./manifests.js'),
+    },
+];

package/dist-cms/packages/library/vite.config.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("vite").UserConfig;
+export default _default;

package/dist-cms/packages/library/vite.config.js

@@ -0,0 +1,9 @@
+import { defineConfig } from 'vite';
+import { rmSync } from 'fs';
+import { getDefaultConfig } from '../../vite-config-base.js';
+const dist = '../../../dist-cms/packages/library';
+// delete the unbundled dist folder
+rmSync(dist, { recursive: true, force: true });
+export default defineConfig({
+    ...getDefaultConfig({ dist }),
+});

package/dist-cms/packages/management-api/server-event/global-context/server-event.context.js

@@ -1,7 +1,7 @@
 import { UMB_MANAGEMENT_API_SERVER_EVENT_CONTEXT } from './server-event.context-token.js';
 import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import { UMB_AUTH_CONTEXT } from '../../../core/auth/index.js';
-import { HubConnectionBuilder } from '../../../../external/signalr/index.js';
+import { HubConnectionBuilder, HttpTransportType, } from '../../../../external/signalr/index.js';
 import { UMB_SERVER_CONTEXT } from '../../../core/server/index.js';
 import { filter, Subject } from '../../../../external/rxjs/index.js';
 import { UmbBooleanState } from '../../../../libs/observable-api/index.js';
@@ -70,11 +70,15 @@ export class UmbManagementApiServerEventContext extends UmbContextBase {
         }
         // TODO: get the url from a server config?
         const serverEventHubUrl = `${serverURL}/umbraco/serverEventHub`;
-        this.#connection = new HubConnectionBuilder()
-            .withUrl(serverEventHubUrl, {
+        const skipNegotiation = this.#serverContext?.getServerConnection()?.getSignalRSkipNegotiation() ?? false;
+        const hubOptions = {
             accessTokenFactory: () => token,
-        })
-            .build();
+        };
+        if (skipNegotiation) {
+            hubOptions.skipNegotiation = true;
+            hubOptions.transport = HttpTransportType.WebSockets;
+        }
+        this.#connection = new HubConnectionBuilder().withUrl(serverEventHubUrl, hubOptions).build();
         this.#connection.on('notify', (payload) => {
             const event = {
                 ...payload,

package/dist-cms/packages/management-api/tree/tree-data.request-manager.js

@@ -53,8 +53,8 @@ export class UmbManagementApiTreeDataRequestManager extends UmbControllerBase {
             ? {
                 items: data.items,
                 total: data.total,
-                totalBefore: 0,
-                totalAfter: data.total - data.items.length,
+                totalBefore: skip,
+                totalAfter: Math.max(data.total - skip - data.items.length, 0),
             }
             : undefined;
         return { data: mappedData, error };
@@ -107,8 +107,8 @@ export class UmbManagementApiTreeDataRequestManager extends UmbControllerBase {
             ? {
                 items: data.items,
                 total: data.total,
-                totalBefore: 0,
-                totalAfter: data.total - data.items.length,
+                totalBefore: skip,
+                totalAfter: Math.max(data.total - skip - data.items.length, 0),
             }
             : undefined;
         return { data: mappedData, error };
@@ -125,16 +125,14 @@ export class UmbManagementApiTreeDataRequestManager extends UmbControllerBase {
         if (paging && isOffsetPaginationRequest(paging)) {
             return paging.skip !== undefined ? paging.skip : 0;
         }
-        // Including args.skip for backwards compatibility
-        return args.skip !== undefined ? args.skip : 0;
+        return 0;
     }
     #getTakeFromArgs(args) {
         const paging = args.paging;
         if (paging && isOffsetPaginationRequest(paging)) {
             return paging.take !== undefined ? paging.take : this.#defaultTakeSize;
         }
-        // Including args.take for backwards compatibility
-        return args.take !== undefined ? args.take : this.#defaultTakeSize;
+        return this.#defaultTakeSize;
     }
     #getTargetResultHasValidParents(data, parentUnique) {
         if (!data) {

package/dist-cms/packages/markdown-editor/property-editors/markdown-editor/manifests.js

@@ -17,6 +17,7 @@ export const manifests = [
             propertyEditorSchemaAlias: 'Umbraco.MarkdownEditor',
             icon: 'icon-code',
             group: 'richContent',
+            keywords: ['content', 'article', 'body', 'markdown', 'documentation', 'md', 'readme'],
             supportsReadOnly: true,
             settings: {
                 properties: [

package/dist-cms/packages/media/imaging/imaging.server.data.d.ts

@@ -25,7 +25,7 @@ export declare class UmbImagingServerDataSource {
         data: UmbMediaUrlModel[];
         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/media/media/audit-log/repository/media-audit-log.repository.d.ts

@@ -28,7 +28,7 @@ export declare class UmbMediaAuditLogRepository extends UmbRepositoryBase implem
         };
         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/media/media/audit-log/repository/media-audit-log.server.data-source.d.ts

@@ -26,7 +26,7 @@ export declare class UmbMediaAuditLogServerDataSource implements UmbAuditLogData
         };
         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/media/media/collection/repository/media-collection.repository.d.ts

@@ -15,7 +15,7 @@ export declare class UmbMediaCollectionRepository extends UmbRepositoryBase impl
         };
         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/media/media/collection/repository/media-collection.server.data-source.d.ts

@@ -11,7 +11,7 @@ export declare class UmbMediaCollectionServerDataSource implements UmbCollection
         };
         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/media/media/components/input-image-cropper/image-cropper-field.element.js

@@ -12,14 +12,13 @@ let UmbInputImageCropperFieldElement = class UmbInputImageCropperFieldElement ex
     set value(value) {
         if (!value) {
             this.crops = [];
-            this.focalPoint = { left: 0.5, top: 0.5 };
+            this.focalPoint = null;
             this.src = '';
             this.#value = undefined;
         }
         else {
             this.crops = [...value.crops];
-            // TODO: This is a temporary solution to make sure we have a focal point
-            this.focalPoint = value.focalPoint || { left: 0.5, top: 0.5 };
+            this.focalPoint = value.focalPoint ?? null;
             this.src = value.src;
             this.#value = value;
         }
@@ -58,7 +57,7 @@ let UmbInputImageCropperFieldElement = class UmbInputImageCropperFieldElement ex
     constructor() {
         super();
         this.crops = [];
-        this.focalPoint = { left: 0.5, top: 0.5 };
+        this.focalPoint = null;
         this.hideFocalPoint = false;
         this.src = '';
         this._serverUrl = '';
@@ -79,7 +78,7 @@ let UmbInputImageCropperFieldElement = class UmbInputImageCropperFieldElement ex
             this.#updateValue();
         };
         this.onResetFocalPoint = () => {
-            this.focalPoint = { left: 0.5, top: 0.5 };
+            this.focalPoint = null;
             this.#updateValue();
         };
         this.consumeContext(UMB_SERVER_CONTEXT, (context) => {
@@ -139,7 +138,7 @@ let UmbInputImageCropperFieldElement = class UmbInputImageCropperFieldElement ex
     renderActions() {
         return html `
 			<slot name="actions"></slot>
-			${when(!this.hideFocalPoint && this.focalPoint.left !== 0.5 && this.focalPoint.top !== 0.5, () => html `
+			${when(!this.hideFocalPoint && this.focalPoint && (this.focalPoint.left !== 0.5 || this.focalPoint.top !== 0.5), () => html `
 					<uui-button compact label=${this.localize.term('content_resetFocalPoint')} @click=${this.onResetFocalPoint}>
 						<uui-icon name="icon-axis-rotation"></uui-icon>
 						${this.localize.term('content_resetFocalPoint')}

package/dist-cms/packages/media/media/components/input-image-cropper/image-cropper-focus-setter.element.d.ts

@@ -9,8 +9,8 @@ export declare class UmbImageCropperFocusSetterElement extends UmbLitElement {
     focalPointElement: HTMLElement;
     private _isDraggingGridHandle;
     private _coords;
-    set focalPoint(value: UmbFocalPointModel);
-    get focalPoint(): UmbFocalPointModel;
+    set focalPoint(value: UmbFocalPointModel | null);
+    get focalPoint(): UmbFocalPointModel | null;
     hideFocalPoint: boolean;
     disabled: boolean;
     src?: string;

package/dist-cms/packages/media/media/components/input-image-cropper/image-cropper-focus-setter.element.js

@@ -15,14 +15,15 @@ let UmbImageCropperFocusSetterElement = class UmbImageCropperFocusSetterElement
         super(...arguments);
         this._isDraggingGridHandle = false;
         this._coords = { x: 0, y: 0 };
-        this.#focalPoint = { left: 0.5, top: 0.5 };
+        this.#focalPoint = null;
         this.hideFocalPoint = false;
         this.disabled = false;
         this.#DOT_RADIUS = 8;
     }
     set focalPoint(value) {
         this.#focalPoint = value;
-        this.#setFocalPointStyle(this.#focalPoint.left, this.#focalPoint.top);
+        const resolved = this.#focalPoint ?? { left: 0.5, top: 0.5 };
+        this.#setFocalPointStyle(resolved.left, resolved.top);
         this.#onFocalPointUpdated();
     }
     get focalPoint() {
@@ -45,7 +46,8 @@ let UmbImageCropperFocusSetterElement = class UmbImageCropperFocusSetterElement
     async #initializeImage() {
         await this.updateComplete; // Wait for the @query to be resolved
         if (!this.hideFocalPoint) {
-            this.#setFocalPointStyle(this.focalPoint.left, this.focalPoint.top);
+            const resolved = this.focalPoint ?? { left: 0.5, top: 0.5 };
+            this.#setFocalPointStyle(resolved.left, resolved.top);
         }
         this.imageElement.onload = () => {
             if (!this.imageElement || !this.wrapperElement)
@@ -82,8 +84,8 @@ let UmbImageCropperFocusSetterElement = class UmbImageCropperFocusSetterElement
         this.focalPointElement.style.top = `calc(${top * 100}% - ${this.#DOT_RADIUS}px)`;
     }
     #isCentered(focalPoint) {
-        if (!this.focalPoint)
-            return;
+        if (!focalPoint)
+            return true;
         return isCentered(focalPoint);
     }
     #resetCoords() {

package/dist-cms/packages/media/media/components/input-image-cropper/image-cropper-preview.element.d.ts

@@ -7,8 +7,8 @@ export declare class UmbImageCropperPreviewElement extends UmbLitElement {
     crop?: UmbImageCropperCrop;
     src: string;
     label?: string;
-    set focalPoint(value: import("../../types.js").UmbFocalPointModel);
-    get focalPoint(): import("../../types.js").UmbFocalPointModel;
+    set focalPoint(value: import("../../types.js").UmbFocalPointModel | null);
+    get focalPoint(): import("../../types.js").UmbFocalPointModel | null;
     connectedCallback(): void;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult;

package/dist-cms/packages/media/media/components/input-image-cropper/image-cropper-preview.element.js

@@ -11,7 +11,7 @@ let UmbImageCropperPreviewElement = class UmbImageCropperPreviewElement extends
     constructor() {
         super(...arguments);
         this.src = '';
-        this.#focalPoint = { left: 0.5, top: 0.5 };
+        this.#focalPoint = null;
     }
     set focalPoint(value) {
         this.#focalPoint = value;
@@ -109,9 +109,10 @@ let UmbImageCropperPreviewElement = class UmbImageCropperPreviewElement extends
             containerWidth = container.width;
             containerHeight = container.height;
         }
-        // position image so that its center is at the focal point
-        let imageLeft = containerWidth / 2 - imageWidth * this.#focalPoint.left;
-        let imageTop = containerHeight / 2 - imageHeight * this.#focalPoint.top;
+        // position image so that its center is at the focal point (default to center if null)
+        const focalPoint = this.#focalPoint ?? { left: 0.5, top: 0.5 };
+        let imageLeft = containerWidth / 2 - imageWidth * focalPoint.left;
+        let imageTop = containerHeight / 2 - imageHeight * focalPoint.top;
         // clamp
         imageLeft = clamp(imageLeft, containerWidth - imageWidth, 0);
         imageTop = clamp(imageTop, containerHeight - imageHeight, 0);

package/dist-cms/packages/media/media/components/input-image-cropper/image-cropper.element.js

@@ -12,10 +12,7 @@ let UmbImageCropperElement = class UmbImageCropperElement extends UmbLitElement
     constructor() {
         super(...arguments);
         this.src = '';
-        this.focalPoint = {
-            left: 0.5,
-            top: 0.5,
-        };
+        this.focalPoint = null;
         this.#zoom = 0;
         this.#VIEWPORT_PADDING = 50;
         this.#MAX_SCALE_FACTOR = 4;
@@ -166,8 +163,9 @@ let UmbImageCropperElement = class UmbImageCropperElement extends UmbLitElement
             imageWidth = this.imageElement.naturalWidth * this.#minImageScale;
             imageHeight = this.imageElement.naturalHeight * this.#minImageScale;
             // position image so that its center is at the focal point
-            imageLeft = maskLeft + maskWidth / 2 - imageWidth * this.focalPoint.left;
-            imageTop = maskTop + maskHeight / 2 - imageHeight * this.focalPoint.top;
+            const focalPoint = this.focalPoint ?? { left: 0.5, top: 0.5 };
+            imageLeft = maskLeft + maskWidth / 2 - imageWidth * focalPoint.left;
+            imageTop = maskTop + maskHeight / 2 - imageHeight * focalPoint.top;
             // clamp image position so it stays within the mask
             const minLeft = maskLeft + maskWidth - imageWidth;
             const minTop = maskTop + maskHeight - imageHeight;

package/dist-cms/packages/media/media/components/input-image-cropper/input-image-cropper.element.js

@@ -18,12 +18,11 @@ import './image-cropper-field.element.js';
 import './image-cropper-focus-setter.element.js';
 import './image-cropper-preview.element.js';
 import './image-cropper.element.js';
-const DefaultFocalPoint = { left: 0.5, top: 0.5 };
 const DefaultValue = {
     temporaryFileId: null,
     src: '',
     crops: [],
-    focalPoint: DefaultFocalPoint,
+    focalPoint: null,
 };
 let UmbInputImageCropperElement = class UmbInputImageCropperElement extends UmbFormControlMixin(UmbLitElement, undefined) {
     #config;

package/dist-cms/packages/media/media/components/input-image-cropper/types.d.ts

@@ -2,7 +2,7 @@ import type { UmbCropModel, UmbFocalPointModel } from '../../types.js';
 export type UmbImageCropperPropertyEditorValue = {
     temporaryFileId?: string | null;
     crops: Array<UmbCropModel>;
-    focalPoint: UmbFocalPointModel;
+    focalPoint: UmbFocalPointModel | null;
     src: string;
 };
 export type UmbImageCropperCrop = UmbImageCropperPropertyEditorValue['crops'][number];

package/dist-cms/packages/media/media/components/input-rich-media/input-rich-media.element.js

@@ -150,7 +150,7 @@ let UmbInputRichMediaElement = class UmbInputRichMediaElement extends UmbFormCon
                 },
                 value: {
                     crops: item.crops ?? [],
-                    focalPoint: item.focalPoint ?? { left: 0.5, top: 0.5 },
+                    focalPoint: item.focalPoint ?? null,
                     src: '',
                     key,
                     unique: item.mediaKey,

package/dist-cms/packages/media/media/dropzone/media-dropzone.manager.js

@@ -1,5 +1,4 @@
 import { UmbMediaDetailRepository } from '../repository/detail/index.js';
-import { UMB_MEDIA_PROPERTY_VALUE_ENTITY_TYPE } from '../entity.js';
 import { UMB_DROPZONE_MEDIA_TYPE_PICKER_MODAL } from './modals/index.js';
 import { UmbDropzoneManager, UmbFileDropzoneItemStatus, } from '../../dropzone/index.js';
 import { getFileExtension } from '../../../core/utils/index.js';
@@ -203,7 +202,6 @@ export class UmbMediaDropzoneManager extends UmbDropzoneManager {
             value: { temporaryFileId: item.temporaryFile?.temporaryUnique },
             culture: null,
             segment: null,
-            entityType: UMB_MEDIA_PROPERTY_VALUE_ENTITY_TYPE,
         };
         const preset = {
             unique: item.unique,

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

@@ -3,7 +3,7 @@ import { UmbRepositoryBase } from '../../../../../core/repository/index.js';
 export declare class UmbMoveMediaRepository 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 { UmbMoveMediaRepository as api };

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

@@ -1,6 +1,7 @@
 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 './dropzone/index.js';
 export * from './global-contexts/index.js';
 export * from './modals/index.js';

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

@@ -1,6 +1,7 @@
 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 './dropzone/index.js';
 export * from './global-contexts/index.js';
 export * from './modals/index.js';

package/dist-cms/packages/media/media/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 entityActionsManifests } from './entity-actions/manifests.js';
@@ -18,6 +19,7 @@ import { manifests as urlManifests } from './url/manifests.js';
 import { manifests as workspaceManifests } from './workspace/manifests.js';
 import * as entryPointModule from './entry-point.js';
 export const manifests = [
+    ...startNodeManifests,
     ...auditLogManifests,
     ...collectionManifests,
     ...entityActionsManifests,

package/dist-cms/packages/media/media/modals/image-cropper-editor/image-cropper-editor-modal.element.d.ts

@@ -17,8 +17,6 @@ export declare class UmbImageCropperEditorModalElement extends UmbModalBaseEleme
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];
 }
-/** @deprecated Should be exported as `element` only; to be removed in Umbraco 18. */
-export default UmbImageCropperEditorModalElement;
 export { UmbImageCropperEditorModalElement as element };
 declare global {
     interface HTMLElementTagNameMap {

package/dist-cms/packages/media/media/modals/image-cropper-editor/image-cropper-editor-modal.element.js

@@ -79,7 +79,7 @@ let UmbImageCropperEditorModalElement = class UmbImageCropperEditorModalElement
             ...this.value,
             src: item.url,
             crops,
-            focalPoint: this.value.focalPoint ?? { left: 0.5, top: 0.5 },
+            focalPoint: this.value.focalPoint ?? null,
         };
         this._imageCropperValue = value;
     }
@@ -108,7 +108,12 @@ let UmbImageCropperEditorModalElement = class UmbImageCropperEditorModalElement
             this._imageCropperValue.crops = value.crops;
             this._imageCropperValue.focalPoint = value.focalPoint;
         }
-        this.value = { key: this._key, unique: this._unique, crops: value.crops, focalPoint: value.focalPoint };
+        this.value = {
+            key: this._key,
+            unique: this._unique,
+            crops: value.crops,
+            focalPoint: value.focalPoint,
+        };
     }
     render() {
         return html `
@@ -240,6 +245,4 @@ UmbImageCropperEditorModalElement = __decorate([
     customElement('umb-image-cropper-editor-modal')
 ], UmbImageCropperEditorModalElement);
 export { UmbImageCropperEditorModalElement };
-/** @deprecated Should be exported as `element` only; to be removed in Umbraco 18. */
-export default UmbImageCropperEditorModalElement;
 export { UmbImageCropperEditorModalElement as element };

package/dist-cms/packages/media/media/modals/image-cropper-editor/image-cropper-editor-modal.token.d.ts

@@ -15,6 +15,6 @@ export interface UmbImageCropperEditorModalValue {
     focalPoint: {
         left: number;
         top: number;
-    };
+    } | null;
 }
 export declare const UMB_IMAGE_CROPPER_EDITOR_MODAL: UmbModalToken<UmbImageCropperEditorModalData<any>, UmbImageCropperEditorModalValue>;

package/dist-cms/packages/media/media/modals/media-picker/media-picker-modal.element.js

@@ -127,8 +127,7 @@ let UmbMediaPickerModalElement = class UmbMediaPickerModalElement extends UmbPic
                 entityType: this._currentMediaEntity.entityType,
             },
             dataType: this.#dataType,
-            skip,
-            take,
+            paging: { skip, take },
         });
         this._currentChildren = data?.items ?? [];
         paginationManager.setTotalItems(data?.total ?? 0);

package/dist-cms/packages/media/media/property-editors/image-cropper/manifests.js

@@ -9,6 +9,7 @@ export const manifests = [
             label: 'Image Cropper',
             icon: 'icon-crop',
             group: 'media',
+            keywords: ['image', 'crop', 'photo', 'thumbnail', 'avatar', 'profile', 'cover', 'portrait'],
             propertyEditorSchemaAlias: 'Umbraco.ImageCropper',
         },
     },

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

@@ -10,6 +10,22 @@ export const manifests = [
             propertyEditorSchemaAlias: 'Umbraco.MediaPicker3',
             icon: 'icon-picture',
             group: 'media',
+            keywords: [
+                'select',
+                'image',
+                'photo',
+                'picture',
+                'banner',
+                'thumbnail',
+                'logo',
+                'avatar',
+                'gallery',
+                'media',
+                'video',
+                'file',
+                'attachment',
+                'cover',
+            ],
             supportsReadOnly: true,
         },
     },

package/dist-cms/packages/media/media/property-editors/upload-field/manifests.js

@@ -10,6 +10,7 @@ export const manifests = [
             propertyEditorSchemaAlias: 'Umbraco.UploadField',
             icon: 'icon-download-alt',
             group: 'media',
+            keywords: ['file', 'upload', 'attachment', 'document', 'asset', 'download'],
         },
     },
     schemaManifest,

package/dist-cms/packages/media/media/property-editors/upload-field/types.d.ts

@@ -5,8 +5,3 @@ export interface UmbMediaValueType {
     temporaryFileId?: string | null;
     src?: string;
 }
-/**
- * @deprecated Use `UmbMediaValueType` instead. This will be removed in Umbraco 18.
- */
-export interface MediaValueType extends UmbMediaValueType {
-}

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

@@ -24,7 +24,7 @@ export declare class UmbMediaRecycleBinServerDataSource implements UmbRecycleBin
         } | 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/media/media/recycle-bin/tree/constants.d.ts

@@ -1,8 +1,3 @@
 export declare const UMB_MEDIA_RECYCLE_BIN_TREE_REPOSITORY_ALIAS = "Umb.Repository.Media.RecycleBin.Tree";
-/**
- * @deprecated Use {@link UMB_MEDIA_RECYCLE_BIN_TREE_REPOSITORY_ALIAS} instead. This will be removed in Umbraco 18.
- */
-export declare const UMB_MEDIA_RECYCLE_BIN_TREE_STORE_ALIAS = "Umb.Store.Media.RecycleBin.Tree";
 export declare const UMB_MEDIA_RECYCLE_BIN_TREE_ALIAS = "Umb.Tree.Media.RecycleBin";
-export { UMB_MEDIA_RECYCLE_BIN_TREE_STORE_CONTEXT } from './media-recycle-bin-tree.store.context-token.js';
 export * from './tree-item-children/constants.js';

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

@@ -1,8 +1,3 @@
 export const UMB_MEDIA_RECYCLE_BIN_TREE_REPOSITORY_ALIAS = 'Umb.Repository.Media.RecycleBin.Tree';
-/**
- * @deprecated Use {@link UMB_MEDIA_RECYCLE_BIN_TREE_REPOSITORY_ALIAS} instead. This will be removed in Umbraco 18.
- */
-export const UMB_MEDIA_RECYCLE_BIN_TREE_STORE_ALIAS = 'Umb.Store.Media.RecycleBin.Tree';
 export const UMB_MEDIA_RECYCLE_BIN_TREE_ALIAS = 'Umb.Tree.Media.RecycleBin';
-export { UMB_MEDIA_RECYCLE_BIN_TREE_STORE_CONTEXT } from './media-recycle-bin-tree.store.context-token.js';
 export * from './tree-item-children/constants.js';

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

@@ -1,2 +1 @@
 export { UmbMediaRecycleBinTreeRepository } from './media-recycle-bin-tree.repository.js';
-export { type UmbMediaRecycleBinTreeStore } from './media-recycle-bin-tree.store.js';

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

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

package/dist-cms/packages/media/media/recycle-bin/tree/manifests.js

@@ -1,7 +1,6 @@
 import { UMB_MEDIA_ENTITY_TYPE } from '../../entity.js';
 import { UMB_MEDIA_RECYCLE_BIN_ROOT_ENTITY_TYPE } from '../root/entity.js';
-import { UMB_MEDIA_RECYCLE_BIN_TREE_ALIAS, UMB_MEDIA_RECYCLE_BIN_TREE_REPOSITORY_ALIAS, UMB_MEDIA_RECYCLE_BIN_TREE_STORE_ALIAS, } from './constants.js';
-import { UmbMediaRecycleBinTreeStore } from './media-recycle-bin-tree.store.js';
+import { UMB_MEDIA_RECYCLE_BIN_TREE_ALIAS, UMB_MEDIA_RECYCLE_BIN_TREE_REPOSITORY_ALIAS } from './constants.js';
 import { manifests as reloadTreeItemChildrenManifests } from './reload-tree-item-children/manifests.js';
 import { manifests as treeItemChildrenManifests } from './tree-item-children/manifests.js';
 export const manifests = [
@@ -11,12 +10,6 @@ export const manifests = [
         name: 'Media Recycle Bin Tree Repository',
         api: () => import('./media-recycle-bin-tree.repository.js'),
     },
-    {
-        type: 'treeStore',
-        alias: UMB_MEDIA_RECYCLE_BIN_TREE_STORE_ALIAS,
-        name: 'Media Recycle Bin Tree Store',
-        api: UmbMediaRecycleBinTreeStore,
-    },
     {
         type: 'tree',
         kind: 'default',

package/dist-cms/packages/media/media/recycle-bin/tree/media-recycle-bin-tree.repository.js

@@ -1,13 +1,12 @@
 import { UMB_MEDIA_RECYCLE_BIN_ROOT_ENTITY_TYPE } from '../constants.js';
 import { UmbMediaRecycleBinTreeServerDataSource } from './media-recycle-bin-tree.server.data-source.js';
-import { UMB_MEDIA_RECYCLE_BIN_TREE_STORE_CONTEXT } from './media-recycle-bin-tree.store.context-token.js';
 import { UmbTreeRepositoryBase } from '../../../../core/tree/index.js';
 export class UmbMediaRecycleBinTreeRepository extends UmbTreeRepositoryBase {
     constructor(host) {
-        super(host, UmbMediaRecycleBinTreeServerDataSource, UMB_MEDIA_RECYCLE_BIN_TREE_STORE_CONTEXT);
+        super(host, UmbMediaRecycleBinTreeServerDataSource);
     }
     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,