@umbraco-cms/backoffice 16.0.0-rc2 → 16.0.0-rc4

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

@@ -0,0 +1,78 @@
+import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
+import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
+import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
+/**
+ * A controller for resolving data for document urls
+ * @exports
+ * @class UmbDocumentUrlsDataResolver
+ * @augments {UmbControllerBase}
+ */
+export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
+    #appCulture;
+    #propertyDataSetCulture;
+    #data;
+    #init;
+    #urls;
+    constructor(host) {
+        super(host);
+        this.#urls = new UmbArrayState([], (url) => url.url);
+        /**
+         * The urls for the current culture
+         * @returns {ObservableArray<UmbDocumentUrlModel>} The urls for the current culture
+         * @memberof UmbDocumentUrlsDataResolver
+         */
+        this.urls = this.#urls.asObservable();
+        // TODO: listen for UMB_VARIANT_CONTEXT when available
+        this.#init = Promise.all([
+            this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (context) => {
+                this.#propertyDataSetCulture = context?.getVariantId();
+                this.#setCultureAwareValues();
+            }).asPromise(),
+        ]);
+    }
+    /**
+     * Get the current data
+     * @returns {Array<UmbDocumentUrlModel> | undefined} The current data
+     * @memberof UmbDocumentUrlsDataResolver
+     */
+    getData() {
+        return this.#data;
+    }
+    /**
+     * Set the current data
+     * @param {Array<UmbDocumentUrlModel> | undefined} data The current data
+     * @memberof UmbDocumentUrlsDataResolver
+     */
+    setData(data) {
+        this.#data = data;
+        if (!this.#data) {
+            this.#urls.setValue([]);
+            return;
+        }
+        this.#setCultureAwareValues();
+    }
+    /**
+     * Get the urls for the current culture
+     * @returns {(Promise<Array<UmbDocumentUrlModel> | []>)} The urls for the current culture
+     * @memberof UmbDocumentUrlsDataResolver
+     */
+    async getUrls() {
+        await this.#init;
+        return this.#urls.getValue();
+    }
+    #setCultureAwareValues() {
+        this.#setUrls();
+    }
+    #setUrls() {
+        const data = this.#getDataForCurrentCulture();
+        this.#urls.setValue(data ?? []);
+    }
+    #getCurrentCulture() {
+        return this.#propertyDataSetCulture?.culture || this.#appCulture;
+    }
+    #getDataForCurrentCulture() {
+        const culture = this.#getCurrentCulture();
+        // If there is no culture context (invariant data) we return all urls
+        return culture ? this.#data?.filter((x) => x.culture === culture) : this.#data;
+    }
+}

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

@@ -1,2 +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,2 +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/info-app/document-links-workspace-info-app.element.d.ts

@@ -6,7 +6,6 @@ export declare class UmbDocumentLinksWorkspaceInfoAppElement extends UmbLitEleme
     private _variantOptions?;
     private _loading;
     private _links;
-    private _defaultCulture?;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
     disconnectedCallback(): void;

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

@@ -6,19 +6,22 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UmbDocumentUrlRepository } from '../repository/index.js';
 import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../workspace/constants.js';
-import { css, customElement, html, nothing, repeat, state, when } from '@umbraco-cms/backoffice/external/lit';
+import { UmbDocumentUrlsDataResolver } from '../document-urls-data-resolver.js';
+import { css, customElement, html, ifDefined, nothing, repeat, state, when, } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbRequestReloadStructureForEntityEvent } from '@umbraco-cms/backoffice/entity-action';
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 import { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
 import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api';
 import { debounce } from '@umbraco-cms/backoffice/utils';
-import { UMB_APP_LANGUAGE_CONTEXT } from '@umbraco-cms/backoffice/language';
+import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
 let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInfoAppElement extends UmbLitElement {
     #documentUrlRepository;
     #urls;
     #documentWorkspaceContext;
     #eventContext;
+    #propertyDataSetVariantId;
+    #documentUrlsDataResolver;
     constructor() {
         super();
         this.#documentUrlRepository = new UmbDocumentUrlRepository(this);
@@ -26,6 +29,7 @@ let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInf
         this._loading = false;
         this._links = [];
         this.#urls = [];
+        this.#documentUrlsDataResolver = new UmbDocumentUrlsDataResolver(this);
         this.#debounceRequestUrls = debounce(() => this.#requestUrls(), 50);
         this.#onReloadRequest = (event) => {
             // TODO: Introduce "Published Event". We only need to update the url when the document is published.
@@ -61,19 +65,24 @@ let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInf
                 this.#setLinks();
             });
         });
