Merge remote-tracking branch 'origin/main' into feature/dropzone-management

This commit is contained in:
Lone Iversen
2024-05-10 15:25:15 +02:00
4 changed files with 23 additions and 16 deletions

View File

@@ -75,6 +75,10 @@ export class UmbBodyLayoutElement extends LitElement {
this.toggleAttribute('scrolling', this._scrollContainer.scrollTop > 0);
};
#setSlotVisibility(target: HTMLElement, hasChildren: boolean) {
target.style.display = hasChildren ? 'flex' : 'none';
}
render() {
return html`
<div
@@ -92,18 +96,21 @@ export class UmbBodyLayoutElement extends LitElement {
name="header"
@slotchange=${(e: Event) => {
this._headerSlotHasChildren = this.#hasNodes(e);
this.#setSlotVisibility(e.target as HTMLElement, this._headerSlotHasChildren);
}}></slot>
<slot
id="navigation-slot"
name="navigation"
@slotchange=${(e: Event) => {
this._actionsMenuSlotHasChildren = this.#hasNodes(e);
this._navigationSlotHasChildren = this.#hasNodes(e);
this.#setSlotVisibility(e.target as HTMLElement, this._navigationSlotHasChildren);
}}></slot>
<slot
id="action-menu-slot"
name="action-menu"
@slotchange=${(e: Event) => {
this._actionsMenuSlotHasChildren = this.#hasNodes(e);
this.#setSlotVisibility(e.target as HTMLElement, this._actionsMenuSlotHasChildren);
}}></slot>
</div>
@@ -185,18 +192,16 @@ export class UmbBodyLayoutElement extends LitElement {
}
#header-slot,
#tabs-slot,
#action-menu-slot,
#navigation-slot {
display: flex;
display: none;
height: 100%;
align-items: center;
box-sizing: border-box;
min-width: 0;
}
#navigation-slot,
#tabs-slot {
#navigation-slot {
margin-left: auto;
}

View File

@@ -250,6 +250,7 @@ export class UmbSplitPanelElement extends LitElement {
slot {
overflow: var(--umb-split-panel-slot-overflow);
display: block;
min-height: 0;
}
#main {
width: 100%;

View File

@@ -69,11 +69,11 @@ export class UmbLanguageServerDataSource implements UmbDetailDataSource<UmbLangu
// TODO: make data mapper to prevent errors
const dataType: UmbLanguageDetailModel = {
entityType: UMB_LANGUAGE_ENTITY_TYPE,
fallbackIsoCode: data.fallbackIsoCode?.toLowerCase() || null,
fallbackIsoCode: data.fallbackIsoCode || null,
isDefault: data.isDefault,
isMandatory: data.isMandatory,
name: data.name,
unique: data.isoCode.toLowerCase(),
unique: data.isoCode,
};
return { data: dataType };
@@ -90,10 +90,10 @@ export class UmbLanguageServerDataSource implements UmbDetailDataSource<UmbLangu
// TODO: make data mapper to prevent errors
const requestBody: CreateLanguageRequestModel = {
fallbackIsoCode: model.fallbackIsoCode?.toLowerCase(),
fallbackIsoCode: model.fallbackIsoCode,
isDefault: model.isDefault,
isMandatory: model.isMandatory,
isoCode: model.unique.toLowerCase(),
isoCode: model.unique,
name: model.name,
};
@@ -122,7 +122,7 @@ export class UmbLanguageServerDataSource implements UmbDetailDataSource<UmbLangu
// TODO: make data mapper to prevent errors
const requestBody: UpdateLanguageRequestModel = {
fallbackIsoCode: model.fallbackIsoCode?.toLowerCase(),
fallbackIsoCode: model.fallbackIsoCode,
isDefault: model.isDefault,
isMandatory: model.isMandatory,
name: model.name,
@@ -131,7 +131,7 @@ export class UmbLanguageServerDataSource implements UmbDetailDataSource<UmbLangu
const { error } = await tryExecuteAndNotify(
this.#host,
LanguageService.putLanguageByIsoCode({
isoCode: model.unique.toLowerCase(),
isoCode: model.unique,
requestBody,
}),
);

View File

@@ -81,16 +81,16 @@ export class UmbUserGridCollectionViewElement extends UmbLitElement {
const avatarUrls = [
{
scale: '1x',
url: user.avatarUrls?.[0],
},
{
scale: '2x',
url: user.avatarUrls?.[1],
},
{
scale: '3x',
scale: '2x',
url: user.avatarUrls?.[2],
},
{
scale: '3x',
url: user.avatarUrls?.[3],
},
];
let avatarSrcset = '';
@@ -111,6 +111,7 @@ export class UmbUserGridCollectionViewElement extends UmbLitElement {
${this.#renderUserTag(user)} ${this.#renderUserGroupNames(user)} ${this.#renderUserLoginDate(user)}
<uui-avatar
style="font-size: 1.6rem;"
slot="avatar"
.name=${user.name || 'Unknown'}
img-src=${ifDefined(user.avatarUrls.length > 0 ? avatarUrls[0].url : undefined)}