Skip to content

Commit 3586f13

Browse files
authored
avoid indifferences on property-entry property order (#18530)
1 parent 1f2afba commit 3586f13

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export class UmbBlockElementManager<LayoutDataType extends UmbBlockLayoutBaseMod
195195
throw new Error(`Editor Alias of "${property.dataType.unique}" not found.`);
196196
}
197197

198-
const entry = { ...variantId.toObject(), alias, editorAlias, value } as UmbBlockDataValueModel<ValueType>;
198+
const entry = { editorAlias, ...variantId.toObject(), alias, value } as UmbBlockDataValueModel<ValueType>;
199199

200200
const currentData = this.getData();
201201
if (currentData) {

src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/content-detail-workspace-base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ export abstract class UmbContentDetailWorkspaceContextBase<
479479
}
480480

481481
// Notice the order of the properties is important for our JSON String Compare function. [NL]
482-
const entry = { editorAlias, alias, ...variantId.toObject(), value } as UmbElementValueModel;
482+
const entry = { editorAlias, ...variantId.toObject(), alias, value } as UmbElementValueModel;
483483

484484
const currentData = this.getData();
485485
if (currentData) {

src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/repository/detail/document-blueprint-detail.server.data-source.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ export class UmbDocumentBlueprintServerDataSource implements UmbDetailDataSource
9393
values: data.values.map((value) => {
9494
return {
9595
editorAlias: value.editorAlias,
96-
alias: value.alias,
9796
culture: value.culture || null,
9897
segment: value.segment || null,
98+
alias: value.alias,
9999
value: value.value,
100100
};
101101
}),

src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/repository/document-publishing.server.data-source.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ export class UmbDocumentPublishingServerDataSource {
140140
values: data.values.map((value) => {
141141
return {
142142
editorAlias: value.editorAlias,
143-
alias: value.alias,
144143
culture: value.culture || null,
145144
segment: value.segment || null,
145+
alias: value.alias,
146146
value: value.value,
147147
};
148148
}),

src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ export class UmbDocumentServerDataSource implements UmbDetailDataSource<UmbDocum
9494
values: data.values.map((value) => {
9595
return {
9696
editorAlias: value.editorAlias,
97-
alias: value.alias,
9897
culture: value.culture || null,
9998
segment: value.segment || null,
99+
alias: value.alias,
100100
value: value.value,
101101
};
102102
}),

0 commit comments

Comments
 (0)