@crombolo/backoffice-host 0.56.0 → 0.57.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/plugin/app-preview/umbraco-package.json +1 -1
- package/plugin/branding/theme-dark.css +4 -2
- package/plugin/branding/theme.css +5 -2
- package/plugin/bundle-editor-sections.js +5 -0
- package/plugin/bundle-editor.js +1 -1
- package/plugin/bundles-client.js +14 -4
- package/plugin/bundles-created-overview.js +30 -2
- package/plugin/bundles-installed.js +199 -13
- package/plugin/bundles-marketplace.js +82 -30
- package/plugin/bundles-tool.js +2 -2
- package/plugin/changes-dashboard.js +6 -0
- package/plugin/ci-access-words.js +1 -1
- package/plugin/ci-access.js +27 -3
- package/plugin/localizations/umbraco-package.json +1 -1
- package/plugin/search-tool.js +88 -0
- package/plugin/seo/document-view.js +45 -18
- package/plugin/seo/umbraco-package.json +5 -4
- package/plugin/settings-cards.js +18 -17
- package/plugin/settings-section.js +36 -4
- package/plugin/settings-title.js +46 -0
- package/plugin/sign-in/umbraco-package.json +1 -1
- package/plugin/template-picker-modal.js +1 -0
- package/plugin/template-picker-model.js +6 -2
- package/plugin/trusted-signers.js +374 -0
- package/plugin/umbraco-package.json +22 -3
- package/src/bundle-package.ts +98 -13
- package/src/bundle-permissions.ts +230 -18
- package/src/content-security.ts +78 -0
- package/src/extensions.ts +4 -1
- package/src/index.ts +1 -0
|
@@ -10,8 +10,8 @@
|
|
|
10
10
|
* bundle publishes, and filtered to the ones whose manifest is a valid bundle.
|
|
11
11
|
* Installing runs `bun add` on the server, then adds the content the bundle
|
|
12
12
|
* carries unless the site or the person installing declines it. A bundle that
|
|
13
|
-
*
|
|
14
|
-
* which the server insists on too (
|
|
13
|
+
* asks for permissions installs only once someone grants each one, as it
|
|
14
|
+
* asks, in its card, which the server insists on too (stories 222, 308).
|
|
15
15
|
*/
|
|
16
16
|
import { css, html, nothing, repeat } from '@umbraco-cms/backoffice/external/lit'
|
|
17
17
|
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'
|
|
@@ -35,6 +35,10 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
35
35
|
_consenting: { state: true },
|
|
36
36
|
_trusted: { state: true },
|
|
37
37
|
_asks: { state: true },
|
|
38
|
+
_asksActAs: { state: true },
|
|
39
|
+
_layout: { state: true },
|
|
40
|
+
_layoutChoice: { state: true },
|
|
41
|
+
_actAs: { state: true },
|
|
38
42
|
_reviewing: { state: true },
|
|
39
43
|
_signatures: { state: true },
|
|
40
44
|
}
|
|
@@ -46,7 +50,7 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
46
50
|
this._error = ''
|
|
47
51
|
this._busy = ''
|
|
48
52
|
this._notice = ''
|
|
49
|
-
this._keyword = 'crombolo-
|
|
53
|
+
this._keyword = 'crombolo-extension'
|
|
50
54
|
this._url = ''
|
|
51
55
|
this._query = ''
|
|
52
56
|
this._appliesContent = true
|
|
@@ -56,6 +60,8 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
56
60
|
this._consenting = ''
|
|
57
61
|
this._trusted = false
|
|
58
62
|
this._asks = []
|
|
63
|
+
this._asksActAs = false
|
|
64
|
+
this._actAs = 'installer'
|
|
59
65
|
this._reviewing = ''
|
|
60
66
|
this._signatures = new Map()
|
|
61
67
|
}
|
|
@@ -86,7 +92,7 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
86
92
|
/** The host's own place for installs, when it gave one. */
|
|
87
93
|
#elsewhereLink() {
|
|
88
94
|
const url = this._elsewhere?.url
|
|
89
|
-
return url ? html`<a href=${url} target="_blank" rel="noopener">Add
|
|
95
|
+
return url ? html`<a href=${url} target="_blank" rel="noopener">Add extensions</a>` : ''
|
|
90
96
|
}
|
|
91
97
|
|
|
92
98
|
#search(event) {
|
|
@@ -152,10 +158,14 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
152
158
|
`
|
|
153
159
|
}
|
|
154
160
|
|
|
155
|
-
#askConsent(item,
|
|
161
|
+
#askConsent(item, outcome) {
|
|
156
162
|
this._consenting = item.name
|
|
157
163
|
this._trusted = false
|
|
158
|
-
this._asks =
|
|
164
|
+
this._asks = outcome.permissions ?? []
|
|
165
|
+
this._asksActAs = outcome.asksActAs === true
|
|
166
|
+
// Story 312: the site layout its page templates sit in, its suggestion first.
|
|
167
|
+
this._layout = outcome.layout
|
|
168
|
+
this._layoutChoice = outcome.layout?.suggested ?? ''
|
|
159
169
|
}
|
|
160
170
|
|
|
161
171
|
#cancelConsent() {
|
|
@@ -164,7 +174,7 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
164
174
|
this._asks = []
|
|
165
175
|
}
|
|
166
176
|
|
|
167
|
-
async #install(item,
|
|
177
|
+
async #install(item, granting) {
|
|
168
178
|
this._busy = item.name
|
|
169
179
|
this._notice = ''
|
|
170
180
|
try {
|
|
@@ -172,14 +182,17 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
172
182
|
item.name,
|
|
173
183
|
item.version,
|
|
174
184
|
!this._declined.has(item.name),
|
|
175
|
-
|
|
176
|
-
|
|
185
|
+
granting ? this._asks.map((ask) => ask.permission) : [],
|
|
186
|
+
granting && this._asksActAs ? this._actAs : undefined,
|
|
187
|
+
granting && this._layout && this._layoutChoice
|
|
188
|
+
? { [this._layout.key]: this._layoutChoice }
|
|
189
|
+
: undefined,
|
|
177
190
|
)
|
|
178
|
-
//
|
|
179
|
-
// server says what
|
|
180
|
-
if (outcome.
|
|
181
|
-
if (
|
|
182
|
-
this.#askConsent(item, outcome
|
|
191
|
+
// It asks for permissions, or a version asks for more than was granted:
|
|
192
|
+
// the server says what, with the reasons, and the card asks.
|
|
193
|
+
if (outcome.needsGrant) {
|
|
194
|
+
if (granting) this._notice = outcome.message ?? ''
|
|
195
|
+
this.#askConsent(item, outcome)
|
|
183
196
|
return
|
|
184
197
|
}
|
|
185
198
|
this._consenting = ''
|
|
@@ -218,22 +231,57 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
218
231
|
`
|
|
219
232
|
}
|
|
220
233
|
|
|
221
|
-
/**
|
|
234
|
+
/** What it asks for, each permission with its reason, granted together in its own card. */
|
|
222
235
|
#consent(item) {
|
|
223
236
|
return html`
|
|
224
|
-
<div class="consent" role="group" aria-label="
|
|
237
|
+
<div class="consent" role="group" aria-label="What it asks for">
|
|
225
238
|
${this.#signature(item)}
|
|
226
239
|
<p>
|
|
227
|
-
<strong>
|
|
228
|
-
|
|
240
|
+
<strong>It asks for these permissions.</strong> Grant them to install it: it may do only
|
|
241
|
+
this, and its screens act as whoever is signed in.
|
|
229
242
|
</p>
|
|
243
|
+
<ul class="asks">
|
|
244
|
+
${this._asks.map(
|
|
245
|
+
(ask) =>
|
|
246
|
+
html`<li>
|
|
247
|
+
${ask.allows}${ask.origins?.length ? html`: ${ask.origins.join(', ')}` : nothing}
|
|
248
|
+
${ask.reason ? html`<span class="reason">${ask.reason}</span>` : nothing}
|
|
249
|
+
</li>`,
|
|
250
|
+
)}
|
|
251
|
+
</ul>
|
|
230
252
|
${
|
|
231
|
-
this.
|
|
232
|
-
? html`<
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
253
|
+
this._asksActAs
|
|
254
|
+
? html`<uui-select
|
|
255
|
+
label="Acts for"
|
|
256
|
+
.options=${[
|
|
257
|
+
{
|
|
258
|
+
name: 'You, who install it',
|
|
259
|
+
value: 'installer',
|
|
260
|
+
selected: this._actAs === 'installer',
|
|
261
|
+
},
|
|
262
|
+
{ name: 'Whoever uses it', value: 'caller', selected: this._actAs === 'caller' },
|
|
263
|
+
]}
|
|
264
|
+
@change=${(event) => {
|
|
265
|
+
this._actAs = event.target.value
|
|
266
|
+
}}></uui-select>`
|
|
267
|
+
: nothing
|
|
268
|
+
}
|
|
269
|
+
${
|
|
270
|
+
this._layout
|
|
271
|
+
? html`<uui-select
|
|
272
|
+
label=${this._layout.label}
|
|
273
|
+
.options=${[
|
|
274
|
+
{ name: 'None: a page of its own', value: '', selected: !this._layoutChoice },
|
|
275
|
+
...this._layout.values.map((layout) => ({
|
|
276
|
+
name: layout,
|
|
277
|
+
value: layout,
|
|
278
|
+
selected: layout === this._layoutChoice,
|
|
279
|
+
})),
|
|
280
|
+
]}
|
|
281
|
+
@change=${(event) => {
|
|
282
|
+
this._layoutChoice = event.target.value
|
|
283
|
+
}}></uui-select>`
|
|
284
|
+
: nothing
|
|
237
285
|
}
|
|
238
286
|
<p class="meta">
|
|
239
287
|
<span>Published by ${item.publisher ?? 'an unnamed publisher'}</span>
|
|
@@ -245,7 +293,7 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
245
293
|
}
|
|
246
294
|
</p>
|
|
247
295
|
<uui-checkbox
|
|
248
|
-
label="I trust this publisher, and
|
|
296
|
+
label="I trust this publisher, and grant what it asks for"
|
|
249
297
|
.checked=${this._trusted}
|
|
250
298
|
@change=${(event) => {
|
|
251
299
|
this._trusted = event.target.checked
|
|
@@ -254,7 +302,7 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
254
302
|
<uui-button
|
|
255
303
|
look="primary"
|
|
256
304
|
color="warning"
|
|
257
|
-
label="
|
|
305
|
+
label="Grant and install"
|
|
258
306
|
?disabled=${!this._trusted}
|
|
259
307
|
.state=${this._busy === item.name ? 'waiting' : undefined}
|
|
260
308
|
@click=${() => this.#install(item, true)}></uui-button>
|
|
@@ -266,7 +314,7 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
266
314
|
|
|
267
315
|
#empty() {
|
|
268
316
|
return html`
|
|
269
|
-
<uui-box headline="No
|
|
317
|
+
<uui-box headline="No extensions published yet">
|
|
270
318
|
<p>Nothing on npm carries the <code>${this._keyword}</code> keyword yet.</p>
|
|
271
319
|
</uui-box>
|
|
272
320
|
`
|
|
@@ -280,8 +328,8 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
280
328
|
<div id="head">
|
|
281
329
|
<uui-input
|
|
282
330
|
type="search"
|
|
283
|
-
label="Search
|
|
284
|
-
placeholder="Search npm for
|
|
331
|
+
label="Search extensions"
|
|
332
|
+
placeholder="Search npm for extensions"
|
|
285
333
|
@change=${this.#search}></uui-input>
|
|
286
334
|
${
|
|
287
335
|
this._url
|
|
@@ -296,7 +344,7 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
296
344
|
? nothing
|
|
297
345
|
: this._elsewhere
|
|
298
346
|
? html`<div id="notice">${this._elsewhere.message} ${this.#elsewhereLink()}</div>`
|
|
299
|
-
: html`<div id="notice">
|
|
347
|
+
: html`<div id="notice">Extensions are added to this site by a deploy, so that every server has them: add one to the site's <code>package.json</code> and deploy it.</div>`
|
|
300
348
|
}
|
|
301
349
|
${
|
|
302
350
|
this._items.length === 0 && !this._error
|
|
@@ -408,6 +456,10 @@ export default class CromboloBundlesMarketplaceElement extends UmbLitElement {
|
|
|
408
456
|
border-left: 3px solid var(--uui-color-warning, #f0ac00);
|
|
409
457
|
background: var(--uui-color-surface-alt, #f3f3f5);
|
|
410
458
|
}
|
|
459
|
+
.consent .reason {
|
|
460
|
+
display: block;
|
|
461
|
+
color: var(--uui-color-text-alt);
|
|
462
|
+
}
|
|
411
463
|
.consent .asks {
|
|
412
464
|
margin: 0 0 var(--uui-size-space-3, 9px);
|
|
413
465
|
padding-left: 1.25em;
|
package/plugin/bundles-tool.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Bundles, a Settings tool (story 238): Marketplace, Installed and Created as
|
|
3
|
-
* tabs, each at an address of its own under `dashboard/
|
|
3
|
+
* tabs, each at an address of its own under `dashboard/extensions/`. The views
|
|
4
4
|
* are the ones Umbraco's Packages section showed, which this replaces.
|
|
5
5
|
*/
|
|
6
6
|
import { css, html } from '@umbraco-cms/backoffice/external/lit'
|
|
@@ -14,7 +14,7 @@ export const BUNDLE_TABS = [
|
|
|
14
14
|
]
|
|
15
15
|
|
|
16
16
|
/** Where the tool is, relative to the back office. */
|
|
17
|
-
export const BUNDLES_PATH = 'section/settings/dashboard/
|
|
17
|
+
export const BUNDLES_PATH = 'section/settings/dashboard/extensions'
|
|
18
18
|
|
|
19
19
|
export default class CromboloBundlesToolElement extends UmbLitElement {
|
|
20
20
|
static properties = { _routerPath: { state: true }, _active: { state: true } }
|
|
@@ -207,7 +207,13 @@ export default class CromboloChangesDashboardElement extends UmbLitElement {
|
|
|
207
207
|
<h4>
|
|
208
208
|
${SOURCE_LABEL[group.source] ?? group.source}
|
|
209
209
|
${pending?.label ? html`<strong>${pending.label}</strong>` : group.scope ? html`<code>${group.scope}</code>` : nothing}
|
|
210
|
+
${pending?.sitePackage ? html`<uui-tag look="secondary">Site package</uui-tag>` : nothing}
|
|
210
211
|
</h4>
|
|
212
|
+
${
|
|
213
|
+
pending?.sitePackage
|
|
214
|
+
? html`<p class="note">Applying it replaces this site's code, settings and installed extensions with the ones it carries.</p>`
|
|
215
|
+
: nothing
|
|
216
|
+
}
|
|
211
217
|
${
|
|
212
218
|
group.findings.length === 0
|
|
213
219
|
? nothing
|
|
@@ -27,7 +27,7 @@ export const CI_PERMISSIONS = [
|
|
|
27
27
|
verb: 'Crombolo.Remote.InstallCode',
|
|
28
28
|
label: 'Install code',
|
|
29
29
|
explain:
|
|
30
|
-
'Install
|
|
30
|
+
'Install extensions, and the code a site package carries, which runs on the server after a restart.',
|
|
31
31
|
},
|
|
32
32
|
]
|
|
33
33
|
|
package/plugin/ci-access.js
CHANGED
|
@@ -151,9 +151,24 @@ export default class CromboloCiAccessElement extends UmbLitElement {
|
|
|
151
151
|
${
|
|
152
152
|
state.remoteEnabled
|
|
153
153
|
? nothing
|
|
154
|
-
: html`<
|
|
155
|
-
|
|
156
|
-
|
|
154
|
+
: html`<div class="notice" role="status">
|
|
155
|
+
<p>Pull and push is disabled on this site.</p>
|
|
156
|
+
<details>
|
|
157
|
+
<summary>How to enable it</summary>
|
|
158
|
+
<ol>
|
|
159
|
+
<li>
|
|
160
|
+
On the server, set <code>CROMBOLO_REMOTE_ACCESS</code>: <code>read</code> to let
|
|
161
|
+
others pull, <code>content</code> to also take content, or <code>all</code> to
|
|
162
|
+
take whole-site pushes and deploys.
|
|
163
|
+
</li>
|
|
164
|
+
<li>Restart the site.</li>
|
|
165
|
+
<li>
|
|
166
|
+
Trust the CI jobs that may reach it below, and give people the pull and push
|
|
167
|
+
permissions they need on their user groups.
|
|
168
|
+
</li>
|
|
169
|
+
</ol>
|
|
170
|
+
</details>
|
|
171
|
+
</div>`
|
|
157
172
|
}
|
|
158
173
|
${this._draft ? this.#form() : nothing}
|
|
159
174
|
<uui-box headline="Trusted CI jobs">
|
|
@@ -219,6 +234,15 @@ export default class CromboloCiAccessElement extends UmbLitElement {
|
|
|
219
234
|
uui-box + uui-box {
|
|
220
235
|
margin-top: var(--uui-size-layout-1);
|
|
221
236
|
}
|
|
237
|
+
.notice p {
|
|
238
|
+
margin: 0;
|
|
239
|
+
}
|
|
240
|
+
.notice details {
|
|
241
|
+
margin-top: var(--uui-size-space-3);
|
|
242
|
+
}
|
|
243
|
+
.notice summary {
|
|
244
|
+
cursor: pointer;
|
|
245
|
+
}
|
|
222
246
|
.notice {
|
|
223
247
|
padding: var(--uui-size-space-4) var(--uui-size-space-5);
|
|
224
248
|
border-left: 4px solid var(--uui-color-warning);
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Search, a Settings tool: what pages say in search results and when shared,
|
|
3
|
+
* and the back office's search indexes, as two tabs at addresses of their own
|
|
4
|
+
* under `dashboard/search-and-sharing/`. The indexes tab is Umbraco's own
|
|
5
|
+
* screen, whose routes for one index sit below it.
|
|
6
|
+
*/
|
|
7
|
+
import { loadManifestElement } from '@umbraco-cms/backoffice/extension-api'
|
|
8
|
+
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'
|
|
9
|
+
import { css, html } from '@umbraco-cms/backoffice/external/lit'
|
|
10
|
+
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'
|
|
11
|
+
|
|
12
|
+
/** Umbraco's search indexes screen, loaded as its own dashboard, which this tool overwrites, would be. */
|
|
13
|
+
async function indexesScreen() {
|
|
14
|
+
const manifest = umbExtensionsRegistry.getByAlias('Umb.Dashboard.ExamineManagement')
|
|
15
|
+
return { default: await loadManifestElement(manifest.element) }
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
/** The tabs, in order: each one's segment, its label, and its view. */
|
|
19
|
+
export const SEARCH_TABS = [
|
|
20
|
+
{ path: 'settings', label: 'Search settings', load: () => import('./seo/dashboard.js') },
|
|
21
|
+
{ path: 'indexes', label: 'Search indexes', load: indexesScreen },
|
|
22
|
+
]
|
|
23
|
+
|
|
24
|
+
/** Where the tool is, relative to the back office. */
|
|
25
|
+
export const SEARCH_PATH = 'section/settings/dashboard/search-and-sharing'
|
|
26
|
+
|
|
27
|
+
export default class CromboloSearchToolElement extends UmbLitElement {
|
|
28
|
+
static properties = { _routerPath: { state: true }, _active: { state: true } }
|
|
29
|
+
|
|
30
|
+
constructor() {
|
|
31
|
+
super()
|
|
32
|
+
this._routerPath = SEARCH_PATH
|
|
33
|
+
this._active = SEARCH_TABS[0].path
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
#routes = [
|
|
37
|
+
...SEARCH_TABS.map((tab) => ({ path: tab.path, component: tab.load })),
|
|
38
|
+
{ path: '', pathMatch: 'full', redirectTo: SEARCH_TABS[0].path },
|
|
39
|
+
]
|
|
40
|
+
|
|
41
|
+
render() {
|
|
42
|
+
return html`
|
|
43
|
+
<uui-tab-group>
|
|
44
|
+
${SEARCH_TABS.map(
|
|
45
|
+
(tab) => html`<uui-tab
|
|
46
|
+
label=${tab.label}
|
|
47
|
+
href=${`${this._routerPath}/${tab.path}`}
|
|
48
|
+
?active=${this._active === tab.path}
|
|
49
|
+
>${tab.label}</uui-tab>`,
|
|
50
|
+
)}
|
|
51
|
+
</uui-tab-group>
|
|
52
|
+
<umb-router-slot
|
|
53
|
+
.routes=${this.#routes}
|
|
54
|
+
@init=${(event) => {
|
|
55
|
+
this._routerPath = event.target.absoluteRouterPath
|
|
56
|
+
}}
|
|
57
|
+
@change=${(event) => {
|
|
58
|
+
const active = event.target.absoluteActiveViewPath ?? ''
|
|
59
|
+
// An index's own page sits below its tab, at indexes/index/<name>.
|
|
60
|
+
this._active =
|
|
61
|
+
SEARCH_TABS.find((tab) => active.includes(`/${tab.path}`))?.path ?? SEARCH_TABS[0].path
|
|
62
|
+
}}
|
|
63
|
+
></umb-router-slot>
|
|
64
|
+
`
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
static styles = css`
|
|
68
|
+
:host {
|
|
69
|
+
display: flex;
|
|
70
|
+
flex-direction: column;
|
|
71
|
+
height: 100%;
|
|
72
|
+
}
|
|
73
|
+
uui-tab-group {
|
|
74
|
+
flex: none;
|
|
75
|
+
height: auto;
|
|
76
|
+
padding: 0 var(--uui-size-layout-1);
|
|
77
|
+
border-bottom: 1px solid var(--uui-color-border);
|
|
78
|
+
--uui-tab-divider: transparent;
|
|
79
|
+
}
|
|
80
|
+
umb-router-slot {
|
|
81
|
+
display: block;
|
|
82
|
+
flex: 1 1 auto;
|
|
83
|
+
min-height: 0;
|
|
84
|
+
}
|
|
85
|
+
`
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
customElements.define('crombolo-search-tool', CromboloSearchToolElement)
|
|
@@ -17,7 +17,7 @@ const SOURCES = {
|
|
|
17
17
|
template: 'From the page design',
|
|
18
18
|
site: 'Site setting',
|
|
19
19
|
name: 'Page name',
|
|
20
|
-
none: 'Not
|
|
20
|
+
none: 'Not configured',
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
export default class CromboloSeoDocumentViewElement extends UmbLitElement {
|
|
@@ -58,8 +58,14 @@ export default class CromboloSeoDocumentViewElement extends UmbLitElement {
|
|
|
58
58
|
return html`
|
|
59
59
|
<tr>
|
|
60
60
|
<th>${label}</th>
|
|
61
|
-
<td>${item.value ? render(item.value) :
|
|
62
|
-
<td
|
|
61
|
+
<td>${item.value ? render(item.value) : '-'}</td>
|
|
62
|
+
<td>
|
|
63
|
+
${
|
|
64
|
+
item.source === 'none'
|
|
65
|
+
? html`<span class="unset"><uui-icon name="icon-alert"></uui-icon>Not configured</span>`
|
|
66
|
+
: html`<uui-tag look="secondary">${SOURCES[item.source] ?? item.source}</uui-tag>`
|
|
67
|
+
}
|
|
68
|
+
</td>
|
|
63
69
|
</tr>
|
|
64
70
|
`
|
|
65
71
|
}
|
|
@@ -72,11 +78,11 @@ export default class CromboloSeoDocumentViewElement extends UmbLitElement {
|
|
|
72
78
|
return html`
|
|
73
79
|
<uui-box headline="In search results">
|
|
74
80
|
<div class="snippet">
|
|
75
|
-
|
|
76
|
-
<div class="
|
|
77
|
-
|
|
78
|
-
${snippet.description || html`<em>Search engines will pick some text from the page.</em>`}
|
|
81
|
+
${snippet.name ? html`<div class="field"><span class="label">Name:</span> ${snippet.name}</div>` : nothing}
|
|
82
|
+
<div class="field url">
|
|
83
|
+
<span class="label">URL:</span> ${snippet.url || 'This page has no address yet'}
|
|
79
84
|
</div>
|
|
85
|
+
${snippet.description ? html`<div class="description">${snippet.description}</div>` : nothing}
|
|
80
86
|
</div>
|
|
81
87
|
${
|
|
82
88
|
meta.noindex.value
|
|
@@ -89,11 +95,14 @@ export default class CromboloSeoDocumentViewElement extends UmbLitElement {
|
|
|
89
95
|
</p>`
|
|
90
96
|
: nothing
|
|
91
97
|
}
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
98
|
+
${
|
|
99
|
+
preview.differs === 'unpublished'
|
|
100
|
+
? html`<p class="note">This page is not published yet, so search engines do not see it.</p>`
|
|
101
|
+
: preview.differs === 'changed'
|
|
102
|
+
? html`<p class="note">Includes saved changes that are not published yet.</p>`
|
|
103
|
+
: nothing
|
|
104
|
+
}
|
|
105
|
+
<h4>Searchable property values</h4>
|
|
97
106
|
<table>
|
|
98
107
|
${this.#row('Title', meta.title)}
|
|
99
108
|
${this.#row('Description', meta.description)}
|
|
@@ -105,6 +114,14 @@ export default class CromboloSeoDocumentViewElement extends UmbLitElement {
|
|
|
105
114
|
}
|
|
106
115
|
|
|
107
116
|
static styles = css`
|
|
117
|
+
/* A value nothing sets: a warning, so it is put right. */
|
|
118
|
+
.unset {
|
|
119
|
+
display: inline-flex;
|
|
120
|
+
align-items: center;
|
|
121
|
+
gap: var(--uui-size-space-1);
|
|
122
|
+
color: var(--uui-color-warning-standalone, var(--uui-color-warning-emphasis));
|
|
123
|
+
font-weight: 600;
|
|
124
|
+
}
|
|
108
125
|
:host {
|
|
109
126
|
display: block;
|
|
110
127
|
padding: var(--uui-size-layout-1);
|
|
@@ -116,17 +133,22 @@ export default class CromboloSeoDocumentViewElement extends UmbLitElement {
|
|
|
116
133
|
max-width: 600px;
|
|
117
134
|
font-family: arial, sans-serif;
|
|
118
135
|
}
|
|
136
|
+
/* The page's name and address, each on a line with its label. */
|
|
137
|
+
.snippet .field {
|
|
138
|
+
font-size: 14px;
|
|
139
|
+
overflow-wrap: anywhere;
|
|
140
|
+
}
|
|
141
|
+
.snippet .field .label {
|
|
142
|
+
display: inline-block;
|
|
143
|
+
min-width: 3.5em;
|
|
144
|
+
color: var(--uui-color-text-alt);
|
|
145
|
+
font-weight: 600;
|
|
146
|
+
}
|
|
119
147
|
.snippet .url {
|
|
120
148
|
color: var(--uui-color-text-alt);
|
|
121
149
|
font-size: 14px;
|
|
122
150
|
overflow-wrap: anywhere;
|
|
123
151
|
}
|
|
124
|
-
.snippet .title {
|
|
125
|
-
/* A search result's link blue: Google's own, light and dark. */
|
|
126
|
-
color: var(--crombolo-snippet-title, #1a0dab);
|
|
127
|
-
font-size: 20px;
|
|
128
|
-
margin: 4px 0;
|
|
129
|
-
}
|
|
130
152
|
.snippet .description {
|
|
131
153
|
color: var(--uui-color-text);
|
|
132
154
|
font-size: 14px;
|
|
@@ -134,6 +156,11 @@ export default class CromboloSeoDocumentViewElement extends UmbLitElement {
|
|
|
134
156
|
.warning {
|
|
135
157
|
color: var(--uui-color-danger);
|
|
136
158
|
}
|
|
159
|
+
h4 {
|
|
160
|
+
margin: var(--uui-size-layout-1) 0 var(--uui-size-space-3);
|
|
161
|
+
padding-top: var(--uui-size-space-5);
|
|
162
|
+
border-top: 1px solid var(--uui-color-divider);
|
|
163
|
+
}
|
|
137
164
|
.note {
|
|
138
165
|
color: var(--uui-color-text-alt);
|
|
139
166
|
font-size: 12px;
|
|
@@ -2,17 +2,18 @@
|
|
|
2
2
|
"$schema": "../../../backoffice-dist/dist/umbraco-package-schema.json",
|
|
3
3
|
"name": "Crombolo Search & sharing",
|
|
4
4
|
"id": "Crombolo.Seo",
|
|
5
|
-
"version": "0.
|
|
5
|
+
"version": "0.57.0",
|
|
6
6
|
"allowPublicAccess": false,
|
|
7
7
|
"extensions": [
|
|
8
8
|
{
|
|
9
9
|
"type": "dashboard",
|
|
10
10
|
"alias": "Crombolo.Dashboard.Seo",
|
|
11
|
-
"name": "Crombolo Search
|
|
12
|
-
"element": "/crombolo-plugin/
|
|
11
|
+
"name": "Crombolo Search Dashboard",
|
|
12
|
+
"element": "/crombolo-plugin/search-tool.js",
|
|
13
|
+
"overwrites": ["Umb.Dashboard.ExamineManagement"],
|
|
13
14
|
"weight": 10,
|
|
14
15
|
"meta": {
|
|
15
|
-
"label": "Search
|
|
16
|
+
"label": "Search",
|
|
16
17
|
"pathname": "search-and-sharing"
|
|
17
18
|
},
|
|
18
19
|
"conditions": [
|
package/plugin/settings-cards.js
CHANGED
|
@@ -19,9 +19,9 @@ export const GROUPS = ['Site', 'Health', 'History', 'Developers', 'Extensions',
|
|
|
19
19
|
export const CARDS = {
|
|
20
20
|
'Crombolo.Dashboard.Seo': {
|
|
21
21
|
group: 'Site',
|
|
22
|
-
title: 'Search
|
|
22
|
+
title: 'Search',
|
|
23
23
|
description:
|
|
24
|
-
'What
|
|
24
|
+
'What pages say in search results and when shared, the robots file, and the search indexes.',
|
|
25
25
|
},
|
|
26
26
|
'Crombolo.Dashboard.Addresses': {
|
|
27
27
|
group: 'Site',
|
|
@@ -31,7 +31,7 @@ export const CARDS = {
|
|
|
31
31
|
'Umb.Dashboard.RedirectManagement': {
|
|
32
32
|
group: 'Site',
|
|
33
33
|
title: 'Redirects',
|
|
34
|
-
description: "
|
|
34
|
+
description: "Configure the site's redirect rules.",
|
|
35
35
|
},
|
|
36
36
|
'Umb.MenuItem.Webhook': {
|
|
37
37
|
group: 'Site',
|
|
@@ -43,16 +43,16 @@ export const CARDS = {
|
|
|
43
43
|
title: 'Logs',
|
|
44
44
|
description: 'Search and read what the server has logged.',
|
|
45
45
|
},
|
|
46
|
-
'Umb.Dashboard.ExamineManagement': {
|
|
47
|
-
group: 'Site',
|
|
48
|
-
title: 'Search indexes',
|
|
49
|
-
description: "The back office's search indexes: their health, and rebuilding them.",
|
|
50
|
-
},
|
|
51
46
|
'Crombolo.Dashboard.BackgroundJobs': {
|
|
52
47
|
group: 'Site',
|
|
53
48
|
title: 'Background jobs',
|
|
54
49
|
description: 'Scheduled and queued work, how far each got, and running a failed one again.',
|
|
55
50
|
},
|
|
51
|
+
'Umb.MenuItem.Relations': {
|
|
52
|
+
group: 'Site',
|
|
53
|
+
title: 'Relations',
|
|
54
|
+
description: 'How items point at each other, such as a copy and its original.',
|
|
55
|
+
},
|
|
56
56
|
'Umb.Dashboard.HealthCheck': {
|
|
57
57
|
group: 'Health',
|
|
58
58
|
title: 'Health check',
|
|
@@ -63,11 +63,6 @@ export const CARDS = {
|
|
|
63
63
|
title: 'Published status',
|
|
64
64
|
description: 'The published cache visitors are served from, and rebuilding it.',
|
|
65
65
|
},
|
|
66
|
-
'Umb.MenuItem.Relations': {
|
|
67
|
-
group: 'Health',
|
|
68
|
-
title: 'Relations',
|
|
69
|
-
description: 'How items point at each other, such as a copy and its original.',
|
|
70
|
-
},
|
|
71
66
|
'Crombolo.Dashboard.Changes': {
|
|
72
67
|
group: 'History',
|
|
73
68
|
title: 'Changes',
|
|
@@ -82,13 +77,19 @@ export const CARDS = {
|
|
|
82
77
|
'Umb.MenuItem.Extensions': {
|
|
83
78
|
group: 'Developers',
|
|
84
79
|
title: 'Extension insights',
|
|
85
|
-
description: 'What the back office has loaded, and from which
|
|
80
|
+
description: 'What the back office has loaded, and from which extension.',
|
|
86
81
|
},
|
|
87
82
|
'Crombolo.Dashboard.CiAccess': {
|
|
88
83
|
group: 'Developers',
|
|
89
84
|
title: 'CI access',
|
|
90
85
|
description: 'The CI jobs that may pull and push here without a person, and what each may do.',
|
|
91
86
|
},
|
|
87
|
+
'Crombolo.Dashboard.TrustedSigners': {
|
|
88
|
+
group: 'Developers',
|
|
89
|
+
title: 'Trusted signers',
|
|
90
|
+
description:
|
|
91
|
+
'The keys and builds whose site bundles this site applies: yours, other sites, and CI.',
|
|
92
|
+
},
|
|
92
93
|
'Umb.Dashboard.ModelsBuilder': {
|
|
93
94
|
group: 'Developers',
|
|
94
95
|
title: 'Types for code',
|
|
@@ -96,8 +97,8 @@ export const CARDS = {
|
|
|
96
97
|
},
|
|
97
98
|
'Crombolo.Dashboard.Bundles': {
|
|
98
99
|
group: 'Extensions',
|
|
99
|
-
title: '
|
|
100
|
-
description: 'Find, install and build
|
|
100
|
+
title: 'Extensions',
|
|
101
|
+
description: 'Find, install and build extensions: what they add, and turning them off.',
|
|
101
102
|
},
|
|
102
103
|
}
|
|
103
104
|
|
|
@@ -170,7 +171,7 @@ export function settingsCards({ dashboards = [], advanced = [] }) {
|
|
|
170
171
|
|
|
171
172
|
/** Where the Bundles section shows an installed bundle, relative to the back office. */
|
|
172
173
|
export const bundlePath = (packageName) =>
|
|
173
|
-
`section/settings/dashboard/
|
|
174
|
+
`section/settings/dashboard/extensions/installed?extension=${encodeURIComponent(packageName)}`
|
|
174
175
|
|
|
175
176
|
const rank = (order, alias) => {
|
|
176
177
|
const at = order.indexOf(alias)
|