diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/manifests.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/manifests.handlers.ts index 3a8b5d3891..4edd2140c4 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/manifests.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/manifests.handlers.ts @@ -34,7 +34,7 @@ export const manifestDevelopmentHandler = rest.get(umbracoPath('/package/manifes label: 'My Custom Property', icon: 'document', group: 'Common', - propertyEditorModel: 'Umbraco.JSON', + propertyEditorSchema: 'Umbraco.JSON', }, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/property-editor-config/property-editor-config.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/property-editor-config/property-editor-config.element.ts index 96d90a7779..196838b67b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/property-editor-config/property-editor-config.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/property-editor-config/property-editor-config.element.ts @@ -45,12 +45,12 @@ export class UmbPropertyEditorConfigElement extends UmbLitElement { @state() private _properties: Array = []; - private _propertyEditorModelConfigDefaultData: Array = []; + private _propertyEditorSchemaConfigDefaultData: Array = []; private _propertyEditorUISettingsDefaultData: Array = []; private _configDefaultData?: Array; - private _propertyEditorModelConfigProperties: Array = []; + private _propertyEditorSchemaConfigProperties: Array = []; private _propertyEditorUISettingsProperties: Array = []; private _observePropertyEditorUIConfig() { @@ -59,7 +59,7 @@ export class UmbPropertyEditorConfigElement extends UmbLitElement { this.observe( umbExtensionsRegistry.getByTypeAndAlias('propertyEditorUi', this.propertyEditorUiAlias), (manifest) => { - this._observePropertyEditorModelConfig(manifest?.meta.propertyEditorAlias); + this._observePropertyEditorSchemaConfig(manifest?.meta.propertyEditorSchemaAlias); this._propertyEditorUISettingsProperties = manifest?.meta.settings?.properties || []; this._propertyEditorUISettingsDefaultData = manifest?.meta.settings?.defaultData || []; this._mergeConfigProperties(); @@ -68,24 +68,27 @@ export class UmbPropertyEditorConfigElement extends UmbLitElement { ); } - private _observePropertyEditorModelConfig(propertyEditorAlias?: string) { - if (!propertyEditorAlias) return; + private _observePropertyEditorSchemaConfig(propertyEditorSchemaAlias?: string) { + if (!propertyEditorSchemaAlias) return; - this.observe(umbExtensionsRegistry.getByTypeAndAlias('propertyEditorModel', propertyEditorAlias), (manifest) => { - this._propertyEditorModelConfigProperties = manifest?.meta.settings?.properties || []; - this._propertyEditorModelConfigDefaultData = manifest?.meta.settings?.defaultData || []; - this._mergeConfigProperties(); - this._mergeConfigDefaultData(); - }); + this.observe( + umbExtensionsRegistry.getByTypeAndAlias('propertyEditorSchema', propertyEditorSchemaAlias), + (manifest) => { + this._propertyEditorSchemaConfigProperties = manifest?.meta.settings?.properties || []; + this._propertyEditorSchemaConfigDefaultData = manifest?.meta.settings?.defaultData || []; + this._mergeConfigProperties(); + this._mergeConfigDefaultData(); + } + ); } private _mergeConfigProperties() { - this._properties = [...this._propertyEditorModelConfigProperties, ...this._propertyEditorUISettingsProperties]; + this._properties = [...this._propertyEditorSchemaConfigProperties, ...this._propertyEditorUISettingsProperties]; } private _mergeConfigDefaultData() { this._configDefaultData = [ - ...this._propertyEditorModelConfigDefaultData, + ...this._propertyEditorSchemaConfigDefaultData, ...this._propertyEditorUISettingsDefaultData, ]; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/property-type-based-property/property-type-based-property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/property-type-based-property/property-type-based-property.element.ts index 995652cfb7..ff93a45bb2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/property-type-based-property/property-type-based-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/property-type-based-property/property-type-based-property.element.ts @@ -98,13 +98,13 @@ export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement { if (!this._propertyEditorUiAlias && dataType?.propertyEditorAlias) { //use 'dataType.propertyEditorAlias' to look up the extension in the registry: this.observe( - umbExtensionsRegistry.getByTypeAndAlias('propertyEditorModel', dataType.propertyEditorAlias), + umbExtensionsRegistry.getByTypeAndAlias('propertyEditorSchema', dataType.propertyEditorAlias), (extension) => { if (!extension) return; this._propertyEditorUiAlias = extension?.meta.defaultPropertyEditorUiAlias; - this.removeControllerByUnique('_observePropertyEditorModel'); + this.removeControllerByUnique('_observePropertyEditorSchema'); }, - '_observePropertyEditorModel' + '_observePropertyEditorSchema' ); } }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/ref-property-editor-ui.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/ref-property-editor-ui.element.ts index d4c2e261a1..9cc6595a5e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/ref-property-editor-ui.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/ref-property-editor-ui.element.ts @@ -26,8 +26,8 @@ export class UmbRefPropertyEditorUIElement extends UUIRefNodeElement { * @attr * @default '' */ - @property({ type: String, attribute: 'property-editor-model-alias' }) - propertyEditorModelAlias = ''; + @property({ type: String, attribute: 'property-editor-schema-alias' }) + propertyEditorSchemaAlias = ''; protected renderDetail() { const details: string[] = []; @@ -36,8 +36,8 @@ export class UmbRefPropertyEditorUIElement extends UUIRefNodeElement { details.push(this.alias); } - if (this.propertyEditorModelAlias !== '') { - details.push(this.propertyEditorModelAlias); + if (this.propertyEditorSchemaAlias !== '') { + details.push(this.propertyEditorSchemaAlias); } else { details.push('Property Editor Missing'); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts index f64615e2ec..1bbbfd4d73 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-property-editor-ui/ref-property-editor-ui.stories.ts @@ -15,7 +15,7 @@ export const Overview: Story = { args: { name: 'Custom Property Editor UI', alias: 'Umb.PropertyEditorUi.CustomUI', - propertyEditorModelAlias: 'Umbraco.JSON', + propertyEditorSchemaAlias: 'Umbraco.JSON', }, }; @@ -23,7 +23,7 @@ export const WithDetail: Story = { args: { name: 'Custom Property Editor UI', alias: 'Umb.PropertyEditorUi.CustomUI', - propertyEditorModelAlias: 'Umbraco.JSON', + propertyEditorSchemaAlias: 'Umbraco.JSON', detail: 'With some custom details', }, }; @@ -32,14 +32,14 @@ export const WithSlots: Story = { args: { name: 'Custom Property Editor UI', alias: 'Umb.PropertyEditorUi.CustomUI', - propertyEditorModelAlias: 'Umbraco.JSON', + propertyEditorSchemaAlias: 'Umbraco.JSON', detail: 'With some custom details', }, render: (args) => html`
10
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts index 7cdb6d1d10..7f84a6dd3a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts @@ -11,7 +11,7 @@ import type { ManifestMenuItem, ManifestMenuItemTreeKind } from './menu-item.mod import type { ManifestModal } from './modal.model.js'; import type { ManifestPackageView } from './package-view.model.js'; import type { ManifestPropertyAction } from './property-action.model.js'; -import type { ManifestPropertyEditorUi, ManifestPropertyEditorModel } from './property-editor.model.js'; +import type { ManifestPropertyEditorUi, ManifestPropertyEditorSchema } from './property-editor.model.js'; import type { ManifestRepository } from './repository.model.js'; import type { ManifestSection } from './section.model.js'; import type { ManifestSectionSidebarApp, ManifestSectionSidebarAppMenuKind } from './section-sidebar-app.model.js'; @@ -74,7 +74,7 @@ export type ManifestTypes = | ManifestModal | ManifestPackageView | ManifestPropertyAction - | ManifestPropertyEditorModel + | ManifestPropertyEditorSchema | ManifestPropertyEditorUi | ManifestRepository | ManifestSection diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-editor.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-editor.model.ts index 3ff0fe102e..5b76646ad0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-editor.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-editor.model.ts @@ -9,7 +9,7 @@ export interface ManifestPropertyEditorUi extends ManifestElement = [ +export const manifests: Array = [ blockGrid, blockList, checkboxList, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/block-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/block-configuration/manifests.ts index 43286756d4..08c0612745 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/block-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/block-configuration/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-block-grid-block-configuration.element.js'), meta: { label: 'Block Grid Block Configuration', - propertyEditorAlias: 'Umbraco.BlockGrid.BlockConfiguration', + propertyEditorSchemaAlias: 'Umbraco.BlockGrid.BlockConfiguration', icon: 'umb:autofill', group: 'blocks', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/group-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/group-configuration/manifests.ts index d7c9bd0209..30014646ec 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/group-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/group-configuration/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-block-grid-group-configuration.element.js'), meta: { label: 'Block Grid Group Configuration', - propertyEditorAlias: 'Umbraco.BlockGrid.GroupConfiguration', + propertyEditorSchemaAlias: 'Umbraco.BlockGrid.GroupConfiguration', icon: 'umb:autofill', group: 'blocks', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/stylesheet-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/stylesheet-picker/manifests.ts index 340b29287d..ada6070970 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/stylesheet-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/config/stylesheet-picker/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-block-grid-stylesheet-picker.element.js'), meta: { label: 'Block Grid Stylesheet Picker', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', icon: 'umb:autofill', group: 'blocks', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/manifests.ts index 78e2890e1c..590ecb2a48 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/manifests.ts @@ -10,7 +10,7 @@ const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-block-grid.element.js'), meta: { label: 'Block Grid', - propertyEditorAlias: 'Umbraco.BlockGrid', + propertyEditorSchemaAlias: 'Umbraco.BlockGrid', icon: 'umb:icon-layout', group: 'richContent', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-list/config/block-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-list/config/block-configuration/manifests.ts index 8580adc8fe..17f2bd0d65 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-list/config/block-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-list/config/block-configuration/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-block-list-block-configuration.element.js'), meta: { label: 'Block List Block Configuration', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', icon: 'umb:autofill', group: 'common', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-list/manifests.ts index f8a87af670..49a75bd072 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-list/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-list/manifests.ts @@ -8,7 +8,7 @@ const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-block-list.element.js'), meta: { label: 'Block List', - propertyEditorAlias: 'Umbraco.BlockList', + propertyEditorSchemaAlias: 'Umbraco.BlockList', icon: 'umb:thumbnail-list', group: 'lists', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/checkbox-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/checkbox-list/manifests.ts index df2ad411a2..b1d1349434 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/checkbox-list/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/checkbox-list/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-checkbox-list.element.js'), meta: { label: 'Checkbox List', - propertyEditorAlias: 'Umbraco.CheckboxList', + propertyEditorSchemaAlias: 'Umbraco.CheckboxList', icon: 'umb:bulleted-list', group: 'lists', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/bulk-action-permissions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/bulk-action-permissions/manifests.ts index aa9ba88bcc..c9062bb8cc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/bulk-action-permissions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/bulk-action-permissions/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-collection-view-bulk-action-permissions.element.js'), meta: { label: 'Collection View Bulk Action Permissions', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', icon: 'umb:autofill', group: 'lists', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/column-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/column-configuration/manifests.ts index 971d393ac9..929d7f19da 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/column-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/column-configuration/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-collection-view-column-configuration.element.js'), meta: { label: 'Collection View Column Configuration', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', icon: 'umb:autofill', group: 'lists', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/layout-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/layout-configuration/manifests.ts index c24fa89c2c..6b088e9ffe 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/layout-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/layout-configuration/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-collection-view-layout-configuration.element.js'), meta: { label: 'Collection View Layout Configuration', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', icon: 'umb:autofill', group: 'lists', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/order-by/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/order-by/manifests.ts index 9bd87faddb..711d1cd002 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/order-by/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/config/order-by/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-collection-view-order-by.element.js'), meta: { label: 'Collection View Order By', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', icon: 'umb:autofill', group: 'lists', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/manifests.ts index 99f20c15d9..288c405d0d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/collection-view/manifests.ts @@ -11,7 +11,7 @@ const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-collection-view.element.js'), meta: { label: 'Collection View', - propertyEditorAlias: 'Umbraco.ListView', + propertyEditorSchemaAlias: 'Umbraco.ListView', icon: 'umb:bulleted-list', group: 'lists', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/color-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/color-picker/manifests.ts index d64117c7dc..b0b6db8878 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/color-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/color-picker/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-color-picker.element.js'), meta: { label: 'Color Picker', - propertyEditorAlias: 'Umbraco.ColorPicker', + propertyEditorSchemaAlias: 'Umbraco.ColorPicker', icon: 'umb:colorpicker', group: 'pickers', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/date-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/date-picker/manifests.ts index c967960016..35cfecc8ac 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/date-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/date-picker/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-date-picker.element.js'), meta: { label: 'Date Picker', - propertyEditorAlias: 'Umbraco.DateTime', + propertyEditorSchemaAlias: 'Umbraco.DateTime', icon: 'umb:time', group: 'pickers', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/dropdown/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/dropdown/manifests.ts index 39018f8b2f..230e1e8588 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/dropdown/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/dropdown/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-dropdown.element.js'), meta: { label: 'Dropdown', - propertyEditorAlias: 'Umbraco.Dropdown', + propertyEditorSchemaAlias: 'Umbraco.Dropdown', icon: 'umb:time', group: 'pickers', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/eye-dropper/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/eye-dropper/manifests.ts index 03ac68fd4a..22729116a0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/eye-dropper/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/eye-dropper/manifests.ts @@ -9,7 +9,7 @@ export const manifest: ManifestPropertyEditorUi = { label: 'Eye Dropper Color Picker', icon: 'umb:colorpicker', group: 'pickers', - propertyEditorAlias: 'Umbraco.ColorPicker.EyeDropper', + propertyEditorSchemaAlias: 'Umbraco.ColorPicker.EyeDropper', settings: { properties: [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/manifests.ts index bfdfe09949..f0f315a848 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-icon-picker.element.js'), meta: { label: 'Icon Picker', - propertyEditorAlias: 'Umbraco.JSON', + propertyEditorSchemaAlias: 'Umbraco.JSON', icon: 'umb:autofill', group: 'common', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/image-cropper/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/image-cropper/manifests.ts index 8e47b04edf..fa139e153d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/image-cropper/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/image-cropper/manifests.ts @@ -9,6 +9,6 @@ export const manifest: ManifestPropertyEditorUi = { label: 'Image Cropper', icon: 'umb:colorpicker', group: 'pickers', - propertyEditorAlias: 'Umbraco.ImageCropper', + propertyEditorSchemaAlias: 'Umbraco.ImageCropper', }, }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/image-crops-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/image-crops-configuration/manifests.ts index 8598edfe63..43e63c422d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/image-crops-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/image-crops-configuration/manifests.ts @@ -9,6 +9,6 @@ export const manifest: ManifestPropertyEditorUi = { label: 'Image Crops Configuration', icon: 'umb:autofill', group: 'common', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', }, }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/label/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/label/manifests.ts index a342425827..112bf5bf55 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/label/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/label/manifests.ts @@ -9,6 +9,6 @@ export const manifest: ManifestPropertyEditorUi = { label: 'Label', icon: 'umb:readonly', group: 'pickers', - propertyEditorAlias: 'Umbraco.Label', + propertyEditorSchemaAlias: 'Umbraco.Label', }, }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/manifests.ts index 8c120ed5fe..bc9e65ecd1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/manifests.ts @@ -74,7 +74,7 @@ export const manifests: Array = [ label: 'Number', icon: 'umb:autofill', group: 'common', - propertyEditorAlias: 'Umbraco.Integer', + propertyEditorSchemaAlias: 'Umbraco.Integer', }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/markdown-editor/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/markdown-editor/manifests.ts index 8fb1db4358..64217e33dc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/markdown-editor/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/markdown-editor/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-markdown-editor.element.js'), meta: { label: 'Markdown Editor', - propertyEditorAlias: 'Umbraco.MarkdownEditor', + propertyEditorSchemaAlias: 'Umbraco.MarkdownEditor', icon: 'umb:code', group: 'pickers', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/media-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/media-picker/manifests.ts index 28d621cc27..3bf6b01f36 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/media-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/media-picker/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-media-picker.element.js'), meta: { label: 'Media Picker', - propertyEditorAlias: 'Umbraco.MediaPicker3', + propertyEditorSchemaAlias: 'Umbraco.MediaPicker3', icon: 'umb:picture', group: 'pickers', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/member-group-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/member-group-picker/manifests.ts index 199b601fcc..f52da3c85f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/member-group-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/member-group-picker/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-member-group-picker.element.js'), meta: { label: 'Member Group Picker', - propertyEditorAlias: 'Umbraco.MemberGroupPicker', + propertyEditorSchemaAlias: 'Umbraco.MemberGroupPicker', icon: 'umb:users-alt', group: 'people', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/member-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/member-picker/manifests.ts index 18394c5e32..7b35f57061 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/member-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/member-picker/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-member-picker.element.js'), meta: { label: 'Member Picker', - propertyEditorAlias: 'Umbraco.MemberPicker', + propertyEditorSchemaAlias: 'Umbraco.MemberPicker', icon: 'umb:user', group: 'people', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multi-url-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multi-url-picker/manifests.ts index 1844b8e0d8..d06b22fc77 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multi-url-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multi-url-picker/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-multi-url-picker.element.js'), meta: { label: 'Multi URL Picker', - propertyEditorAlias: 'Umbraco.MultiUrlPicker', + propertyEditorSchemaAlias: 'Umbraco.MultiUrlPicker', icon: 'umb:link', group: 'pickers', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multiple-text-string/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multiple-text-string/manifests.ts index 86db9a7d50..0f8f900a83 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multiple-text-string/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multiple-text-string/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-multiple-text-string.element.js'), meta: { label: 'Multiple Text String', - propertyEditorAlias: 'Umbraco.MultipleTextString', + propertyEditorSchemaAlias: 'Umbraco.MultipleTextString', icon: 'umb:ordered-list', group: '', supportsReadOnly: true, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number-range/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number-range/manifests.ts index 970f463008..42f4419e19 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number-range/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number-range/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-number-range.element.js'), meta: { label: 'Number Range', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', icon: 'umb:autofill', group: 'common', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number/manifests.ts index f401fcb8cc..1bc94f246a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number/manifests.ts @@ -15,7 +15,7 @@ export const manifests: Array = [ loader: () => import('./property-editor-ui-number.element.js'), meta: { label: 'Integer', - propertyEditorAlias: 'Umbraco.Integer', + propertyEditorSchemaAlias: 'Umbraco.Integer', icon: 'umb:autofill', group: 'common', settings: { @@ -36,7 +36,7 @@ export const manifests: Array = [ loader: () => import('./property-editor-ui-number.element.js'), meta: { label: 'Decimal', - propertyEditorAlias: 'Umbraco.Decimal', + propertyEditorSchemaAlias: 'Umbraco.Decimal', icon: 'umb:autofill', group: 'common', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/order-direction/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/order-direction/manifests.ts index ee17704ef3..315121c8e5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/order-direction/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/order-direction/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-order-direction.element.js'), meta: { label: 'Order Direction', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', icon: 'umb:autofill', group: 'common', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/overlay-size/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/overlay-size/manifests.ts index 0300271f0e..5e85579e45 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/overlay-size/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/overlay-size/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-overlay-size.element.js'), meta: { label: 'Overlay Size', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', icon: 'umb:document', group: '', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/radio-button-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/radio-button-list/manifests.ts index 28637d28f6..459d5c9695 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/radio-button-list/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/radio-button-list/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-radio-button-list.element.js'), meta: { label: 'Radio Button List', - propertyEditorAlias: 'Umbraco.RadioButtonList', + propertyEditorSchemaAlias: 'Umbraco.RadioButtonList', icon: 'umb:target', group: 'lists', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/slider/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/slider/manifests.ts index 662200e610..c5b4a66f93 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/slider/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/slider/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-slider.element.js'), meta: { label: 'Slider', - propertyEditorAlias: 'Umbraco.Slider', + propertyEditorSchemaAlias: 'Umbraco.Slider', icon: 'umb:navigation-horizontal', group: 'common', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/text-box/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/text-box/manifests.ts index 6059b3a2a7..6084d0bb9c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/text-box/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/text-box/manifests.ts @@ -16,7 +16,7 @@ export const manifests: Array = [ loader: () => import('./property-editor-ui-text-box.element.js'), meta: { label: 'Text Box', - propertyEditorAlias: 'Umbraco.TextBox', + propertyEditorSchemaAlias: 'Umbraco.TextBox', icon: 'umb:autofill', group: 'common', settings: { @@ -37,7 +37,7 @@ export const manifests: Array = [ loader: () => import('./property-editor-ui-text-box.element.js'), meta: { label: 'Email', - propertyEditorAlias: 'Umbraco.EmailAddress', + propertyEditorSchemaAlias: 'Umbraco.EmailAddress', icon: 'umb:message', group: 'common', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/textarea/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/textarea/manifests.ts index 8d63aaf6a0..bcf042cccf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/textarea/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/textarea/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-textarea.element.js'), meta: { label: 'Text Area', - propertyEditorAlias: 'Umbraco.TextArea', + propertyEditorSchemaAlias: 'Umbraco.TextArea', icon: 'umb:edit', group: 'common', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/configuration/manifests.ts index 16f0d58dab..38dea7e1b8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/configuration/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-tiny-mce-configuration.element.js'), meta: { label: 'Rich Text Editor Configuration', - propertyEditorAlias: 'Umbraco.TinyMCE.Configuration', + propertyEditorSchemaAlias: 'Umbraco.TinyMCE.Configuration', icon: 'umb:autofill', group: 'common', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/manifests.ts index d099fecdd5..91c57b6a7c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/manifests.ts @@ -8,7 +8,7 @@ const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-tiny-mce.element.js'), meta: { label: 'Rich Text Editor', - propertyEditorAlias: 'Umbraco.TinyMCE', + propertyEditorSchemaAlias: 'Umbraco.TinyMCE', icon: 'umb:browser-window', group: 'richText', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/toggle/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/toggle/manifests.ts index 011906092a..b7dc5d0b42 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/toggle/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/toggle/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-toggle.element.js'), meta: { label: 'Toggle', - propertyEditorAlias: 'Umbraco.TrueFalse', + propertyEditorSchemaAlias: 'Umbraco.TrueFalse', icon: 'umb:checkbox', group: 'common', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tree-picker/config/start-node/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tree-picker/config/start-node/manifests.ts index f569ee5504..291f884edf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tree-picker/config/start-node/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tree-picker/config/start-node/manifests.ts @@ -9,6 +9,6 @@ export const manifest: ManifestPropertyEditorUi = { label: 'Tree Picker Start Node', icon: 'umb:page-add', group: 'pickers', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', }, }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tree-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tree-picker/manifests.ts index d50b78f9af..0553ae2034 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tree-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tree-picker/manifests.ts @@ -10,7 +10,7 @@ const manifest: ManifestPropertyEditorUi = { label: 'Tree Picker', icon: 'umb:page-add', group: 'pickers', - propertyEditorAlias: 'Umbraco.MultiNodeTreePicker', + propertyEditorSchemaAlias: 'Umbraco.MultiNodeTreePicker', settings: { properties: [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/upload-field/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/upload-field/manifests.ts index 3cd6347dc5..fcbc5f574b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/upload-field/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/upload-field/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-upload-field.element.js'), meta: { label: 'Upload Field', - propertyEditorAlias: 'Umbraco.UploadField', + propertyEditorSchemaAlias: 'Umbraco.UploadField', icon: 'umb:download-alt', group: 'common', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/user-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/user-picker/manifests.ts index 6fe35ba8de..2e1cc22dff 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/user-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/user-picker/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-user-picker.element.js'), meta: { label: 'User Picker', - propertyEditorAlias: 'Umbraco.UserPicker', + propertyEditorSchemaAlias: 'Umbraco.UserPicker', icon: 'umb:user', group: 'people', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/value-type/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/value-type/manifests.ts index dadee77196..40b01b6858 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/value-type/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/value-type/manifests.ts @@ -9,6 +9,6 @@ export const manifest: ManifestPropertyEditorUi = { label: 'Value Type', icon: 'umb:autofill', group: 'common', - propertyEditorAlias: 'Umbraco.JSON', + propertyEditorSchemaAlias: 'Umbraco.JSON', }, }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/Umbraco.ContentPicker.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/Umbraco.ContentPicker.ts index 792d6b07fc..bdd3e10e93 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/Umbraco.ContentPicker.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/Umbraco.ContentPicker.ts @@ -1,7 +1,7 @@ -import type { ManifestPropertyEditorModel } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestPropertyEditorSchema } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: ManifestPropertyEditorModel = { - type: 'propertyEditorModel', +export const manifest: ManifestPropertyEditorSchema = { + type: 'propertyEditorSchema', name: 'Content Picker', alias: 'Umbraco.ContentPicker', meta: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts index 09417384fc..0e2a76844a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-document-picker.element.js'), meta: { label: 'Document Picker', - propertyEditorAlias: 'Umbraco.ContentPicker', + propertyEditorSchemaAlias: 'Umbraco.ContentPicker', icon: 'umb:document', group: 'common', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.element.ts index d3e4de7b3e..10179c4fef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.element.ts @@ -29,7 +29,7 @@ export class UmbRefDataTypeElement extends UmbElementMixin(UUIRefNodeElement) { if (dataType) { this.name = dataType.name ?? ''; this.propertyEditorUiAlias = dataType.propertyEditorUiAlias ?? ''; - this.propertyEditorModelAlias = dataType.propertyEditorAlias ?? ''; + this.propertyEditorSchemaAlias = dataType.propertyEditorAlias ?? ''; } }, 'dataType' @@ -51,7 +51,7 @@ export class UmbRefDataTypeElement extends UmbElementMixin(UUIRefNodeElement) { * Property Editor Model Alias */ @state() - propertyEditorModelAlias = ''; + propertyEditorSchemaAlias = ''; protected renderDetail() { const details: string[] = []; @@ -63,8 +63,8 @@ export class UmbRefDataTypeElement extends UmbElementMixin(UUIRefNodeElement) { } /* // TODO: Revisit if its fine to leave this out: - if (this.propertyEditorModelAlias !== '') { - details.push(this.propertyEditorModelAlias); + if (this.propertyEditorSchemaAlias !== '') { + details.push(this.propertyEditorSchemaAlias); } else { details.push('Property Editor Model Missing'); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.stories.ts index 379dead092..5d4987403f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.stories.ts @@ -15,7 +15,7 @@ export const Overview: Story = { args: { name: 'Custom Data Type', propertyEditorUiAlias: 'Umb.DataTypeInput.CustomUI', - propertyEditorModelAlias: 'Umbraco.JSON', + propertyEditorSchemaAlias: 'Umbraco.JSON', }, }; @@ -23,7 +23,7 @@ export const WithDetail: Story = { args: { name: 'Custom Data Type', propertyEditorUiAlias: 'Umb.DataType.CustomUI', - propertyEditorModelAlias: 'UmbracoInput.JSON', + propertyEditorSchemaAlias: 'UmbracoInput.JSON', detail: 'With some custom details', }, }; @@ -32,14 +32,14 @@ export const WithSlots: Story = { args: { name: 'Custom Data Type', propertyEditorUiAlias: 'Umb.DataTypeInput.CustomUI', - propertyEditorModelAlias: 'Umbraco.JSON', + propertyEditorSchemaAlias: 'Umbraco.JSON', detail: 'With some custom details', }, render: (args) => html`
10
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts index 074f6f8cb6..8c00f1b1f4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts @@ -55,7 +55,7 @@ export class UmbDataTypeWorkspaceContext this.#data.update({ name }); } - setPropertyEditorAlias(alias?: string) { + setPropertyEditorSchemaAlias(alias?: string) { this.#data.update({ propertyEditorAlias: alias }); } setPropertyEditorUiAlias(alias?: string) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts index 9ecc20c214..d623e06fb9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts @@ -32,7 +32,7 @@ export class UmbDataTypeDetailsWorkspaceViewEditElement private _propertyEditorUiAlias?: string; @state() - private _propertyEditorAlias?: string; + private _propertyEditorSchemaAlias?: string; @state() private _data: Array = []; @@ -69,13 +69,13 @@ export class UmbDataTypeDetailsWorkspaceViewEditElement if (this._dataType.propertyEditorAlias) { // Get the property editor UI alias from the property editor alias: this.observe( - umbExtensionsRegistry.getByTypeAndAlias('propertyEditorModel', this._dataType.propertyEditorAlias), - (propertyEditorModel) => { - // TODO: show error. We have stored a PropertyEditorModelAlias and can't find the PropertyEditorModel in the registry. - if (!propertyEditorModel) return; - this._setPropertyEditorUiAlias(propertyEditorModel.meta.defaultPropertyEditorUiAlias ?? undefined); + umbExtensionsRegistry.getByTypeAndAlias('propertyEditorSchema', this._dataType.propertyEditorAlias), + (propertyEditorSchema) => { + // TODO: show error. We have stored a propertyEditorSchemaAlias and can't find the PropertyEditorSchema in the registry. + if (!propertyEditorSchema) return; + this._setPropertyEditorUiAlias(propertyEditorSchema.meta.defaultPropertyEditorUiAlias ?? undefined); }, - '_observePropertyEditorModelForDefaultUI' + '_observepropertyEditorSchemaForDefaultUI' ); } else { this._setPropertyEditorUiAlias(undefined); @@ -105,8 +105,8 @@ export class UmbDataTypeDetailsWorkspaceViewEditElement return; } - // remove the '_observePropertyEditorModelForDefaultUI' controller, as we do not want to observe for default value anymore: - this.removeControllerByUnique('_observePropertyEditorModelForDefaultUI'); + // remove the '_observepropertyEditorSchemaForDefaultUI' controller, as we do not want to observe for default value anymore: + this.removeControllerByUnique('_observepropertyEditorSchemaForDefaultUI'); this.observe( umbExtensionsRegistry.getByTypeAndAlias('propertyEditorUi', propertyEditorUiAlias), @@ -117,9 +117,9 @@ export class UmbDataTypeDetailsWorkspaceViewEditElement this._propertyEditorUiName = propertyEditorUI?.meta.label ?? propertyEditorUI?.name ?? ''; this._propertyEditorUiAlias = propertyEditorUI?.alias ?? ''; this._propertyEditorUiIcon = propertyEditorUI?.meta.icon ?? ''; - this._propertyEditorAlias = propertyEditorUI?.meta.propertyEditorAlias ?? ''; + this._propertyEditorSchemaAlias = propertyEditorUI?.meta.propertyEditorSchemaAlias ?? ''; - this._workspaceContext?.setPropertyEditorAlias(this._propertyEditorAlias); + this._workspaceContext?.setPropertyEditorSchemaAlias(this._propertyEditorSchemaAlias); }, '_observePropertyEditorUI' ); @@ -158,7 +158,7 @@ export class UmbDataTypeDetailsWorkspaceViewEditElement slot="editor" name=${this._propertyEditorUiName} alias=${this._propertyEditorUiAlias} - property-editor-model-alias=${this._propertyEditorAlias} + property-editor-model-alias=${this._propertyEditorSchemaAlias} border> @@ -180,7 +180,7 @@ export class UmbDataTypeDetailsWorkspaceViewEditElement private _renderConfig() { return html` - ${this._propertyEditorAlias && this._propertyEditorUiAlias + ${this._propertyEditorSchemaAlias && this._propertyEditorUiAlias ? html` import('./property-editor-ui-tags-storage-type.element.js'), meta: { label: 'Tags Storage Type', - propertyEditorAlias: '', + propertyEditorSchemaAlias: '', icon: 'umb:autofill', group: 'common', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/manifests.ts index 6288f41ee2..81443609cf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/manifests.ts @@ -8,7 +8,7 @@ const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-tags.element.js'), meta: { label: 'Tags', - propertyEditorAlias: 'Umbraco.Tags', + propertyEditorSchemaAlias: 'Umbraco.Tags', icon: 'umb:tags', group: 'common', }, diff --git a/src/Umbraco.Web.UI.Client/storybook/stories/extending/property-editors.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/property-editors.mdx index a4ce9e22a6..8b0c42db1e 100644 --- a/src/Umbraco.Web.UI.Client/storybook/stories/extending/property-editors.mdx +++ b/src/Umbraco.Web.UI.Client/storybook/stories/extending/property-editors.mdx @@ -26,7 +26,7 @@ import { Meta } from '@storybook/addon-docs'; ```json { - "type": "propertyEditorModel", + "type": "propertyEditorSchema", "name": "Text Box", "alias": "Umbraco.TextBox", }; @@ -43,7 +43,7 @@ import { Meta } from '@storybook/addon-docs'; "js": "./my-text-box.element.js", "meta": { "label": "My Text Box", - "propertyEditorModel": "Umbraco.TextBox", + "propertyEditorSchema": "Umbraco.TextBox", "icon": "umb:autofill", "group": "common" }