@umbraco-cms/backoffice 17.3.3 → 17.4.0-rc

package/dist-cms/packages/media/media/search/media-search-result-item.element.js

@@ -13,7 +13,12 @@ let UmbMediaSearchResultItemElement = class UmbMediaSearchResultItemElement exte
         const classes = { trashed: this.item.isTrashed };
         return html `
 			${when(this.item.mediaType.icon ?? this.item.icon, (icon) => html `<umb-icon name=${icon}></umb-icon>`, () => html `<uui-icon name="icon-picture"></uui-icon>`)}
-			<span class=${classMap(classes)}>${this.item.name}</span>
+			<span class=${classMap(classes)}>
+				${this.item.name}
+				${when(this.item.ancestors?.length, () => html `<small class="ancestors"
+							>${this.item?.ancestors?.map((a) => a.name || '(Untitled)').join(' / ')}</small
+						>`)}
+			</span>
 			<div class="extra">
 				${when(this.item.isTrashed, () => html `
 						<uui-tag look="secondary">
@@ -43,6 +48,12 @@ let UmbMediaSearchResultItemElement = class UmbMediaSearchResultItemElement exte
 						text-decoration: line-through;
 						opacity: 0.6;
 					}
+					> .ancestors {
+						display: block;
+						opacity: 0.6;
+						font-size: 0.7rem;
+						font-weight: 400;
+					}
 				}
 			}
 		`,

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

@@ -16,6 +16,37 @@ export class UmbMediaSearchServerDataSource {
     constructor(host) {
         this.#host = host;
     }
+    async #fetchAncestors(ids) {
+        if (!ids.length)
+            return { data: new Map() };
+        const { data, error } = await tryExecute(this.#host, MediaService.getItemMediaAncestors({ query: { id: ids } }));
+        if (error)
+            return { error };
+        const ancestorsByItemId = new Map();
+        if (data) {
+            for (const entry of data) {
+                ancestorsByItemId.set(entry.id, entry.ancestors.map((ancestor) => ({
+                    entityType: UMB_MEDIA_ENTITY_TYPE,
+                    hasChildren: ancestor.hasChildren,
+                    isTrashed: ancestor.isTrashed,
+                    unique: ancestor.id,
+                    mediaType: {
+                        collection: ancestor.mediaType.collection ? { unique: ancestor.mediaType.collection.id } : null,
+                        icon: ancestor.mediaType.icon,
+                        unique: ancestor.mediaType.id,
+                    },
+                    name: ancestor.variants[0]?.name ?? '',
+                    parent: ancestor.parent ? { unique: ancestor.parent.id } : null,
+                    variants: ancestor.variants.map((variant) => ({
+                        culture: variant.culture || null,
+                        name: variant.name,
+                    })),
+                    flags: ancestor.flags,
+                })));
+            }
+        }
+        return { data: ancestorsByItemId };
+    }
     /**
      * Get a list of versions for a data
      * @param {UmbMediaSearchRequestArgs}args - The arguments for the search
@@ -36,6 +67,10 @@ export class UmbMediaSearchServerDataSource {
             },
         }));
         if (data) {
+            const ids = data.items.map((item) => item.id);
+            const { data: ancestorsByItemId, error: ancestorsError } = await this.#fetchAncestors(ids);
+            if (ancestorsError)
+                return { error: ancestorsError };
             const mappedItems = data.items.map((item) => {
                 return {
                     entityType: UMB_MEDIA_ENTITY_TYPE,
@@ -57,6 +92,7 @@ export class UmbMediaSearchServerDataSource {
                         };
                     }),
                     flags: item.flags,
+                    ancestors: ancestorsByItemId.get(item.id) ?? [],
                 };
             });
             return { data: { items: mappedItems, total: data.total } };

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

@@ -3,6 +3,7 @@ import type { UmbSearchRequestArgs } from '../../../core/search/index.js';
 import type { UmbMediaTypeEntityType } from '../../media-types/index.js';
 export interface UmbMediaSearchItemModel extends UmbMediaItemModel {
     href: string;
+    ancestors?: Array<UmbMediaItemModel>;
 }
 export interface UmbMediaSearchRequestArgs extends UmbSearchRequestArgs {
     allowedContentTypes?: Array<{

package/dist-cms/packages/media/media/tree/media-tree.store.js

@@ -13,7 +13,7 @@ export class UmbMediaTreeStore extends UmbUniqueTreeStore {
      * @memberof UmbMediaTreeStore
      */
     constructor(host) {
-        super(host, UMB_MEDIA_TREE_STORE_CONTEXT.toString());
+        super(host, UMB_MEDIA_TREE_STORE_CONTEXT);
     }
 }
 export default UmbMediaTreeStore;

package/dist-cms/packages/media/media/url/repository/media-url.store.js

@@ -12,7 +12,7 @@ export class UmbMediaUrlStore extends UmbItemStoreBase {
      * @memberof UmbMediaUrlStore
      */
     constructor(host) {
-        super(host, UMB_MEDIA_URL_STORE_CONTEXT.toString());
+        super(host, UMB_MEDIA_URL_STORE_CONTEXT);
     }
 }
 export default UmbMediaUrlStore;

package/dist-cms/packages/media/media/workspace/views/info/media-workspace-view-info.element.js

@@ -5,17 +5,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UMB_MEDIA_WORKSPACE_CONTEXT } from '../../media-workspace.context-token.js';
-import { TimeOptions } from '../../../audit-log/info-app/utils.js';
 import { css, customElement, html, ifDefined, nothing, state } from '../../../../../../external/lit/index.js';
+import { createExtensionApiByAlias } from '../../../../../core/extension-registry/index.js';
 import { UmbLitElement } from '../../../../../core/lit-element/index.js';
-import { UMB_MEDIA_TYPE_ENTITY_TYPE, UmbMediaTypeItemRepository } from '../../../../media-types/index.js';
+import { UmbMediaTypeItemRepository, UMB_MEDIA_TYPE_ENTITY_TYPE } from '../../../../media-types/index.js';
 import { UmbModalRouteRegistrationController } from '../../../../../core/router/index.js';
 import { UmbTextStyles } from '../../../../../core/style/index.js';
-import { UMB_WORKSPACE_MODAL } from '../../../../../core/workspace/index.js';
-import { createExtensionApiByAlias } from '../../../../../core/extension-registry/index.js';
+import { UMB_DATE_TIME_FORMAT_OPTIONS } from '../../../../../core/utils/index.js';
+import { UMB_IS_TRASHED_ENTITY_CONTEXT } from '../../../../../core/recycle-bin/index.js';
 import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '../../../../../core/section/index.js';
 import { UMB_SETTINGS_SECTION_ALIAS } from '../../../../../settings/index.js';
-import { UMB_IS_TRASHED_ENTITY_CONTEXT } from '../../../../../core/recycle-bin/index.js';
+import { UMB_WORKSPACE_MODAL } from '../../../../../core/workspace/index.js';
 let UmbMediaWorkspaceViewInfoElement = class UmbMediaWorkspaceViewInfoElement extends UmbLitElement {
     #workspaceContext;
     #mediaTypeItemRepository;
@@ -129,7 +129,7 @@ let UmbMediaWorkspaceViewInfoElement = class UmbMediaWorkspaceViewInfoElement ex
 			<div class="general-item">
 				<strong><umb-localize key="content_createDate"></umb-localize></strong>
 				<span>
-					<umb-localize-date .date=${this._createDate} .options=${TimeOptions}></umb-localize-date>
+					<umb-localize-date .date=${this._createDate} .options=${UMB_DATE_TIME_FORMAT_OPTIONS}></umb-localize-date>
 				</span>
 			</div>
 		`;