-        this.consumeContext(UMB_APP_LANGUAGE_CONTEXT, (instance) => {
-            this.observe(instance?.appDefaultLanguage, (value) => {
-                this._defaultCulture = value?.unique;
-                this.#setLinks();
-            });
+        this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (context) => {
+            this.#propertyDataSetVariantId = context?.getVariantId();
+            this.#setLinks();
+        });
+        this.observe(this.#documentUrlsDataResolver?.urls, (urls) => {
+            this.#urls = urls ?? [];
+            this.#setLinks();
         });
     }
     #setLinks() {
-        const links = this.#urls.map((u) => {
-            const culture = u.culture ?? this._defaultCulture ?? '';
-            const url = u.url;
+        const links = this.#urls.map((url) => {
+            const culture = url.culture;
             const state = this._variantOptions?.find((variantOption) => variantOption.culture === culture)?.variant?.state;
-            return { culture, url, state };
+            return {
+                culture,
+                url: url.url,
+                state,
+            };
         });
         this._links = links;
     }
@@ -92,12 +101,10 @@ let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInf
         if (!this._unique)
             return;
         this._loading = true;
-        this.#urls = [];
+        this.#documentUrlsDataResolver?.setData([]);
         const { data } = await this.#documentUrlRepository.requestItems([this._unique]);
         if (data?.length) {
-            const item = data[0];
-            this.#urls = item.urls;
-            this.#setLinks();
+            this.#documentUrlsDataResolver?.setData(data[0].urls);
         }
         this._loading = false;
     }
@@ -145,7 +152,7 @@ let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInf
             return this.#renderEmptyLink(link.culture, link.state);
         }
         return html `
-			<a class="link-item" href=${this.#getTargetUrl(link.url)} target="_blank">
+			<a class="link-item" href=${ifDefined(this.#getTargetUrl(link.url))} target="_blank">
 				<span>
 					${this.#renderLinkCulture(link.culture)}
 					<span>${link.url}</span>
@@ -155,7 +162,9 @@ let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInf
 		`;
     }
     #renderNoLinks() {
-        return html ` ${this._variantOptions?.map((variantOption) => this.#renderEmptyLink(variantOption.culture, variantOption.variant?.state))}`;
+        return html ` ${this._variantOptions
+            ?.filter((variantOption) => variantOption.culture === this.#propertyDataSetVariantId?.culture)
+            .map((variantOption) => this.#renderEmptyLink(variantOption.culture, variantOption.variant?.state))}`;
     }
     #renderEmptyLink(culture, state) {
         return html `<div class="link-item">
@@ -170,6 +179,9 @@ let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInf
             return nothing;
         if (this._links.length === 1)
             return nothing;
+        const allLinksHaveSameCulture = this._links?.every((link) => link.culture === culture);
+        if (allLinksHaveSameCulture)
+            return nothing;
         return html `<span class="culture">${culture}</span>`;
     }
     disconnectedCallback() {
@@ -178,10 +190,6 @@ let UmbDocumentLinksWorkspaceInfoAppElement = class UmbDocumentLinksWorkspaceInf
     }
     static { this.styles = [
         css `
