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

Merge remote-tracking branch 'origin/main' into bugfix/members

Browse Source
This commit is contained in:
JesmoDev
2024-03-05 16:39:22 +01:00
parent 3aba73d0cc 9e25ff7f08
commit 8236e13f53
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts
View File

@@ -533,8 +533,8 @@ export const data: Array<UmbMockDataTypeModel> = [
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,
@@ -619,7 +619,7 @@ export const data: Array<UmbMockDataTypeModel> = [
name: 'Media Picker',
id: 'dt-mediaPicker',
parent: null,
editorAlias: 'Umbraco.MediaPicker3',
editorAlias: 'Umbraco.MediaPicker',
editorUiAlias: 'Umb.PropertyEditorUi.MediaPicker',
hasChildren: false,
isFolder: false,

4
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.CheckboxList.ts
View File

@@ -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',
},
};

6
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker3.ts → src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/Umbraco.MediaPicker.ts
View File

@@ -2,10 +2,10 @@ 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.MediaPicker3',
defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.MediaPicker',
settings: {
properties: [
{

2
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/schemas/manifests.ts
View File

@@ -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';

4
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/manifests.ts
View File

@@ -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: {

2
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/manifests.ts
View File

@@ -8,7 +8,7 @@ export const manifest: ManifestPropertyEditorUi = {
meta: {
label: 'Dropdown',
propertyEditorSchemaAlias: 'Umbraco.DropDown.Flexible',
icon: 'icon-time',
icon: 'icon-list',
group: 'pickers',
},
};

2
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
View File

@@ -12,7 +12,7 @@ import type { UmbInputMultipleTextStringElement } from '@umbraco-cms/backoffice/
@customElement('umb-property-editor-ui-multiple-text-string')
export class UmbPropertyEditorUIMultipleTextStringElement extends UmbLitElement implements UmbPropertyEditorUiElement {
@property({ type: Array })
public value: Array<string> = [];
value?: Array<string>;
@property({ attribute: false })
public set config(config: UmbPropertyEditorConfigCollection | undefined) {

2
src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts
View File

@@ -100,7 +100,7 @@ export class UmbLogViewerWorkspaceContext extends UmbControllerBase implements U
#polling = new UmbObjectState<PoolingCOnfig>({ enabled: false, interval: 2000 });
polling = this.#polling.asObservable();
#sortingDirection = new UmbBasicState<DirectionModel>(DirectionModel.ASCENDING);
#sortingDirection = new UmbBasicState<DirectionModel>(DirectionModel.DESCENDING);
sortingDirection = this.#sortingDirection.asObservable();
#intervalID: number | null = null;

2
src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/manifests.ts
View File

@@ -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',
},