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

Merge remote-tracking branch 'origin/release/17.0'

Browse Source
This commit is contained in:
Jacob Overgaard
2025-11-04 08:25:04 +01:00
parent c1a8500f12 b68a6a9502
commit b502e29d51
19 changed files with 659 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
View File

@@ -142,7 +142,10 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement<
}
this.removeUmbController(contentContextConsumer);
this.removeUmbController(propContextConsumer);
const propertyEditorName = this.#propertyEditorUIs.find((ui) => ui.alias === params.uiAlias)?.name;
const propertyEditorUiManifest = this.#propertyEditorUIs.find((ui) => ui.alias === params.uiAlias);
const propertyEditorName = this.localize.string(
propertyEditorUiManifest?.meta?.label || propertyEditorUiManifest?.name || '#general_notFound',
);
const dataTypeName = `${contentContext?.getName() ?? ''} - ${propContext.getName() ?? ''} - ${propertyEditorName}`;
return {

2
src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts
View File

@@ -208,7 +208,7 @@ export class UmbDataTypeWorkspaceContext
umbExtensionsRegistry.byTypeAndAlias('propertyEditorUi', propertyEditorUIAlias),
(manifest) => {
this.#propertyEditorUiIcon.setValue(manifest?.meta.icon || null);
this.#propertyEditorUiName.setValue(manifest?.name || null);
this.#propertyEditorUiName.setValue(manifest?.meta?.label || manifest?.name || null);
// Maps properties to have a weight, so they can be sorted, notice UI properties have a +1000 weight compared to schema properties.
this.#propertyEditorUISettingsProperties = (manifest?.meta.settings?.properties ?? []).map((x, i) => ({

2
src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-property-editor-picker.element.ts
View File

@@ -83,7 +83,7 @@ export class UmbDataTypeDetailsWorkspacePropertyEditorPickerElement extends UmbF
#renderPropertyEditorReference() {
if (!this.propertyEditorUiAlias || !this.propertyEditorSchemaAlias) return nothing;
let name = this.propertyEditorUiName;
let name = this.localize.string(this.propertyEditorUiName);
let alias = this.propertyEditorUiAlias;
let error = false;