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

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

@@ -7,16 +7,15 @@ import { UMB_DOCUMENT_PUBLISHING_WORKSPACE_CONTEXT, UmbDocumentPublishingReposit
 import { UmbDocumentValidationRepository } from '../repository/validation/index.js';
 import { UMB_DOCUMENT_CONFIGURATION_CONTEXT } from '../index.js';
 import { UMB_DOCUMENT_DETAIL_MODEL_VARIANT_SCAFFOLD, UMB_DOCUMENT_WORKSPACE_ALIAS } from './constants.js';
-import { UMB_INVARIANT_CULTURE, UmbVariantId } from '@umbraco-cms/backoffice/variant';
+import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 import { UmbWorkspaceIsNewRedirectController, UmbWorkspaceIsNewRedirectControllerAlias, } from '@umbraco-cms/backoffice/workspace';
 import { UmbDocumentBlueprintDetailRepository } from '@umbraco-cms/backoffice/document-blueprint';
 import { UmbContentDetailWorkspaceContextBase, } from '@umbraco-cms/backoffice/content';
 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 { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
-import { UMB_LANGUAGE_USER_PERMISSION_CONDITION_ALIAS } from '@umbraco-cms/backoffice/language';
 import { UMB_SERVER_CONTEXT } from '@umbraco-cms/backoffice/server';
+import { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
 export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContextBase {
     #isTrashedContext;
     #publishingContext;
@@ -51,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
@@ -59,10 +59,7 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
                 }
                 return true;
             };
-        });
-        this.consumeContext(UMB_DOCUMENT_CONFIGURATION_CONTEXT, async (context) => {
-            const documentConfiguration = (await context?.getDocumentConfiguration()) ?? undefined;
-            if (documentConfiguration?.allowEditInvariantFromNonDefault !== true) {
+            if (allowEditInvariantFromNonDefault === false) {
                 this.#preventEditInvariantFromNonDefault();
             }
         });
@@ -140,40 +137,6 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
             },
         ]);
     }
