diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/action/create-member-collection-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/action/create-member-collection-action.element.ts index d0be24f752..61b3247c1d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/action/create-member-collection-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/action/create-member-collection-action.element.ts @@ -50,11 +50,14 @@ export class UmbCreateDocumentCollectionActionElement extends UmbLitElement { (option) => option.unique, (option) => html` - - ${option.label} +
+ + ${option.label} +
`, )} `; @@ -84,6 +87,12 @@ export class UmbCreateDocumentCollectionActionElement extends UmbLitElement { flex-direction: column; --uui-button-content-align: left; } + + uui-button.create-member-type > div { + display: flex; + align-items: center; + gap: 5px; + } `, ]; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts index 7d2c96563b..8b5ec33a30 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts @@ -59,7 +59,7 @@ export class UmbMemberCollectionServerDataSource implements UmbCollectionDataSou isLockedOut: item.isLockedOut, groups: item.groups, isTwoFactorEnabled: item.isTwoFactorEnabled, - memberType: { unique: item.memberType.id }, + memberType: { unique: item.memberType.id, icon: item.memberType.icon }, username: item.username, values: item.values as UmbMemberValueModel[], }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts index 0186182e63..fd594ad898 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts @@ -1,18 +1,16 @@ import type { UmbMemberItemModel } from '../../repository/index.js'; import { UmbMemberPickerInputContext } from './input-member.context.js'; -import { css, customElement, html, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit'; +import { css, customElement, html, nothing, property, repeat, state, when } from '@umbraco-cms/backoffice/external/lit'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; +import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; -import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace'; import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router'; import { UmbSorterController } from '@umbraco-cms/backoffice/sorter'; -import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation'; import { UMB_MEMBER_TYPE_ENTITY_TYPE } from '@umbraco-cms/backoffice/member-type'; +import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace'; -const elementName = 'umb-input-member'; - -@customElement(elementName) +@customElement('umb-input-member') export class UmbInputMemberElement extends UmbFormControlMixin( UmbLitElement, ) { @@ -215,6 +213,7 @@ export class UmbInputMemberElement extends UmbFormControlMixin + ${when(item.memberType.icon, (icon) => html``)} ${this.#renderOpenButton(item)} ${this.#renderRemoveButton(item)} @@ -228,7 +227,7 @@ export class UmbInputMemberElement extends UmbFormControlMixin - ${this.localize.term('general_open')} + `; } @@ -257,6 +256,6 @@ export { UmbInputMemberElement as element }; declare global { interface HTMLElementTagNameMap { - [elementName]: UmbInputMemberElement; + 'umb-input-member': UmbInputMemberElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/member-picker-modal/member-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/member-picker-modal/member-picker-modal.element.ts index 89571c3eaf..db9349b932 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/member-picker-modal/member-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/member-picker-modal/member-picker-modal.element.ts @@ -127,7 +127,7 @@ export class UmbMemberPickerModalElement extends UmbModalBaseElement< @selected=${() => this.#pickerContext.selection.select(item.unique)} @deselected=${() => this.#pickerContext.selection.deselect(item.unique)} ?selected=${this.#pickerContext.selection.isSelected(item.unique)}> - + `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts index 674205460c..30d4bddac9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts @@ -39,6 +39,7 @@ export class UmbMemberServerDataSource implements UmbDetailDataSource