manual merges

umbraco · Nov 7, 2024 · 023e558 · 023e558
1 parent c8756c6
commit 023e558
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 74 deletions.
diff --git a/.../collection/components/boolean-table-column-layout/boolean-table-column-layout.element.ts b/.../collection/components/boolean-table-column-layout/boolean-table-column-layout.element.ts
diff --git a/...core/collection/components/boolean-table-column-view/boolean-table-column-view.element.ts b/...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
@@ -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/...mponents/entity-actions-table-column-layout/entity-actions-table-column-layout.element.ts b/...mponents/entity-actions-table-column-layout/entity-actions-table-column-layout.element.ts
diff --git 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/...e-item-children/collection/views/document-type-tree-item-table-collection-view.element.ts b/...e-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`<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>`,
 					},
 				],
 			};

diff --git 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<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,
 			},
 		],
Original file line number	Diff line number	Diff line change
		@@ -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';