-    #preventEditInvariantFromNonDefault() {
-        this.observe(observeMultiple([this.structure.contentTypeProperties, this.languages]), ([properties, languages]) => {
-            if (properties.length === 0)
-                return;
-            if (languages.length === 0)
-                return;
-            const defaultLanguageUnique = languages.find((x) => x.isDefault)?.unique;
-            const ruleUnique = 'UMB_preventEditInvariantFromNonDefault';
-            const rule = {
-                unique: ruleUnique,
-                permitted: false,
-                message: 'Shared properties can only be edited in the default language',
-                variantId: UmbVariantId.CreateInvariant(),
-            };
-            /* The permission is false by default, and the onChange callback will not be triggered if the permission hasn't changed.
-        Therefore, we add the rule to the readOnlyGuard here. */
-            this.propertyWriteGuard.addRule(rule);
-            createExtensionApiByAlias(this, UMB_LANGUAGE_USER_PERMISSION_CONDITION_ALIAS, [
-                {
-                    config: {
-                        allOf: [defaultLanguageUnique],
-                    },
-                    onChange: (permitted) => {
-                        if (permitted) {
-                            this.propertyWriteGuard.removeRule(ruleUnique);
-                        }
-                        else {
-                            this.propertyWriteGuard.addRule(rule);
-                        }
-                    },
-                },
-            ]);
-        }, 'observePreventEditInvariantFromNonDefault');
-    }
     resetState() {
         super.resetState();
         this.#isTrashedContext.setIsTrashed(false);
@@ -238,31 +201,27 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
     setTemplate(templateUnique) {
         this._data.updateCurrent({ template: { unique: templateUnique } });
     }
-    /**
-     * Request a submit of the workspace, in the case of Document Workspaces the validation does not need to be valid for this to be submitted.
-     * @returns {Promise<void>} a promise which resolves once it has been completed.
-     */
-    requestSubmit() {
+    async _handleSave() {
         const elementStyle = this.getHostElement().style;
         elementStyle.setProperty('--uui-color-invalid', 'var(--uui-color-warning)');
         elementStyle.setProperty('--uui-color-invalid-emphasis', 'var(--uui-color-warning-emphasis)');
         elementStyle.setProperty('--uui-color-invalid-standalone', 'var(--uui-color-warning-standalone)');
         elementStyle.setProperty('--uui-color-invalid-contrast', 'var(--uui-color-warning-contrast)');
-        return this._handleSubmit();
+        await super._handleSave();
     }
     async saveAndPreview() {
-        return this.#handleSaveAndPreview();
+        return await this.#handleSaveAndPreview();
     }
     async #handleSaveAndPreview() {
         const unique = this.getUnique();
         if (!unique)
             throw new Error('Unique is missing');
-        let culture = UMB_INVARIANT_CULTURE;
+        let firstVariantId = UmbVariantId.CreateInvariant();
         // Save document (the active variant) before previewing.
         const { selected } = await this._determineVariantOptions();
         if (selected.length > 0) {
-            culture = selected[0];
-            const variantIds = [UmbVariantId.FromString(culture)];
+            firstVariantId = UmbVariantId.FromString(selected[0]);
+            const variantIds = [firstVariantId];
             const saveData = await this._data.constructData(variantIds);
             await this.runMandatoryValidationForSaveData(saveData);
             await this.performCreateOrUpdate(variantIds, saveData);
@@ -274,10 +233,13 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
             throw new Error('Server context is missing');
         }
         const backofficePath = serverContext.getBackofficePath();
-        const previewUrl = new URL(ensurePathEndsWithSlash(backofficePath) + 'preview', serverContext.getServerUrl());
+        const previewUrl = new URL(ensurePathEndsWithSlash(backofficePath) + 'preview', window.location.origin);
         previewUrl.searchParams.set('id', unique);
-        if (culture && culture !== UMB_INVARIANT_CULTURE) {
-            previewUrl.searchParams.set('culture', culture);
+        if (firstVariantId.culture) {
+            previewUrl.searchParams.set('culture', firstVariantId.culture);
+        }
+        if (firstVariantId.segment) {
+            previewUrl.searchParams.set('segment', firstVariantId.segment);
         }
         const previewWindow = window.open(previewUrl.toString(), `umbpreview-${unique}`);
         previewWindow?.focus();
@@ -290,7 +252,7 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
         }).warn();
         if (!this.#publishingContext)
             throw new Error('Publishing context is missing');
-        this.#publishingContext.publish();
+        await this.#publishingContext.publish();
     }
     /**
      * Save the document and publish it.
@@ -304,7 +266,7 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
         }).warn();
         if (!this.#publishingContext)
             throw new Error('Publishing context is missing');
-        this.#publishingContext.saveAndPublish();
+        await this.#publishingContext.saveAndPublish();
     }
     /**
      * Schedule the document to be published at a later date.
@@ -318,7 +280,7 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
         }).warn();
         if (!this.#publishingContext)
             throw new Error('Publishing context is missing');
-        this.#publishingContext.schedule();
+        await this.#publishingContext.schedule();
     }
     /**
      * Unpublish the document.
@@ -332,7 +294,7 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
         }).warn();
         if (!this.#publishingContext)
             throw new Error('Publishing context is missing');
-        this.#publishingContext.unpublish();
+        await this.#publishingContext.unpublish();
     }
     /**
      * Publish the document and all its descendants.
@@ -346,7 +308,7 @@ export class UmbDocumentWorkspaceContext extends UmbContentDetailWorkspaceContex
         }).warn();
         if (!this.#publishingContext)
             throw new Error('Publishing context is missing');
-        this.#publishingContext.publishWithDescendants();
+        await this.#publishingContext.publishWithDescendants();
     }
     createPropertyDatasetContext(host, variantId) {
         return new UmbDocumentPropertyDatasetContext(host, this, variantId);
@@ -361,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/extension-insights/collection/views/table/extension-table-collection-view.element.js

@@ -76,6 +76,7 @@ let UmbExtensionTableCollectionViewElement = class UmbExtensionTableCollectionVi
 							.value=${{
                             entityType: extension.entityType,
                             unique: extension.unique,
+                            name: extension.name,
                         }}></umb-entity-actions-table-column-view>`,
                     },
                 ],

package/dist-cms/packages/language/app-language-select/app-language-select.element.js

@@ -100,7 +100,8 @@ let UmbAppLanguageSelectElement = class UmbAppLanguageSelectElement extends UmbL
 			id="dropdown-popover"
 			data-mark="app-language-menu"
 			@beforetoggle=${this.#onPopoverToggle}>
-			<umb-popover-layout>
+						<umb-popover-layout>
+			<uui-scroll-container style="max-height:calc(100vh - (var(--umb-header-layout-height) + 60px));">
 				${repeat(this._languages, (language) => language.unique, (language) => html `
 						<uui-menu-item
 							label=${ifDefined(language.name)}
@@ -110,7 +111,9 @@ let UmbAppLanguageSelectElement = class UmbAppLanguageSelectElement extends UmbL
 							${this.#isLanguageReadOnly(language.unique) ? this.#renderReadOnlyTag(language.unique) : nothing}
 						</uui-menu-item>
 					`)}
-			</umb-popover-layout>
+				</uui-scroll-container>
+							</umb-popover-layout>
+
 		</uui-popover-container>`;
     }
     #isLanguageReadOnly(culture) {
@@ -154,6 +157,8 @@ let UmbAppLanguageSelectElement = class UmbAppLanguageSelectElement extends UmbL
 
 			uui-menu-item {
 				color: var(--uui-color-text);
+				
+				width: auto;
 			}
 		`,
     ]; }

package/dist-cms/packages/language/collection/views/table/language-table-collection-view.element.js

@@ -91,6 +91,7 @@ let UmbLanguageTableCollectionViewElement = class UmbLanguageTableCollectionView
 							.value=${{
                             entityType: language.entityType,
                             unique: language.unique,
+                            name: language.name,
                         }}></umb-entity-actions-table-column-view>`,
                     },
                 ],

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/language/menu/language-menu-structure.context.d.ts

@@ -1,6 +1,6 @@
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import type { UmbStructureItemModel } from '@umbraco-cms/backoffice/menu';
+import { type UmbStructureItemModel } from '@umbraco-cms/backoffice/menu';
 export declare class UmbLanguageNavigationStructureWorkspaceContext extends UmbContextBase {
     #private;
     readonly structure: import("rxjs").Observable<UmbStructureItemModel[]>;

package/dist-cms/packages/language/menu/language-menu-structure.context.js

@@ -1,15 +1,17 @@
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
+import { UMB_MENU_STRUCTURE_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/menu';
 export class UmbLanguageNavigationStructureWorkspaceContext extends UmbContextBase {
     // TODO: figure out the correct type where we have "data" available
     #workspaceContext;
     #structure;
     constructor(host) {
-        // TODO: set up context token
-        super(host, 'UmbMenuStructureWorkspaceContext');
+        super(host, UMB_MENU_STRUCTURE_WORKSPACE_CONTEXT);
         this.#structure = new UmbArrayState([], (x) => x.unique);
         this.structure = this.#structure.asObservable();
+        // 'UmbMenuStructureWorkspaceContext' is Obsolete, will be removed in v.18
+        this.provideContext('UmbMenuStructureWorkspaceContext', this);
         this.consumeContext(UMB_WORKSPACE_CONTEXT, (instance) => {
             this.#workspaceContext = instance;
             this.#requestStructure();

package/dist-cms/packages/language/repository/item/language-item.server.data-source.d.ts

@@ -14,4 +14,8 @@ export declare class UmbLanguageItemServerDataSource extends UmbItemServerDataSo
      * @memberof UmbLanguageItemServerDataSource
      */
     constructor(host: UmbControllerHost);
+    getItems(uniques: Array<string>): Promise<{
+        data: UmbLanguageItemModel[] | undefined;
+        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+    }>;
 }

