yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not lowercase

Browse Source
This commit is contained in:
Niels Lyngsø
2024-08-21 11:57:07 +02:00
parent c400cd3037
commit ed5b2f6fc3
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts
View File

@@ -133,6 +133,8 @@ export class UmbPropertyEditorUIBlockListElement
constructor() {
super();
//this.#validationContext.messages.debug('block list');
this.consumeContext(UMB_PROPERTY_CONTEXT, (context) => {
this.observe(
context.dataPath,

5
src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-properties.element.ts
View File

@@ -4,7 +4,7 @@ import { css, html, customElement, property, state, repeat } from '@umbraco-cms/
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import type { UmbContentTypeModel, UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type';
import { UmbContentTypePropertyStructureHelper } from '@umbraco-cms/backoffice/content-type';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import { UmbLitElement, umbDestroyOnDisconnect } from '@umbraco-cms/backoffice/lit-element';
@customElement('umb-block-workspace-view-edit-properties')
export class UmbBlockWorkspaceViewEditPropertiesElement extends UmbLitElement {
@@ -70,7 +70,8 @@ export class UmbBlockWorkspaceViewEditPropertiesElement extends UmbLitElement {
html`<umb-property-type-based-property
class="property"
data-path=${this._dataPaths![index]}
.property=${property}></umb-property-type-based-property> `,
.property=${property}
${umbDestroyOnDisconnect()}></umb-property-type-based-property>`,
);
}

23
src/Umbraco.Web.UI.Client/src/packages/core/validation/context/validation-messages.manager.ts
View File

@@ -15,16 +15,16 @@ export class UmbValidationMessagesManager {
#messages = new UmbArrayState<UmbValidationMessage>([], (x) => x.key);
messages = this.#messages.asObservable();
/*constructor() {
this.#messages.asObservable().subscribe((x) => console.log('all messages:', x));
}*/
debug(logName: string) {
this.#messages.asObservable().subscribe((x) => console.log(logName, x, this.#translators));
}
getHasAnyMessages(): boolean {
return this.#messages.getValue().length !== 0;
}
messagesOfPathAndDescendant(path: string): Observable<Array<UmbValidationMessage>> {
path = path.toLowerCase();
//path = path.toLowerCase();
// Find messages that starts with the given path, if the path is longer then require a dot or [ as the next character. using a more performant way than Regex:
return this.#messages.asObservablePart((msgs) =>
msgs.filter(
@@ -36,13 +36,13 @@ export class UmbValidationMessagesManager {
}
messagesOfTypeAndPath(type: UmbValidationMessageType, path: string): Observable<Array<UmbValidationMessage>> {
path = path.toLowerCase();
//path = path.toLowerCase();
// Find messages that matches the given type and path.
return this.#messages.asObservablePart((msgs) => msgs.filter((x) => x.type === type && x.path === path));
}
hasMessagesOfPathAndDescendant(path: string): Observable<boolean> {
path = path.toLowerCase();
//path = path.toLowerCase();
return this.#messages.asObservablePart((msgs) =>
// Find messages that starts with the given path, if the path is longer then require a dot or [ as the next character. Using a more performant way than Regex: [NL]
msgs.some(
@@ -53,7 +53,7 @@ export class UmbValidationMessagesManager {
);
}
getHasMessagesOfPathAndDescendant(path: string): boolean {
path = path.toLowerCase();
//path = path.toLowerCase();
return this.#messages
.getValue()
.some(
@@ -64,7 +64,8 @@ export class UmbValidationMessagesManager {
}
addMessage(type: UmbValidationMessageType, path: string, body: string, key: string = UmbId.new()): void {
path = this.#translatePath(path.toLowerCase()) ?? path.toLowerCase();
//path = this.#translatePath(path.toLowerCase()) ?? path.toLowerCase();
path = this.#translatePath(path) ?? path;
// check if there is an existing message with the same path and type, and append the new messages: [NL]
if (this.#messages.getValue().find((x) => x.type === type && x.path === path && x.body === body)) {
return;
@@ -73,7 +74,8 @@ export class UmbValidationMessagesManager {
}
addMessages(type: UmbValidationMessageType, path: string, bodies: Array<string>): void {
path = this.#translatePath(path.toLowerCase()) ?? path.toLowerCase();
//path = this.#translatePath(path.toLowerCase()) ?? path.toLowerCase();
path = this.#translatePath(path) ?? path;
// filter out existing messages with the same path and type, and append the new messages: [NL]
const existingMessages = this.#messages.getValue();
const newBodies = bodies.filter(
@@ -86,7 +88,7 @@ export class UmbValidationMessagesManager {
this.#messages.removeOne(key);
}
removeMessagesByTypeAndPath(type: UmbValidationMessageType, path: string): void {
path = path.toLowerCase();
//path = path.toLowerCase();
this.#messages.filter((x) => !(x.type === type && x.path === path));
}
removeMessagesByType(type: UmbValidationMessageType): void {
@@ -94,6 +96,7 @@ export class UmbValidationMessagesManager {
}
#translatePath(path: string): string | undefined {
//path = path.toLowerCase();
for (const translator of this.#translators) {
const newPath = translator.translate(path);
// If not undefined or false, then it was a valid translation: [NL]