yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manual merges

Browse Source
This commit is contained in:
Mads Rasmussen
2024-11-07 15:35:35 +01:00
parent 97455f2de4
commit bf616609fa
7 changed files with 11 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Umbraco.Web.UI.Client/src/packages/core/collection/components/boolean-table-column-layout/boolean-table-column-layout.element.ts
View File

@@ -1,19 +0,0 @@
import { html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
const elementName = 'umb-boolean-table-column-layout';
@customElement(elementName)
export class UmbBooleanTableColumnLayoutElement extends UmbLitElement {
@property({ attribute: false })
value = false;
override render() {
return this.value ? html`<uui-icon name="icon-check"></uui-icon>` : nothing;
}
}
declare global {
interface HTMLElementTagNameMap {
[elementName]: UmbBooleanTableColumnLayoutElement;
}
}

5
src/Umbraco.Web.UI.Client/src/packages/core/collection/components/boolean-table-column-view/boolean-table-column-view.element.ts
View File

@@ -1,8 +1,7 @@
import { html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
const elementName = 'umb-boolean-table-column-view';
@customElement(elementName)
@customElement('umb-boolean-table-column-view')
export class UmbBooleanTableColumnViewElement extends UmbLitElement {
@property({ attribute: false })
value = false;
@@ -14,6 +13,6 @@ export class UmbBooleanTableColumnViewElement extends UmbLitElement {
declare global {
interface HTMLElementTagNameMap {
[elementName]: UmbBooleanTableColumnViewElement;
['umb-boolean-table-column-view']: UmbBooleanTableColumnViewElement;
}
}

1
src/Umbraco.Web.UI.Client/src/packages/core/collection/components/index.ts
View File

@@ -1,4 +1,3 @@
import './boolean-table-column-layout/boolean-table-column-layout.element.js';
import './boolean-table-column-view/boolean-table-column-view.element.js';
import './collection-action-bundle.element.js';
import './collection-filter-field.element.js';

41
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/global-components/entity-actions-table-column-layout/entity-actions-table-column-layout.element.ts
View File

@@ -1,41 +0,0 @@
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import { html, nothing, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
const elementName = 'umb-entity-actions-table-column-layout';
@customElement(elementName)
export class UmbEntityActionsTableColumnLayoutElement extends UmbLitElement {
@property({ attribute: false })
value?: UmbEntityModel;
@state()
_isOpen = false;
#onActionExecuted() {
this._isOpen = false;
}
#onClick(event: Event) {
event.stopPropagation();
}
override render() {
if (!this.value) return nothing;
return html`
<umb-dropdown .open=${this._isOpen} @click=${this.#onClick} compact hide-expand>
<uui-symbol-more slot="label"></uui-symbol-more>
<umb-entity-action-list
@action-executed=${this.#onActionExecuted}
entity-type=${this.value.entityType}
.unique=${this.value.unique}></umb-entity-action-list>
</umb-dropdown>
`;
}
}
declare global {
interface HTMLElementTagNameMap {
[elementName]: UmbEntityActionsTableColumnLayoutElement;
}
}

1
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/global-components/index.ts
View File

@@ -1,2 +1 @@
import './entity-actions-table-column-layout/entity-actions-table-column-layout.element.js';
import './entity-actions-table-column-view/entity-actions-table-column-view.element.js';

6
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
View File

@@ -94,15 +94,15 @@ export class UmbDocumentTypeTreeItemTableCollectionViewElement extends UmbLitEle
},
{
columnAlias: 'isElementType',
value: html`<umb-boolean-table-column-layout .value=${item.isElement}></umb-boolean-table-column-layout>`,
value: html`<umb-boolean-table-column-view .value=${item.isElement}></umb-boolean-table-column-view>`,
},
{
columnAlias: 'entityActions',
value: html`<umb-entity-actions-table-column-layout
value: html`<umb-entity-actions-table-column-view
.value=${{
entityType: item.entityType,
unique: item.unique,
}}></umb-entity-actions-table-column-layout>`,
}}></umb-entity-actions-table-column-view>`,
},
],
};

12
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type/manifests.ts
View File

@@ -1,6 +1,6 @@
import { UMB_DOCUMENT_TYPE_COMPOSITION_REPOSITORY_ALIAS } from '../../repository/composition/index.js';
import { UMB_DOCUMENT_TYPE_WORKSPACE_ALIAS } from './constants.js';
import { UmbSubmitWorkspaceAction } from '@umbraco-cms/backoffice/workspace';
import { UMB_WORKSPACE_CONDITION_ALIAS, UmbSubmitWorkspaceAction } from '@umbraco-cms/backoffice/workspace';
export const manifests: Array<UmbExtensionManifest> = [
{
@@ -26,7 +26,7 @@ export const manifests: Array<UmbExtensionManifest> = [
},
conditions: [
{
alias: 'Umb.Condition.WorkspaceAlias',
alias: UMB_WORKSPACE_CONDITION_ALIAS,
match: UMB_DOCUMENT_TYPE_WORKSPACE_ALIAS,
},
],
@@ -44,7 +44,7 @@ export const manifests: Array<UmbExtensionManifest> = [
},
conditions: [
{
alias: 'Umb.Condition.WorkspaceAlias',
alias: UMB_WORKSPACE_CONDITION_ALIAS,
match: UMB_DOCUMENT_TYPE_WORKSPACE_ALIAS,
},
],
@@ -62,7 +62,7 @@ export const manifests: Array<UmbExtensionManifest> = [
},
conditions: [
{
alias: 'Umb.Condition.WorkspaceAlias',
alias: UMB_WORKSPACE_CONDITION_ALIAS,
match: UMB_DOCUMENT_TYPE_WORKSPACE_ALIAS,
},
],
@@ -80,7 +80,7 @@ export const manifests: Array<UmbExtensionManifest> = [
},
conditions: [
{
alias: 'Umb.Condition.WorkspaceAlias',
alias: UMB_WORKSPACE_CONDITION_ALIAS,
match: UMB_DOCUMENT_TYPE_WORKSPACE_ALIAS,
},
],
@@ -98,7 +98,7 @@ export const manifests: Array<UmbExtensionManifest> = [
},
conditions: [
{
alias: 'Umb.Condition.WorkspaceAlias',
alias: UMB_WORKSPACE_CONDITION_ALIAS,
match: UMB_DOCUMENT_TYPE_WORKSPACE_ALIAS,
},
],