@umbraco-cms/backoffice 18.0.1 → 18.1.0-rc

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

@@ -25,6 +25,9 @@ export declare class UmbDocumentRedirectManagementRepository extends UmbControll
      * @param {boolean} enabled - Whether the tracker should be enabled.
      * @returns {*}
      * @memberof UmbDocumentRedirectManagementRepository
+     * @deprecated Deprecated since v17. The backend endpoint is now a no-op; set the
+     *   `Umbraco:CMS:WebRouting:DisableRedirectUrlTracking` configuration key instead.
+     *   Scheduled for removal in Umbraco 19.
      */
     setStatus(enabled: boolean): Promise<{
         error: import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;

package/dist-cms/packages/documents/documents/redirect-management/repository/document-redirect-management.repository.js

@@ -1,5 +1,6 @@
 import { UmbDocumentRedirectManagementServerDataSource } from './document-redirect-management.server.data-source.js';
 import { UmbControllerBase } from '../../../../../libs/class-api/index.js';
+import { UmbDeprecation } from '../../../../core/utils/index.js';
 /**
  * Repository for managing document redirect URLs.
  * @class UmbDocumentRedirectManagementRepository
@@ -20,8 +21,16 @@ export class UmbDocumentRedirectManagementRepository extends UmbControllerBase {
      * @param {boolean} enabled - Whether the tracker should be enabled.
      * @returns {*}
      * @memberof UmbDocumentRedirectManagementRepository
+     * @deprecated Deprecated since v17. The backend endpoint is now a no-op; set the
+     *   `Umbraco:CMS:WebRouting:DisableRedirectUrlTracking` configuration key instead.
+     *   Scheduled for removal in Umbraco 19.
      */
     async setStatus(enabled) {
+        new UmbDeprecation({
+            deprecated: 'UmbDocumentRedirectManagementRepository.setStatus()',
+            removeInVersion: '19.0.0',
+            solution: 'The backend endpoint is now a no-op. Set the Umbraco:CMS:WebRouting:DisableRedirectUrlTracking configuration key instead.',
+        }).warn();
         return this.#dataSource.setStatus(enabled);
     }
     /**

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

@@ -29,6 +29,9 @@ export declare class UmbDocumentRedirectManagementServerDataSource {
      * @param {boolean} enabled - Whether the tracker should be enabled.
      * @returns {*}
      * @memberof UmbDocumentRedirectManagementServerDataSource
+     * @deprecated Deprecated since v17. The backend endpoint is now a no-op; set the
+     *   `Umbraco:CMS:WebRouting:DisableRedirectUrlTracking` configuration key instead.
+     *   Scheduled for removal in Umbraco 19.
      */
     setStatus(enabled: boolean): Promise<{
         error: import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;

package/dist-cms/packages/documents/documents/redirect-management/repository/document-redirect-management.server.data-source.js

@@ -34,6 +34,9 @@ export class UmbDocumentRedirectManagementServerDataSource {
      * @param {boolean} enabled - Whether the tracker should be enabled.
      * @returns {*}
      * @memberof UmbDocumentRedirectManagementServerDataSource
+     * @deprecated Deprecated since v17. The backend endpoint is now a no-op; set the
+     *   `Umbraco:CMS:WebRouting:DisableRedirectUrlTracking` configuration key instead.
+     *   Scheduled for removal in Umbraco 19.
      */
     async setStatus(enabled) {
         const status = enabled ? RedirectStatusModel.ENABLED : RedirectStatusModel.DISABLED;

package/dist-cms/packages/documents/documents/repository/detail/document-detail-request.mappers.d.ts

@@ -0,0 +1,17 @@
+import type { UmbDocumentDetailModel } from '../../types.js';
+import type { CreateDocumentRequestModel, UpdateDocumentRequestModel } from '../../../../core/backend-api/index.js';
+/**
+ * Maps a Document detail model to the create request body.
+ * Shared by the detail create endpoint and the publishing create-and-publish endpoint.
+ * @param {UmbDocumentDetailModel} model - The Document to create
+ * @param {string | null} parentUnique - The unique of the parent to create under
+ * @returns {CreateDocumentRequestModel} The create request body
+ */
+export declare function umbMapDocumentCreateRequestBody(model: UmbDocumentDetailModel, parentUnique: string | null): CreateDocumentRequestModel;
+/**
+ * Maps a Document detail model to the update request body.
+ * Shared by the detail update endpoint and the publishing update-and-publish endpoint.
+ * @param {UmbDocumentDetailModel} model - The Document to update
+ * @returns {UpdateDocumentRequestModel} The update request body
+ */
+export declare function umbMapDocumentUpdateRequestBody(model: UmbDocumentDetailModel): UpdateDocumentRequestModel;

package/dist-cms/packages/documents/documents/repository/detail/document-detail-request.mappers.js

@@ -0,0 +1,30 @@
+/**
+ * Maps a Document detail model to the create request body.
+ * Shared by the detail create endpoint and the publishing create-and-publish endpoint.
+ * @param {UmbDocumentDetailModel} model - The Document to create
+ * @param {string | null} parentUnique - The unique of the parent to create under
+ * @returns {CreateDocumentRequestModel} The create request body
+ */
+export function umbMapDocumentCreateRequestBody(model, parentUnique) {
+    return {
+        id: model.unique,
+        parent: parentUnique ? { id: parentUnique } : null,
+        documentType: { id: model.documentType.unique },
+        template: model.template ? { id: model.template.unique } : null,
+        values: model.values,
+        variants: model.variants,
+    };
+}
+/**
+ * Maps a Document detail model to the update request body.
+ * Shared by the detail update endpoint and the publishing update-and-publish endpoint.
+ * @param {UmbDocumentDetailModel} model - The Document to update
+ * @returns {UpdateDocumentRequestModel} The update request body
+ */
+export function umbMapDocumentUpdateRequestBody(model) {
+    return {
+        template: model.template ? { id: model.template.unique } : null,
+        values: model.values,
+        variants: model.variants,
+    };
+}

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

@@ -1,7 +1,8 @@
 import type { UmbDocumentDetailModel } from '../../types.js';
+import { UmbDocumentServerDataSource } from './document-detail.server.data-source.js';
 import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
 import { UmbDetailRepositoryBase } from '../../../../core/repository/index.js';
-export declare class UmbDocumentDetailRepository extends UmbDetailRepositoryBase<UmbDocumentDetailModel> {
+export declare class UmbDocumentDetailRepository extends UmbDetailRepositoryBase<UmbDocumentDetailModel, UmbDocumentServerDataSource> {
     constructor(host: UmbControllerHost);
 }
 export { UmbDocumentDetailRepository as api };

package/dist-cms/packages/documents/documents/repository/detail/document-detail.server.data-source.js

@@ -5,6 +5,7 @@ import { tryExecute } from '../../../../core/resources/index.js';
 import { umbDeepMerge } from '../../../../core/utils/index.js';
 import { UmbDocumentTypeDetailServerDataSource } from '../../../document-types/index.js';
 import { UmbControllerBase } from '../../../../../libs/class-api/index.js';
+import { umbMapDocumentCreateRequestBody, umbMapDocumentUpdateRequestBody } from './document-detail-request.mappers.js';
 /**
  * A data source for the Document that fetches data from the server
  * @class UmbDocumentServerDataSource
@@ -26,10 +27,11 @@ export class UmbDocumentServerDataSource extends UmbControllerBase {
         const { data } = await new UmbDocumentTypeDetailServerDataSource(this).read(documentTypeUnique);
         const documentTypeIcon = data?.icon ?? null;
         const documentTypeCollection = data?.collection ?? null;
+        const defaultTemplate = data?.defaultTemplate ? { unique: data.defaultTemplate.id } : null;
         const defaultData = {
             entityType: UMB_DOCUMENT_ENTITY_TYPE,
             unique: UmbId.new(),
-            template: null,
+            template: defaultTemplate,
             documentType: {
                 unique: documentTypeUnique,
                 collection: documentTypeCollection,
@@ -106,15 +108,7 @@ export class UmbDocumentServerDataSource extends UmbControllerBase {
             throw new Error('Document is missing');
         if (!model.unique)
             throw new Error('Document unique is missing');
-        // TODO: make data mapper to prevent errors
-        const body = {
-            id: model.unique,
-            parent: parentUnique ? { id: parentUnique } : null,
-            documentType: { id: model.documentType.unique },
-            template: model.template ? { id: model.template.unique } : null,
-            values: model.values,
-            variants: model.variants,
-        };
+        const body = umbMapDocumentCreateRequestBody(model, parentUnique);
         const { data, error } = await tryExecute(this, DocumentService.postDocument({
             body: body,
         }));
@@ -132,12 +126,7 @@ export class UmbDocumentServerDataSource extends UmbControllerBase {
     async update(model) {
         if (!model.unique)
             throw new Error('Unique is missing');
-        // TODO: make data mapper to prevent errors
-        const body = {
-            template: model.template ? { id: model.template.unique } : null,
-            values: model.values,
-            variants: model.variants,
-        };
+        const body = umbMapDocumentUpdateRequestBody(model);
         const { error } = await tryExecute(this, DocumentService.putDocumentById({
             path: { id: model.unique },
             body: body,

package/dist-cms/packages/documents/documents/search/document-search.server.data-source.js

@@ -1,6 +1,7 @@
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js';
 import { DocumentService } from '../../../core/backend-api/index.js';
 import { tryExecute } from '../../../core/resources/index.js';
+import { UmbItemDataApiGetRequestController } from '../../../core/entity-item/index.js';
 /**
  * A data source for the Rollback that fetches data from the server
  * @class UmbDocumentSearchServerDataSource
@@ -19,32 +20,22 @@ export class UmbDocumentSearchServerDataSource {
     async #fetchAncestors(ids) {
         if (!ids.length)
             return { data: new Map() };
-        const { data, error } = await tryExecute(this.#host, DocumentService.getItemDocumentAncestors({ query: { id: ids } }));
+        const requestController = new UmbItemDataApiGetRequestController(this.#host, {
+            uniques: ids,
+            // eslint-disable-next-line local-rules/no-direct-api-import
+            api: ({ uniques }) => DocumentService.getItemDocumentAncestors({ query: { id: uniques } }),
+        });
+        const { data, error } = await requestController.request();
         if (error)
             return { error };
+        // A failed batch resolves without rejecting, leaving an `undefined` hole in `data` rather than
+        // surfacing an error, so guard against it before mapping below.
+        if (data?.some((entry) => entry == null))
+            return { error: new Error('Error fetching ancestors for one or more document items.') };
         const ancestorsByItemId = new Map();
         if (data) {
             for (const entry of data) {
-                ancestorsByItemId.set(entry.id, entry.ancestors.map((ancestor) => ({
-                    documentType: {
-                        unique: ancestor.documentType.id,
-                        icon: ancestor.documentType.icon,
-                        collection: ancestor.documentType.collection ? { unique: ancestor.documentType.collection.id } : null,
-                    },
-                    entityType: UMB_DOCUMENT_ENTITY_TYPE,
-                    hasChildren: ancestor.hasChildren,
-                    isProtected: ancestor.isProtected,
-                    isTrashed: ancestor.isTrashed,
-                    parent: ancestor.parent ? { unique: ancestor.parent.id } : null,
-                    unique: ancestor.id,
-                    variants: ancestor.variants.map((variant) => ({
-                        name: variant.name,
-                        culture: variant.culture || null,
-                        state: variant.state,
-                        flags: variant.flags,
-                    })),
-                    flags: ancestor.flags,
-                })));
+                ancestorsByItemId.set(entry.id, entry.ancestors.map(mapAncestorToItemModel));
             }
         }
         return { data: ancestorsByItemId };
@@ -105,3 +96,25 @@ export class UmbDocumentSearchServerDataSource {
         return { error };
     }
 }
+function mapAncestorToItemModel(ancestor) {
+    return {
+        documentType: {
+            unique: ancestor.documentType.id,
+            icon: ancestor.documentType.icon,
+            collection: ancestor.documentType.collection ? { unique: ancestor.documentType.collection.id } : null,
+        },
+        entityType: UMB_DOCUMENT_ENTITY_TYPE,
+        hasChildren: ancestor.hasChildren,
+        isProtected: ancestor.isProtected,
+        isTrashed: ancestor.isTrashed,
+        parent: ancestor.parent ? { unique: ancestor.parent.id } : null,
+        unique: ancestor.id,
+        variants: ancestor.variants.map((variant) => ({
+            name: variant.name,
+            culture: variant.culture || null,
+            state: variant.state,
+            flags: variant.flags,
+        })),
+        flags: ancestor.flags,
+    };
+}

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

@@ -10,7 +10,7 @@ export const manifests = [
         weight: 800,
         api: () => import('./document-global-search.js'),
         meta: {
-            label: 'Documents',
+            label: '#globalSearch_documents',
             searchProviderAlias: UMB_DOCUMENT_SEARCH_PROVIDER_ALIAS,
             sectionAlias: UMB_CONTENT_SECTION_ALIAS,
         },

package/dist-cms/packages/documents/documents/tree/server-data-source/document-tree.server.request-manager.d.ts

@@ -13,6 +13,7 @@ interface UmbManagementApiDocumentTreeSiblingsFromRequestArgs extends UmbManagem
     };
 }
 export declare class UmbManagementApiDocumentTreeDataRequestManager extends UmbManagementApiTreeDataRequestManager<DocumentTreeItemResponseModel, UmbManagementApiDocumentTreeRootItemsRequestArgs, PagedDocumentTreeItemResponseModel, UmbManagementApiDocumentTreeChildrenOfRequestArgs, PagedDocumentTreeItemResponseModel, UmbManagementApiTreeAncestorsOfRequestArgs, Array<DocumentTreeItemResponseModel>, UmbManagementApiDocumentTreeSiblingsFromRequestArgs, SubsetDocumentTreeItemResponseModel> {
+    #private;
     constructor(host: UmbControllerHost);
 }
 export {};

package/dist-cms/packages/documents/documents/tree/server-data-source/document-tree.server.request-manager.js

@@ -1,7 +1,8 @@
 /* eslint-disable local-rules/no-direct-api-import */
 import { DocumentService } from '../../../../core/backend-api/index.js';
-import { UmbManagementApiTreeDataRequestManager } from '../../../../management-api/index.js';
+import { UmbManagementApiInFlightRequestCache, UmbManagementApiTreeDataRequestManager, } from '../../../../management-api/index.js';
 export class UmbManagementApiDocumentTreeDataRequestManager extends UmbManagementApiTreeDataRequestManager {
+    static #inflightRequestCache = new UmbManagementApiInFlightRequestCache();
     constructor(host) {
         super(host, {
             getRootItems: (args) => DocumentService.getTreeDocumentRoot({
@@ -32,6 +33,7 @@ export class UmbManagementApiDocumentTreeDataRequestManager extends UmbManagemen
                     after: args.paging.takeAfter,
                 },
             }),
+            inflightRequestCache: UmbManagementApiDocumentTreeDataRequestManager.#inflightRequestCache,
         });
     }
 }

package/dist-cms/packages/documents/documents/tree/tree-item/document-tree-item.context.d.ts

@@ -12,7 +12,6 @@ export declare class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContex
     readonly flags: import("rxjs").Observable<import("../../../../core/entity-flag/index.js").UmbEntityFlag[]>;
     readonly ancestors: import("rxjs").Observable<import("../../../../core/entity/index.js").UmbEntityModel[]>;
     readonly isTrashed: import("rxjs").Observable<boolean>;
-    readonly noAccess: import("rxjs").Observable<boolean>;
     setIsMenu(isMenu: boolean): void;
     constructor(host: UmbControllerHost);
     setTreeItem(treeItem: UmbDocumentTreeItemModel | undefined): void;

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

@@ -12,11 +12,15 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext {
     #ancestorsContext;
     #entityContentTypeContext;
     #item;
+    // A collection is only browsed via its Collection view when the user can actually access it.
+    // When the node is a "no access" ancestor of the user's start node, it must remain expandable
+    // in the tree so the user can browse down to their start node.
+    #collapsibleCollection;
     setIsMenu(isMenu) {
         super.setIsMenu(isMenu);
         if (isMenu) {
-            this.observe(this.hasCollection, (hasCollection) => {
-                if (hasCollection) {
+            this.observe(this.#collapsibleCollection, (collapsibleCollection) => {
+                if (collapsibleCollection) {
                     this._treeItemChildrenManager.setTargetTakeSize(1, 1);
                     this.observe(this.hasActiveDescendant, (active) => {
                         if (active === false) {
@@ -24,6 +28,9 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext {
                         }
                     }, 'observeCollectionHasActiveDescendant');
                 }
+                else {
+                    this.removeUmbControllerByAlias('observeCollectionHasActiveDescendant');
+                }
             }, '_whenMenuObserveHasCollection');
         }
     }
@@ -46,7 +53,10 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext {
         // TODO: Move to API
         this.ancestors = this._treeItem.asObservablePart((item) => item?.ancestors ?? []);
         this.isTrashed = this._treeItem.asObservablePart((item) => item?.isTrashed ?? false);
-        this.noAccess = this._treeItem.asObservablePart((item) => item?.noAccess ?? false);
+        // A collection is only browsed via its Collection view when the user can actually access it.
+        // When the node is a "no access" ancestor of the user's start node, it must remain expandable
+        // in the tree so the user can browse down to their start node.
+        this.#collapsibleCollection = mergeObservables([this.hasCollection, this.noAccess], ([hasCollection, noAccess]) => hasCollection && !noAccess);
         this.observe(this.isTrashed, (isTrashed) => {
             this.#isTrashedContext.setIsTrashed(isTrashed);
         });
@@ -65,7 +75,7 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext {
         return this.#item.getHasCollection();
     }
     showChildren() {
-        if (this.getIsMenu() && this.#item.getHasCollection()) {
+        if (this.getIsMenu() && this.#getCollapsibleCollection()) {
             // Collections cannot be expanded via a menu, instead we open the Collection for the user.
             this.#openCollection();
             return;
@@ -73,12 +83,15 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext {
         super.showChildren();
     }
     hideChildren() {
-        if (this.getIsMenu() && this.#item.getHasCollection()) {
+        if (this.getIsMenu() && this.#getCollapsibleCollection()) {
             // Collections in a menu will collapse when already showing children, and instead we open the Collection for the user.
             this.#openCollection();
         }
         super.hideChildren();
     }
+    #getCollapsibleCollection() {
+        return this.#item.getHasCollection() && this.getTreeItem()?.noAccess !== true;
+    }
     #openCollection() {
         // open the collection view for this item:
         history.pushState(null, '', ensureSlash(this.getPath()) + '?openCollection=true');

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

@@ -19,7 +19,9 @@ let UmbDocumentTreeItemElement = class UmbDocumentTreeItemElement extends UmbTre
         this._renderExpandSymbol = () => {
             // If this in the menu and it is a collection, then we will enforce the user to the Collection view instead of expanding.
             // `this._forceShowExpand` is equivalent to hasCollection for this element.
-            if (this._isMenu && this._forceShowExpand) {
+            // Exception: a "no access" collection is an ancestor of the user's start node, so it must stay
+            // expandable in the tree (render the normal caret) to let the user browse down to it.
+            if (this._isMenu && this._forceShowExpand && !this._noAccess) {
                 return html `<umb-icon data-mark="open-collection" name="icon-list" style="font-size: 8px;"></umb-icon>`;
             }
             else {
@@ -40,9 +42,6 @@ let UmbDocumentTreeItemElement = class UmbDocumentTreeItemElement extends UmbTre
             });
             this.observe(this.#api.icon, (icon) => (this.#icon = icon || ''));
             this.observe(this.#api.flags, (flags) => (this._flags = flags || []));
-            // Observe noAccess from context and update base class property (_noAccess).
-            // This enables access restriction behavior (click prevention) and styling from the base class.
-            this.observe(this.#api.noAccess, (noAccess) => (this._noAccess = noAccess));
         }
         super.api = value;
     }

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

@@ -15,6 +15,13 @@ export declare class UmbDocumentUrlsDataResolver extends UmbControllerBase {
      * @memberof UmbDocumentUrlsDataResolver
      */
     readonly urls: import("rxjs").Observable<UmbDocumentUrlModel[]>;
+    /**
+     * The culture to request urls for from the server. Emits whenever the displayed culture changes.
+     * Resolves to undefined for invariant documents (meaning all cultures).
+     * @returns {Observable<string | undefined>} The culture to request urls for
+     * @memberof UmbDocumentUrlsDataResolver
+     */
+    readonly requestCulture: import("rxjs").Observable<string | undefined>;
     constructor(host: UmbControllerHost);
     /**
      * Get the current data
@@ -34,4 +41,12 @@ export declare class UmbDocumentUrlsDataResolver extends UmbControllerBase {
      * @memberof UmbDocumentUrlsDataResolver
      */
     getUrls(): Promise<Array<UmbDocumentUrlModel> | []>;
+    /**
+     * Gets the culture to request urls for from the server.
+     * Returns the current culture for variant documents, or undefined for invariant documents
+     * (which must return all of their domain urls).
+     * @returns {Promise<string | undefined>} The culture to request, or undefined for all cultures
+     * @memberof UmbDocumentUrlsDataResolver
+     */
+    getRequestCulture(): Promise<string | undefined>;
 }

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

@@ -1,5 +1,5 @@
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
-import { UmbArrayState } from '../../../../libs/observable-api/index.js';
+import { UmbArrayState, UmbStringState } from '../../../../libs/observable-api/index.js';
 import { UMB_VARIANT_CONTEXT } from '../../../core/variant/index.js';
 /**
  * A controller for resolving data for document urls
@@ -8,12 +8,12 @@ import { UMB_VARIANT_CONTEXT } from '../../../core/variant/index.js';
  * @augments {UmbControllerBase}
  */
 export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
-    #appCulture;
     #variantId;
     #displayVariantId;
     #data;
     #init;
     #urls;
+    #requestCulture;
     constructor(host) {
         super(host);
         this.#urls = new UmbArrayState([], (url) => url.url);
@@ -23,10 +23,25 @@ export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
          * @memberof UmbDocumentUrlsDataResolver
          */
         this.urls = this.#urls.asObservable();
+        this.#requestCulture = new UmbStringState(undefined);
+        /**
+         * The culture to request urls for from the server. Emits whenever the displayed culture changes.
+         * Resolves to undefined for invariant documents (meaning all cultures).
+         * @returns {Observable<string | undefined>} The culture to request urls for
+         * @memberof UmbDocumentUrlsDataResolver
+         */
+        this.requestCulture = this.#requestCulture.asObservable();
         this.#init = Promise.all([
             this.consumeContext(UMB_VARIANT_CONTEXT, async (context) => {
                 this.#variantId = await context?.getVariantId();
-                this.#displayVariantId = await this.observe(context?.displayVariantId)?.asPromise();
+                // Observe the display variant id so the resolver reacts to culture switches, rather than
+                // capturing the culture only once.
+                if (context) {
+                    this.observe(context.displayVariantId, (displayVariantId) => {
+                        this.#displayVariantId = displayVariantId;
+                        this.#setCultureAwareValues();
+                    }, 'observeDisplayVariantId');
+                }
                 this.#setCultureAwareValues();
             }).asPromise(),
         ]);
@@ -61,15 +76,31 @@ export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
         await this.#init;
         return this.#urls.getValue();
     }
+    /**
+     * Gets the culture to request urls for from the server.
+     * Returns the current culture for variant documents, or undefined for invariant documents
+     * (which must return all of their domain urls).
+     * @returns {Promise<string | undefined>} The culture to request, or undefined for all cultures
+     * @memberof UmbDocumentUrlsDataResolver
+     */
+    async getRequestCulture() {
+        await this.#init;
+        return this.#requestCulture.getValue();
+    }
     #setCultureAwareValues() {
         this.#setUrls();
+        // TODO: when the variant context gains a dedicated "request/effective culture" accessor, resolve the
+        // invariant->all-cultures decision through it instead of here.
+        this.#requestCulture.setValue(this.#variantId?.isCultureInvariant() ? undefined : this.#getCurrentCulture());
     }
     #setUrls() {
         const data = this.#getDataForCurrentCulture();
         this.#urls.setValue(data ?? []);
     }
     #getCurrentCulture() {
-        return this.#variantId?.culture || this.#displayVariantId?.culture || this.#appCulture;
+        // Culture resolution (incl. inheritance/fallback) is owned by the variant context; we read its
+        // already-resolved display variant rather than re-deriving it here.
+        return this.#displayVariantId?.culture ?? undefined;
     }
     #getDataForCurrentCulture() {
         // Invariant document: return all URLs. The server tags each URL with the

package/dist-cms/packages/documents/documents/url/info-app/document-links-workspace-info-app.element.js

@@ -37,7 +37,7 @@ let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInf
                 return;
             if (event.getEntityType() !== this.#documentWorkspaceContext.getEntityType())
                 return;
-            this.#debounceRequestUrls();
+            this.#scheduleRequestUrls();
         };
         this.consumeContext(UMB_ACTION_EVENT_CONTEXT, (context) => {
             this.#eventContext = context;
@@ -53,7 +53,7 @@ let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInf
                     this._isNew = isNew === true;
                     if (unique !== this._unique) {
                         this._unique = unique;
-                        this.#requestUrls();
+                        this.#scheduleRequestUrls();
                     }
                 }, 'observeWorkspaceState');
             }
@@ -65,6 +65,8 @@ let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInf
                 this.#setLinks();
             });
         });
+        // Re-request when the displayed culture changes, so switching language fetches that culture.
+        this.observe(this.#documentUrlsDataResolver?.requestCulture, () => this.#scheduleRequestUrls(), 'observeRequestCulture');
         this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (context) => {
             this.#propertyDataSetVariantId = context?.getVariantId();
             this.#setLinks();
@@ -95,18 +97,31 @@ let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInf
         }
         return url;
     }
-    async #requestUrls() {
-        if (this._isNew)
+    // Show the loading indicator immediately (synchronously), before the debounced request runs, so no
+    // stale "no URL" message is shown while the URL is (re)resolved - e.g. on load or when switching culture.
+    #scheduleRequestUrls() {
+        if (this._isNew || !this._unique)
             return;
-        if (!this._unique)
+        this._loading = true;
+        this.#debounceRequestUrls();
+    }
+    async #requestUrls() {
+        if (this._isNew || !this._unique)
             return;
         this._loading = true;
         this.#documentUrlsDataResolver?.setData([]);
-        const { data } = await this.#documentUrlRepository.requestItems([this._unique]);
-        if (data?.length) {
-            this.#documentUrlsDataResolver?.setData(data[0].urls);
+        try {
+            // Only request the culture currently being displayed for variant documents. Invariant documents
+            // return all of their domain urls, so no culture is passed (getRequestCulture resolves undefined).
+            const culture = await this.#documentUrlsDataResolver?.getRequestCulture();
+            const { data } = await this.#documentUrlRepository.requestUrls([this._unique], culture);
+            if (data?.length) {
+                this.#documentUrlsDataResolver?.setData(data[0].urls);
+            }
+        }
+        finally {
+            this._loading = false;
         }
-        this._loading = false;
     }
     #getStateLocalizationKey(state) {
         switch (state) {

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

@@ -2,6 +2,19 @@ import type { UmbDocumentUrlsModel } from './types.js';
 import { UmbItemRepositoryBase } from '../../../../core/repository/index.js';
 import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
 export declare class UmbDocumentUrlRepository extends UmbItemRepositoryBase<UmbDocumentUrlsModel> {
+    #private;
     constructor(host: UmbControllerHost);
+    /**
+     * Requests the urls for the given uniques, optionally restricted to a single culture.
+     * @param {Array<string>} uniques The document uniques to request urls for.
+     * @param {string} [culture] The culture to restrict variant document urls to, or undefined for all cultures.
+     * @returns {*} The requested url data.
+     * @memberof UmbDocumentUrlRepository
+     */
+    requestUrls(uniques: Array<string>, culture?: string): Promise<{
+        data: UmbDocumentUrlsModel[] | undefined;
+        error: Error | import("../../../../core/resources/index.js").UmbError | import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;
+        asObservable: () => import("rxjs").Observable<UmbDocumentUrlsModel[]> | undefined;
+    }>;
 }
 export { UmbDocumentUrlRepository as api };

package/dist-cms/packages/documents/documents/url/repository/document-url.repository.js

@@ -2,8 +2,30 @@ import { UMB_DOCUMENT_URL_STORE_CONTEXT } from './document-url.store.context-tok
 import { UmbDocumentUrlServerDataSource } from './document-url.server.data-source.js';
 import { UmbItemRepositoryBase } from '../../../../core/repository/index.js';
 export class UmbDocumentUrlRepository extends UmbItemRepositoryBase {
+    // The culture-aware request needs its own data source instance: `UmbItemRepositoryBase` keeps its
+    // data source private and the inherited `requestItems` signature cannot carry a culture. Extending
+    // the item base keeps this consistent with `UmbMediaUrlRepository`; `requestUrls` otherwise mirrors
+    // the base flow, including store population.
+    #urlSource = new UmbDocumentUrlServerDataSource(this);
     constructor(host) {
         super(host, UmbDocumentUrlServerDataSource, UMB_DOCUMENT_URL_STORE_CONTEXT);
     }
+    /**
+     * Requests the urls for the given uniques, optionally restricted to a single culture.
+     * @param {Array<string>} uniques The document uniques to request urls for.
+     * @param {string} [culture] The culture to restrict variant document urls to, or undefined for all cultures.
+     * @returns {*} The requested url data.
+     * @memberof UmbDocumentUrlRepository
+     */
+    async requestUrls(uniques, culture) {
+        if (!uniques)
+            throw new Error('Uniques are missing');
+        await this._init;
+        const { data, error } = await this.#urlSource.getItems(uniques, culture);
+        if (data) {
+            this._itemStore?.appendItems(data);
+        }
+        return { data, error, asObservable: () => this._itemStore?.items(uniques) };
+    }
 }
 export { UmbDocumentUrlRepository as api };

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

@@ -14,7 +14,7 @@ export declare class UmbDocumentUrlServerDataSource extends UmbItemServerDataSou
      * @memberof UmbDocumentUrlServerDataSource
      */
     constructor(host: UmbControllerHost);
-    getItems(uniques: Array<string>): Promise<{
+    getItems(uniques: Array<string>, culture?: string): Promise<{
         data: UmbDocumentUrlsModel[] | undefined;
         error: Error | import("../../../../core/resources/index.js").UmbError | import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;
     }>;

package/dist-cms/packages/documents/documents/url/repository/document-url.server.data-source.js

@@ -15,12 +15,12 @@ export class UmbDocumentUrlServerDataSource extends UmbItemServerDataSourceBase
     constructor(host) {
         super(host, { mapper });
     }
-    async getItems(uniques) {
+    async getItems(uniques, culture) {
         if (!uniques)
             throw new Error('Uniques are missing');
         const itemRequestManager = new UmbItemDataApiGetRequestController(this, {
             // eslint-disable-next-line local-rules/no-direct-api-import
-            api: (args) => DocumentService.getDocumentUrls({ query: { id: args.uniques } }),
+            api: (args) => DocumentService.getDocumentUrls({ query: { id: args.uniques, culture } }),
             uniques,
         });
         const { data, error } = await itemRequestManager.request();