Merge branch 'main' into v14/bugfix/fallback-to-layout-columns

Author: nielslyngsoe

package-lock.json

@@ -126,6 +126,7 @@
 		"url": "https://umbraco.com"
 	},
 	"workspaces": [
+		"./src/packages/block",
 		"./src/packages/data-type",
 		"./src/packages/dictionary",
 		"./src/packages/documents",

package.json

@@ -46,6 +46,9 @@ export class UmbBlockTypeCardElement extends UmbLitElement {
 	@state()
 	_name?: string;
 
+	@state()
+	_description?: string;
+
 	@state()
 	_fallbackIcon?: string | null;
 
@@ -57,6 +60,7 @@ export class UmbBlockTypeCardElement extends UmbLitElement {
 			if (item) {
 				this._fallbackIcon = item.icon;
 				this._name = item.name;
+				this._description = item.description ?? undefined;
 			}
 		});
 	}
@@ -67,6 +71,7 @@ export class UmbBlockTypeCardElement extends UmbLitElement {
 			<uui-card-block-type
 				href=${ifDefined(this.href)}
 				.name=${this._name ?? 'Unknown'}
+				.description=${this._description}
 				.background=${this.backgroundColor}>
 				${this.iconFile
 					? html`<img src=${this.iconFile} alt="" />`

src/packages/block/block-type/components/block-type-card/block-type-card.element.ts

@@ -0,0 +1,8 @@
+{
+	"name": "@umbraco-backoffice/block",
+	"private": true,
+	"type": "module",
+	"scripts": {
+		"build": "vite build"
+	}
+}

src/packages/block/package.json

@@ -0,0 +1,23 @@
+import { defineConfig } from 'vite';
+import { rmSync } from 'fs';
+import { getDefaultConfig } from '../../vite-config-base';
+
+const dist = '../../../dist-cms/packages/block';
+
+// delete the unbundled dist folder
+rmSync(dist, { recursive: true, force: true });
+
+export default defineConfig({
+	...getDefaultConfig({
+		dist,
+		entry: {
+			'block/index': 'block/index.ts',
+			'block-grid/index': 'block-grid/index.ts',
+			'block-list/index': 'block-list/index.ts',
+			'block-rte/index': 'block-rte/index.ts',
+			'block-type/index': 'block-type/index.ts',
+			manifests: 'manifests.ts',
+			'umbraco-package': 'umbraco-package.ts',
+		},
+	}),
+});

src/packages/block/vite.config.ts

@@ -475,7 +475,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 	renderTabInner(tab: UmbPropertyTypeContainerModel, tabActive: boolean, ownedTab: boolean) {
 		// TODO: Localize this:
 		if (this._sortModeActive) {
-			return html`<div class="not-active">
+			return html`<div class="tab">
 				${ownedTab
 					? html`<uui-icon name="icon-navigation" class="drag-${tab.id}"> </uui-icon>${tab.name!}
 							<uui-input

src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts

@@ -35,5 +35,6 @@ const mapper = (item: DocumentTypeItemResponseModel): UmbDocumentTypeItemModel =
 		icon: item.icon,
 		unique: item.id,
 		name: item.name,
+		description: item.description,
 	};
 };

src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts

@@ -6,4 +6,5 @@ export type UmbDocumentTypeItemModel = {
 	name: string;
 	isElement: boolean;
 	icon?: string | null;
+	description?: string | null;
 };