From 460208a9832a4d0dcae4c26e568b6add0ff17b35 Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Thu, 20 Jun 2024 15:47:46 +0200 Subject: [PATCH 1/4] Switch class to "Tab" when in sort mode --- .../views/design/content-type-design-editor.element.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts index 8c87055a6d..f919693ee1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.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`
+ return html`
${ownedTab ? html` ${tab.name!} Date: Mon, 24 Jun 2024 12:57:06 +0200 Subject: [PATCH 2/4] Upgrade to typescript 5.5 --- src/Umbraco.Web.UI.Client/package-lock.json | 8 ++++---- src/Umbraco.Web.UI.Client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 0c265967a8..4b90633014 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -91,7 +91,7 @@ "tiny-glob": "^0.2.9", "tsc-alias": "^1.8.8", "typedoc": "^0.25.13", - "typescript": "^5.4.5", + "typescript": "^5.5.2", "typescript-json-schema": "^0.63.0", "vite": "^5.2.9", "vite-plugin-static-copy": "^1.0.5", @@ -19672,9 +19672,9 @@ } }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", + "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 679141f9db..af3d5f7325 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -257,7 +257,7 @@ "tiny-glob": "^0.2.9", "tsc-alias": "^1.8.8", "typedoc": "^0.25.13", - "typescript": "^5.4.5", + "typescript": "^5.5.2", "typescript-json-schema": "^0.63.0", "vite": "^5.2.9", "vite-plugin-static-copy": "^1.0.5", From 2d1677ecabc0ae9015aa3d710581b51e52362776 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 24 Jun 2024 14:32:39 +0200 Subject: [PATCH 3/4] update packagelock --- src/Umbraco.Web.UI.Client/package-lock.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 505cab58a9..ce1f82ed1a 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -21236,7 +21236,9 @@ "url": "https://github.com/sponsors/wooorm" } }, - "src/packages/block": {}, + "src/packages/block": { + "name": "@umbraco-backoffice/block" + }, "src/packages/data-type": { "name": "@umbraco-backoffice/data-type" }, From 44bea13b22a94ae3067a0142d81b65ac33c2a295 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 24 Jun 2024 14:43:36 +0200 Subject: [PATCH 4/4] fix: block types do not show their descriptions This maps the `description` property to the doc type model and displays it for block types. --- .../components/block-type-card/block-type-card.element.ts | 5 +++++ .../repository/item/document-type-item.server.data-source.ts | 1 + .../documents/document-types/repository/item/types.ts | 1 + 3 files changed, 7 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts index 3140195750..f2690281a4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts @@ -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 { ${this.iconFile ? html`` diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts index 33b7b69346..31798bd0e5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts @@ -35,5 +35,6 @@ const mapper = (item: DocumentTypeItemResponseModel): UmbDocumentTypeItemModel = icon: item.icon, unique: item.id, name: item.name, + description: item.description, }; }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/types.ts index c7dd55055c..3f4c82011a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/types.ts @@ -6,4 +6,5 @@ export type UmbDocumentTypeItemModel = { name: string; isElement: boolean; icon?: string | null; + description?: string | null; };