Skip to content

Commit b840fec

Browse files
madsrasmussenmadsrasmussen
committed
wrap in layout element
1 parent 5e7065b commit b840fec

File tree

7 files changed

+69
-84
lines changed

7 files changed

+69
-84
lines changed

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/info-app/document-history-workspace-info-app.element.ts

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,22 @@ export class UmbDocumentHistoryWorkspaceInfoAppElement extends UmbLitElement {
9999

100100
override render() {
101101
return html`
102-
<umb-extension-with-api-slot
103-
slot="header-actions"
104-
type="entityAction"
105-
.filter=${(manifest: ManifestEntityAction) =>
106-
this.#allowedActions.has(manifest.alias)}></umb-extension-with-api-slot>
107-
108-
${when(
109-
this._items,
110-
() => this.#renderHistory(),
111-
() => html`<div id="loader"><uui-loader></uui-loader></div>`,
112-
)}
113-
${this.#renderPagination()}
102+
<umb-workspace-info-app-layout headline="#general_history">
103+
<umb-extension-with-api-slot
104+
slot="header-actions"
105+
type="entityAction"
106+
.filter=${(manifest: ManifestEntityAction) =>
107+
this.#allowedActions.has(manifest.alias)}></umb-extension-with-api-slot>
108+
109+
<div id="content">
110+
${when(
111+
this._items,
112+
() => this.#renderHistory(),
113+
() => html`<div id="loader"><uui-loader></uui-loader></div>`,
114+
)}
115+
${this.#renderPagination()}
116+
</div>
117+
</umb-workspace-info-app-layout>
114118
`;
115119
}
116120

@@ -162,7 +166,7 @@ export class UmbDocumentHistoryWorkspaceInfoAppElement extends UmbLitElement {
162166
static override styles = [
163167
UmbTextStyles,
164168
css`
165-
:host {
169+
#content {
166170
display: block;
167171
padding: var(--uui-size-space-4) var(--uui-size-space-5);
168172
}

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/info-app/manifests.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ export const manifests: Array<UmbExtensionManifest> = [
88
alias: 'Umb.WorkspaceInfoApp.Document.History',
99
element: () => import('./document-history-workspace-info-app.element.js'),
1010
weight: 80,
11-
meta: {
12-
label: '#general_history',
13-
},
1411
conditions: [
1512
{
1613
alias: UMB_WORKSPACE_CONDITION_ALIAS,

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/reference/info-app/document-references-workspace-view-info.element.ts

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { UmbDocumentReferenceRepository } from '../repository/index.js';
2+
import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../constants.js';
23
import { css, customElement, html, nothing, repeat, state, when } from '@umbraco-cms/backoffice/external/lit';
34
import { isDefaultReference, isDocumentReference, isMediaReference } from '@umbraco-cms/backoffice/relations';
45
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@@ -7,7 +8,6 @@ import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/rou
78
import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
89
import type { UmbReferenceModel } from '@umbraco-cms/backoffice/relations';
910
import type { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui';
10-
import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../constants.js';
1111
import type { UmbEntityUnique } from '@umbraco-cms/backoffice/entity';
1212

1313
@customElement('umb-document-references-workspace-info-app')
@@ -137,47 +137,49 @@ export class UmbDocumentReferencesWorkspaceInfoAppElement extends UmbLitElement
137137
override render() {
138138
if (!this._items?.length) return nothing;
139139
return html`
140-
<uui-table>
141-
<uui-table-head>
142-
<uui-table-head-cell></uui-table-head-cell>
143-
<uui-table-head-cell><umb-localize key="general_name">Name</umb-localize></uui-table-head-cell>
144-
<uui-table-head-cell><umb-localize key="general_status">Status</umb-localize></uui-table-head-cell>
145-
<uui-table-head-cell><umb-localize key="general_typeName">Type Name</umb-localize></uui-table-head-cell>
146-
<uui-table-head-cell><umb-localize key="general_type">Type</umb-localize></uui-table-head-cell>
147-
</uui-table-head>
148-
${repeat(
149-
this._items,
150-
(item) => item.id,
151-
(item) => html`
152-
<uui-table-row>
153-
<uui-table-cell style="text-align:center;">
154-
<umb-icon name=${this.#getIcon(item)}></umb-icon>
155-
</uui-table-cell>
156-
<uui-table-cell class="link-cell">
157-
${when(
158-
isDocumentReference(item),
159-
() => html`
160-
<uui-button
161-
label="${this.localize.term('general_edit')} ${item.name}"
162-
href="${this._editDocumentPath}edit/${item.id}">
163-
${item.name}
164-
</uui-button>
165-
`,
166-
() => item.name,
167-
)}
168-
</uui-table-cell>
169-
<uui-table-cell>
170-
${this.#getPublishedStatus(item)
171-
? this.localize.term('content_published')
172-
: this.localize.term('content_unpublished')}
173-
</uui-table-cell>
174-
<uui-table-cell>${this.#getContentTypeName(item)}</uui-table-cell>
175-
<uui-table-cell>${this.#getContentType(item)}</uui-table-cell>
176-
</uui-table-row>
177-
`,
178-
)}
179-
</uui-table>
180-
${this.#renderReferencePagination()}
140+
<umb-workspace-info-app-layout headline="#references_labelUsedByItems">
141+
<uui-table>
142+
<uui-table-head>
143+
<uui-table-head-cell></uui-table-head-cell>
144+
<uui-table-head-cell><umb-localize key="general_name">Name</umb-localize></uui-table-head-cell>
145+
<uui-table-head-cell><umb-localize key="general_status">Status</umb-localize></uui-table-head-cell>
146+
<uui-table-head-cell><umb-localize key="general_typeName">Type Name</umb-localize></uui-table-head-cell>
147+
<uui-table-head-cell><umb-localize key="general_type">Type</umb-localize></uui-table-head-cell>
148+
</uui-table-head>
149+
${repeat(
150+
this._items,
151+
(item) => item.id,
152+
(item) => html`
153+
<uui-table-row>
154+
<uui-table-cell style="text-align:center;">
155+
<umb-icon name=${this.#getIcon(item)}></umb-icon>
156+
</uui-table-cell>
157+
<uui-table-cell class="link-cell">
158+
${when(
159+
isDocumentReference(item),
160+
() => html`
161+
<uui-button
162+
label="${this.localize.term('general_edit')} ${item.name}"
163+
href="${this._editDocumentPath}edit/${item.id}">
164+
${item.name}
165+
</uui-button>
166+
`,
167+
() => item.name,
168+
)}
169+
</uui-table-cell>
170+
<uui-table-cell>
171+
${this.#getPublishedStatus(item)
172+
? this.localize.term('content_published')
173+
: this.localize.term('content_unpublished')}
174+
</uui-table-cell>
175+
<uui-table-cell>${this.#getContentTypeName(item)}</uui-table-cell>
176+
<uui-table-cell>${this.#getContentType(item)}</uui-table-cell>
177+
</uui-table-row>
178+
`,
179+
)}
180+
</uui-table>
181+
${this.#renderReferencePagination()}
182+
</umb-workspace-info-app-layout>
181183
`;
182184
}
183185

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/reference/info-app/manifests.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ export const manifests: Array<UmbExtensionManifest> = [
88
alias: 'Umb.WorkspaceInfoApp.Document.References',
99
element: () => import('./document-references-workspace-view-info.element.js'),
1010
weight: 90,
11-
meta: {
12-
label: '#references_labelUsedByItems',
13-
},
1411
conditions: [
1512
{
1613
alias: UMB_WORKSPACE_CONDITION_ALIAS,

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/info-app/document-links-workspace-info-app.element.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,13 @@ export class UmbDocumentLinksWorkspaceInfoAppElement extends UmbLitElement {
155155

156156
override render() {
157157
return html`
158-
${when(
159-
this._loading,
160-
() => this.#renderLoading(),
161-
() => this.#renderContent(),
162-
)}
158+
<umb-workspace-info-app-layout headline="#general_links">
159+
${when(
160+
this._loading,
161+
() => this.#renderLoading(),
162+
() => this.#renderContent(),
163+
)}
164+
</umb-workspace-info-app-layout>
163165
`;
164166
}
165167

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/info-app/manifests.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ export const manifests: Array<UmbExtensionManifest> = [
88
alias: 'Umb.WorkspaceInfoApp.Document.Links',
99
element: () => import('./document-links-workspace-info-app.element.js'),
1010
weight: 100,
11-
meta: {
12-
label: '#general_links',
13-
},
1411
conditions: [
1512
{
1613
alias: UMB_WORKSPACE_CONDITION_ALIAS,

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,7 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement {
178178
override render() {
179179
return html`
180180
<div class="container">
181-
<umb-extension-slot
182-
id="workspace-info-apps"
183-
type="workspaceInfoApp"
184-
.renderMethod=${this.#renderInfoApp}></umb-extension-slot>
181+
<umb-extension-slot id="workspace-info-apps" type="workspaceInfoApp"></umb-extension-slot>
185182
</div>
186183
<div class="container">
187184
<uui-box headline=${this.localize.term('general_general')} id="general-section">
@@ -191,17 +188,6 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement {
191188
`;
192189
}
193190

194-
#renderInfoApp(initializer: UmbExtensionElementInitializer<ManifestWorkspaceInfoApp>) {
195-
const headline = initializer.manifest?.meta.label;
196-
return html`
197-
<uui-box
198-
headline=${ifDefined(headline ? this.localize.string(headline) : undefined)}
199-
style="--uui-box-default-padding:0">
200-
${initializer.component}</uui-box
201-
>
202-
`;
203-
}
204-
205191
#renderGeneralSection() {
206192
const editDocumentTypePath = this._routeBuilder?.({ entityType: 'document-type' }) ?? '';
207193

0 commit comments

Comments
 (0)