Skip to content

Commit 5a65eb1

Browse files
AndyButlandAndyButland
committed
Update OpenApi.json and client-side models.
1 parent 105cb9d commit 5a65eb1

File tree

4 files changed

+67
-11
lines changed

4 files changed

+67
-11
lines changed

‎src/Umbraco.Cms.Api.Management/OpenApi.json‎

Lines changed: 50 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37322,6 +37322,9 @@
3732237322
{
3732337323
"$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
3732437324
},
37325+
{
37326+
"$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
37327+
},
3732537328
{
3732637329
"$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
3732737330
}
@@ -37608,6 +37611,9 @@
3760837611
{
3760937612
"$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
3761037613
},
37614+
{
37615+
"$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
37616+
},
3761137617
{
3761237618
"$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
3761337619
}
@@ -38444,7 +38450,8 @@
3844438450
"type": "boolean"
3844538451
},
3844638452
"allowNonExistingSegmentsCreation": {
38447-
"type": "boolean"
38453+
"type": "boolean",
38454+
"deprecated": true
3844838455
}
3844938456
},
3845038457
"additionalProperties": false
@@ -39088,6 +39095,36 @@
3908839095
},
3908939096
"additionalProperties": false
3909039097
},
39098+
"DocumentTypePermissionPresentationModel": {
39099+
"required": [
39100+
"$type",
39101+
"documentTypeAlias",
39102+
"verbs"
39103+
],
39104+
"type": "object",
39105+
"properties": {
39106+
"$type": {
39107+
"type": "string"
39108+
},
39109+
"verbs": {
39110+
"uniqueItems": true,
39111+
"type": "array",
39112+
"items": {
39113+
"type": "string"
39114+
}
39115+
},
39116+
"documentTypeAlias": {
39117+
"type": "string"
39118+
}
39119+
},
39120+
"additionalProperties": false,
39121+
"discriminator": {
39122+
"propertyName": "$type",
39123+
"mapping": {
39124+
"DocumentTypePermissionPresentationModel": "#/components/schemas/DocumentTypePermissionPresentationModel"
39125+
}
39126+
}
39127+
},
3909139128
"DocumentTypePropertyTypeContainerResponseModel": {
3909239129
"required": [
3909339130
"id",
@@ -39683,7 +39720,8 @@
3968339720
"NotCreated",
3968439721
"Draft",
3968539722
"Published",
39686-
"PublishedPendingChanges"
39723+
"PublishedPendingChanges",
39724+
"Trashed"
3968739725
],
3968839726
"type": "string"
3968939727
},
@@ -40178,7 +40216,7 @@
4017840216
},
4017940217
"actionParameters": {
4018040218
"type": "object",
40181-
"additionalProperties": { },
40219+
"additionalProperties": {},
4018240220
"nullable": true
4018340221
}
4018440222
},
@@ -40803,7 +40841,7 @@
4080340841
},
4080440842
"extensions": {
4080540843
"type": "array",
40806-
"items": { }
40844+
"items": {}
4080740845
}
4080840846
},
4080940847
"additionalProperties": false
@@ -44640,7 +44678,7 @@
4464044678
"nullable": true
4464144679
}
4464244680
},
44643-
"additionalProperties": { }
44681+
"additionalProperties": {}
4464444682
},
4464544683
"ProblemDetailsBuilderModel": {
4464644684
"type": "object",
@@ -47813,6 +47851,9 @@
4781347851
{
4781447852
"$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
4781547853
},
47854+
{
47855+
"$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
47856+
},
4781647857
{
4781747858
"$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
4781847859
}
@@ -48250,6 +48291,9 @@
4825048291
{
4825148292
"$ref": "#/components/schemas/DocumentPropertyValuePermissionPresentationModel"
4825248293
},
48294+
{
48295+
"$ref": "#/components/schemas/DocumentTypePermissionPresentationModel"
48296+
},
4825348297
{
4825448298
"$ref": "#/components/schemas/UnknownTypePermissionPresentationModel"
4825548299
}
@@ -48932,4 +48976,4 @@
4893248976
}
4893348977
}
4893448978
}
48935-
}
48979+
}