@@ -141,7 +141,7 @@ let UmbMediaWorkspaceViewInfoElement = class UmbMediaWorkspaceViewInfoElement ex
 			<div class="general-item">
 				<strong><umb-localize key="content_updateDate"></umb-localize></strong>
 				<span>
-					<umb-localize-date .date=${this._updateDate} .options=${TimeOptions}></umb-localize-date>
+					<umb-localize-date .date=${this._updateDate} .options=${UMB_DATE_TIME_FORMAT_OPTIONS}></umb-localize-date>
 				</span>
 			</div>
 		`;

package/dist-cms/packages/media/media-types/entity-actions/create/default/manifests.js

@@ -10,6 +10,7 @@ export const manifests = [
         meta: {
             icon: 'icon-picture',
             label: '#content_mediatype',
+            additionalOptions: true,
         },
     },
 ];

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

@@ -1,4 +1,5 @@
 import { manifests as entityActionsManifests } from './entity-actions/manifests.js';
+import { manifests as mediaTypeRootManifests } from './media-type-root/manifests.js';
 import { manifests as menuManifests } from './menu/manifests.js';
 import { manifests as propertyEditorUiManifests } from './property-editors/manifests.js';
 import { manifests as propertyTypeManifests } from './property-type/manifests.js';
@@ -10,6 +11,7 @@ import * as entryPointModule from './entry-point.js';
 export const manifests = [
     ...entityActionsManifests,
     ...menuManifests,
+    ...mediaTypeRootManifests,
     ...propertyEditorUiManifests,
     ...propertyTypeManifests,
     ...repositoryManifests,

package/dist-cms/packages/media/media-types/media-type-root/manifests.js

@@ -1,9 +1,10 @@
 import { UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE } from '../entity.js';
+import { UMB_MEDIA_TYPE_ROOT_WORKSPACE_ALIAS } from './index.js';
 export const manifests = [
     {
         type: 'workspace',
         kind: 'default',
-        alias: 'Umb.Workspace.MediaType.Root',
+        alias: UMB_MEDIA_TYPE_ROOT_WORKSPACE_ALIAS,
         name: 'Media Type Root Workspace',
         meta: {
             entityType: UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE,

package/dist-cms/packages/media/media-types/repository/detail/media-type-detail.store.js

@@ -12,7 +12,7 @@ export class UmbMediaTypeDetailStore extends UmbDetailStoreBase {
      * @memberof UmbMediaTypeStore
      */
     constructor(host) {
-        super(host, UMB_MEDIA_TYPE_DETAIL_STORE_CONTEXT.toString());
+        super(host, UMB_MEDIA_TYPE_DETAIL_STORE_CONTEXT);
     }
 }
 export default UmbMediaTypeDetailStore;

package/dist-cms/packages/media/media-types/repository/item/media-type-item.store.js

@@ -12,7 +12,7 @@ export class UmbMediaTypeItemStore extends UmbItemStoreBase {
      * @memberof UmbMediaTypeItemStore
      */
     constructor(host) {
-        super(host, UMB_MEDIA_TYPE_ITEM_STORE_CONTEXT.toString());
+        super(host, UMB_MEDIA_TYPE_ITEM_STORE_CONTEXT);
     }
 }
 export default UmbMediaTypeItemStore;

package/dist-cms/packages/media/media-types/tree/folder/repository/media-type-folder.store.js

@@ -12,7 +12,7 @@ export class UmbMediaTypeFolderStore extends UmbDetailStoreBase {
      * @memberof UmbMediaTypeStore
      */
     constructor(host) {
-        super(host, UMB_MEDIA_TYPE_FOLDER_STORE_CONTEXT.toString());
+        super(host, UMB_MEDIA_TYPE_FOLDER_STORE_CONTEXT);
     }
 }
 export { UmbMediaTypeFolderStore as api };

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

@@ -32,16 +32,6 @@ export const manifests = [
         name: 'Media Type Tree Item',
         forEntityTypes: [UMB_MEDIA_TYPE_ENTITY_TYPE, UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE, UMB_MEDIA_TYPE_FOLDER_ENTITY_TYPE],
     },
-    {
-        type: 'workspace',
-        kind: 'default',
-        alias: 'Umb.Workspace.MediaType.Root',
-        name: 'Media Type Root Workspace',
-        meta: {
-            entityType: UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE,
-            headline: '#treeHeaders_mediaTypes',
-        },
-    },
     ...folderManifests,
     ...treeItemChildrenManifest,
 ];

package/dist-cms/packages/media/media-types/tree/media-type-tree.store.js

@@ -13,7 +13,7 @@ export class UmbMediaTypeTreeStore extends UmbUniqueTreeStore {
      * @memberof UmbMediaTypeTreeStore
      */
     constructor(host) {
-        super(host, UMB_MEDIA_TYPE_TREE_STORE_CONTEXT.toString());
+        super(host, UMB_MEDIA_TYPE_TREE_STORE_CONTEXT);
     }
 }
 export default UmbMediaTypeTreeStore;

package/dist-cms/packages/media/media-types/tree/tree-item-children/collection/repository/media-type-tree-item-children-collection.repository.d.ts

@@ -1,11 +1,6 @@
-import type { UmbCollectionFilterModel, UmbCollectionRepository } from '../../../../../../core/collection/index.js';
-import { UmbRepositoryBase } from '../../../../../../core/repository/index.js';
-export declare class UmbMediaTypeTreeItemChildrenCollectionRepository extends UmbRepositoryBase implements UmbCollectionRepository {
-    #private;
-    requestCollection(filter: UmbCollectionFilterModel): Promise<{
-        data: import("../../../../../../core/repository/index.js").UmbTargetPagedModel<import("../../../types.js").UmbMediaTypeTreeItemModel> | undefined;
-        error: Error | import("../../../../../../core/resources/index.js").UmbApiError | import("../../../../../../core/resources/index.js").UmbCancelError | import("../../../../../../core/resources/index.js").UmbError | undefined;
-        asObservable: () => import("rxjs").Observable<import("../../../types.js").UmbMediaTypeTreeItemModel[]> | undefined;
-    }>;
+import { UmbTreeItemChildrenCollectionRepositoryBase } from '../../../../../../core/tree/index.js';
+import type { UmbControllerHost } from '../../../../../../../libs/controller-api/index.js';
+export declare class UmbMediaTypeTreeItemChildrenCollectionRepository extends UmbTreeItemChildrenCollectionRepositoryBase {
+    constructor(host: UmbControllerHost);
 }
 export { UmbMediaTypeTreeItemChildrenCollectionRepository as api };

package/dist-cms/packages/media/media-types/tree/tree-item-children/collection/repository/media-type-tree-item-children-collection.repository.js

@@ -1,26 +1,9 @@
-import UmbMediaTypeTreeRepository from '../../../media-type-tree.repository.js';
-import { UmbRepositoryBase } from '../../../../../../core/repository/index.js';
-import { UMB_ENTITY_CONTEXT } from '../../../../../../core/entity/index.js';
-export class UmbMediaTypeTreeItemChildrenCollectionRepository extends UmbRepositoryBase {
-    #treeRepository = new UmbMediaTypeTreeRepository(this);
-    async requestCollection(filter) {
-        // TODO: get parent from args
-        const entityContext = await this.getContext(UMB_ENTITY_CONTEXT);
-        if (!entityContext)
-            throw new Error('Entity context not found');
-        const entityType = entityContext.getEntityType();
-        const unique = entityContext.getUnique();
-        if (!entityType)
-            throw new Error('Entity type not found');
-        if (unique === undefined)
-            throw new Error('Unique not found');
-        const parent = { entityType, unique };
-        if (parent.unique === null) {
-            return this.#treeRepository.requestTreeRootItems({ skip: filter.skip, take: filter.take });
-        }
-        else {
-            return this.#treeRepository.requestTreeItemsOf({ parent, skip: filter.skip, take: filter.take });
-        }
+import { UMB_MEDIA_TYPE_TREE_REPOSITORY_ALIAS } from '../../../constants.js';
+import { UmbTreeItemChildrenCollectionRepositoryBase } from '../../../../../../core/tree/index.js';
+export class UmbMediaTypeTreeItemChildrenCollectionRepository extends UmbTreeItemChildrenCollectionRepositoryBase {
+    constructor(host) {
+        super(host);
+        this._setTreeRepositoryAlias(UMB_MEDIA_TYPE_TREE_REPOSITORY_ALIAS);
     }
 }
 export { UmbMediaTypeTreeItemChildrenCollectionRepository as api };

package/dist-cms/packages/members/member/collection/action/create-member-collection-action.element.d.ts

@@ -1,8 +1,12 @@
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import type { ManifestCollectionAction } from '../../../../core/collection/index.js';
 export declare class UmbCreateMemberCollectionActionElement extends UmbLitElement {
     #private;
-    private _options;
-    render(): import("lit-html").TemplateResult<1>;
+    private _allowedMemberTypes;
+    private _popoverOpen;
+    manifest?: ManifestCollectionAction;
+    firstUpdated(): Promise<void>;
+    render(): import("lit-html").TemplateResult<1> | undefined;
     static styles: import("lit").CSSResult[];
 }
 export default UmbCreateMemberCollectionActionElement;

package/dist-cms/packages/members/member/collection/action/create-member-collection-action.element.js

@@ -4,97 +4,101 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UmbTextStyles } from '../../../../core/style/index.js';
-import { html, customElement, state, repeat, css, until, nothing } from '../../../../../external/lit/index.js';
+import { UMB_CREATE_MEMBER_WORKSPACE_PATH_PATTERN } from '../../paths.js';
+import { css, customElement, html, property, repeat, state } from '../../../../../external/lit/index.js';
+import { UmbMemberTypeStructureRepository } from '../../../member-type/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
-import { UmbMemberTypeTreeRepository } from '../../../member-type/index.js';
 let UmbCreateMemberCollectionActionElement = class UmbCreateMemberCollectionActionElement extends UmbLitElement {
     constructor() {
         super(...arguments);
-        this._options = [];
-        this.#memberTypeTreeRepository = new UmbMemberTypeTreeRepository(this);
-        this.#onButtonClick = async () => {
-            if (this._options.length > 0)
-                return;
-            await this.#getOptions();
-            if (this._options.length === 1) {
-                history.pushState({}, '', `section/member-management/workspace/member/create/${this._options[0].unique}`);
-            }
-        };
+        this._allowedMemberTypes = [];
+        this._popoverOpen = false;
+        this.#memberTypeStructureRepository = new UmbMemberTypeStructureRepository(this);
     }
-    #memberTypeTreeRepository;
-    #optionRequestPromise;
-    async #getOptions() {
-        //TODO: Should we use the tree repository or make a collection repository?
-        //TODO: And how would we get all the member types?
-        //TODO: This only works because member types can't have folders.
-        const { data } = await this.#memberTypeTreeRepository.requestTreeRootItems({});
-        if (!data)
-            return;
-        this._options = data.items.map((item) => {
-            return {
-                label: item.name,
-                unique: item.unique,
-                icon: item.icon || '',
-            };
+    #memberTypeStructureRepository;
+    async firstUpdated() {
+        this.#retrieveAllowedMemberTypes();
+    }
+    async #retrieveAllowedMemberTypes() {
+        const { data } = await this.#memberTypeStructureRepository.requestAllowedChildrenOf(null, null);
+        if (data && data.items) {
+            this._allowedMemberTypes = data.items;
+        }
+    }
+    #onPopoverToggle(event) {
+        // TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        this._popoverOpen = event.newState === 'open';
+    }
+    #getCreateUrl(item) {
+        if (!item.unique) {
+            throw new Error('Item unique is missing');
+        }
+        return UMB_CREATE_MEMBER_WORKSPACE_PATH_PATTERN.generateAbsolute({
+            memberTypeUnique: item.unique,
         });
-        this.requestUpdate();
     }
-    #onButtonClick;
-    async #renderOptions() {
-        await this.#optionRequestPromise;
-        // If we only have one option, we don't need to render the popover. We will go directly to it on click.
-        if (this._options.length === 1)
-            return nothing;
+    render() {
+        return this._allowedMemberTypes.length !== 1 ? this.#renderDropdown() : this.#renderCreateButton();
+    }
+    #renderCreateButton() {
+        if (this._allowedMemberTypes.length !== 1)
+            return;
+        const item = this._allowedMemberTypes[0];
+        const label = (this.manifest?.meta.label
+            ? this.localize.string(this.manifest?.meta.label)
+            : this.localize.term('general_create')) +
+            ' ' +
+            this.localize.string(item.name);
         return html `