-			uui-box {
-				--uui-box-default-padding: 0;
-			}
-
 			#loader-container {
 				display: flex;
 				justify-content: center;
@@ -234,9 +242,6 @@ __decorate([
 __decorate([
     state()
 ], UmbDocumentLinksWorkspaceInfoAppElement.prototype, "_links", void 0);
-__decorate([
-    state()
-], UmbDocumentLinksWorkspaceInfoAppElement.prototype, "_defaultCulture", void 0);
 UmbDocumentLinksWorkspaceInfoAppElement = __decorate([
     customElement('umb-document-links-workspace-info-app')
 ], UmbDocumentLinksWorkspaceInfoAppElement);

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

@@ -3,6 +3,6 @@ export interface UmbDocumentUrlsModel {
     urls: Array<UmbDocumentUrlModel>;
 }
 export interface UmbDocumentUrlModel {
-    culture?: string | null;
+    culture: string | null;
     url?: string;
 }

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();

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

@@ -48,8 +48,10 @@ let UmbDocumentWorkspaceEditorElement = class UmbDocumentWorkspaceEditorElement
         this.#workspaceContext?.splitView.setActiveVariant(index, culture, segment);
     }
     #generateRoutes() {
-        if (!this.#variants || !this.#appCulture)
+        if (!this.#variants || !this.#appCulture) {
+            this._routes = [];
             return;
+        }
         // Generate split view routes for all available routes
         const routes = [];
         // Split view routes:
@@ -86,10 +88,14 @@ let UmbDocumentWorkspaceEditorElement = class UmbDocumentWorkspaceEditorElement
             // Using first single view as the default route for now (hence the math below):
             routes.push({
                 path: '',
-                resolve: () => {
+                pathMatch: 'full',
+                resolve: async () => {
+                    if (!this.#workspaceContext) {
+                        throw new Error('Workspace context is not available when resolving the default route.');
+                    }
                     const route = routes.find((route) => route.path === this.#appCulture);
                     if (!route) {
-                        const firstVariantPath = routes.find((route) => route.path === this.#variants?.[0].unique)?.path;
+                        const firstVariantPath = routes.find((route) => route.path === this.#variants?.[0]?.unique)?.path;
                         if (firstVariantPath) {
                             history.replaceState({}, '', `${this.#workspaceRoute}/${firstVariantPath}`);
                             return;
@@ -102,11 +108,11 @@ let UmbDocumentWorkspaceEditorElement = class UmbDocumentWorkspaceEditorElement
                     history.replaceState({}, '', `${this.#workspaceRoute}/${route?.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/workspace/document-workspace.context.js

@@ -15,6 +15,7 @@ import { UmbIsTrashedEntityContext } from '@umbraco-cms/backoffice/recycle-bin';
 import { ensurePathEndsWithSlash, UmbDeprecation } from '@umbraco-cms/backoffice/utils';
 import { createExtensionApiByAlias } from '@umbraco-cms/backoffice/extension-registry';
 import { UMB_SERVER_CONTEXT } from '@umbraco-cms/backoffice/server';
+import { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
 export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContextBase {
     #isTrashedContext;
     #publishingContext;
@@ -49,6 +50,7 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
         this.consumeContext(UMB_DOCUMENT_CONFIGURATION_CONTEXT, async (context) => {
             const config = await context?.getDocumentConfiguration();
             const allowSegmentCreation = config?.allowNonExistingSegmentsCreation ?? false;
+            const allowEditInvariantFromNonDefault = config?.allowEditInvariantFromNonDefault ?? true;
             this._variantOptionsFilter = (variantOption) => {
                 const isNotCreatedSegmentVariant = variantOption.segment && !variantOption.variant;
                 // Do not allow creating a segment variant
@@ -57,6 +59,9 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
                 }
                 return true;
             };
+            if (allowEditInvariantFromNonDefault === false) {
+                this.#preventEditInvariantFromNonDefault();
+            }
         });
         this.observe(this.contentTypeUnique, (unique) => {
             if (unique) {
@@ -318,5 +323,29 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
             message,
         });
     }
+    #preventEditInvariantFromNonDefault() {
+        this.observe(observeMultiple([this.structure.contentTypeProperties, this.variantOptions]), ([properties, variantOptions]) => {
+            if (properties.length === 0)
+                return;
+            if (variantOptions.length === 0)
+                return;
+            variantOptions.forEach((variantOption) => {
+                // Do not add a rule for the default language. It is always permitted to edit.
+                if (variantOption.language.isDefault)
+                    return;
+                const datasetVariantId = UmbVariantId.CreateFromPartial(variantOption);
+                const invariantVariantId = UmbVariantId.CreateInvariant();
+                const unique = `UMB_PREVENT_EDIT_INVARIANT_FROM_NON_DEFAULT_DATASET=${datasetVariantId.toString()}_PROPERTY_${invariantVariantId.toString()}`;
+                const rule = {
+                    unique,
+                    message: 'Shared properties can only be edited in the default language',
+                    variantId: invariantVariantId,
+                    datasetVariantId,
+                    permitted: false,
+                };
+                this.propertyWriteGuard.addRule(rule);
+            });
+        });
+    }
 }
 export default UmbDocumentWorkspaceContext;

package/dist-cms/packages/language/global-contexts/app-language.context.js

@@ -5,6 +5,7 @@ import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbReadOnlyStateManager } from '@umbraco-cms/backoffice/utils';
 import { UMB_CURRENT_USER_CONTEXT } from '@umbraco-cms/backoffice/current-user';
 import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth';
+import { UmbVariantContext } from '@umbraco-cms/backoffice/variant';
 // TODO: Make a store for the App Languages.
 // TODO: Implement default language end-point, in progress at backend team, so we can avoid getting all languages.
 export class UmbAppLanguageContext extends UmbContextBase {
@@ -24,6 +25,7 @@ export class UmbAppLanguageContext extends UmbContextBase {
     #currentUserHasAccessToAllLanguages;
     #readOnlyStateIdentifier;
     #localStorageKey;
+    #variantContext;
     constructor(host) {
         super(host, UMB_APP_LANGUAGE_CONTEXT);
         this.#languagesPromise = new Promise((resolve) => {
@@ -45,6 +47,7 @@ export class UmbAppLanguageContext extends UmbContextBase {
         this.#currentUserHasAccessToAllLanguages = false;
         this.#readOnlyStateIdentifier = 'UMB_LANGUAGE_PERMISSION_';
         this.#localStorageKey = 'umb:appLanguage';
+        this.#variantContext = new UmbVariantContext(this);
         // TODO: We need to ensure this request is called every time the user logs in, but this should be done somewhere across the app and not here [JOV]
         this.consumeContext(UMB_AUTH_CONTEXT, (authContext) => {
             this.observe(authContext?.isAuthorized, (isAuthorized) => {
@@ -80,6 +83,9 @@ export class UmbAppLanguageContext extends UmbContextBase {
         }
         // set the new language
         this.#appLanguage.update(language);
+        // Update the variant context with the new language
+        this.#variantContext.setCulture(language.unique);
+        this.#variantContext.setAppCulture(language.unique);
         // store the new language in local storage
         localStorage.setItem(this.#localStorageKey, language?.unique);
         // set the new read-only state
@@ -98,22 +104,18 @@ export class UmbAppLanguageContext extends UmbContextBase {
         }
     }
     #initAppLanguage() {
-        // get the selected language from local storage
-        const uniqueFromLocalStorage = localStorage.getItem(this.#localStorageKey);
-        if (uniqueFromLocalStorage) {
-            const language = this.#findLanguage(uniqueFromLocalStorage);
-            if (language) {
-                this.setLanguage(language.unique);
-                return;
-            }
-        }
-        const defaultLanguage = this.#languages.getValue().find((x) => x.isDefault);
+        const defaultLanguageUnique = this.#languages.getValue().find((x) => x.isDefault)?.unique;
         // TODO: do we always have a default language?
         // do we always get the default language on the first request, or could it be on page 2?
         // in that case do we then need an endpoint to get the default language?
-        if (!defaultLanguage?.unique)
+        if (!defaultLanguageUnique)
             return;
-        this.setLanguage(defaultLanguage.unique);
+        this.#variantContext.setFallbackCulture(defaultLanguageUnique);
+        // get the selected language from local storage
+        const uniqueFromLocalStorage = localStorage.getItem(this.#localStorageKey);
+        const languageFromLocalStorage = this.#findLanguage(uniqueFromLocalStorage || '');
+        const languageUniqueToSet = languageFromLocalStorage ? languageFromLocalStorage.unique : defaultLanguageUnique;
+        this.setLanguage(languageUniqueToSet);
     }
     #findLanguage(unique) {
         return this.#languages.getValue().find((x) => x.unique === unique);

package/dist-cms/packages/markdown-editor/components/input-markdown-editor/input-markdown.element.js

@@ -60,6 +60,9 @@ let UmbInputMarkdownElement = class UmbInputMarkdownElement extends UmbFormContr
             this.observe(umbExtensionsRegistry.byType('monacoMarkdownEditorAction'), (manifests) => {
                 manifests.forEach(async (manifest) => {
                     const api = await createExtensionApi(this, manifest, [this]);
+                    if (api) {
+                        api.manifest = manifest;
+                    }
                     const action = {
                         id: manifest.alias ?? api.getUnique(),
                         label: this.localize.string(manifest.meta?.label ?? api.getLabel()),

package/dist-cms/packages/media/media/components/input-media/input-media.context.js

@@ -2,6 +2,7 @@ import { UMB_MEDIA_ITEM_REPOSITORY_ALIAS } from '../../constants.js';
 import { UMB_MEDIA_PICKER_MODAL } from '../../modals/index.js';
 import { UMB_MEDIA_SEARCH_PROVIDER_ALIAS } from '../../search/constants.js';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
+import { UMB_VARIANT_CONTEXT } from '@umbraco-cms/backoffice/variant';
 export class UmbMediaPickerInputContext extends UmbPickerInputContext {
     constructor(host) {
         super(host, UMB_MEDIA_ITEM_REPOSITORY_ALIAS, UMB_MEDIA_PICKER_MODAL);
@@ -19,10 +20,13 @@ export class UmbMediaPickerInputContext extends UmbPickerInputContext {
                 ...pickerData?.search,
             };
         }
+        const variantContext = await this.getContext(UMB_VARIANT_CONTEXT);
+        const culture = await variantContext?.getDisplayCulture();
         // pass allowedContentTypes to the search request args
         combinedPickerData.search.queryParams = {
             allowedContentTypes: args?.allowedContentTypes,
             includeTrashed: args?.includeTrashed,
+            culture,
             ...pickerData?.search?.queryParams,
         };
         await super.openPicker(combinedPickerData);

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

@@ -3,6 +3,7 @@ export * from './entity-actions/constants.js';
 export * from './entity-bulk-actions/constants.js';
 export * from './menu/constants.js';
 export * from './modals/constants.js';
+export * from './paths.js';
 export * from './recycle-bin/constants.js';
 export * from './reference/constants.js';
 export * from './repository/constants.js';
@@ -10,6 +11,5 @@ export * from './search/constants.js';
 export * from './tree/constants.js';
 export * from './url/constants.js';
 export * from './workspace/constants.js';
-export * from './paths.js';
 export { UMB_MEDIA_VARIANT_CONTEXT } from './property-dataset-context/media-property-dataset-context.token.js';
 export { UMB_MEDIA_ENTITY_TYPE, UMB_MEDIA_ROOT_ENTITY_TYPE, UMB_MEDIA_PLACEHOLDER_ENTITY_TYPE, UMB_MEDIA_PROPERTY_VALUE_ENTITY_TYPE, } from './entity.js';

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

@@ -3,6 +3,7 @@ export * from './entity-actions/constants.js';
 export * from './entity-bulk-actions/constants.js';
 export * from './menu/constants.js';
 export * from './modals/constants.js';
+export * from './paths.js';
 export * from './recycle-bin/constants.js';
 export * from './reference/constants.js';
 export * from './repository/constants.js';
@@ -10,6 +11,5 @@ export * from './search/constants.js';
 export * from './tree/constants.js';
 export * from './url/constants.js';
 export * from './workspace/constants.js';
-export * from './paths.js';
 export { UMB_MEDIA_VARIANT_CONTEXT } from './property-dataset-context/media-property-dataset-context.token.js';
 export { UMB_MEDIA_ENTITY_TYPE, UMB_MEDIA_ROOT_ENTITY_TYPE, UMB_MEDIA_PLACEHOLDER_ENTITY_TYPE, UMB_MEDIA_PROPERTY_VALUE_ENTITY_TYPE, } from './entity.js';

package/dist-cms/packages/media/media/dashboard/media-dashboard.element.js

@@ -42,6 +42,7 @@ let UmbMediaDashboardElement = class UmbMediaDashboardElement extends UmbLitElem
                 },
                 {
                     path: '',
+                    pathMatch: 'full',
                     redirectTo: 'collection',
                 },
                 {

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

@@ -13,6 +13,7 @@ import { debounce, UmbPaginationManager } from '@umbraco-cms/backoffice/utils';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UMB_CONTENT_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/content';
 import { isUmbracoFolder } from '@umbraco-cms/backoffice/media-type';
+import { UMB_VARIANT_CONTEXT } from '@umbraco-cms/backoffice/variant';
 import '@umbraco-cms/backoffice/imaging';
 const root = { name: 'Media', unique: null, entityType: UMB_MEDIA_ROOT_ENTITY_TYPE };
 // TODO: investigate how we can reuse the picker-search-field element, picker context etc.
@@ -22,6 +23,7 @@ let UmbMediaPickerModalElement = class UmbMediaPickerModalElement extends UmbMod
     #mediaSearchProvider;
     #dataType;
     #pagingMap;
+    #contextCulture;
     constructor() {
         super();
         this.#mediaTreeRepository = new UmbMediaTreeRepository(this);
@@ -45,6 +47,11 @@ let UmbMediaPickerModalElement = class UmbMediaPickerModalElement extends UmbMod
                 this.#dataType = dataType;
             });
         });
+        this.consumeContext(UMB_VARIANT_CONTEXT, (context) => {
+            this.observe(context?.culture, (culture) => {
+                this.#contextCulture = culture;
+            });
+        });
     }
     async connectedCallback() {
         super.connectedCallback();
@@ -140,6 +147,7 @@ let UmbMediaPickerModalElement = class UmbMediaPickerModalElement extends UmbMod
         const { data } = await this.#mediaSearchProvider.search({
             query,
             searchFrom: this._searchFrom,
+            culture: this.#contextCulture,
             ...this.data?.search?.queryParams,
         });
         if (!data) {

package/dist-cms/packages/media/media/search/constants.d.ts

@@ -1 +1,2 @@
+export * from './global-search/constants.js';
 export declare const UMB_MEDIA_SEARCH_PROVIDER_ALIAS = "Umb.SearchProvider.Media";

package/dist-cms/packages/media/media/search/constants.js

@@ -1 +1,2 @@
+export * from './global-search/constants.js';
 export const UMB_MEDIA_SEARCH_PROVIDER_ALIAS = 'Umb.SearchProvider.Media';

package/dist-cms/packages/media/media/search/global-search/constants.d.ts

@@ -0,0 +1 @@
+export declare const UMB_MEDIA_GLOBAL_SEARCH_ALIAS = "Umb.GlobalSearch.Media";

package/dist-cms/packages/media/media/search/global-search/constants.js

@@ -0,0 +1 @@
+export const UMB_MEDIA_GLOBAL_SEARCH_ALIAS = 'Umb.GlobalSearch.Media';

package/dist-cms/packages/media/media/search/global-search/manifests.d.ts

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

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

@@ -0,0 +1,23 @@
+import { UMB_MEDIA_SECTION_ALIAS } from '../../../media-section/constants.js';
+import { UMB_MEDIA_SEARCH_PROVIDER_ALIAS } from '../constants.js';
+import { UMB_MEDIA_GLOBAL_SEARCH_ALIAS } from './constants.js';
+import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section';
+export const manifests = [
+    {
+        name: 'Media Global Search',
+        alias: UMB_MEDIA_GLOBAL_SEARCH_ALIAS,
+        type: 'globalSearch',
+        weight: 700,
+        api: () => import('./media-global-search.js'),
+        meta: {
+            label: 'Media',
+            searchProviderAlias: UMB_MEDIA_SEARCH_PROVIDER_ALIAS,
+        },
+        conditions: [
+            {
+                alias: UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS,
+                match: UMB_MEDIA_SECTION_ALIAS,
+            },
+        ],
+    },
+];

package/dist-cms/packages/media/media/search/global-search/media-global-search.d.ts

@@ -0,0 +1,15 @@
+import type { UmbMediaSearchProvider } from '../media.search-provider.js';
+import { UmbGlobalSearchBase, type UmbGlobalSearchApi, type UmbSearchRequestArgs } from '@umbraco-cms/backoffice/search';
+export declare class UmbMediaGlobalSearch extends UmbGlobalSearchBase<UmbMediaSearchProvider> implements UmbGlobalSearchApi {
+    search(args: UmbSearchRequestArgs): Promise<{
+        data: {
+            items: import("../types.js").UmbMediaSearchItemModel[];
+            total: number;
+        };
+        error?: undefined;
+    } | {
+        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+        data?: undefined;
+    }>;
+}
+export { UmbMediaGlobalSearch as api };

package/dist-cms/packages/media/media/search/global-search/media-global-search.js

@@ -0,0 +1,15 @@
+import { UmbGlobalSearchBase, } from '@umbraco-cms/backoffice/search';
+import { UMB_VARIANT_CONTEXT } from '@umbraco-cms/backoffice/variant';
+export class UmbMediaGlobalSearch extends UmbGlobalSearchBase {
+    async search(args) {
+        await this._init;
+        if (!this._searchProvider) {
+            throw new Error('Search provider is not available');
+        }
+        // TODO: change this to consume so we don't emit context events for every search change [MR]
+        const variantContext = await this.getContext(UMB_VARIANT_CONTEXT);
+        const displayCulture = await variantContext?.getDisplayCulture();
+        return await this._searchProvider.search({ culture: displayCulture, query: args.query });
+    }
+}
+export { UmbMediaGlobalSearch as api };

package/dist-cms/packages/media/media/search/manifests.js

@@ -1,5 +1,6 @@
 import { UMB_MEDIA_ENTITY_TYPE } from '../entity.js';
 import { UMB_MEDIA_SEARCH_PROVIDER_ALIAS } from './constants.js';
+import { manifests as globalSearchManifests } from './global-search/manifests.js';
 export const manifests = [
     {
         name: 'Media Search Provider',
@@ -18,4 +19,5 @@ export const manifests = [
         element: () => import('./media-search-result-item.element.js'),
         forEntityTypes: [UMB_MEDIA_ENTITY_TYPE],
     },
+    ...globalSearchManifests,
 ];