‎src/Umbraco.Web.UI.Client/src/packages/core/backend-api/types.gen.ts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ export type CreateUserGroupRequestModel = {
412412
mediaStartNode?: ReferenceByIdModel | null;
413413
mediaRootAccess: boolean;
414414
fallbackPermissions: Array<string>;
415-
permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
415+
permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
416416
id?: string | null;
417417
};
418418

@@ -471,7 +471,7 @@ export type CurrentUserResponseModel = {
471471
hasAccessToAllLanguages: boolean;
472472
hasAccessToSensitiveData: boolean;
473473
fallbackPermissions: Array<string>;
474-
permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
474+
permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
475475
allowedSections: Array<string>;
476476
isAdmin: boolean;
477477
};
@@ -659,6 +659,9 @@ export type DocumentConfigurationResponseModel = {
659659
disableDeleteWhenReferenced: boolean;
660660
disableUnpublishWhenReferenced: boolean;
661661
allowEditInvariantFromNonDefault: boolean;
662+
/**
663+
* @deprecated
664+
*/
662665
allowNonExistingSegmentsCreation: boolean;
663666
};
664667

@@ -791,6 +794,12 @@ export type DocumentTypeItemResponseModel = {
791794
description?: string | null;
792795
};
793796

797+
export type DocumentTypePermissionPresentationModel = {
798+
$type: string;
799+
verbs: Array<string>;
800+
documentTypeAlias: string;
801+
};
802+
794803
export type DocumentTypePropertyTypeContainerResponseModel = {
795804
id: string;
796805
parent?: ReferenceByIdModel | null;
@@ -920,7 +929,8 @@ export enum DocumentVariantStateModel {
920929
NOT_CREATED = 'NotCreated',
921930
DRAFT = 'Draft',
922931
PUBLISHED = 'Published',
923-
PUBLISHED_PENDING_CHANGES = 'PublishedPendingChanges'
932+
PUBLISHED_PENDING_CHANGES = 'PublishedPendingChanges',
933+
TRASHED = 'Trashed'
924934
}
925935

926936
export type DocumentVersionItemResponseModel = {
@@ -2822,7 +2832,7 @@ export type UpdateUserGroupRequestModel = {
28222832
mediaStartNode?: ReferenceByIdModel | null;
28232833
mediaRootAccess: boolean;
28242834
fallbackPermissions: Array<string>;
2825-
permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
2835+
permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
28262836
};
28272837

28282838
export type UpdateUserGroupsOnUserRequestModel = {
@@ -2923,7 +2933,7 @@ export type UserGroupResponseModel = {
29232933
mediaStartNode?: ReferenceByIdModel | null;
29242934
mediaRootAccess: boolean;
29252935
fallbackPermissions: Array<string>;
2926-
permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
2936+
permissions: Array<DocumentPermissionPresentationModel | DocumentPropertyValuePermissionPresentationModel | DocumentTypePermissionPresentationModel | UnknownTypePermissionPresentationModel>;
29272937
id: string;
29282938
isDeletable: boolean;
29292939
aliasCanBeChanged: boolean;

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const variantStatesOrder = {
88
[DocumentVariantStateModel.PUBLISHED]: 1,
99
[DocumentVariantStateModel.DRAFT]: 2,
1010
[DocumentVariantStateModel.NOT_CREATED]: 3,
11+
[DocumentVariantStateModel.TRASHED]: 4,
1112
};
1213

1314
const getVariantStateOrderValue = (variant?: UmbDocumentVariantOptionModel['variant']) => {

‎src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view-variant-selector.element.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export class UmbDocumentWorkspaceSplitViewVariantSelectorElement extends UmbWork
2222
// We should also make our own state model for this
2323
[DocumentVariantStateModel.PUBLISHED_PENDING_CHANGES]: 'content_published',
2424
[DocumentVariantStateModel.NOT_CREATED]: 'content_notCreated',
25+
[DocumentVariantStateModel.TRASHED]: 'mediaPicker_trashed',
2526
};
2627

2728
constructor() {

0 commit comments

Comments
 (0)