package/dist-cms/packages/language/repository/item/language-item.server.data-source.js

@@ -1,6 +1,7 @@
 import { UMB_LANGUAGE_ENTITY_TYPE } from '../../entity.js';
 import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository';
 import { LanguageService } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbItemDataApiGetRequestController } from '@umbraco-cms/backoffice/entity-item';
 /**
  * A server data source for Language items
  * @class UmbLanguageItemServerDataSource
@@ -14,13 +15,21 @@ export class UmbLanguageItemServerDataSource extends UmbItemServerDataSourceBase
      */
     constructor(host) {
         super(host, {
-            getItems,
             mapper,
         });
     }
+    async getItems(uniques) {
+        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) => LanguageService.getItemLanguage({ query: { isoCode: args.uniques } }),
+            uniques,
+        });
+        const { data, error } = await itemRequestManager.request();
+        return { data: this._getMappedItems(data), error };
+    }
 }
-/* eslint-disable local-rules/no-direct-api-import */
-const getItems = (uniques) => LanguageService.getItemLanguage({ query: { isoCode: uniques } });
 const mapper = (item) => {
     return {
         unique: item.isoCode,

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/collection/media-collection.element.js

@@ -18,6 +18,7 @@ let UmbMediaCollectionElement = class UmbMediaCollectionElement extends UmbColle
         this._progress = -1;
         this._unique = null;
         this.consumeContext(UMB_MEDIA_COLLECTION_CONTEXT, (context) => {
+            // TODO: stop consuming the context both in the default element and here. Instead make the default able to inform when the context is consumed. Or come up with a better system for the controllers to talk together. [NL]
             this.#collectionContext = context;
         });
         this.consumeContext(UMB_MEDIA_WORKSPACE_CONTEXT, (instance) => {

package/dist-cms/packages/media/media/collection/views/table/media-table-collection-view.element.js

@@ -94,6 +94,7 @@ let UmbMediaTableCollectionViewElement = class UmbMediaTableCollectionViewElemen
 								.value=${{
                             entityType: item.entityType,
                             unique: item.unique,
+                            name: item.name,
                         }}></umb-entity-actions-table-column-view>`,
                     };
                 }

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/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/repository/item/media-item.server.data-source.d.ts

@@ -8,7 +8,6 @@ import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'
  * @implements {MediaTreeDataSource}
  */
 export declare class UmbMediaItemServerDataSource extends UmbItemServerDataSourceBase<MediaItemResponseModel, UmbMediaItemModel> {
-    #private;
     /**
      * Creates an instance of UmbMediaItemServerDataSource.
      * @param {UmbControllerHost} host - The controller host for this controller to be appended to
@@ -31,4 +30,8 @@ export declare class UmbMediaItemServerDataSource extends UmbItemServerDataSourc
         data: UmbMediaItemModel[];
         error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
     }>;
+    getItems(uniques: Array<string>): Promise<{
+        data: UmbMediaItemModel[] | undefined;
+        error: Error | import("@umbraco-cms/backoffice/resources").UmbError | import("@umbraco-cms/backoffice/resources").UmbApiError | import("@umbraco-cms/backoffice/resources").UmbCancelError | undefined;
+    }>;
 }

package/dist-cms/packages/media/media/repository/item/media-item.server.data-source.js

@@ -2,13 +2,13 @@ import { UMB_MEDIA_ENTITY_TYPE } from '../../entity.js';
 import { MediaService } from '@umbraco-cms/backoffice/external/backend-api';
 import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository';
 import { tryExecute } from '@umbraco-cms/backoffice/resources';
+import { UmbItemDataApiGetRequestController } from '@umbraco-cms/backoffice/entity-item';
 /**
  * A data source for Media items that fetches data from the server
  * @class UmbMediaItemServerDataSource
  * @implements {MediaTreeDataSource}
  */
 export class UmbMediaItemServerDataSource extends UmbItemServerDataSourceBase {
-    #host;
     /**
      * Creates an instance of UmbMediaItemServerDataSource.
      * @param {UmbControllerHost} host - The controller host for this controller to be appended to
@@ -16,10 +16,8 @@ export class UmbMediaItemServerDataSource extends UmbItemServerDataSourceBase {
      */
     constructor(host) {
         super(host, {
-            getItems,
             mapper,
         });
-        this.#host = host;
     }
     /**
      * @deprecated - The search method will be removed in v17. Use the
@@ -30,13 +28,22 @@ export class UmbMediaItemServerDataSource extends UmbItemServerDataSourceBase {
      * ```
      */
     async search({ query, skip, take }) {
-        const { data, error } = await tryExecute(this.#host, MediaService.getItemMediaSearch({ query: { query, skip, take } }));
+        const { data, error } = await tryExecute(this, MediaService.getItemMediaSearch({ query: { query, skip, take } }));
         const mapped = data?.items.map((item) => mapper(item));
         return { data: mapped, error };
     }
+    async getItems(uniques) {
+        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) => MediaService.getItemMedia({ query: { id: args.uniques } }),
+            uniques,
+        });
+        const { data, error } = await itemRequestManager.request();
+        return { data: this._getMappedItems(data), error };
+    }
 }
-/* eslint-disable local-rules/no-direct-api-import */
-const getItems = (uniques) => MediaService.getItemMedia({ query: { id: uniques } });
 const mapper = (item) => {
     return {
         entityType: UMB_MEDIA_ENTITY_TYPE,

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 };