Skip to content

Commit 466435f

Browse files
committed
Fixed several @sonarcloud issues
1 parent e41c1df commit 466435f

File tree

5 files changed

+51
-47
lines changed

5 files changed

+51
-47
lines changed

src/packages/rte/tiny-mce/property-editors/block/property-editor-ui-block-rte-type-configuration.element.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import { type UmbBlockTypeBaseModel, UmbInputBlockTypeElement } from '@umbraco-cms/backoffice/block-type';
2-
import { UMB_BLOCK_RTE_TYPE } from '@umbraco-cms/backoffice/block-rte';
3-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
4-
import { html, customElement, property, state, nothing } from '@umbraco-cms/backoffice/external/lit';
5-
import {
6-
UmbPropertyValueChangeEvent,
7-
type UmbPropertyEditorConfigCollection,
8-
} from '@umbraco-cms/backoffice/property-editor';
1+
import { customElement, html, property, state, nothing } from '@umbraco-cms/backoffice/external/lit';
2+
import { UmbInputBlockTypeElement } from '@umbraco-cms/backoffice/block-type';
93
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
10-
import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
114
import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
5+
import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
6+
import { UMB_BLOCK_RTE_TYPE } from '@umbraco-cms/backoffice/block-rte';
7+
import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
8+
import type { UmbBlockTypeBaseModel } from '@umbraco-cms/backoffice/block-type';
9+
import type {
10+
UmbPropertyEditorUiElement,
11+
UmbPropertyEditorConfigCollection,
12+
} from '@umbraco-cms/backoffice/property-editor';
1213

