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

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,
 ];

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

@@ -25,9 +25,10 @@ export class UmbMediaSearchServerDataSource {
     async search(args) {
         const { data, error } = await tryExecute(this.#host, MediaService.getItemMediaSearch({
             query: {
-                query: args.query,
-                parentId: args.searchFrom?.unique || undefined,
                 allowedMediaTypes: args.allowedContentTypes?.map((mediaReference) => mediaReference.unique),
+                culture: args.culture || undefined,
+                parentId: args.searchFrom?.unique || undefined,
+                query: args.query,
                 trashed: args.includeTrashed,
             },
         }));

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

@@ -10,4 +10,5 @@ export interface UmbMediaSearchRequestArgs extends UmbSearchRequestArgs {
         entityType: UmbMediaTypeEntityType;
     }>;
     includeTrashed?: boolean;
+    culture?: string | null;
 }

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

@@ -14,4 +14,8 @@ export declare class UmbMediaUrlServerDataSource extends UmbItemServerDataSource
      * @memberof UmbMediaUrlServerDataSource
      */
     constructor(host: UmbControllerHost);
+    getItems(uniques: Array<string>): Promise<{
+        data: UmbMediaUrlModel[] | 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/url/repository/media-url.server.data-source.js

@@ -1,3 +1,4 @@
+import { UmbItemDataApiGetRequestController } from '@umbraco-cms/backoffice/entity-item';
 import { MediaService } from '@umbraco-cms/backoffice/external/backend-api';
 import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository';
 /**
@@ -13,13 +14,21 @@ export class UmbMediaUrlServerDataSource 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) => MediaService.getMediaUrls({ 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.getMediaUrls({ query: { id: uniques } });
 const mapper = (item) => {
     const url = item.urlInfos.length ? item.urlInfos[0].url : undefined;
     const extension = url ? url.slice(url.lastIndexOf('.') + 1, url.length) : undefined;

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

@@ -5,4 +5,5 @@ export * from './property-type/constants.js';
 export * from './repository/constants.js';
 export * from './tree/constants.js';
 export * from './workspace/constants.js';
+export * from './search/constants.js';
 export { UMB_MEDIA_TYPE_ENTITY_TYPE, UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE, UMB_MEDIA_TYPE_FOLDER_ENTITY_TYPE, } from './entity.js';

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

@@ -5,4 +5,5 @@ export * from './property-type/constants.js';
 export * from './repository/constants.js';
 export * from './tree/constants.js';
 export * from './workspace/constants.js';
+export * from './search/constants.js';
 export { UMB_MEDIA_TYPE_ENTITY_TYPE, UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE, UMB_MEDIA_TYPE_FOLDER_ENTITY_TYPE, } from './entity.js';

package/dist-cms/packages/media/media-types/repository/item/media-type-item.server.data-source.d.ts

@@ -14,4 +14,8 @@ export declare class UmbMediaTypeItemServerDataSource extends UmbItemServerDataS
      * @memberof UmbMediaTypeItemServerDataSource
      */
     constructor(host: UmbControllerHost);
+    getItems(uniques: Array<string>): Promise<{
+        data: UmbMediaTypeItemModel[] | 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-types/repository/item/media-type-item.server.data-source.js

@@ -1,6 +1,7 @@
 import { UMB_MEDIA_TYPE_ENTITY_TYPE } from '../../entity.js';
 import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository';
 import { MediaTypeService } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbItemDataApiGetRequestController } from '@umbraco-cms/backoffice/entity-item';
 /**
  * A data source for Media Type items that fetches data from the server
  * @class UmbMediaTypeItemServerDataSource
@@ -14,13 +15,21 @@ export class UmbMediaTypeItemServerDataSource extends UmbItemServerDataSourceBas
      */
     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) => MediaTypeService.getItemMediaType({ 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) => MediaTypeService.getItemMediaType({ query: { id: uniques } });
 const mapper = (item) => {
     return {
         entityType: UMB_MEDIA_TYPE_ENTITY_TYPE,

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

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

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

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

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

@@ -0,0 +1 @@
+export declare const UMB_MEDIA_TYPE_GLOBAL_SEARCH_ALIAS = "Umb.GlobalSearch.MediaType";

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

@@ -0,0 +1 @@
+export const UMB_MEDIA_TYPE_GLOBAL_SEARCH_ALIAS = 'Umb.GlobalSearch.MediaType';

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

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

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

@@ -0,0 +1,22 @@
+import { UMB_MEDIA_TYPE_SEARCH_PROVIDER_ALIAS } from '../constants.js';
+import { UMB_MEDIA_TYPE_GLOBAL_SEARCH_ALIAS } from './constants.js';
+import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section';
+import { UMB_SETTINGS_SECTION_ALIAS } from '@umbraco-cms/backoffice/settings';
+export const manifests = [
+    {
+        name: 'Media Type Global Search',
+        alias: UMB_MEDIA_TYPE_GLOBAL_SEARCH_ALIAS,
+        type: 'globalSearch',
+        weight: 500,
+        meta: {
+            label: 'Media Types',
+            searchProviderAlias: UMB_MEDIA_TYPE_SEARCH_PROVIDER_ALIAS,
+        },
+        conditions: [
+            {
+                alias: UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS,
+                match: UMB_SETTINGS_SECTION_ALIAS,
+            },
+        ],
+    },
+];

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

@@ -1,8 +1,10 @@
 import { UMB_MEDIA_TYPE_ENTITY_TYPE } from '../entity.js';
+import { UMB_MEDIA_TYPE_SEARCH_PROVIDER_ALIAS } from './constants.js';
+import { manifests as globalSearchManifests } from './global-search/manifests.js';
 export const manifests = [
     {
         name: 'Media Type Search Provider',
-        alias: 'Umb.SearchProvider.MediaType',
+        alias: UMB_MEDIA_TYPE_SEARCH_PROVIDER_ALIAS,
         type: 'searchProvider',
         api: () => import('./media-type.search-provider.js'),
         weight: 500,
@@ -16,4 +18,5 @@ export const manifests = [
         type: 'searchResultItem',
         forEntityTypes: [UMB_MEDIA_TYPE_ENTITY_TYPE],
     },
+    ...globalSearchManifests,
 ];

package/dist-cms/packages/media/media-types/tree/tree-item-children/collection/views/media-type-tree-item-table-collection-view.element.js

@@ -81,6 +81,7 @@ let UmbMediaTypeTreeItemTableCollectionViewElement = class UmbMediaTypeTreeItemT
 							.value=${{
                             entityType: item.entityType,
                             unique: item.unique,
+                            name: item.name,
                         }}></umb-entity-actions-table-column-view>`,
                     },
                 ],

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

@@ -97,6 +97,7 @@ let UmbMemberTableCollectionViewElement = class UmbMemberTableCollectionViewElem
 							.value=${{
                             entityType: member.entityType,
                             unique: member.unique,
+                            name: member.variants[0].name,
                         }}></umb-entity-actions-table-column-view>`,
                     },
                 ],

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

@@ -14,4 +14,8 @@ export declare class UmbMemberItemServerDataSource extends UmbItemServerDataSour
      * @memberof UmbMemberItemServerDataSource
      */
     constructor(host: UmbControllerHost);
+    getItems(uniques: Array<string>): Promise<{
+        data: UmbMemberItemModel[] | 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/members/member/item/repository/member-item.server.data-source.js

@@ -1,6 +1,7 @@
 import { UMB_MEMBER_ENTITY_TYPE } from '../../entity.js';
 import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository';
 import { MemberService } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbItemDataApiGetRequestController } from '@umbraco-cms/backoffice/entity-item';
 /**
  * A server data source for Member items
  * @class UmbMemberItemServerDataSource
@@ -14,13 +15,21 @@ export class UmbMemberItemServerDataSource 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) => MemberService.getItemMember({ 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) => MemberService.getItemMember({ query: { id: uniques } });
 const mapper = (item) => {
     return {
         entityType: UMB_MEMBER_ENTITY_TYPE,

package/dist-cms/packages/members/member/picker/member-picker-search-result-item.element.js

@@ -17,8 +17,9 @@ let UmbMemberPickerSearchResultItemElement = class UmbMemberPickerSearchResultIt
 				id=${item.unique}
 				icon=${item.memberType.icon ?? 'icon-user'}
 				select-only
-				selectable
+				?selectable=${!this.disabled}
 				?selected=${this._isSelected}
+				?disabled=${this.disabled}
 				@deselected=${() => this.pickerContext?.selection.deselect(item.unique)}
 				@selected=${() => this.pickerContext?.selection.select(item.unique)}>
 			</umb-ref-item>

package/dist-cms/packages/members/member/search/constants.d.ts

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

package/dist-cms/packages/members/member/search/constants.js

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

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

@@ -0,0 +1 @@
+export declare const UMB_MEMBER_GLOBAL_SEARCH_ALIAS = "Umb.GlobalSearch.Member";

package/dist-cms/packages/members/member/search/global-search/constants.js

@@ -0,0 +1 @@
+export const UMB_MEMBER_GLOBAL_SEARCH_ALIAS = 'Umb.GlobalSearch.Member';

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

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

package/dist-cms/packages/members/member/search/global-search/manifests.js

@@ -0,0 +1,22 @@
+import { UMB_MEMBER_MANAGEMENT_SECTION_ALIAS } from '../../../section/constants.js';
+import { UMB_MEMBER_SEARCH_PROVIDER_ALIAS } from '../constants.js';
+import { UMB_MEMBER_GLOBAL_SEARCH_ALIAS } from './constants.js';
+import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section';
+export const manifests = [
+    {
+        name: 'Member Global Search',
+        alias: UMB_MEMBER_GLOBAL_SEARCH_ALIAS,
+        type: 'globalSearch',
+        weight: 300,
+        meta: {
+            label: 'Members',
+            searchProviderAlias: UMB_MEMBER_SEARCH_PROVIDER_ALIAS,
+        },
+        conditions: [
+            {
+                alias: UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS,
+                match: UMB_MEMBER_MANAGEMENT_SECTION_ALIAS,
+            },
+        ],
+    },
+];

package/dist-cms/packages/members/member/search/manifests.js

@@ -1,5 +1,6 @@
 import { UMB_MEMBER_ENTITY_TYPE } from '../entity.js';
 import { UMB_MEMBER_SEARCH_PROVIDER_ALIAS } from './constants.js';
+import { manifests as globalSearchManifests } from './global-search/manifests.js';
 export const manifests = [
     {
         name: 'Member Search Provider',
@@ -17,4 +18,5 @@ export const manifests = [
         type: 'searchResultItem',
         forEntityTypes: [UMB_MEMBER_ENTITY_TYPE],
     },
+    ...globalSearchManifests,
 ];

package/dist-cms/packages/members/member-group/collection/views/table/member-group-table-collection-view.element.js

@@ -55,6 +55,7 @@ let UmbMemberGroupTableCollectionViewElement = class UmbMemberGroupTableCollecti
 							.value=${{
                             entityType: memberGroup.entityType,
                             unique: memberGroup.unique,
+                            name: memberGroup.name,
                         }}></umb-entity-actions-table-column-view>`,
                     },
                 ],

package/dist-cms/packages/members/member-group/repository/item/member-group-item.server.data-source.d.ts

@@ -14,4 +14,8 @@ export declare class UmbMemberGroupItemServerDataSource extends UmbItemServerDat
      * @memberof UmbMemberGroupItemServerDataSource
      */
     constructor(host: UmbControllerHost);
+    getItems(uniques: Array<string>): Promise<{
+        data: UmbMemberGroupItemModel[] | 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/members/member-group/repository/item/member-group-item.server.data-source.js

@@ -1,6 +1,7 @@
 import { UMB_MEMBER_GROUP_ENTITY_TYPE } from '../../entity.js';
 import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository';
 import { MemberGroupService } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbItemDataApiGetRequestController } from '@umbraco-cms/backoffice/entity-item';
 /**
  * A server data source for Member Group items
  * @class UmbMemberGroupItemServerDataSource
@@ -14,13 +15,21 @@ export class UmbMemberGroupItemServerDataSource extends UmbItemServerDataSourceB
      */
     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) => MemberGroupService.getItemMemberGroup({ 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) => MemberGroupService.getItemMemberGroup({ query: { id: uniques } });
 const mapper = (item) => {
     return {
         unique: item.id,

package/dist-cms/packages/members/member-type/constants.d.ts

@@ -2,6 +2,7 @@ export * from './entity-actions/constants.js';
 export * from './paths.js';
 export * from './property-type/constants.js';
 export * from './repository/constants.js';
+export * from './search/constants.js';
 export * from './tree/constants.js';
 export * from './workspace/constants.js';
 export { UMB_MEMBER_TYPE_ROOT_ENTITY_TYPE, UMB_MEMBER_TYPE_ENTITY_TYPE } from './entity.js';

package/dist-cms/packages/members/member-type/constants.js

@@ -2,6 +2,7 @@ export * from './entity-actions/constants.js';
 export * from './paths.js';
 export * from './property-type/constants.js';
 export * from './repository/constants.js';
+export * from './search/constants.js';
 export * from './tree/constants.js';
 export * from './workspace/constants.js';
 export { UMB_MEMBER_TYPE_ROOT_ENTITY_TYPE, UMB_MEMBER_TYPE_ENTITY_TYPE } from './entity.js';

package/dist-cms/packages/members/member-type/repository/item/member-type-item.server.data-source.d.ts

@@ -14,4 +14,8 @@ export declare class UmbMemberTypeItemServerDataSource extends UmbItemServerData
      * @memberof UmbMemberTypeItemServerDataSource
      */
     constructor(host: UmbControllerHost);
+    getItems(uniques: Array<string>): Promise<{
+        data: UmbMemberTypeItemModel[] | 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/members/member-type/repository/item/member-type-item.server.data-source.js

@@ -1,6 +1,7 @@
 import { UMB_MEMBER_TYPE_ENTITY_TYPE } from '../../entity.js';
 import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository';
 import { MemberTypeService } from '@umbraco-cms/backoffice/external/backend-api';
+import { UmbItemDataApiGetRequestController } from '@umbraco-cms/backoffice/entity-item';
 /**
  * A server data source for Member Type items
  * @class UmbMemberTypeItemServerDataSource
@@ -14,13 +15,21 @@ export class UmbMemberTypeItemServerDataSource extends UmbItemServerDataSourceBa
      */
     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) => MemberTypeService.getItemMemberType({ 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) => MemberTypeService.getItemMemberType({ query: { id: uniques } });
 const mapper = (item) => {
     return {
         entityType: UMB_MEMBER_TYPE_ENTITY_TYPE,

package/dist-cms/packages/members/member-type/search/constants.d.ts

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

package/dist-cms/packages/members/member-type/search/constants.js

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

package/dist-cms/packages/members/member-type/search/global-search/constants.d.ts

@@ -0,0 +1 @@
+export declare const UMB_MEMBER_TYPE_GLOBAL_SEARCH_ALIAS = "Umb.GlobalSearch.MemberType";

package/dist-cms/packages/members/member-type/search/global-search/constants.js

@@ -0,0 +1 @@
+export const UMB_MEMBER_TYPE_GLOBAL_SEARCH_ALIAS = 'Umb.GlobalSearch.MemberType';

package/dist-cms/packages/members/member-type/search/global-search/manifests.d.ts

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

package/dist-cms/packages/members/member-type/search/global-search/manifests.js

@@ -0,0 +1,22 @@
+import { UMB_MEMBER_TYPE_SEARCH_PROVIDER_ALIAS } from '../constants.js';
+import { UMB_MEMBER_TYPE_GLOBAL_SEARCH_ALIAS } from './constants.js';
+import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section';
+import { UMB_SETTINGS_SECTION_ALIAS } from '@umbraco-cms/backoffice/settings';
+export const manifests = [
+    {
+        name: 'Member Type Global Search',
+        alias: UMB_MEMBER_TYPE_GLOBAL_SEARCH_ALIAS,
+        type: 'globalSearch',
+        weight: 200,
+        meta: {
+            label: 'Member Types',
+            searchProviderAlias: UMB_MEMBER_TYPE_SEARCH_PROVIDER_ALIAS,
+        },
+        conditions: [
+            {
+                alias: UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS,
+                match: UMB_SETTINGS_SECTION_ALIAS,
+            },
+        ],
+    },
+];

package/dist-cms/packages/members/member-type/search/manifests.js

@@ -1,8 +1,10 @@
 import { UMB_MEMBER_TYPE_ENTITY_TYPE } from '../entity.js';
+import { UMB_MEMBER_TYPE_SEARCH_PROVIDER_ALIAS } from './constants.js';
+import { manifests as globalSearchManifests } from './global-search/manifests.js';
 export const manifests = [
     {
         name: 'Member Type Search Provider',
-        alias: 'Umb.SearchProvider.MemberType',
+        alias: UMB_MEMBER_TYPE_SEARCH_PROVIDER_ALIAS,
         type: 'searchProvider',
         api: () => import('./member-type.search-provider.js'),
         weight: 200,
@@ -16,4 +18,5 @@ export const manifests = [
         type: 'searchResultItem',
         forEntityTypes: [UMB_MEMBER_TYPE_ENTITY_TYPE],
     },
+    ...globalSearchManifests,
 ];

package/dist-cms/packages/multi-url-picker/components/input-multi-url/input-multi-url.element.d.ts

@@ -70,6 +70,10 @@ export declare class UmbInputMultiUrlElement extends UmbInputMultiUrlElement_bas
     get readonly(): boolean;
     set readonly(value: boolean);
     private _modalRoute?;
+    _resolvedLinkUrls: Array<{
+        unique: string;
+        url: string;
+    }>;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];

package/dist-cms/packages/multi-url-picker/components/input-multi-url/input-multi-url.element.js

@@ -13,6 +13,8 @@ import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui';
+import { UmbDocumentUrlRepository, UmbDocumentUrlsDataResolver } from '@umbraco-cms/backoffice/document';
+import { UmbMediaUrlRepository } from '@umbraco-cms/backoffice/media';
 /**
  * @element umb-input-multi-url
  * @fires change - when the value of the input changes
@@ -46,6 +48,7 @@ let UmbInputMultiUrlElement = class UmbInputMultiUrlElement extends UUIFormContr
         this.#urls = [...data]; // Unfreeze data coming from State, so we can manipulate it.
         super.value = this.#urls.map((x) => x.url).join(',');
         this.#sorter.setModel(this.#urls);
+        this.#populateLinksUrl();
     }
     get urls() {
         return this.#urls;
@@ -104,6 +107,7 @@ let UmbInputMultiUrlElement = class UmbInputMultiUrlElement extends UUIFormContr
         this.maxMessage = 'This field exceeds the allowed amount of items';
         this.#urls = [];
         this.#readonly = false;
+        this._resolvedLinkUrls = [];
         this.addValidator('rangeUnderflow', () => this.minMessage, () => !!this.min && this.urls.length < this.min);
         this.addValidator('rangeOverflow', () => this.maxMessage, () => !!this.max && this.urls.length > this.max);
         this.#linkPickerModal = new UmbModalRouteRegistrationController(this, UMB_LINK_PICKER_MODAL)
@@ -160,6 +164,45 @@ let UmbInputMultiUrlElement = class UmbInputMultiUrlElement extends UUIFormContr
             this._modalRoute = routeBuilder;
         });
     }
+    #populateLinksUrl() {
+        // Documents and media have URLs saved in the local link format. Display the actual URL to align with what
+        // the user sees when they selected it initially.
+        this.#urls.forEach(async (link) => {
+            if (!link.unique)
+                return;
+            let url = undefined;
+            switch (link.type) {
+                case 'document': {
+                    url = await this.#getUrlForDocument(link.unique);
+                    break;
+                }
+                case 'media': {
+                    url = await this.#getUrlForMedia(link.unique);
+                    break;
+                }
+                default:
+                    break;
+            }
+            if (url) {
+                const resolvedUrl = { unique: link.unique, url };
+                this._resolvedLinkUrls = [...this._resolvedLinkUrls, resolvedUrl];
+            }
+        });
+    }
+    async #getUrlForDocument(unique) {
+        const documentUrlRepository = new UmbDocumentUrlRepository(this);
+        const { data: documentUrlData } = await documentUrlRepository.requestItems([unique]);
+        const urlsItem = documentUrlData?.[0];
+        const dataResolver = new UmbDocumentUrlsDataResolver(this);
+        dataResolver.setData(urlsItem?.urls);
+        const resolvedUrls = await dataResolver.getUrls();
+        return resolvedUrls?.[0]?.url ?? '';
+    }
+    async #getUrlForMedia(unique) {
+        const mediaUrlRepository = new UmbMediaUrlRepository(this);
+        const { data: mediaUrlData } = await mediaUrlRepository.requestItems([unique]);
+        return mediaUrlData?.[0].url ?? '';
+    }
     async #requestRemoveItem(index) {
         const item = this.#urls[index];
         if (!item)
@@ -227,12 +270,13 @@ let UmbInputMultiUrlElement = class UmbInputMultiUrlElement extends UUIFormContr
     #renderItem(link, index) {
         const unique = this.#getUnique(link);
         const href = this.readonly ? undefined : (this._modalRoute?.({ index }) ?? undefined);
+        const resolvedUrl = this._resolvedLinkUrls.find((url) => url.unique === link.unique)?.url ?? '';
         return html `
 			<uui-ref-node
 				id=${unique}
 				href=${ifDefined(href)}
 				name=${link.name || ''}
-				detail=${(link.url || '') + (link.queryString || '')}
+				detail=${resolvedUrl + (link.queryString || '')}
 				?readonly=${this.readonly}>
 				<umb-icon slot="icon" name=${link.icon || 'icon-link'}></umb-icon>
 				${when(!this.readonly, () => html `
@@ -288,6 +332,9 @@ __decorate([
 __decorate([
     state()
 ], UmbInputMultiUrlElement.prototype, "_modalRoute", void 0);
+__decorate([
+    state()
+], UmbInputMultiUrlElement.prototype, "_resolvedLinkUrls", void 0);
 UmbInputMultiUrlElement = __decorate([
     customElement(elementName)
 ], UmbInputMultiUrlElement);