-			${repeat(this._options, (option) => option.unique, (option) => html `<uui-button
-						class="create-member-type"
-						compact
-						label=${option.label}
-						href="section/member-management/workspace/member/create/${option.unique}">
-						<div>
-							<umb-icon name=${option.icon}></umb-icon>
-							<span>${option.label}</span>
-						</div>
-					</uui-button>`)}
+			<uui-button color="default" href=${this.#getCreateUrl(item)} label=${label} look="outline"></uui-button>
 		`;
     }
-    render() {
+    #renderDropdown() {
+        if (!this._allowedMemberTypes.length)
+            return;
+        const label = this.manifest?.meta.label
+            ? this.localize.string(this.manifest?.meta.label)
+            : this.localize.term('general_create');
         return html `
-			<uui-button
-				label=${this.localize.term('general_create')}
-				@click=${this.#onButtonClick}
-				look="outline"
-				data-mark="action:create"
-				popovertarget="create-popover"></uui-button>
-			<uui-popover-container id="create-popover">
-				<div id="popover-content">${until(this.#renderOptions(), html `<uui-loader></uui-loader>`)}</div>
+			<uui-button popovertarget="collection-action-menu-popover" label=${label} color="default" look="outline">
+				${label}
+				<uui-symbol-expand .open=${this._popoverOpen}></uui-symbol-expand>
+			</uui-button>
+			<uui-popover-container
+				id="collection-action-menu-popover"
+				placement="bottom-start"
+				@toggle=${this.#onPopoverToggle}>
+				<umb-popover-layout>
+					<uui-scroll-container>
+						${repeat(this._allowedMemberTypes, (item) => item.unique, (item) => html `
+								<uui-menu-item label=${this.localize.string(item.name)} href=${this.#getCreateUrl(item)}>
+									<umb-icon slot="icon" name=${item.icon ?? 'icon-user'}></umb-icon>
+								</uui-menu-item>
+							`)}
+					</uui-scroll-container>
+				</umb-popover-layout>
 			</uui-popover-container>
 		`;
     }
     static { this.styles = [
-        UmbTextStyles,
         css `
-			#popover-content {
-				background-color: var(--uui-color-surface);
-				box-shadow: var(--uui-shadow-depth-3);
-				border-radius: var(--uui-border-radius);
-				display: flex;
-				flex-direction: column;
-				--uui-button-content-align: left;
-			}
-
-			uui-button.create-member-type > div {
-				display: flex;
-				align-items: center;
-				gap: 5px;
+			uui-scroll-container {
+				max-height: 500px;
 			}
 		`,
     ]; }
 };
 __decorate([
     state()
-], UmbCreateMemberCollectionActionElement.prototype, "_options", void 0);
+], UmbCreateMemberCollectionActionElement.prototype, "_allowedMemberTypes", void 0);
+__decorate([
+    state()
+], UmbCreateMemberCollectionActionElement.prototype, "_popoverOpen", void 0);
+__decorate([
+    property({ attribute: false })
+], UmbCreateMemberCollectionActionElement.prototype, "manifest", void 0);
 UmbCreateMemberCollectionActionElement = __decorate([
     customElement('umb-create-member-collection-action')
 ], UmbCreateMemberCollectionActionElement);

package/dist-cms/packages/members/member/collection/member-collection-header.element.js

@@ -52,7 +52,7 @@ let UmbMemberCollectionHeaderElement = class UmbMemberCollectionHeaderElement ex
     }
     #renderContentTypeFilter() {
         return html `
-			<umb-dropdown data-mark="dropdown:filter">
+			<umb-dropdown data-mark="dropdown:filter" label=${this.localize.term('defaultdialogs_selectMemberType')}>
 				<span slot="label">${this.#getContentTypeFilterLabel}</span>
 				<div id="dropdown-layout">
 					<uui-button

package/dist-cms/packages/members/member/collection/repository/member-collection.server.data-source.js

@@ -50,6 +50,7 @@ export class UmbMemberCollectionServerDataSource {
                 lastLoginDate: item.lastLoginDate || null,
                 lastLockoutDate: item.lastLockoutDate || null,
                 lastPasswordChangeDate: item.lastPasswordChangeDate || null,
+                profileData: item.profileData ?? null,
                 failedPasswordAttempts: item.failedPasswordAttempts,
                 isApproved: item.isApproved,
                 isLockedOut: item.isLockedOut,

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

@@ -93,11 +93,13 @@ let UmbMemberTableCollectionViewElement = class UmbMemberTableCollectionViewElem
             const name = member.variants[0].name;
             const kind = member.kind === UmbMemberKind.API
                 ? this.localize.term('member_memberKindApi')
-                : this.localize.term('member_memberKindDefault');
+                : member.kind === UmbMemberKind.EXTERNAL_ONLY
+                    ? this.localize.term('member_memberKindExternalOnly')
+                    : this.localize.term('member_memberKindDefault');
             const memberType = memberTypes?.find((type) => type.unique === member.memberType.unique);
             return {
                 id: member.unique,
-                icon: memberType?.icon,
+                icon: memberType?.icon || 'icon-user',
                 data: [
                     {
                         columnAlias: 'memberName',

package/dist-cms/packages/members/member/components/member-picker-modal/member-picker-modal.element.js

@@ -93,7 +93,7 @@ let UmbMemberPickerModalElement = class UmbMemberPickerModalElement extends UmbM
 				@selected=${() => this.#pickerContext.selection.select(item.unique)}
 				@deselected=${() => this.#pickerContext.selection.deselect(item.unique)}
 				?selected=${this.#pickerContext.selection.isSelected(item.unique)}>
-				<umb-icon slot="icon" name=${item.memberType.icon}></umb-icon>
+				<umb-icon slot="icon" name=${item.memberType.icon || 'icon-user'}></umb-icon>
 			</uui-menu-item>
 		`;
     }

package/dist-cms/packages/members/member/entity-actions/create/member-create-options-modal.element.js

@@ -8,31 +8,28 @@ import { UMB_CREATE_MEMBER_WORKSPACE_PATH_PATTERN } from '../../paths.js';
 import { html, customElement, state, repeat, css } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../core/style/index.js';
 import { UmbModalBaseElement } from '../../../../core/modal/index.js';
-import { UmbMemberTypeTreeRepository } from '../../../member-type/index.js';
+import { UmbMemberTypeStructureRepository } from '../../../member-type/index.js';
 let UmbMemberCreateOptionsModalElement = class UmbMemberCreateOptionsModalElement extends UmbModalBaseElement {
     constructor() {
         super(...arguments);
         this._options = [];
-        this.#memberTypeTreeRepository = new UmbMemberTypeTreeRepository(this);
+        this.#memberTypeStructureRepository = new UmbMemberTypeStructureRepository(this);
     }
-    #memberTypeTreeRepository;
+    #memberTypeStructureRepository;
     firstUpdated() {
         this.#getOptions();
     }
     async #getOptions() {
-        //TODO: Should we use the tree repository or make a collection repository?
-        //TODO: And how would we get all the member types?
-        //TODO: This only works because member types can't have folders.
-        const { data } = await this.#memberTypeTreeRepository.requestTreeRootItems({});
+        const { data } = await this.#memberTypeStructureRepository.requestAllowedChildrenOf(null, null);
         if (!data)
             return;
-        this._options = data.items.map((item) => {
-            return {
-                label: item.name,
-                unique: item.unique,
-                icon: item.icon || '',
-            };
-        });
+        this._options = data.items
+            .filter((item) => item.unique !== null)
+            .map((item) => ({
+            label: item.name,
+            unique: item.unique,
+            icon: item.icon || '',
+        }));
     }
     // close the modal when navigating
     #onOpen(event, unique) {
@@ -59,7 +56,7 @@ let UmbMemberCreateOptionsModalElement = class UmbMemberCreateOptionsModalElemen
     #renderOptions() {
         return repeat(this._options, (option) => option.unique, (option) => html `
 				<uui-ref-node
-					.name=${this.localize.string(option.label)}
+					.name=${this.localize.string(option.label) + '...'}
 					@open=${(event) => this.#onOpen(event, option.unique)}>
 					<umb-icon slot="icon" name=${option.icon || 'icon-circle-dotted'}></umb-icon>
 				</uui-ref-node>

package/dist-cms/packages/members/member/item/member-item-ref.element.js

@@ -67,9 +67,7 @@ let UmbMemberItemRefElement = class UmbMemberItemRefElement extends UmbLitElemen
 		`;
     }
     #renderIcon(item) {
-        if (!item.memberType.icon)
-            return;
-        return html `<umb-icon slot="icon" name=${item.memberType.icon}></umb-icon>`;
+        return html `<umb-icon slot="icon" name=${item.memberType.icon || 'icon-user'}></umb-icon>`;
     }
 };
 __decorate([

package/dist-cms/packages/members/member/item/repository/member-item.store.js

@@ -12,7 +12,7 @@ export class UmbMemberItemStore extends UmbItemStoreBase {
      * @memberof UmbMemberItemStore
      */
     constructor(host) {
-        super(host, UMB_MEMBER_ITEM_STORE_CONTEXT.toString());
+        super(host, UMB_MEMBER_ITEM_STORE_CONTEXT);
     }
 }
 export default UmbMemberItemStore;

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

@@ -4,6 +4,7 @@ import { manifests as itemManifests } from './item/manifests.js';
 import { manifests as memberPickerModalManifests } from './components/member-picker-modal/manifests.js';
 import { manifests as menuItemManifests } from './menu-item/manifests.js';
 import { manifests as pickerManifests } from './picker/manifests.js';
+import { manifests as profileDataManifests } from './profile-data/manifests.js';
 import { manifests as propertyEditorManifests } from './property-editor/manifests.js';
 import { manifests as referenceManifests } from './reference/manifests.js';
 import { manifests as repositoryManifests } from './repository/manifests.js';
@@ -17,6 +18,7 @@ export const manifests = [
     ...memberPickerModalManifests,
     ...menuItemManifests,
     ...pickerManifests,
+    ...profileDataManifests,
     ...propertyEditorManifests,
     ...referenceManifests,
     ...repositoryManifests,

package/dist-cms/packages/members/member/profile-data/info-app/manifests.d.ts

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