@umbraco-cms/backoffice 16.0.0-rc3 → 16.0.0-rc5

package/dist-cms/packages/core/repository/item/item-repository-base.js

@@ -1,14 +1,16 @@
 import { UmbRepositoryBase } from '../repository-base.js';
+import { of } from '@umbraco-cms/backoffice/external/rxjs';
 export class UmbItemRepositoryBase extends UmbRepositoryBase {
     #itemSource;
     constructor(host, itemSource, itemStoreContextAlias) {
         super(host);
         this.#itemSource = new itemSource(host);
         this._init = this.consumeContext(itemStoreContextAlias, (instance) => {
-            if (instance) {
-                this._itemStore = instance;
-            }
-        }).asPromise({ preventTimeout: true });
+            this._itemStore = instance;
+        })
+            .asPromise({ preventTimeout: true })
+            // Ignore the error, we can assume that the flow was stopped (asPromise failed), but it does not mean that the consumption was not successful.
+            .catch(() => undefined);
     }
     /**
      * Requests the items for the given uniques
@@ -19,17 +21,22 @@ export class UmbItemRepositoryBase extends UmbRepositoryBase {
     async requestItems(uniques) {
         if (!uniques)
             throw new Error('Uniques are missing');
-        await this._init;
-        const { data, error: _error } = await this.#itemSource.getItems(uniques);
+        try {
+            await this._init;
+        }
+        catch {
+            return {};
+        }
+        const { data, error } = await this.#itemSource.getItems(uniques);
         if (!this._itemStore) {
             // If store is gone, then we are most likely in a disassembled state.
             return {};
         }
-        const error = _error;
         if (data) {
             this._itemStore.appendItems(data);
         }
-        return { data, error, asObservable: () => this._itemStore.items(uniques) };
+        // TODO: Fix the type of error, it should be UmbApiError, but currently it is any.
+        return { data, error: error, asObservable: () => this._itemStore.items(uniques) };
     }
     /**
      * Returns a promise with an observable of the items for the given uniques
@@ -38,7 +45,16 @@ export class UmbItemRepositoryBase extends UmbRepositoryBase {
      * @memberof UmbItemRepositoryBase
      */
     async items(uniques) {
-        await this._init;
+        try {
+            await this._init;
+        }
+        catch {
+            return undefined;
+        }
+        if (!this._itemStore) {
+            // If store is gone, then we are most likely in a disassembled state.
+            return of([]);
+        }
         return this._itemStore.items(uniques);
     }
 }

package/dist-cms/packages/core/repository/item/item-repository.interface.d.ts

@@ -7,5 +7,5 @@ export interface UmbItemRepository<ItemType> extends UmbApi {
         error?: UmbProblemDetails | undefined;
         asObservable?: () => Observable<Array<ItemType>>;
     }>;
-    items: (uniques: string[]) => Promise<Observable<Array<ItemType>>>;
+    items: (uniques: string[]) => Promise<Observable<Array<ItemType>> | undefined>;
 }

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

