Skip to content

Commit 47359b5

Browse files
authored
Merge pull request #2321 from umbraco/v15/feature/editorAliasCherryPickFromBlockVariantPOC
V15: cherry pick editor-alias changes from block variant POC
2 parents c684916 + dd63061 commit 47359b5

File tree

16 files changed

+146
-14
lines changed

16 files changed

+146
-14
lines changed

src/external/backend-api/src/types.gen.ts

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ export type DocumentBlueprintItemResponseModel = {
612612
};
613613

614614
export type DocumentBlueprintResponseModel = {
615-
values: Array<(DocumentValueModel)>;
615+
values: Array<(DocumentValueResponseModel)>;
616616
variants: Array<(DocumentVariantResponseModel)>;
617617
id: string;
618618
documentType: (DocumentTypeReferenceResponseModel);
@@ -628,7 +628,7 @@ export type DocumentBlueprintTreeItemResponseModel = {
628628
};
629629

630630
export type DocumentCollectionResponseModel = {
631-
values: Array<(DocumentValueModel)>;
631+
values: Array<(DocumentValueResponseModel)>;
632632
variants: Array<(DocumentVariantResponseModel)>;
633633
id: string;
634634
creator?: (string) | null;
@@ -684,7 +684,7 @@ export type DocumentReferenceResponseModel = {
684684
};
685685

686686
export type DocumentResponseModel = {
687-
values: Array<(DocumentValueModel)>;
687+
values: Array<(DocumentValueResponseModel)>;
688688
variants: Array<(DocumentVariantResponseModel)>;
689689
id: string;
690690
documentType: (DocumentTypeReferenceResponseModel);
@@ -834,6 +834,14 @@ export type DocumentValueModel = {
834834
value?: unknown;
835835
};
836836

837+
export type DocumentValueResponseModel = {
838+
culture?: (string) | null;
839+
segment?: (string) | null;
840+
alias: string;
841+
value?: unknown;
842+
editorAlias: string;
843+
};
844+
837845
export type DocumentVariantItemResponseModel = {
838846
name: string;
839847
culture?: (string) | null;
@@ -875,7 +883,7 @@ export type DocumentVersionItemResponseModel = {
875883
};
876884

877885
export type DocumentVersionResponseModel = {
878-
values: Array<(DocumentValueModel)>;
886+
values: Array<(DocumentValueResponseModel)>;
879887
variants: Array<(DocumentVariantResponseModel)>;
880888
id: string;
881889
documentType: (DocumentTypeReferenceResponseModel);
@@ -1156,7 +1164,7 @@ export type ManifestResponseModel = {
11561164
};
11571165

11581166
export type MediaCollectionResponseModel = {
1159-
values: Array<(MediaValueModel)>;
1167+
values: Array<(MediaValueResponseModel)>;
11601168
variants: Array<(MediaVariantResponseModel)>;
11611169
id: string;
11621170
creator?: (string) | null;
@@ -1195,7 +1203,7 @@ export type MediaReferenceResponseModel = {
11951203
};
11961204

11971205
export type MediaResponseModel = {
1198-
values: Array<(MediaValueModel)>;
1206+
values: Array<(MediaValueResponseModel)>;
11991207
variants: Array<(MediaVariantResponseModel)>;
12001208
id: string;
12011209
urls: Array<(MediaUrlInfoModel)>;
@@ -1325,6 +1333,14 @@ export type MediaValueModel = {
13251333
value?: unknown;
13261334
};
13271335

1336+
export type MediaValueResponseModel = {
1337+
culture?: (string) | null;
1338+
segment?: (string) | null;
1339+
alias: string;
1340+
value?: unknown;
1341+
editorAlias: string;
1342+
};
1343+
13281344
export type MediaVariantRequestModel = {
13291345
culture?: (string) | null;
13301346
segment?: (string) | null;
@@ -1369,7 +1385,7 @@ export enum MemberKindModel {
13691385
}
13701386

13711387
export type MemberResponseModel = {
1372-
values: Array<(MemberValueModel)>;
1388+
values: Array<(MemberValueResponseModel)>;
13731389
variants: Array<(MemberVariantResponseModel)>;
13741390
id: string;
13751391
email: string;
@@ -1479,6 +1495,14 @@ export type MemberValueModel = {
14791495
value?: unknown;
14801496
};
14811497

1498+
export type MemberValueResponseModel = {
1499+
culture?: (string) | null;
1500+
segment?: (string) | null;
1501+
alias: string;
1502+
value?: unknown;
1503+
editorAlias: string;
1504+
};
1505+
14821506
export type MemberVariantRequestModel = {
14831507
culture?: (string) | null;
14841508
segment?: (string) | null;

src/mocks/data/document-blueprint/document-blueprint.data.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export const data: Array<UmbMockDocumentBlueprintModel> = [
3636
],
3737
values: [
3838
{
39+
editorAlias: 'Umbraco.TextBox',
3940
alias: 'prop1',
4041
culture: null,
4142
segment: null,

src/mocks/data/document-blueprint/document-blueprint.db.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
DocumentItemResponseModel,
1313
DocumentResponseModel,
1414
DocumentTreeItemResponseModel,
15+
DocumentValueResponseModel,
1516
} from '@umbraco-cms/backoffice/external/backend-api';
1617

1718
export class UmbDocumentBlueprintMockDB extends UmbEntityMockDbBase<UmbMockDocumentBlueprintModel> {
@@ -65,7 +66,7 @@ const createMockDocumentBlueprintMapper = (request: CreateDocumentRequestModel):
6566
isTrashed: false,
6667
noAccess: false,
6768
parent: request.parent,
68-
values: request.values,
69+
values: request.values as DocumentValueResponseModel[],
6970
variants: request.variants.map((variantRequest) => {
7071
return {
7172
culture: variantRequest.culture,

0 commit comments

Comments
 (0)