@umbraco-cms/backoffice 16.0.0 → 16.1.0

package/dist-cms/packages/core/resources/resource.controller.d.ts

@@ -1,4 +1,4 @@
-import { UmbApiError, UmbCancelError, UmbError } from './umb-error.js';
+import { UmbApiError, UmbCancelError } from './umb-error.js';
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 export declare class UmbResourceController<T = unknown> extends UmbControllerBase {
@@ -14,7 +14,7 @@ export declare class UmbResourceController<T = unknown> extends UmbControllerBas
      * @param {*} error The error to map
      * @returns {*} The mapped error
      */
-    mapToUmbError(error: unknown): UmbApiError | UmbCancelError | UmbError;
+    mapToUmbError(error: unknown): UmbApiError | UmbCancelError;
     /**
      * Cancel all resources that are currently being executed by this controller if they are cancelable.
      *

package/dist-cms/packages/core/resources/resource.controller.js

@@ -1,5 +1,5 @@
 import { isApiError, isCancelablePromise, isCancelError, isProblemDetailsLike } from './apiTypeValidators.function.js';
-import { UmbApiError, UmbCancelError, UmbError } from './umb-error.js';
+import { UmbApiError, UmbCancelError } from './umb-error.js';
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 export class UmbResourceController extends UmbControllerBase {
     constructor(host, promise, alias) {
@@ -28,11 +28,16 @@ export class UmbResourceController extends UmbControllerBase {
         else if (UmbApiError.isUmbApiError(error)) {
             return error;
         }
-        else if (UmbError.isUmbError(error)) {
-            return error;
-        }
-        // If the error is not an UmbError, we will just return it as is
-        return new UmbError(error instanceof Error ? error.message : 'Unknown error');
+        // If the error is not recognizable, for example if it has no ProblemDetails body, we will return a generic UmbApiError.
+        // This is to ensure that we always return an UmbApiError, so we can handle it in a consistent way.
+        return new UmbApiError(error instanceof Error ? error.message : 'Unknown error', 0, null, {
+            status: 0,
+            title: 'Unknown error',
+            detail: error instanceof Error ? error.message : 'Unknown error',
+            errors: undefined,
+            type: 'error',
+            stack: error instanceof Error ? error.stack : undefined,
+        });
     }
     /**
      * Cancel all resources that are currently being executed by this controller if they are cancelable.

package/dist-cms/packages/core/resources/try-execute/try-execute.controller.js

@@ -1,6 +1,12 @@
-import { isProblemDetailsLike } from '../apiTypeValidators.function.js';
 import { UmbResourceController } from '../resource.controller.js';
-import { UmbApiError, UmbCancelError } from '../umb-error.js';
+import { UmbCancelError } from '../umb-error.js';
+/**
+ * Codes that are ignored for notifications.
+ * These are typically non-fatal errors that the UI can handle gracefully,
+ * such as 401 (Unauthorized), 403 (Forbidden), and 404 (Not Found).
+ * The UI should handle these cases without showing a notification.
+ */
+const IGNORED_ERROR_CODES = [401, 403, 404];
 export class UmbTryExecuteController extends UmbResourceController {
     #abortSignal;
     async tryExecute(opts) {
@@ -34,24 +40,32 @@ export class UmbTryExecuteController extends UmbResourceController {
             return;
         }
         let headline = 'An error occurred';
-        let message = 'An error occurred while trying to execute the request.';
+        let message = 'A fatal server error occurred. If this continues, please reach out to your administrator.';
         let details = undefined;
+        const apiError = error;
         // Check if we can extract problem details from the error
-        const problemDetails = UmbApiError.isUmbApiError(error)
-            ? error.problemDetails
-            : isProblemDetailsLike(error)
-                ? error
-                : undefined;
-        if (problemDetails) {
+        if (apiError.problemDetails) {
+            if (IGNORED_ERROR_CODES.includes(apiError.problemDetails.status)) {
+                // Non-fatal errors that the UI can handle gracefully
+                // so we avoid showing a notification
+                return;
+            }
             // UmbProblemDetails, show notification
-            message = problemDetails.title;
-            details = problemDetails.errors ?? undefined;
+            message = apiError.problemDetails.title;
+            details = apiError.problemDetails.errors ?? undefined;
+            // Special handling for ObjectCacheAppCache corruption errors, which we are investigating
+            if (apiError.problemDetails.detail?.includes('ObjectCacheAppCache') ||
+                apiError.problemDetails.detail?.includes('Umbraco.Cms.Infrastructure.Scoping.Scope.DisposeLastScope()')) {
+                headline = 'Please restart the server';
+                message =
+                    'The Umbraco object cache is corrupt, but your action may still have been executed. Please restart the server to reset the cache. This is a work in progress.';
+            }
         }
         else {
             // Unknown error, show notification
-            headline = '';
-            message = error instanceof Error ? error.message : 'An unknown error occurred.';
+            message = apiError instanceof Error ? apiError.message : 'An unknown error occurred.';
         }
         this._peekError(headline, message, details);
+        console.error('[UmbTryExecuteController] Error in request:', error);
     }
 }

package/dist-cms/packages/core/resources/types.d.ts

@@ -1,4 +1,4 @@
-import type { UmbApiError, UmbCancelError, UmbError } from './umb-error.js';
+import type { UmbApiError, UmbCancelError } from './umb-error.js';
 export type * from './data-api/types.js';
 export interface XhrRequestOptions extends UmbTryExecuteOptions {
     baseUrl?: string;
@@ -33,7 +33,7 @@ export interface UmbTryExecuteOptions {
     abortSignal?: AbortSignal;
 }
 export type UmbApiWithErrorResponse = {
-    error?: UmbError | UmbApiError | UmbCancelError | Error;
+    error?: UmbApiError | UmbCancelError;
 };
 /**
  * UmbApiResponse is a type that represents the response from an API call.

package/dist-cms/packages/core/router/route/forbidden/route-forbidden.element.d.ts

@@ -0,0 +1,17 @@
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+/**
+ * A component that displays a "Forbidden" message when a user tries to access a route they do not have permission for.
+ * This is typically used in routing scenarios where access control is enforced.
+ * It informs the user that they do not have the necessary permissions to view the requested resource.
+ * @element umb-route-forbidden
+ */
+export declare class UmbRouteForbiddenElement extends UmbLitElement {
+    render(): import("lit-html").TemplateResult<1>;
+    static styles: import("lit").CSSResult[];
+}
+export default UmbRouteForbiddenElement;
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-route-forbidden': UmbRouteForbiddenElement;
+    }
+}

package/dist-cms/packages/core/router/route/forbidden/route-forbidden.element.js

@@ -0,0 +1,59 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 { UmbTextStyles } from '@umbraco-cms/backoffice/style';
+import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+/**
+ * A component that displays a "Forbidden" message when a user tries to access a route they do not have permission for.
+ * This is typically used in routing scenarios where access control is enforced.
+ * It informs the user that they do not have the necessary permissions to view the requested resource.
+ * @element umb-route-forbidden
+ */
+let UmbRouteForbiddenElement = class UmbRouteForbiddenElement extends UmbLitElement {
+    render() {
+        return html `
+			<div class="uui-text">
+				<h4><umb-localize key="routing_routeForbiddenTitle">Access denied</umb-localize></h4>
+				<umb-localize key="routing_routeForbiddenDescription">
+					You do not have permission to access this resource. Please contact your administrator for assistance.
+				</umb-localize>
+			</div>
+		`;
+    }
+    static { this.styles = [
+        UmbTextStyles,
+        css `
+			:host {
+				display: block;
+				width: 100%;
+				height: 100%;
+				min-width: 0;
+			}
+
+			:host > div {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				height: 100%;
+				opacity: 0;
+				animation: fadeIn 2s 2s forwards;
+			}
+
+			@keyframes fadeIn {
+				100% {
+					opacity: 100%;
+				}
+			}
+		`,
+    ]; }
+};
+UmbRouteForbiddenElement = __decorate([
+    customElement('umb-route-forbidden')
+], UmbRouteForbiddenElement);
+export { UmbRouteForbiddenElement };
+export default UmbRouteForbiddenElement;

package/dist-cms/packages/core/router/route/index.d.ts

@@ -1,3 +1,4 @@
+export * from './forbidden/route-forbidden.element.js';
 export * from './not-found/route-not-found.element.js';
 export * from './route.context.js';
 export * from './router-slot-change.event.js';

package/dist-cms/packages/core/router/route/index.js

@@ -1,3 +1,4 @@
+export * from './forbidden/route-forbidden.element.js';
 export * from './not-found/route-not-found.element.js';
 export * from './route.context.js';
 export * from './router-slot-change.event.js';

package/dist-cms/packages/core/section/conditions/constants.d.ts

@@ -1 +1,2 @@
-export declare const UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS = "Umb.Condition.SectionUserPermission";
+export * from './section-alias/constants.js';
+export * from './section-user-permission/constants.js';

package/dist-cms/packages/core/section/conditions/constants.js

@@ -1 +1,2 @@
-export const UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS = 'Umb.Condition.SectionUserPermission';
+export * from './section-alias/constants.js';
+export * from './section-user-permission/constants.js';

package/dist-cms/packages/core/section/conditions/manifests.js

@@ -1,17 +1,3 @@
-import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from './constants.js';
-import { UmbSectionAliasCondition } from './section-alias.condition.js';
-import { UmbSectionUserPermissionCondition } from './section-user-permission.condition.js';
-export const manifests = [
-    {
-        type: 'condition',
-        name: 'Section User Permission Condition',
-        alias: UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS,
-        api: UmbSectionUserPermissionCondition,
-    },
-    {
-        type: 'condition',
-        name: 'Section Alias Condition',
-        alias: 'Umb.Condition.SectionAlias',
-        api: UmbSectionAliasCondition,
-    },
-];
+import { manifests as sectionAliasManifests } from './section-alias/manifests.js';
+import { manifests as sectionUserPermissionManifests } from './section-user-permission/manifests.js';
+export const manifests = [...sectionAliasManifests, ...sectionUserPermissionManifests];

package/dist-cms/packages/core/section/conditions/section-alias/constants.d.ts

@@ -0,0 +1 @@
+export declare const UMB_SECTION_ALIAS_CONDITION_ALIAS = "Umb.Condition.SectionAlias";

package/dist-cms/packages/core/section/conditions/section-alias/constants.js

@@ -0,0 +1 @@
+export const UMB_SECTION_ALIAS_CONDITION_ALIAS = 'Umb.Condition.SectionAlias';

package/dist-cms/packages/core/section/conditions/section-alias/manifests.d.ts

@@ -0,0 +1 @@
+export declare const manifests: Array<UmbExtensionManifest>;

package/dist-cms/packages/core/section/conditions/section-alias/manifests.js

@@ -0,0 +1,10 @@
+import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from './constants.js';
+import { UmbSectionAliasCondition } from './section-alias.condition.js';
+export const manifests = [
+    {
+        type: 'condition',
+        name: 'Section Alias Condition',
+        alias: UMB_SECTION_ALIAS_CONDITION_ALIAS,
+        api: UmbSectionAliasCondition,
+    },
+];

package/dist-cms/packages/core/section/conditions/{section-alias.condition.d.ts → section-alias/section-alias.condition.d.ts}

@@ -1,5 +1,5 @@
-import { UmbConditionBase } from '../../extension-registry/conditions/condition-base.controller.js';
-import type { SectionAliasConditionConfig } from './types.js';
+import { UmbConditionBase } from '../../../extension-registry/conditions/condition-base.controller.js';
+import type { SectionAliasConditionConfig } from '../types.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api';
 export declare class UmbSectionAliasCondition extends UmbConditionBase<SectionAliasConditionConfig> implements UmbExtensionCondition {

package/dist-cms/packages/core/section/conditions/{section-alias.condition.js → section-alias/section-alias.condition.js}

@@ -1,5 +1,5 @@
-import { UmbConditionBase } from '../../extension-registry/conditions/condition-base.controller.js';
-import { UMB_SECTION_CONTEXT } from '../section.context.js';
+import { UmbConditionBase } from '../../../extension-registry/conditions/condition-base.controller.js';
+import { UMB_SECTION_CONTEXT } from '../../section.context.js';
 export class UmbSectionAliasCondition extends UmbConditionBase {
     constructor(host, args) {
         super(host, args);

package/dist-cms/packages/core/section/conditions/section-alias/types.d.ts

@@ -0,0 +1,20 @@
+import type { UMB_SECTION_ALIAS_CONDITION_ALIAS } from './constants.js';
+import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api';
+export type SectionAliasConditionConfig = UmbConditionConfigBase<typeof UMB_SECTION_ALIAS_CONDITION_ALIAS> & {
+    /**
+     * Define the section that this extension should be available in
+     * @example "Umb.Section.Content"
+     */
+    match: string;
+    /**
+     * Define one or more workspaces that this extension should be available in
+     * @example
+     * ["Umb.Section.Content", "Umb.Section.Media"]
+     */
+    oneOf?: Array<string>;
+};
+declare global {
+    interface UmbExtensionConditionConfigMap {
+        UmbSectionAliasConditionConfig: SectionAliasConditionConfig;
+    }
+}

package/dist-cms/packages/core/section/conditions/section-alias/types.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/packages/core/section/conditions/section-user-permission/constants.d.ts

@@ -0,0 +1 @@
+export declare const UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS = "Umb.Condition.SectionUserPermission";

package/dist-cms/packages/core/section/conditions/section-user-permission/constants.js

@@ -0,0 +1 @@
+export const UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS = 'Umb.Condition.SectionUserPermission';

package/dist-cms/packages/core/section/conditions/section-user-permission/manifests.d.ts

@@ -0,0 +1 @@
+export declare const manifests: Array<UmbExtensionManifest>;

package/dist-cms/packages/core/section/conditions/section-user-permission/manifests.js

@@ -0,0 +1,10 @@
+import { UmbSectionUserPermissionCondition } from './section-user-permission.condition.js';
+import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from './constants.js';
+export const manifests = [
+    {
+        type: 'condition',
+        name: 'Section User Permission Condition',
+        alias: UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS,
+        api: UmbSectionUserPermissionCondition,
+    },
+];

package/dist-cms/packages/core/section/conditions/{section-user-permission.condition.d.ts → section-user-permission/section-user-permission.condition.d.ts}

@@ -1,4 +1,4 @@
-import type { UmbSectionUserPermissionConditionConfig } from './types.js';
+import type { UmbSectionUserPermissionConditionConfig } from '../types.js';
 import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';

package/dist-cms/packages/core/section/conditions/section-user-permission/types.d.ts

@@ -0,0 +1,16 @@
+import type { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from './constants.js';
+import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api';
+export type UmbSectionUserPermissionConditionConfig = UmbConditionConfigBase<typeof UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS> & {
+    /**
+     *
+     *
+     * @example
+     * "Umb.Section.Content"
+     */
+    match: string;
+};
+declare global {
+    interface UmbExtensionConditionConfigMap {
+        UmbSectionUserPermissionConditionConfig: UmbSectionUserPermissionConditionConfig;
+    }
+}

package/dist-cms/packages/core/section/conditions/section-user-permission/types.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/packages/core/section/conditions/types.d.ts

@@ -1,30 +1,2 @@
-import type { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from './constants.js';
-import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api';
-export type UmbSectionUserPermissionConditionConfig = UmbConditionConfigBase<typeof UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS> & {
-    /**
-     *
-     *
-     * @example
-     * "Umb.Section.Content"
-     */
-    match: string;
-};
-export type SectionAliasConditionConfig = UmbConditionConfigBase<'Umb.Condition.SectionAlias'> & {
-    /**
-     * Define the section that this extension should be available in
-     * @example "Umb.Section.Content"
-     */
-    match: string;
-    /**
-     * Define one or more workspaces that this extension should be available in
-     * @example
-     * ["Umb.Section.Content", "Umb.Section.Media"]
-     */
-    oneOf?: Array<string>;
-};
-declare global {
-    interface UmbExtensionConditionConfigMap {
-        UmbSectionUserPermissionConditionConfig: UmbSectionUserPermissionConditionConfig;
-        UmbSectionAliasConditionConfig: SectionAliasConditionConfig;
-    }
-}
+export type * from './section-alias/types.js';
+export type * from './section-user-permission/types.js';

package/dist-cms/packages/core/server-file-system/rename/rename-server-file-repository-base.d.ts

@@ -16,6 +16,6 @@ export declare abstract class UmbRenameServerFileRepositoryBase<DetailModelType
      */
     rename(unique: string, name: string): Promise<{
         data: DetailModelType | undefined;
-        error: Error | import("../../resources/umb-error.js").UmbError | import("../../resources/umb-error.js").UmbApiError | import("../../resources/umb-error.js").UmbCancelError | undefined;
+        error: Error | import("../../resources/umb-error.js").UmbApiError | import("../../resources/umb-error.js").UmbCancelError | import("../../resources/umb-error.js").UmbError | undefined;
     }>;
 }

package/dist-cms/packages/core/temporary-file/config/config.repository.d.ts

@@ -13,11 +13,13 @@ export declare class UmbTemporaryFileConfigRepository extends UmbRepositoryBase
     requestTemporaryFileConfiguration(): Promise<import("../../backend-api/types.gen.js").TemporaryFileConfigurationResponseModel>;
     /**
      * Subscribe to the entire configuration.
+     * @returns {Observable<UmbTemporaryFileConfigurationModel>}
      */
     all(): Observable<import("../../backend-api/types.gen.js").TemporaryFileConfigurationResponseModel | null>;
     /**
      * Subscribe to a part of the configuration.
      * @param part
+     * @returns {Observable<UmbTemporaryFileConfigurationModel[Part]>}
      */
     part<Part extends keyof UmbTemporaryFileConfigurationModel>(part: Part): Observable<UmbTemporaryFileConfigurationModel[Part]>;
 }

package/dist-cms/packages/core/temporary-file/config/config.repository.js

@@ -33,6 +33,7 @@ export class UmbTemporaryFileConfigRepository extends UmbRepositoryBase {
     }
     /**
      * Subscribe to the entire configuration.
+     * @returns {Observable<UmbTemporaryFileConfigurationModel>}
      */
     all() {
         if (!this.#dataStore) {
@@ -43,6 +44,7 @@ export class UmbTemporaryFileConfigRepository extends UmbRepositoryBase {
     /**
      * Subscribe to a part of the configuration.
      * @param part
+     * @returns {Observable<UmbTemporaryFileConfigurationModel[Part]>}
      */
     part(part) {
         if (!this.#dataStore) {

package/dist-cms/packages/core/tree/components/index.d.ts

@@ -0,0 +1 @@
+export * from './tree-load-more-button.element.js';

package/dist-cms/packages/core/tree/components/index.js

@@ -0,0 +1 @@
+export * from './tree-load-more-button.element.js';

package/dist-cms/packages/core/tree/components/tree-load-more-button.element.d.ts

@@ -0,0 +1,10 @@
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+export declare class UmbTreeLoadMoreButtonElement extends UmbLitElement {
+    render(): import("lit-html").TemplateResult<1>;
+    static readonly styles: import("lit").CSSResult;
+}
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-tree-load-more-button': UmbTreeLoadMoreButtonElement;
+    }
+}

package/dist-cms/packages/core/tree/components/tree-load-more-button.element.js

@@ -0,0 +1,36 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 { css, customElement, html } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+let UmbTreeLoadMoreButtonElement = class UmbTreeLoadMoreButtonElement extends UmbLitElement {
+    render() {
+        return html `<uui-button
+			data-mark="tree:load-more"
+			id="load-more"
+			look="secondary"
+			.label=${this.localize.term('actions_loadMore')}></uui-button>`;
+    }
+    static { this.styles = css `
+		:host {
+			position: relative;
+			display: block;
+			padding-left: var(--uui-size-space-3);
+			margin-right: var(--uui-size-space-2);
+			margin-bottom: var(--uui-size-layout-2);
+			margin-left: calc(var(--uui-menu-item-indent, 0) * var(--uui-size-4));
+		}
+		uui-button {
+			width: 100%;
+			height: var(--uui-size---uui-size-layout-3);
+			--uui-box-border-radius: calc(var(--uui-border-radius) * 2);
+		}
+	`; }
+};
+UmbTreeLoadMoreButtonElement = __decorate([
+    customElement('umb-tree-load-more-button')
+], UmbTreeLoadMoreButtonElement);
+export { UmbTreeLoadMoreButtonElement };

package/dist-cms/packages/core/tree/data/tree-repository-base.d.ts

@@ -3,11 +3,10 @@ import type { UmbTreeStore } from './tree-store.interface.js';
 import type { UmbTreeRepository } from './tree-repository.interface.js';
 import type { UmbTreeDataSource, UmbTreeDataSourceConstructor } from './tree-data-source.interface.js';
 import type { UmbTreeAncestorsOfRequestArgs, UmbTreeChildrenOfRequestArgs, UmbTreeRootItemsRequestArgs } from './types.js';
-import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
+import { UmbRepositoryBase, type UmbRepositoryResponse } from '@umbraco-cms/backoffice/repository';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 import type { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import type { UmbProblemDetails } from '@umbraco-cms/backoffice/resources';
 /**
  * Base class for a tree repository.
  * @abstract
@@ -35,10 +34,7 @@ export declare abstract class UmbTreeRepositoryBase<TreeItemType extends UmbTree
      * @returns {*}
      * @memberof UmbTreeRepositoryBase
      */
-    abstract requestTreeRoot(): Promise<{
-        data?: TreeRootType;
-        error?: UmbProblemDetails;
-    }>;
+    abstract requestTreeRoot(): Promise<UmbRepositoryResponse<TreeRootType>>;
     /**
      * Requests root items of a tree
      * @param args
@@ -46,13 +42,13 @@ export declare abstract class UmbTreeRepositoryBase<TreeItemType extends UmbTree
      * @memberof UmbTreeRepositoryBase
      */
     requestTreeRootItems(args: TreeRootItemsRequestArgsType): Promise<{
+        asObservable: () => undefined;
         data?: undefined;
         error?: undefined;
-        asObservable?: undefined;
     } | {
         data: import("@umbraco-cms/backoffice/repository").UmbPagedModel<TreeItemType> | undefined;
-        error: any;
-        asObservable: () => import("rxjs").Observable<TreeItemType[]>;
+        error: Error | import("../../resources/umb-error.js").UmbApiError | import("../../resources/umb-error.js").UmbCancelError | import("../../resources/umb-error.js").UmbError | undefined;
+        asObservable: () => import("rxjs").Observable<TreeItemType[]> | undefined;
     }>;
     /**
      * Requests tree items of a given parent
@@ -62,13 +58,13 @@ export declare abstract class UmbTreeRepositoryBase<TreeItemType extends UmbTree
      * @memberof UmbTreeRepositoryBase
      */
     requestTreeItemsOf(args: TreeChildrenOfRequestArgsType): Promise<{
+        asObservable: () => undefined;
         data?: undefined;
         error?: undefined;
-        asObservable?: undefined;
     } | {
         data: import("@umbraco-cms/backoffice/repository").UmbPagedModel<TreeItemType> | undefined;
-        error: any;
-        asObservable: () => import("rxjs").Observable<TreeItemType[]>;
+        error: Error | import("../../resources/umb-error.js").UmbApiError | import("../../resources/umb-error.js").UmbCancelError | import("../../resources/umb-error.js").UmbError | undefined;
+        asObservable: () => import("rxjs").Observable<TreeItemType[]> | undefined;
     }>;
     /**
      * Requests ancestors of a given item

package/dist-cms/packages/core/tree/data/tree-repository-base.js

@@ -39,13 +39,14 @@ export class UmbTreeRepositoryBase extends UmbRepositoryBase {
         const { data, error } = await this._treeSource.getRootItems(args);
         if (!this._treeStore) {
             // If the tree store is not available, then we most likely are in a destructed setting.
-            return {};
+            return {
+                asObservable: () => undefined,
+            };
         }
         if (data) {
             this._treeStore.appendItems(data.items);
         }
-        // TODO: Fix the type of error, it should be UmbApiError, but currently it is any.
-        return { data, error: error, asObservable: () => this._treeStore.rootItems };
+        return { data, error, asObservable: () => this._treeStore?.rootItems };
     }
     /**
      * Requests tree items of a given parent
@@ -65,13 +66,14 @@ export class UmbTreeRepositoryBase extends UmbRepositoryBase {
         const { data, error } = await this._treeSource.getChildrenOf(args);
         if (!this._treeStore) {
             // If the tree store is not available, then we most likely are in a destructed setting.
-            return {};
+            return {
+                asObservable: () => undefined,
+            };
         }
         if (data) {
             this._treeStore.appendItems(data.items);
         }
-        // TODO: Fix the type of error, it should be UmbApiError, but currently it is any.
-        return { data, error: error, asObservable: () => this._treeStore.childrenOf(args.parent.unique) };
+        return { data, error, asObservable: () => this._treeStore?.childrenOf(args.parent.unique) };
     }
     /**
      * Requests ancestors of a given item
@@ -95,11 +97,7 @@ export class UmbTreeRepositoryBase extends UmbRepositoryBase {
      */
     async rootTreeItems() {
         await this._init;
-        if (!this._treeStore) {
-            // If the tree store is not available, then we most likely are in a destructed setting.
-            return of([]);
-        }
-        return this._treeStore.rootItems;
+        return this._treeStore?.rootItems ?? of([]);
     }
     /**
      * Returns a promise with an observable of children items of a given parent
@@ -111,10 +109,6 @@ export class UmbTreeRepositoryBase extends UmbRepositoryBase {
         if (parentUnique === undefined)
             throw new Error('Parent unique is missing');
         await this._init;
-        if (!this._treeStore) {
-            // If the tree store is not available, then we most likely are in a destructed setting.
-            return of([]);
-        }
-        return this._treeStore.childrenOf(parentUnique);
+        return this._treeStore?.childrenOf(parentUnique) ?? of([]);
     }
 }