From 023e5587c6bb9b81ea12ebd9f0ad1c8daaa09a75 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 7 Nov 2024 15:35:35 +0100 Subject: [PATCH] manual merges --- .../boolean-table-column-layout.element.ts | 19 --------- .../boolean-table-column-view.element.ts | 5 +-- .../core/collection/components/index.ts | 1 - ...ity-actions-table-column-layout.element.ts | 41 ------------------- .../entity-action/global-components/index.ts | 1 - ...tree-item-table-collection-view.element.ts | 6 +-- .../workspace/document-type/manifests.ts | 12 +++--- 7 files changed, 11 insertions(+), 74 deletions(-) delete mode 100644 src/packages/core/collection/components/boolean-table-column-layout/boolean-table-column-layout.element.ts delete mode 100644 src/packages/core/entity-action/global-components/entity-actions-table-column-layout/entity-actions-table-column-layout.element.ts diff --git a/src/packages/core/collection/components/boolean-table-column-layout/boolean-table-column-layout.element.ts b/src/packages/core/collection/components/boolean-table-column-layout/boolean-table-column-layout.element.ts deleted file mode 100644 index 282498668d..0000000000 --- a/src/packages/core/collection/components/boolean-table-column-layout/boolean-table-column-layout.element.ts +++ /dev/null @@ -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`` : nothing; - } -} - -declare global { - interface HTMLElementTagNameMap { - [elementName]: UmbBooleanTableColumnLayoutElement; - } -} diff --git a/src/packages/core/collection/components/boolean-table-column-view/boolean-table-column-view.element.ts b/src/packages/core/collection/components/boolean-table-column-view/boolean-table-column-view.element.ts index cecfee1d0d..6c457ee8d9 100644 --- a/src/packages/core/collection/components/boolean-table-column-view/boolean-table-column-view.element.ts +++ b/src/packages/core/collection/components/boolean-table-column-view/boolean-table-column-view.element.ts @@ -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; } } diff --git a/src/packages/core/collection/components/index.ts b/src/packages/core/collection/components/index.ts index 2a5ff379ba..a440030db1 100644 --- a/src/packages/core/collection/components/index.ts +++ b/src/packages/core/collection/components/index.ts @@ -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'; diff --git a/src/packages/core/entity-action/global-components/entity-actions-table-column-layout/entity-actions-table-column-layout.element.ts b/src/packages/core/entity-action/global-components/entity-actions-table-column-layout/entity-actions-table-column-layout.element.ts deleted file mode 100644 index ef715a08dd..0000000000 --- a/src/packages/core/entity-action/global-components/entity-actions-table-column-layout/entity-actions-table-column-layout.element.ts +++ /dev/null @@ -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` - - - - - `; - } -} - -declare global { - interface HTMLElementTagNameMap { - [elementName]: UmbEntityActionsTableColumnLayoutElement; - } -} diff --git a/src/packages/core/entity-action/global-components/index.ts b/src/packages/core/entity-action/global-components/index.ts index dfa9d13d59..841ca85af1 100644 --- a/src/packages/core/entity-action/global-components/index.ts +++ b/src/packages/core/entity-action/global-components/index.ts @@ -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'; diff --git a/src/packages/documents/document-types/tree/tree-item-children/collection/views/document-type-tree-item-table-collection-view.element.ts b/src/packages/documents/document-types/tree/tree-item-children/collection/views/document-type-tree-item-table-collection-view.element.ts index 6ad5f637a7..a455008f29 100644 --- a/src/packages/documents/document-types/tree/tree-item-children/collection/views/document-type-tree-item-table-collection-view.element.ts +++ b/src/packages/documents/document-types/tree/tree-item-children/collection/views/document-type-tree-item-table-collection-view.element.ts @@ -94,15 +94,15 @@ export class UmbDocumentTypeTreeItemTableCollectionViewElement extends UmbLitEle }, { columnAlias: 'isElementType', - value: html``, + value: html``, }, { columnAlias: 'entityActions', - value: html``, + }}>`, }, ], }; diff --git a/src/packages/documents/document-types/workspace/document-type/manifests.ts b/src/packages/documents/document-types/workspace/document-type/manifests.ts index 81b4a8d3d3..b4644169cb 100644 --- a/src/packages/documents/document-types/workspace/document-type/manifests.ts +++ b/src/packages/documents/document-types/workspace/document-type/manifests.ts @@ -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 = [ { @@ -26,7 +26,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.WorkspaceAlias', + alias: UMB_WORKSPACE_CONDITION_ALIAS, match: UMB_DOCUMENT_TYPE_WORKSPACE_ALIAS, }, ], @@ -44,7 +44,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.WorkspaceAlias', + alias: UMB_WORKSPACE_CONDITION_ALIAS, match: UMB_DOCUMENT_TYPE_WORKSPACE_ALIAS, }, ], @@ -62,7 +62,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.WorkspaceAlias', + alias: UMB_WORKSPACE_CONDITION_ALIAS, match: UMB_DOCUMENT_TYPE_WORKSPACE_ALIAS, }, ], @@ -80,7 +80,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.WorkspaceAlias', + alias: UMB_WORKSPACE_CONDITION_ALIAS, match: UMB_DOCUMENT_TYPE_WORKSPACE_ALIAS, }, ], @@ -98,7 +98,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.WorkspaceAlias', + alias: UMB_WORKSPACE_CONDITION_ALIAS, match: UMB_DOCUMENT_TYPE_WORKSPACE_ALIAS, }, ],