@@ -93,9 +93,11 @@ let UmbRouterSlotElement = class UmbRouterSlotElement extends UmbLitElement {
         }
     }
     disconnectedCallback() {
-        super.disconnectedCallback();
         window.removeEventListener('navigationsuccess', this._onNavigationChanged);
         this.#listening = false;
+        // Close modals opened by this router slot.
+        this.#routeContext._internal_modalRouterChanged(undefined);
+        super.disconnectedCallback();
     }
     firstUpdated(_changedProperties) {
         super.firstUpdated(_changedProperties);

package/dist-cms/packages/core/router/router-slot/model.d.ts

@@ -51,6 +51,7 @@ export interface IRouteBase<D = any> {
  */
 export interface IRedirectRoute<D = any> extends IRouteBase<D> {
     redirectTo: string;
+    awaitStability?: boolean;
     preserveQuery?: boolean;
 }
 /**

package/dist-cms/packages/core/router/router-slot/router-slot.d.ts

@@ -105,6 +105,7 @@ export declare class RouterSlot<D = any, P = any> extends HTMLElement implements
      * @param info
      */
     notifyChildRouters<D = any>(info: IRoutingInfo<D>): void;
+    private getRedirectDelay;
     /**
      * Loads a new path based on the routes.
      * Returns true if a navigation was made to a new page.

package/dist-cms/packages/core/router/router-slot/router-slot.js

@@ -119,6 +119,8 @@ export class RouterSlot extends HTMLElement {
      * Tears down the element.
      */
     disconnectedCallback() {
+        this._setParent(null);
+        this._cancelNavigation?.();
         this.detachListeners();
     }
     /**
@@ -238,6 +240,21 @@ export class RouterSlot extends HTMLElement {
             });
         }
     }
+    getRedirectDelay() {
+        if ('connection' in navigator) {
+            const connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection;
+            switch (connection.effectiveType) {
+                case 'slow-2g':
+                case '2g':
+                    return 1200;
+                case '3g':
+                    return 800;
+                case '4g':
+                    return 200;
+            }
+        }
+        return 400;
+    }
     /**
      * Loads a new path based on the routes.
      * Returns true if a navigation was made to a new page.
@@ -297,6 +314,19 @@ export class RouterSlot extends HTMLElement {
                 // Redirect if necessary
                 if (isRedirectRoute(route)) {
                     cleanup();
+                    if (route.awaitStability === true) {
+                        // await until browser is done loading, based on a guess:
+                        const delay = this.getRedirectDelay();
+                        await new Promise((resolve) => setTimeout(resolve, delay));
+                        if (navigationInvalidated) {
+                            return cancel();
+                        }
+                    }
+                    // Check if the current route is still matching the browser URL.:
+                    if (!window.location.href.includes(this.constructAbsolutePath(''))) {
+                        // If the parent is active, we should not redirect.
+                        return cancel();
+                    }
                     handleRedirect(this, route);
                     return false;
                 }

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

@@ -51,7 +51,7 @@ export declare abstract class UmbTreeRepositoryBase<TreeItemType extends UmbTree
         asObservable?: undefined;
     } | {
         data: import("@umbraco-cms/backoffice/repository").UmbPagedModel<TreeItemType> | undefined;
-        error: UmbProblemDetails;
+        error: any;
         asObservable: () => import("rxjs").Observable<TreeItemType[]>;
     }>;
     /**
@@ -62,6 +62,10 @@ export declare abstract class UmbTreeRepositoryBase<TreeItemType extends UmbTree
      * @memberof UmbTreeRepositoryBase
      */
     requestTreeItemsOf(args: TreeChildrenOfRequestArgsType): Promise<{
+        data?: undefined;
+        error?: undefined;
+        asObservable?: undefined;
+    } | {
         data: import("@umbraco-cms/backoffice/repository").UmbPagedModel<TreeItemType> | undefined;
         error: any;
         asObservable: () => import("rxjs").Observable<TreeItemType[]>;

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

@@ -1,4 +1,5 @@
 import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
+import { of } from '@umbraco-cms/backoffice/external/rxjs';
 /**
  * Base class for a tree repository.
  * @abstract
@@ -21,10 +22,11 @@ export class UmbTreeRepositoryBase extends UmbRepositoryBase {
         super(host);
         this._treeSource = new treeSourceConstructor(this);
         this._init = this.consumeContext(treeStoreContextAlias, (instance) => {
-            if (instance) {
-                this._treeStore = instance;
-            }
-        }).asPromise({ preventTimeout: true });
+            this._treeStore = instance;
+        })
+            .asPromise({ preventTimeout: true })
+            // Ignore the error, we can assume that the flow was stopped (asPromise failed), but it does not mean that the consumption was not successful.
+            .catch(() => undefined);
     }
     /**
      * Requests root items of a tree
@@ -40,9 +42,9 @@ export class UmbTreeRepositoryBase extends UmbRepositoryBase {
             return {};
         }
         if (data) {
-            this._treeStore?.appendItems(data.items);
+            this._treeStore.appendItems(data.items);
         }
-        // TODO: Notice we are casting the error here, is that right?
+        // TODO: Fix the type of error, it should be UmbApiError, but currently it is any.
         return { data, error: error, asObservable: () => this._treeStore.rootItems };
     }
     /**
@@ -60,12 +62,16 @@ export class UmbTreeRepositoryBase extends UmbRepositoryBase {
         if (args.parent.entityType === null)
             throw new Error('Parent entity type is missing');
         await this._init;
-        const { data, error: _error } = await this._treeSource.getChildrenOf(args);
-        const error = _error;
+        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 {};
+        }
         if (data) {
-            this._treeStore?.appendItems(data.items);
+            this._treeStore.appendItems(data.items);
         }
-        return { data, error, asObservable: () => this._treeStore.childrenOf(args.parent.unique) };
+        // 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) };
     }
     /**
      * Requests ancestors of a given item
@@ -77,10 +83,10 @@ export class UmbTreeRepositoryBase extends UmbRepositoryBase {
         if (args.treeItem.unique === undefined)
             throw new Error('Descendant unique is missing');
         await this._init;
-        const { data, error: _error } = await this._treeSource.getAncestorsOf(args);
-        const error = _error;
+        const { data, error } = await this._treeSource.getAncestorsOf(args);
         // TODO: implement observable for ancestor items in the store
-        return { data, error };
+        // TODO: Fix the type of error, it should be UmbApiError, but currently it is any.
+        return { data, error: error };
     }
     /**
      * Returns a promise with an observable of tree root items
@@ -89,6 +95,10 @@ 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;
     }
     /**
@@ -101,6 +111,10 @@ 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);
     }
 }

package/dist-cms/packages/core/tree/tree-item/tree-item.element.js

@@ -26,7 +26,7 @@ let UmbTreeItemElement = class UmbTreeItemElement extends UmbExtensionElementAnd
         this.observe(
         // TODO: what should we do if there are multiple tree items for an entity type?
         // This method gets all extensions based on a type, then filters them based on the entity type. and then we get the alias of the first one [NL]
-        createObservablePart(umbExtensionsRegistry.byTypeAndFilter(this.getExtensionType(), filterByEntityType), (x) => x[0].alias), (alias) => {
+        createObservablePart(umbExtensionsRegistry.byTypeAndFilter(this.getExtensionType(), filterByEntityType), (x) => x[0]?.alias), (alias) => {
             this.alias = alias;
         }, 'umbObserveAlias');
     }

package/dist-cms/packages/core/validation/controllers/validation.controller.js

@@ -386,6 +386,7 @@ export class UmbValidationController extends UmbControllerBase {
         this.#validators = [];
     }
     destroy() {
+        super.destroy();
         this.#validationMode = false;
         if (this.#inUnprovidingState === true) {
             return;
@@ -400,6 +401,5 @@ export class UmbValidationController extends UmbControllerBase {
         this.#localMessages = undefined;
         this.#parentMessages = undefined;
         this.#parent = undefined;
-        super.destroy();
     }
 }

package/dist-cms/packages/core/workspace/components/workspace-action/common/save/save.action.js

@@ -7,7 +7,9 @@ export class UmbSaveWorkspaceAction extends UmbWorkspaceActionBase {
             this._workspaceContext = context;
             this.#observeUnique();
             this._gotWorkspaceContext();
-        }).asPromise();
+        })
+            .asPromise()
+            .catch(() => undefined);
     }
     #observeUnique() {
         this.observe(this._workspaceContext?.unique, (unique) => {

package/dist-cms/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.element.js

@@ -45,9 +45,12 @@ let UmbWorkspaceVariantMenuBreadcrumbElement = class UmbWorkspaceVariantMenuBrea
     #observeStructure() {
         if (!this.#structureContext || !this.#workspaceContext)
             return;
-        const isNew = this.#workspaceContext.getIsNew();
         this.observe(this.#structureContext.structure, (value) => {
-            this._structure = isNew ? value : value.slice(0, -1);
+            if (!this.#workspaceContext)
+                return;
+            const unique = this.#workspaceContext.getUnique();
+            // exclude the current unique from the structure. We append this with an observer of the name
+            this._structure = value.filter((structureItem) => structureItem.unique !== unique);
         });
     }
     #observeDefaultCulture() {

package/dist-cms/packages/core/workspace/components/workspace-split-view/workspace-split-view-variant-selector.element.js

@@ -477,8 +477,8 @@ let UmbWorkspaceSplitViewVariantSelectorElement = class UmbWorkspaceSplitViewVar
 			}
 
 			.switch-button:hover {
-				background: var(--uui-palette-sand);
-				color: var(--uui-palette-space-cadet-light);
+				background: var(--uui-color-surface-emphasis);
+				color: var(--uui-color-interactive-emphasis);
 			}
 			.switch-button .variant-info {
 				flex-grow: 1;

package/dist-cms/packages/core/workspace/contexts/tokens/submittable-tree-entity-workspace.context-token.js

@@ -1,2 +1,2 @@
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-export const UMB_SUBMITTABLE_TREE_ENTITY_WORKSPACE_CONTEXT = new UmbContextToken('UmbWorkspaceContext', undefined, (context) => 'requestSubmit' in context && 'createUnderParent' in context);
+export const UMB_SUBMITTABLE_TREE_ENTITY_WORKSPACE_CONTEXT = new UmbContextToken('UmbWorkspaceContext', undefined, (context) => 'requestSubmit' in context && '_internal_createUnderParent' in context);

package/dist-cms/packages/core/workspace/controllers/workspace-is-new-redirect.controller.d.ts

@@ -13,5 +13,12 @@ export declare const UmbWorkspaceIsNewRedirectControllerAlias: unique symbol;
  * @param router
  */
 export declare class UmbWorkspaceIsNewRedirectController extends UmbControllerBase {
+    /**
+     * TODO: Figure out why we need this timeout. [NL]
+     * The problem this fixes it when save & publishing a document open in a modal, like from a collection.
+     * The redirect triggers something that ends up re-setting the path, making the modal path the one in the browser despite the modal is closed.
+     */
+    timeout: any | undefined;
     constructor(host: UmbControllerHost, workspaceContext: UmbSubmittableWorkspaceContextBase<unknown>, router: UmbRouterSlotElement);
+    destroy(): void;
 }

package/dist-cms/packages/core/workspace/controllers/workspace-is-new-redirect.controller.js

@@ -15,20 +15,41 @@ export class UmbWorkspaceIsNewRedirectController extends UmbControllerBase {
         super(host, UmbWorkspaceIsNewRedirectControllerAlias);
         // Navigate to edit route when language is created:
         this.observe(workspaceContext.isNew, (isNew) => {
+            if (this.timeout) {
+                clearTimeout(this.timeout);
+            }
             if (isNew === false) {
-                const unique = workspaceContext.getUnique();
-                if (router && unique) {
-                    const routerPath = router.absoluteRouterPath;
-                    if (routerPath) {
-                        const newPath = umbUrlPatternToString(ensurePathEndsWithSlash(routerPath) + 'edit/:id', {
-                            id: unique,
-                        });
-                        this.destroy();
-                        window.history.replaceState(null, '', newPath);
+                this.timeout = setTimeout(() => {
+                    const unique = workspaceContext.getUnique();
+                    if (router && unique) {
+                        const routerPath = router.absoluteRouterPath;
+                        if (routerPath) {
+                            const newPath = umbUrlPatternToString(ensurePathEndsWithSlash(routerPath) + 'edit/:id', {
+                                id: unique,
+                            });
+                            this.destroy();
+                            // get current url:
+                            const currentUrl = window.location.href;
+                            if (router.localActiveViewPath === undefined ||
+                                router.localActiveViewPath === '' ||
+                                !currentUrl.includes(router.localActiveViewPath)) {
+                                return;
+                            }
+                            // Check that we are still part of the DOM and thereby relevant:
+                            window.history.replaceState(null, '', newPath);
+                        }
                     }
-                }
+                    this.timeout = undefined;
+                }, 500);
             }
         });
         // TODO: If workspace route changes cause of other reasons then this controller should be destroyed.
     }
+    destroy() {
+        super.destroy();
+        if (this.timeout) {
+            clearTimeout(this.timeout);
+            this.timeout = undefined;
+        }
+    }
 }

package/dist-cms/packages/core/workspace/controllers/workspace-route-manager.controller.js

@@ -22,13 +22,13 @@ export class UmbWorkspaceRouteManager extends UmbControllerBase {
      * @memberof UmbWorkspaceRouteManager
      */
     setRoutes(routes) {
-        const allRoutes = [
-            ...routes,
-            {
+        const allRoutes = [...routes];
+        if (routes.length > 0) {
+            allRoutes.push({
                 path: `**`,
                 component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
-            },
-        ];
+            });
+        }
         const mappedRoutes = allRoutes.map((route) => {
             // override the setup method to set the active local path
             const oldSetupCallback = route.setup;

package/dist-cms/packages/core/workspace/entity-detail/entity-detail-workspace-base.js

@@ -329,6 +329,7 @@ export class UmbEntityDetailWorkspaceContextBase extends UmbSubmittableWorkspace
         this.#entityContext.setUnique(data.unique);
         this._data.setPersisted(data);
         this._data.setCurrent(data);
+        this.setIsNew(false);
         const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
         if (!eventContext)
             throw new Error('Event context not found.');
@@ -337,7 +338,6 @@ export class UmbEntityDetailWorkspaceContextBase extends UmbSubmittableWorkspace
             unique: parent.unique,
         });
         eventContext.dispatchEvent(event);
-        this.setIsNew(false);
     }
     async _update(currentData) {
         const { error, data } = await this._detailRepository.save(currentData);

package/dist-cms/packages/core/workspace/submittable/submittable-workspace-context-base.d.ts

@@ -37,6 +37,7 @@ export declare abstract class UmbSubmittableWorkspaceContextBase<WorkspaceDataMo
     abstract getData(): WorkspaceDataModelType | undefined;
     protected abstract submit(): Promise<void>;
     protected invalidSubmit(reason?: any): Promise<void>;
+    destroy(): void;
 }
 export declare abstract class UmbEditableWorkspaceContextBase<WorkspaceDataModelType> extends UmbSubmittableWorkspaceContextBase<WorkspaceDataModelType> {
 }

package/dist-cms/packages/core/workspace/submittable/submittable-workspace-context-base.js

@@ -112,6 +112,16 @@ export class UmbSubmittableWorkspaceContextBase extends UmbContextBase {
     invalidSubmit(reason) {
         return Promise.reject(reason);
     }
+    destroy() {
+        this.#isNew.destroy();
+        this.routes.destroy();
+        super.destroy();
+        this.#submitPromise = undefined;
+        this.#submitResolve = undefined;
+        this.#submitReject = undefined;
+        this.#validationContexts.forEach((context) => context.destroy());
+        this.#validationContexts = [];
+    }
 }
 /*
  * @deprecated Use UmbSubmittableWorkspaceContextBase instead — Will be removed before RC.

package/dist-cms/packages/data-type/collection/repository/data-type-collection.repository.js

@@ -11,7 +11,12 @@ export class UmbDataTypeCollectionRepository extends UmbRepositoryBase {
             if (instance) {
                 this.#itemStore = instance;
             }
-        }).asPromise({ preventTimeout: true });
+        })
+            .asPromise({ preventTimeout: true })
+            .catch(() => {
+            // If the context is not available, we can assume that the store is not available.
+            this.#itemStore = undefined;
+        });
         this.#collectionSource = new UmbDataTypeCollectionServerDataSource(host);
     }
     async requestCollection(query) {

package/dist-cms/packages/data-type/repository/detail/data-type-detail.repository.js

@@ -8,7 +8,12 @@ export class UmbDataTypeDetailRepository extends UmbDetailRepositoryBase {
         super(host, UmbDataTypeServerDataSource, UMB_DATA_TYPE_DETAIL_STORE_CONTEXT);
         this.#init = this.consumeContext(UMB_DATA_TYPE_DETAIL_STORE_CONTEXT, (instance) => {
             this.#detailStore = instance;
-        }).asPromise({ preventTimeout: true });
+        })
+            .asPromise({ preventTimeout: true })
+            .catch(() => {
+            // If the context is not available, we can assume that the store is not available.
+            this.#detailStore = undefined;
+        });
     }
     async byPropertyEditorUiAlias(propertyEditorUiAlias) {
         if (!propertyEditorUiAlias)

package/dist-cms/packages/documents/document-blueprints/workspace/document-blueprint-workspace-editor.element.js

@@ -74,13 +74,14 @@ let UmbDocumentBlueprintWorkspaceEditorElement = class UmbDocumentBlueprintWorks
             // Using first single view as the default route for now (hence the math below):
             routes.push({
                 path: '',
+                pathMatch: 'full',
                 redirectTo: routes[variants.length * variants.length]?.path,
             });
+            routes.push({
+                path: `**`,
+                component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
+            });
         }
-        routes.push({
-            path: `**`,
-            component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
-        });
         this._routes = routes;
     }
     render() {

package/dist-cms/packages/documents/documents/entity-actions/create-blueprint/modal/create-blueprint-modal.element.js

@@ -71,7 +71,7 @@ let UmbCreateBlueprintModalElement = class UmbCreateBlueprintModalElement extend
 			strong,
 			uui-label,
 			uui-input {
-				display: block;
+				width: 100%;
 			}
 
 			uui-label {

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

@@ -46,10 +46,20 @@ export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
             this.consumeContext(UMB_DOCUMENT_WORKSPACE_CONTEXT, async (context) => {
                 this.#documentWorkspaceContext = context;
                 this.#initPendingChanges();
-            }).asPromise({ preventTimeout: true }),
+            })
+                .asPromise({ preventTimeout: true })
+                .catch(() => {
+                // If the context is not available, we can assume that the context is not available.
+                this.#documentWorkspaceContext = undefined;
+            }),
             this.consumeContext(UMB_ACTION_EVENT_CONTEXT, async (context) => {
                 this.#eventContext = context;
-            }).asPromise({ preventTimeout: true }),
+            })
+                .asPromise({ preventTimeout: true })
+                .catch(() => {
+                // If the context is not available, we can assume that the context is not available.
+                this.#eventContext = undefined;
+            }),
         ]);
         this.consumeContext(UMB_NOTIFICATION_CONTEXT, (context) => {
             this.#notificationContext = context;

package/dist-cms/packages/documents/documents/tree/document-tree.context.js

@@ -1,9 +1,9 @@
-import { UMB_CONTENT_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/content';
+import { UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/content';
 import { UmbDefaultTreeContext } from '@umbraco-cms/backoffice/tree';
 export class UmbDocumentTreeContext extends UmbDefaultTreeContext {
     constructor(host) {
         super(host);
-        this.consumeContext(UMB_CONTENT_PROPERTY_CONTEXT, (context) => {
+        this.consumeContext(UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT, (context) => {
             this.observe(context?.dataType, (value) => {
                 this.updateAdditionalRequestArgs({ dataType: value });
             });

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

@@ -12,6 +12,7 @@ export type * from './modals/types.js';
 export type * from './publishing/types.js';
 export type * from './recycle-bin/types.js';
 export type * from './tree/types.js';
+export type * from './url/types.js';
 export type * from './user-permissions/types.js';
 export type * from './workspace/types.js';
 export interface UmbDocumentDetailModel extends UmbContentDetailModel {

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

@@ -1,3 +1,4 @@
 export { UmbDocumentUrlRepository, UMB_DOCUMENT_URL_REPOSITORY_ALIAS } from './repository/index.js';
+export * from './repository/index.js';
 export * from './constants.js';
 export * from './document-urls-data-resolver.js';

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

@@ -1,3 +1,4 @@
 export { UmbDocumentUrlRepository, UMB_DOCUMENT_URL_REPOSITORY_ALIAS } from './repository/index.js';
+export * from './repository/index.js';
 export * from './constants.js';
 export * from './document-urls-data-resolver.js';

package/dist-cms/packages/documents/documents/url/types.d.ts

@@ -0,0 +1 @@
+export type * from './repository/types.js';

package/dist-cms/packages/documents/documents/url/types.js

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

package/dist-cms/packages/documents/documents/user-permissions/document/conditions/document-user-permission.condition.js

@@ -19,8 +19,10 @@ export class UmbDocumentUserPermissionCondition extends UmbConditionBase {
             }, 'umbUserPermissionConditionObserver');
         });
         this.consumeContext(UMB_ENTITY_CONTEXT, (context) => {
-            if (!context)
+            if (!context) {
+                this.removeUmbControllerByAlias('umbUserPermissionEntityContextObserver');
                 return;
+            }
             this.observe(observeMultiple([context.entityType, context.unique]), ([entityType, unique]) => {
                 this.#entityType = entityType;
                 this.#unique = unique;

package/dist-cms/packages/documents/documents/workspace/actions/save.action.js

@@ -7,9 +7,11 @@ export class UmbDocumentSaveWorkspaceAction extends UmbSaveWorkspaceAction {
     }
     async hasAdditionalOptions() {
         await this._retrieveWorkspaceContext;
-        const variantOptions = await this.observe(this._workspaceContext.variantOptions).asPromise();
+        const variantOptions = await this.observe(this._workspaceContext.variantOptions)
+            .asPromise()
+            .catch(() => undefined);
         const cultureVariantOptions = variantOptions?.filter((option) => option.culture);
-        return cultureVariantOptions?.length > 1;
+        return cultureVariantOptions ? cultureVariantOptions?.length > 1 : false;
     }
     _gotWorkspaceContext() {
         super._gotWorkspaceContext();