Skip to content

Commit 1e89b5a

Browse files
Bugfix: Align collection item entity actions with menu item entity actions (#18118)
1 parent 8f212ae commit 1e89b5a

File tree

13 files changed

+23
-18
lines changed

13 files changed

+23
-18
lines changed

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/global-components/entity-actions-table-column-view/entity-actions-table-column-view.element.ts

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,12 @@ export class UmbEntityActionsTableColumnViewElement extends UmbLitElement {
1111
@state()
1212
_isOpen = false;
1313

14-
#onActionExecuted() {
15-
this._isOpen = false;
16-
}
17-
18-
#onClick(event: Event) {
19-
event.stopPropagation();
20-
}
21-
2214
override render() {
2315
if (!this.value) return nothing;
2416

2517
return html`
26-
<umb-dropdown .open=${this._isOpen} @click=${this.#onClick} compact hide-expand>
27-
<uui-symbol-more slot="label"></uui-symbol-more>
28-
<umb-entity-action-list
29-
@action-executed=${this.#onActionExecuted}
30-
entity-type=${this.value.entityType}
31-
.unique=${this.value.unique}></umb-entity-action-list>
32-
</umb-dropdown>
18+
<umb-entity-actions-bundle .entityType=${this.value.entityType} .unique=${this.value.unique}>
19+
</umb-entity-actions-bundle>
3320
`;
3421
}
3522
}

src/Umbraco.Web.UI.Client/src/packages/data-type/tree/tree-item-children/collection/views/data-type-tree-item-table-collection-view.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export class UmbDataTypeTreeItemTableCollectionViewElement extends UmbLitElement
2626
{
2727
name: '',
2828
alias: 'entityActions',
29+
align: 'right',
2930
},
3031
];
3132

src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/tree-item-children/collection/views/document-type-tree-item-table-collection-view.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export class UmbDocumentTypeTreeItemTableCollectionViewElement extends UmbLitEle
3131
{
3232
name: '',
3333
alias: 'entityActions',
34+
align: 'right',
3435
},
3536
];
3637

src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/document-table-collection-view.element.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,11 @@ export class UmbDocumentTableCollectionViewElement extends UmbLitElement {
125125
};
126126
});
127127

128-
this._tableColumns = [...this.#systemColumns, ...userColumns, { name: '', alias: 'entityActions' }];
128+
this._tableColumns = [
129+
...this.#systemColumns,
130+
...userColumns,
131+
{ name: '', alias: 'entityActions', align: 'right' },
132+
];
129133
}
130134
}
131135

src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/views/table/extension-table-collection-view.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export class UmbExtensionTableCollectionViewElement extends UmbLitElement {
3434
{
3535
name: '',
3636
alias: 'entityActions',
37+
align: 'right',
3738
},
3839
];
3940

src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/language-table-collection-view.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export class UmbLanguageTableCollectionViewElement extends UmbLitElement {
4141
{
4242
name: '',
4343
alias: 'entityActions',
44+
align: 'right',
4445
},
4546
];
4647

src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/tree-item-children/collection/views/media-type-tree-item-table-collection-view.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export class UmbMediaTypeTreeItemTableCollectionViewElement extends UmbLitElemen
2626
{
2727
name: '',
2828
alias: 'entityActions',
29+
align: 'right',
2930
},
3031
];
3132

src/Umbraco.Web.UI.Client/src/packages/media/media/collection/views/table/media-table-collection-view.element.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,13 @@ export class UmbMediaTableCollectionViewElement extends UmbLitElement {
112112
};
113113
});
114114

115-
this._tableColumns = [...this.#systemColumns, ...userColumns, { name: '', alias: 'entityActions' }];
115+
this._tableColumns = [
116+
...this.#systemColumns,
117+
...userColumns,
118+
{ name: '', alias: 'entityActions', align: 'right' },
119+
];
116120
} else {
117-
this._tableColumns = [...this.#systemColumns, { name: '', alias: 'entityActions' }];
121+
this._tableColumns = [...this.#systemColumns, { name: '', alias: 'entityActions', align: 'right' }];
118122
}
119123
}
120124

src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/views/table/member-group-table-collection-view.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export class UmbMemberGroupTableCollectionViewElement extends UmbLitElement {
2222
{
2323
name: '',
2424
alias: 'entityActions',
25+
align: 'right',
2526
},
2627
];
2728

src/Umbraco.Web.UI.Client/src/packages/members/member/collection/views/table/member-table-collection-view.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export class UmbMemberTableCollectionViewElement extends UmbLitElement {
4040
{
4141
name: '',
4242
alias: 'entityActions',
43+
align: 'right',
4344
},
4445
];
4546

0 commit comments

Comments
 (0)