From 614f9f7e41eff61a294f2d3cf098f92d75a0400f Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:19:36 +0100 Subject: [PATCH 1/6] Bugfix: CheckBox SchemaAlias --- .../src/mocks/data/data-type/data-type.data.ts | 4 ++-- .../core/property-editor/schemas/Umbraco.CheckboxList.ts | 4 ++-- .../core/property-editor/uis/checkbox-list/manifests.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts index d1544fbc6e..f45b30f7e6 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts @@ -533,8 +533,8 @@ export const data: Array = [ name: 'Checkbox List', id: 'dt-checkboxList', parent: null, - editorAlias: 'Umbraco.CheckboxList', - editorUiAlias: 'Umb.PropertyEditorUi.CheckboxList', + editorAlias: 'Umbraco.CheckBoxList', + editorUiAlias: 'Umb.PropertyEditorUi.CheckBoxList', hasChildren: false, isFolder: false, isDeletable: true, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.CheckboxList.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.CheckboxList.ts index 1999866902..36213ac286 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.CheckboxList.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.CheckboxList.ts @@ -3,8 +3,8 @@ import type { ManifestPropertyEditorSchema } from '@umbraco-cms/backoffice/exten export const manifest: ManifestPropertyEditorSchema = { type: 'propertyEditorSchema', name: 'Checkbox List', - alias: 'Umbraco.CheckboxList', + alias: 'Umbraco.CheckBoxList', meta: { - defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.CheckboxList', + defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.CheckBoxList', }, }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/manifests.ts index c8c836b805..a4fb438be5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/manifests.ts @@ -2,12 +2,12 @@ import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/extension export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', - alias: 'Umb.PropertyEditorUi.CheckboxList', + alias: 'Umb.PropertyEditorUi.CheckBoxList', name: 'Checkbox List Property Editor UI', element: () => import('./property-editor-ui-checkbox-list.element.js'), meta: { label: 'Checkbox List', - propertyEditorSchemaAlias: 'Umbraco.CheckboxList', + propertyEditorSchemaAlias: 'Umbraco.CheckBoxList', icon: 'icon-bulleted-list', group: 'lists', settings: { From 379c0a8895205c37a0ab63ba19ca16a3c72814ab Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:22:59 +0100 Subject: [PATCH 2/6] dropdown datatype use icon list --- .../src/packages/core/property-editor/uis/dropdown/manifests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/manifests.ts index c639aea701..0a54e6771c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/manifests.ts @@ -8,7 +8,7 @@ export const manifest: ManifestPropertyEditorUi = { meta: { label: 'Dropdown', propertyEditorSchemaAlias: 'Umbraco.DropDown.Flexible', - icon: 'icon-time', + icon: 'icon-list', group: 'pickers', }, }; From 33766e75b8e98446ba0df9eb8be44cc4f20fbf4a Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:23:34 +0100 Subject: [PATCH 3/6] mediapicker ui alias has no 3 in name --- .../core/property-editor/schemas/Umbraco.MediaPicker3.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker3.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker3.ts index e0e21070d0..8859ba5815 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker3.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker3.ts @@ -5,7 +5,7 @@ export const manifest: ManifestPropertyEditorSchema = { name: 'Media Picker 3', alias: 'Umbraco.MediaPicker3', meta: { - defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.MediaPicker3', + defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.MediaPicker', settings: { properties: [ { From afe2ed8350c30176981f1ea68670fb3c57cad7d2 Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:25:43 +0100 Subject: [PATCH 4/6] multipletextstring as value object --- .../property-editor-ui-multiple-text-string.element.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts index 328ac08bb3..74fe46fc74 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts @@ -6,13 +6,17 @@ import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extensi import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbInputMultipleTextStringElement } from '@umbraco-cms/backoffice/components'; +interface MultiTextStringValue { + value: string; +} + /** * @element umb-property-editor-ui-multiple-text-string */ @customElement('umb-property-editor-ui-multiple-text-string') export class UmbPropertyEditorUIMultipleTextStringElement extends UmbLitElement implements UmbPropertyEditorUiElement { @property({ type: Array }) - public value: Array = []; + value?: Array; @property({ attribute: false }) public set config(config: UmbPropertyEditorConfigCollection | undefined) { @@ -56,13 +60,13 @@ export class UmbPropertyEditorUIMultipleTextStringElement extends UmbLitElement #onChange(event: UmbChangeEvent) { event.stopPropagation(); const target = event.currentTarget as UmbInputMultipleTextStringElement; - this.value = target.items; + this.value = target.items.map((item) => ({ value: item })); this.dispatchEvent(new UmbPropertyValueChangeEvent()); } render() { return html` Date: Tue, 5 Mar 2024 16:00:45 +0100 Subject: [PATCH 5/6] string array --- .../property-editor-ui-multiple-text-string.element.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts index 74fe46fc74..8fa9154671 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts @@ -6,17 +6,13 @@ import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extensi import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbInputMultipleTextStringElement } from '@umbraco-cms/backoffice/components'; -interface MultiTextStringValue { - value: string; -} - /** * @element umb-property-editor-ui-multiple-text-string */ @customElement('umb-property-editor-ui-multiple-text-string') export class UmbPropertyEditorUIMultipleTextStringElement extends UmbLitElement implements UmbPropertyEditorUiElement { @property({ type: Array }) - value?: Array; + value?: Array; @property({ attribute: false }) public set config(config: UmbPropertyEditorConfigCollection | undefined) { @@ -60,13 +56,13 @@ export class UmbPropertyEditorUIMultipleTextStringElement extends UmbLitElement #onChange(event: UmbChangeEvent) { event.stopPropagation(); const target = event.currentTarget as UmbInputMultipleTextStringElement; - this.value = target.items.map((item) => ({ value: item })); + this.value = target.items; this.dispatchEvent(new UmbPropertyValueChangeEvent()); } render() { return html` Date: Tue, 5 Mar 2024 16:10:58 +0100 Subject: [PATCH 6/6] remove remaining references to MediaPicker3 --- .../src/mocks/data/data-type/data-type.data.ts | 2 +- .../{Umbraco.MediaPicker3.ts => Umbraco.MediaPicker.ts} | 4 ++-- .../src/packages/core/property-editor/schemas/manifests.ts | 2 +- .../src/packages/log-viewer/workspace/logviewer.context.ts | 2 +- .../media/media/property-editors/media-picker/manifests.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/{Umbraco.MediaPicker3.ts => Umbraco.MediaPicker.ts} (96%) diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts index f45b30f7e6..52f12c19dc 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts @@ -619,7 +619,7 @@ export const data: Array = [ name: 'Media Picker', id: 'dt-mediaPicker', parent: null, - editorAlias: 'Umbraco.MediaPicker3', + editorAlias: 'Umbraco.MediaPicker', editorUiAlias: 'Umb.PropertyEditorUi.MediaPicker', hasChildren: false, isFolder: false, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker3.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker.ts similarity index 96% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker3.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker.ts index 8859ba5815..e82dd509dc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker3.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker.ts @@ -2,8 +2,8 @@ import type { ManifestPropertyEditorSchema } from '@umbraco-cms/backoffice/exten export const manifest: ManifestPropertyEditorSchema = { type: 'propertyEditorSchema', - name: 'Media Picker 3', - alias: 'Umbraco.MediaPicker3', + name: 'Media Picker', + alias: 'Umbraco.MediaPicker', meta: { defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.MediaPicker', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/manifests.ts index 5661955fbd..2108dfc379 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/manifests.ts @@ -14,7 +14,7 @@ import { manifest as integer } from './Umbraco.Integer.js'; import { manifest as label } from './Umbraco.Label.js'; import { manifest as listView } from './Umbraco.ListView.js'; import { manifest as markdownEditor } from './Umbraco.MarkdownEditor.js'; -import { manifest as mediaPicker } from './Umbraco.MediaPicker3.js'; +import { manifest as mediaPicker } from './Umbraco.MediaPicker.js'; import { manifest as memberGroupPicker } from './Umbraco.MemberGroupPicker.js'; import { manifest as memberPicker } from './Umbraco.MemberPicker.js'; import { manifest as multiNodeTreePicker } from './Umbraco.MultiNodeTreePicker.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts index 91c612ec5a..6dbbe79933 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts @@ -100,7 +100,7 @@ export class UmbLogViewerWorkspaceContext extends UmbControllerBase implements U #polling = new UmbObjectState({ enabled: false, interval: 2000 }); polling = this.#polling.asObservable(); - #sortingDirection = new UmbBasicState(DirectionModel.ASCENDING); + #sortingDirection = new UmbBasicState(DirectionModel.DESCENDING); sortingDirection = this.#sortingDirection.asObservable(); #intervalID: number | null = null; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/manifests.ts index 43f21ff442..c02561b470 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/manifests.ts @@ -7,7 +7,7 @@ export const manifest: ManifestPropertyEditorUi = { js: () => import('./property-editor-ui-media-picker.element.js'), meta: { label: 'Media Picker', - propertyEditorSchemaAlias: 'Umbraco.MediaPicker3', + propertyEditorSchemaAlias: 'Umbraco.MediaPicker', icon: 'icon-picture', group: 'pickers', },