1314
/**
1415
* @element umb-property-editor-ui-block-rte-type-configuration

src/packages/rte/tiny-mce/property-editors/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.element.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system';
21
import { customElement, html, property } from '@umbraco-cms/backoffice/external/lit';
32
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
4-
import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
53
import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
6-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
4+
import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system';
5+
import type {
6+
UmbPropertyEditorConfigCollection,
7+
UmbPropertyEditorUiElement,
8+
} from '@umbraco-cms/backoffice/property-editor';
79
import type { UmbStylesheetInputElement } from '@umbraco-cms/backoffice/stylesheet';
810

911
/**

src/packages/rte/tiny-mce/property-editors/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1+
import { css, customElement, html, property, state, repeat } from '@umbraco-cms/backoffice/external/lit';
2+
import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
3+
import { tinymce } from '@umbraco-cms/backoffice/external/tinymce';
4+
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
5+
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
6+
import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
17
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
28
import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
3-
import { customElement, css, html, property, state, repeat } from '@umbraco-cms/backoffice/external/lit';
4-
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
5-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
6-
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
7-
import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
8-
import {
9-
UmbPropertyValueChangeEvent,
10-
type UmbPropertyEditorConfigCollection,
9+
import type {
10+
UmbPropertyEditorUiElement,
11+
UmbPropertyEditorConfigCollection,
1112
} from '@umbraco-cms/backoffice/property-editor';
12-
import { tinymce } from '@umbraco-cms/backoffice/external/tinymce';
1313

1414
const tinyIconSet = tinymce.IconManager.get('default');
1515

src/packages/rte/tiptap/components/input-tiptap/input-tiptap.element.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um
3030
];
3131

3232
@state()
33-
private _extensions: Array<UmbTiptapExtensionApi> = [];
33+
private readonly _extensions: Array<UmbTiptapExtensionApi> = [];
3434

3535
@property({ type: String })
3636
override set value(value: string) {
@@ -312,9 +312,10 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um
312312
}
313313
}
314314
315-
.resize-cursor {
316-
cursor: ew-resize;
317-
cursor: col-resize;
315+
.resize-cursor {
316+
cursor: ew-resize;
317+
cursor: col-resize;
318+
}
318319
}
319320
}
320321
`,

src/packages/rte/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
1818
extends UmbLitElement
1919
implements UmbPropertyEditorUiElement
2020
{
21-
#inUse: Set<string> = new Set();
21+
readonly #inUse: Set<string> = new Set();
2222

2323
#currentDragItem?: {
2424
alias: string;
@@ -55,27 +55,27 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
5555
});
5656
}
5757

58-
#onDragStart = (event: DragEvent, alias: string, fromPos?: [number, number, number]) => {
58+
#onDragStart(event: DragEvent, alias: string, fromPos?: [number, number, number]) {
5959
event.dataTransfer!.effectAllowed = 'move';
6060
this.#currentDragItem = { alias, fromPos };
61-
};
61+
}
6262

63-
#onDragOver = (event: DragEvent) => {
63+
#onDragOver(event: DragEvent) {
6464
event.preventDefault();
6565
event.dataTransfer!.dropEffect = 'move';
66-
};
66+
}
6767

68-
#onDragEnd = (event: DragEvent) => {
68+
#onDragEnd(event: DragEvent) {
6969
event.preventDefault();
7070
if (event.dataTransfer?.dropEffect === 'none') {
7171
const { fromPos } = this.#currentDragItem ?? {};
7272
if (!fromPos) return;
7373

7474
this.#removeItem(fromPos);
7575
}
76-
};
76+
}
7777

78-
#onDrop = (event: DragEvent, toPos?: [number, number, number]) => {
78+
#onDrop(event: DragEvent, toPos?: [number, number, number]) {
7979
event.preventDefault();
8080
const { alias, fromPos } = this.#currentDragItem ?? {};
8181

@@ -93,9 +93,9 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
9393
if (alias && toPos) {
9494
this.#insertItem(alias, toPos);
9595
}
96-
};
96+
}
9797

98-
#moveItem = (from: [number, number, number], to: [number, number, number]) => {
98+
#moveItem(from: [number, number, number], to: [number, number, number]) {
9999
const [rowIndex, groupIndex, itemIndex] = from;
100100

101101
// Get the item to move from the 'from' position
@@ -105,17 +105,17 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
105105
this.#value[rowIndex][groupIndex].splice(itemIndex, 1);
106106

107107
this.#insertItem(itemToMove, to);
108-
};
108+
}
109109

110-
#insertItem = (alias: string, toPos: [number, number, number]) => {
110+
#insertItem(alias: string, toPos: [number, number, number]) {
111111
const [rowIndex, groupIndex, itemIndex] = toPos;
112112

113113
// Insert the item into the new position
114114
const inserted = this.#value[rowIndex][groupIndex].splice(itemIndex, 0, alias);
115115
inserted.forEach((alias) => this.#inUse.add(alias));
116116

117117
this.dispatchEvent(new UmbPropertyValueChangeEvent());
118-
};
118+
}
119119

120120
#removeItem(from: [number, number, number]) {
121121
const [rowIndex, groupIndex, itemIndex] = from;
@@ -126,12 +126,12 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
126126
this.dispatchEvent(new UmbPropertyValueChangeEvent());
127127
}
128128

129-
#addGroup = (rowIndex: number, groupIndex: number) => {
129+
#addGroup(rowIndex: number, groupIndex: number) {
130130
this.#value[rowIndex].splice(groupIndex, 0, []);
131131
this.dispatchEvent(new UmbPropertyValueChangeEvent());
132-
};
132+
}
133133

134-
#removeGroup = (rowIndex: number, groupIndex: number) => {
134+
#removeGroup(rowIndex: number, groupIndex: number) {
135135
if (this.#value[rowIndex].length > groupIndex) {
136136
const removed = this.#value[rowIndex].splice(groupIndex, 1);
137137
removed.forEach((group) => group.forEach((alias) => this.#inUse.delete(alias)));
@@ -143,14 +143,14 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
143143
}
144144

145145
this.dispatchEvent(new UmbPropertyValueChangeEvent());
146-
};
146+
}
147147

148-
#addRow = (rowIndex: number) => {
148+
#addRow(rowIndex: number) {
149149
this.#value.splice(rowIndex, 0, [[]]);
150150
this.dispatchEvent(new UmbPropertyValueChangeEvent());
151-
};
151+
}
152152

153-
#removeRow = (rowIndex: number) => {
153+
#removeRow(rowIndex: number) {
154154
if (this.#value.length > rowIndex) {
155155
const removed = this.#value.splice(rowIndex, 1);
156156
removed.forEach((row) => row.forEach((group) => group.forEach((alias) => this.#inUse.delete(alias))));
@@ -162,7 +162,7 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
162162
}
163163

164164
this.dispatchEvent(new UmbPropertyValueChangeEvent());
165-
};
165+
}
166166

167167
override render() {
168168
return html`
@@ -250,7 +250,7 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
250250
`;
251251
}
252252

253-
static override styles = [
253+
static override readonly styles = [
254254
UmbTextStyles,
255255
css`
256256
:host {

0 commit comments

Comments
 (0)