Skip to content

Commit 836d526

Browse files
iOvergaardiOvergaard
committed
Merge branch 'v15/dev' of https://github.com/umbraco/Umbraco-CMS into v15/dev
2 parents e49374d + f869194 commit 836d526

File tree

15 files changed

+70
-78
lines changed

15 files changed

+70
-78
lines changed

‎src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const treeItemMapper = (model: UmbMockDocumentModel): DocumentTreeItemResponseMo
6969
noAccess: model.noAccess,
7070
parent: model.parent,
7171
variants: model.variants,
72-
createDate: model.createDate
72+
createDate: model.createDate,
7373
};
7474
};
7575

‎src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extension-element-and-api-slot-element-base.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { ManifestElementAndApi } from '@umbraco-cms/backoffice/extension-ap
55
import { UmbExtensionElementAndApiInitializer } from '@umbraco-cms/backoffice/extension-api';
66

77
// TODO: Eslint: allow abstract element class to end with "ElementBase" instead of "Element"
8-
// eslint-disable-next-line local-rules/enforce-element-suffix-on-element-class-name
8+
99
export abstract class UmbExtensionElementAndApiSlotElementBase<
1010
ManifestType extends ManifestElementAndApi,
1111
> extends UmbLitElement {

‎src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export type UmbSorterConfig<T, ElementType extends HTMLElement = HTMLElement> =
203203
Partial<Pick<INTERNAL_UmbSorterConfig<T, ElementType>, 'ignorerSelector' | 'containerSelector' | 'identifier'>>;
204204

205205
/**
206-
206+
207207
* @class UmbSorterController
208208
* @implements {UmbControllerInterface}
209209
* @description This controller can make user able to sort items.

‎src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/sort-children-of-modal.element.ts‎

Lines changed: 37 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement<
3131
_isSorting: boolean = false;
3232

3333
#hasMorePages() {
34-
return this._currentPage < this._totalPages;;
34+
return this._currentPage < this._totalPages;
3535
}
3636

3737
#pagination = new UmbPaginationManager();
3838
#sortedUniques = new Set<string>();
3939
#sorter?: UmbSorterController<UmbTreeItemModel>;
4040

41-
#sortBy: string = "";
42-
#sortDirection: string = "";
41+
#sortBy: string = '';
42+
#sortDirection: string = '';
4343

4444
#localizeDateOptions: Intl.DateTimeFormatOptions = {
4545
day: 'numeric',
@@ -150,7 +150,6 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement<
150150
}
151151

152152
#onSortChildrenBy(key: string) {
153-
154153
if (this._isSorting) {
155154
return;
156155
}
@@ -161,31 +160,31 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement<
161160

162161
// If switching column, revert to ascending sort. Otherwise switch from whatever was previously selected.
163162
if (this.#sortBy !== key) {
164-
this.#sortDirection = "asc";
163+
this.#sortDirection = 'asc';
165164
} else {
166-
this.#sortDirection = this.#sortDirection === "asc" ? "desc" : "asc";
165+
this.#sortDirection = this.#sortDirection === 'asc' ? 'desc' : 'asc';
167166
}
168167

169168
// Sort by the new column.
170169
this.#sortBy = key;
171170
this._children = [...this._children].sort((a, b) => {
172171
switch (key) {
173-
case "name":
172+
case 'name':
174173
return a.name.localeCompare(b.name);
175-
case "createDate":
174+
case 'createDate':
176175
return Date.parse(this.#getCreateDate(a)) - Date.parse(this.#getCreateDate(b));
177176
default:
178177
return 0;
179-
}
178+
}
180179
});
181180

182181
// Reverse the order if sorting descending.
183-
if (this.#sortDirection === "desc") {
182+
if (this.#sortDirection === 'desc') {
184183
this._children.reverse();
185184
}
186185

187186
this.#sortedUniques.clear();
188-
this._children.map(c => c.unique).forEach(u => this.#sortedUniques.add(u));
187+
this._children.map((c) => c.unique).forEach((u) => this.#sortedUniques.add(u));
189188

190189
this.requestUpdate('_children', oldValue);
191190

@@ -211,8 +210,8 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement<
211210
return sorting;
212211
}
213212

214-
#getCreateDate(item: UmbTreeItemModel) : string {
215-
let date = "";
213+
#getCreateDate(item: UmbTreeItemModel): string {
214+
let date = '';
216215
const itemAsDocumentTreeItemModel = item as UmbDocumentTreeItemModel;
217216
if (itemAsDocumentTreeItemModel) {
218217
date = itemAsDocumentTreeItemModel.createDate;
@@ -242,23 +241,23 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement<
242241
<uui-table>
243242
<uui-table-head>
244243
<uui-table-head-cell></uui-table-head-cell>
245-
${this.#renderHeaderCell("name", "general_name")}
246-
${this.#renderHeaderCell("createDate", "content_createDate")}
244+
${this.#renderHeaderCell('name', 'general_name')}
245+
${this.#renderHeaderCell('createDate', 'content_createDate')}
247246
</uui-table-head>
248247
${this._isSorting
249248
? html`
250-
<uui-table-row>
251-
<uui-table-cell></uui-table-cell>
252-
<uui-table-cell><uui-loader-circle></uui-loader-circle></uui-table-cell>
253-
<uui-table-cell></uui-table-cell>
254-
</uui-table-row>
255-
`
249+
<uui-table-row>
250+
<uui-table-cell></uui-table-cell>
251+
<uui-table-cell><uui-loader-circle></uui-loader-circle></uui-table-cell>
252+
<uui-table-cell></uui-table-cell>
253+
</uui-table-row>
254+
`
256255
: nothing}
257256
${repeat(
258-
this._children,
259-
(child) => child.unique,
260-
(child) => this.#renderChild(child),
261-
)}
257+
this._children,
258+
(child) => child.unique,
259+
(child) => this.#renderChild(child),
260+
)}
262261
</uui-table>
263262
264263
${this.#hasMorePages()
@@ -273,32 +272,26 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement<
273272

274273
#renderHeaderCell(key: string, labelKey: string) {
275274
// Only provide buttons for sorting via the column headers if all pages have been loaded.
276-
return html`
277-
<uui-table-head-cell>
278-
${this.#hasMorePages()
279-
? html`
280-
<span>${this.localize.term(labelKey)}</span>
281-
`
282-
: html`
275+
return html` <uui-table-head-cell>
276+
${this.#hasMorePages()
277+
? html` <span>${this.localize.term(labelKey)}</span> `
278+
: html`
283279
<button @click=${() => this.#onSortChildrenBy(key)}>
284280
${this.localize.term(labelKey)}
285281
<uui-symbol-sort
286282
?active=${this.#sortBy === key}
287-
?descending=${this.#sortDirection === "desc"}
288-
></uui-symbol-sort>
283+
?descending=${this.#sortDirection === 'desc'}></uui-symbol-sort>
289284
</button>
290285
`}
291-
292-
</uui-table-head-cell>`;
286+
</uui-table-head-cell>`;
293287
}
294288

295289
#renderChild(item: UmbTreeItemModel) {
296-
return html`
297-
<uui-table-row data-unique=${item.unique} class="${this._isSorting ? "hidden" : ""}">
298-
<uui-table-cell><uui-icon name="icon-navigation" aria-hidden="true"></uui-icon></uui-table-cell>
299-
<uui-table-cell>${item.name}</uui-table-cell>
300-
<uui-table-cell>${this.#renderCreateDate(item)}</uui-table-cell>
301-
</uui-table-row>`;
290+
return html` <uui-table-row data-unique=${item.unique} class="${this._isSorting ? 'hidden' : ''}">
291+
<uui-table-cell><uui-icon name="icon-navigation" aria-hidden="true"></uui-icon></uui-table-cell>
292+
<uui-table-cell>${item.name}</uui-table-cell>
293+
<uui-table-cell>${this.#renderCreateDate(item)}</uui-table-cell>
294+
</uui-table-row>`;
302295
}
303296

304297
#renderCreateDate(item: UmbTreeItemModel) {
@@ -335,8 +328,8 @@ export class UmbSortChildrenOfModalElement extends UmbModalBaseElement<
335328
visibility: hidden;
336329
}
337330
338-
uui-icon[name="icon-navigation"] {
339-
cursor: hand
331+
uui-icon[name='icon-navigation'] {
332+
cursor: hand;
340333
}
341334
`,
342335
];

‎src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { UMB_TREE_ITEM_CONTEXT } from './tree-item-context-base.js';
44
import { html, nothing, state, ifDefined, repeat, property } from '@umbraco-cms/backoffice/external/lit';
55
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
66

7-
// eslint-disable-next-line local-rules/enforce-element-suffix-on-element-class-name
87
export abstract class UmbTreeItemElementBase<TreeItemModelType extends UmbTreeItemModel> extends UmbLitElement {
98
_item?: TreeItemModelType;
109
@property({ type: Object, attribute: false })

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish/entity-bulk-action/publish.bulk-action.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class UmbDocumentPublishEntityBulkAction extends UmbEntityBulkActionBase<
7979
const publishingRepository = new UmbDocumentPublishingRepository(this._host);
8080
for (let i = 0; i < this.selection.length; i++) {
8181
const id = this.selection[i];
82-
await publishingRepository.publish(id, [ { variantId }]);
82+
await publishingRepository.publish(id, [{ variantId }]);
8383
}
8484

8585
eventContext.dispatchEvent(event);

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish/modal/document-publish-modal.element.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ export class UmbDocumentPublishModalElement extends UmbModalBaseElement<
3333
// If we don't know the state (e.g. from a bulk publishing selection) we need to consider it available for selection.
3434
this._options =
3535
this.data?.options.filter(
36-
(option) => (option.variant && option.variant.state === null) ||
36+
(option) =>
37+
(option.variant && option.variant.state === null) ||
3738
isNotPublishedMandatory(option) ||
3839
option.variant?.state !== UmbDocumentVariantState.NOT_CREATED,
3940
) ?? [];

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/modal/document-unpublish-modal.element.ts‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class UmbDocumentUnpublishModalElement extends UmbModalBaseElement<
5454
this.#getReferences();
5555

5656
// If invariant, don't display the variant selection component.
57-
if (this.data?.options.length === 1 && this.data.options[0].unique === "invariant") {
57+
if (this.data?.options.length === 1 && this.data.options[0].unique === 'invariant') {
5858
this._isInvariant = true;
5959
this._hasInvalidSelection = false;
6060
return;
@@ -69,7 +69,9 @@ export class UmbDocumentUnpublishModalElement extends UmbModalBaseElement<
6969

7070
// Only display variants that are relevant to pick from, i.e. variants that are published or published with pending changes.
7171
// If we don't know the state (e.g. from a bulk publishing selection) we need to consider it available for selection.
72-
this._options = this.data?.options.filter((option) => (option.variant && option.variant.state === null) || isPublished(option)) ?? [];
72+
this._options =
73+
this.data?.options.filter((option) => (option.variant && option.variant.state === null) || isPublished(option)) ??
74+
[];
7375

7476
let selected = this.value?.selection ?? [];
7577

@@ -116,9 +118,7 @@ export class UmbDocumentUnpublishModalElement extends UmbModalBaseElement<
116118

117119
#submit() {
118120
if (this._hasUnpublishPermission) {
119-
const selection = this._isInvariant
120-
? ["invariant"]
121-
: this._selection;
121+
const selection = this._isInvariant ? ['invariant'] : this._selection;
122122
this.value = { selection };
123123
this.modalContext?.submit();
124124
return;
@@ -136,19 +136,18 @@ export class UmbDocumentUnpublishModalElement extends UmbModalBaseElement<
136136

137137
override render() {
138138
return html`<umb-body-layout headline=${this.localize.term('content_unpublish')}>
139-
140139
${!this._isInvariant
141140
? html`
142-
<p id="subtitle">
143-
<umb-localize key="content_languagesToUnpublish">
144-
Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages.
145-
</umb-localize>
146-
</p>
147-
<umb-document-variant-language-picker
148-
.selectionManager=${this._selectionManager}
149-
.variantLanguageOptions=${this._options}
150-
.requiredFilter=${this._hasInvalidSelection ? this._requiredFilter : undefined}
151-
.pickableFilter=${this.data?.pickableFilter}></umb-document-variant-language-picker>
141+
<p id="subtitle">
142+
<umb-localize key="content_languagesToUnpublish">
143+
Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages.
144+
</umb-localize>
145+
</p>
146+
<umb-document-variant-language-picker
147+
.selectionManager=${this._selectionManager}
148+
.variantLanguageOptions=${this._options}
149+
.requiredFilter=${this._hasInvalidSelection ? this._requiredFilter : undefined}
150+
.pickableFilter=${this.data?.pickableFilter}></umb-document-variant-language-picker>
152151
`
153152
: nothing}
154153
@@ -178,7 +177,9 @@ export class UmbDocumentUnpublishModalElement extends UmbModalBaseElement<
178177
<uui-button label=${this.localize.term('general_close')} @click=${this.#close}></uui-button>
179178
<uui-button
180179
label="${this.localize.term('actions_unpublish')}"
181-
?disabled=${this._hasInvalidSelection || !this._hasUnpublishPermission || (!this._isInvariant && this._selection.length === 0)}
180+
?disabled=${this._hasInvalidSelection ||
181+
!this._hasUnpublishPermission ||
182+
(!this._isInvariant && this._selection.length === 0)}
182183
look="primary"
183184
color="warning"
184185
@click=${this.#submit}></uui-button>

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/document-recycle-bin-tree.server.data-source.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ const mapper = (item: DocumentRecycleBinItemResponseModel): UmbDocumentRecycleBi
8585
}),
8686
name: item.variants[0]?.name, // TODO: this is not correct. We need to get it from the variants. This is a temp solution.
8787
isFolder: false,
88-
createDate: item.createDate
88+
createDate: item.createDate,
8989
};
9090
};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export class UmbDocumentWorkspaceViewInfoLinksElement extends UmbLitElement {
9090

9191
#setLinks() {
9292
const links: Array<UmbDocumentInfoViewLink> = this.#urls.map((u) => {
93-
const culture = u.culture ?? this._defaultCulture ?? "";
93+
const culture = u.culture ?? this._defaultCulture ?? '';
9494
const url = u.url;
9595
const state = this._variantOptions?.find((variantOption) => variantOption.culture === culture)?.variant?.state;
9696
return { culture, url, state };
@@ -99,13 +99,13 @@ export class UmbDocumentWorkspaceViewInfoLinksElement extends UmbLitElement {
9999
this._links = links;
100100
}
101101

102-
#getTargetUrl (url: string | undefined) {
102+
#getTargetUrl(url: string | undefined) {
103103
if (!url || url.length === 0) {
104104
return url;
105105
}
106106

107-
if (url.includes(".") && !url.includes("//")) {
108-
return "//" + url;
107+
if (url.includes('.') && !url.includes('//')) {
108+
return '//' + url;
109109
}
110110

111111
return url;

0 commit comments

Comments
 (0)