From fe02732c16b6876eb0acc61e577697dcf25353c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 7 Nov 2023 15:43:36 +0100 Subject: [PATCH 1/5] regenerate models --- src/external/backend-api/src/index.ts | 23 +++++++-------- ....ts => ContentForDocumentResponseModel.ts} | 2 +- ...ontentTypeForDocumentTypeResponseModel.ts} | 2 +- ...> ContentTypeForMediaTypeResponseModel.ts} | 2 +- ...> CreateContentForDocumentRequestModel.ts} | 2 +- ...s => CreateContentForMediaRequestModel.ts} | 2 +- ...ContentTypeForDocumentTypeRequestModel.ts} | 2 +- ...ateContentTypeForMediaTypeRequestModel.ts} | 2 +- .../src/models/CreateDocumentRequestModel.ts | 4 +-- .../models/CreateDocumentTypeRequestModel.ts | 4 +-- .../src/models/CreateMediaRequestModel.ts | 4 +-- .../src/models/CreateMediaTypeRequestModel.ts | 4 +-- .../src/models/DocumentItemResponseModel.ts | 1 + .../src/models/DocumentResponseModel.ts | 5 ++-- .../src/models/DocumentTypeResponseModel.ts | 4 +-- .../src/models/LoginRequestModel.ts | 10 ------- .../src/models/MediaItemResponseModel.ts | 1 + .../src/models/MediaTypeResponseModel.ts | 4 +-- ...> UpdateContentForDocumentRequestModel.ts} | 2 +- ...s => UpdateContentForMediaRequestModel.ts} | 2 +- ...ContentTypeForDocumentTypeRequestModel.ts} | 2 +- ...ateContentTypeForMediaTypeRequestModel.ts} | 2 +- .../src/models/UpdateDocumentRequestModel.ts | 4 +-- .../models/UpdateDocumentTypeRequestModel.ts | 4 +-- .../src/models/UpdateMediaRequestModel.ts | 4 +-- .../src/models/UpdateMediaTypeRequestModel.ts | 4 +-- .../src/services/SecurityResource.ts | 29 ------------------- 27 files changed, 47 insertions(+), 84 deletions(-) rename src/external/backend-api/src/models/{ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel.ts => ContentForDocumentResponseModel.ts} (82%) rename src/external/backend-api/src/models/{ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel.ts => ContentTypeForDocumentTypeResponseModel.ts} (88%) rename src/external/backend-api/src/models/{ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel.ts => ContentTypeForMediaTypeResponseModel.ts} (88%) rename src/external/backend-api/src/models/{CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts => CreateContentForDocumentRequestModel.ts} (82%) rename src/external/backend-api/src/models/{CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts => CreateContentForMediaRequestModel.ts} (82%) rename src/external/backend-api/src/models/{CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel.ts => CreateContentTypeForDocumentTypeRequestModel.ts} (88%) rename src/external/backend-api/src/models/{CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel.ts => CreateContentTypeForMediaTypeRequestModel.ts} (88%) delete mode 100644 src/external/backend-api/src/models/LoginRequestModel.ts rename src/external/backend-api/src/models/{UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts => UpdateContentForDocumentRequestModel.ts} (80%) rename src/external/backend-api/src/models/{UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts => UpdateContentForMediaRequestModel.ts} (80%) rename src/external/backend-api/src/models/{UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel.ts => UpdateContentTypeForDocumentTypeRequestModel.ts} (87%) rename src/external/backend-api/src/models/{UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel.ts => UpdateContentTypeForMediaTypeRequestModel.ts} (87%) diff --git a/src/external/backend-api/src/index.ts b/src/external/backend-api/src/index.ts index 510731a073..972ec2bb32 100644 --- a/src/external/backend-api/src/index.ts +++ b/src/external/backend-api/src/index.ts @@ -13,22 +13,22 @@ export type { AuditLogWithUsernameResponseModel } from './models/AuditLogWithUse export { AuditTypeModel } from './models/AuditTypeModel'; export type { ChangePasswordUserRequestModel } from './models/ChangePasswordUserRequestModel'; export type { ConsentLevelPresentationModel } from './models/ConsentLevelPresentationModel'; -export type { ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel } from './models/ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel'; +export type { ContentForDocumentResponseModel } from './models/ContentForDocumentResponseModel'; export { ContentStateModel } from './models/ContentStateModel'; export type { ContentTreeItemResponseModel } from './models/ContentTreeItemResponseModel'; export type { ContentTypeCleanupModel } from './models/ContentTypeCleanupModel'; export type { ContentTypeCompositionModel } from './models/ContentTypeCompositionModel'; export { ContentTypeCompositionTypeModel } from './models/ContentTypeCompositionTypeModel'; -export type { ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel } from './models/ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel'; -export type { ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel } from './models/ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel'; +export type { ContentTypeForDocumentTypeResponseModel } from './models/ContentTypeForDocumentTypeResponseModel'; +export type { ContentTypeForMediaTypeResponseModel } from './models/ContentTypeForMediaTypeResponseModel'; export type { ContentTypeSortModel } from './models/ContentTypeSortModel'; export type { ContentUrlInfoModel } from './models/ContentUrlInfoModel'; export type { CopyDataTypeRequestModel } from './models/CopyDataTypeRequestModel'; export type { CopyDocumentRequestModel } from './models/CopyDocumentRequestModel'; -export type { CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './models/CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel'; -export type { CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel } from './models/CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel'; -export type { CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel } from './models/CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel'; -export type { CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel } from './models/CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel'; +export type { CreateContentForDocumentRequestModel } from './models/CreateContentForDocumentRequestModel'; +export type { CreateContentForMediaRequestModel } from './models/CreateContentForMediaRequestModel'; +export type { CreateContentTypeForDocumentTypeRequestModel } from './models/CreateContentTypeForDocumentTypeRequestModel'; +export type { CreateContentTypeForMediaTypeRequestModel } from './models/CreateContentTypeForMediaTypeRequestModel'; export type { CreateDataTypeRequestModel } from './models/CreateDataTypeRequestModel'; export type { CreateDictionaryItemRequestModel } from './models/CreateDictionaryItemRequestModel'; export type { CreateDocumentRequestModel } from './models/CreateDocumentRequestModel'; @@ -126,7 +126,6 @@ export type { LanguageResponseModel } from './models/LanguageResponseModel'; export type { LinkedLoginModel } from './models/LinkedLoginModel'; export type { LinkedLoginsRequestModel } from './models/LinkedLoginsRequestModel'; export type { LoggerResponseModel } from './models/LoggerResponseModel'; -export type { LoginRequestModel } from './models/LoginRequestModel'; export type { LogLevelCountsReponseModel } from './models/LogLevelCountsReponseModel'; export { LogLevelModel } from './models/LogLevelModel'; export type { LogMessagePropertyPresentationModel } from './models/LogMessagePropertyPresentationModel'; @@ -274,10 +273,10 @@ export type { TextFileViewModelBaseModel } from './models/TextFileViewModelBaseM export type { TourStatusModel } from './models/TourStatusModel'; export type { TreeItemPresentationModel } from './models/TreeItemPresentationModel'; export type { UnlockUsersRequestModel } from './models/UnlockUsersRequestModel'; -export type { UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './models/UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel'; -export type { UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel } from './models/UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel'; -export type { UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel } from './models/UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel'; -export type { UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel } from './models/UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel'; +export type { UpdateContentForDocumentRequestModel } from './models/UpdateContentForDocumentRequestModel'; +export type { UpdateContentForMediaRequestModel } from './models/UpdateContentForMediaRequestModel'; +export type { UpdateContentTypeForDocumentTypeRequestModel } from './models/UpdateContentTypeForDocumentTypeRequestModel'; +export type { UpdateContentTypeForMediaTypeRequestModel } from './models/UpdateContentTypeForMediaTypeRequestModel'; export type { UpdateDataTypeRequestModel } from './models/UpdateDataTypeRequestModel'; export type { UpdateDictionaryItemRequestModel } from './models/UpdateDictionaryItemRequestModel'; export type { UpdateDocumentNotificationsRequestModel } from './models/UpdateDocumentNotificationsRequestModel'; diff --git a/src/external/backend-api/src/models/ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel.ts b/src/external/backend-api/src/models/ContentForDocumentResponseModel.ts similarity index 82% rename from src/external/backend-api/src/models/ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel.ts rename to src/external/backend-api/src/models/ContentForDocumentResponseModel.ts index e1a13f7927..4fd3d790ed 100644 --- a/src/external/backend-api/src/models/ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel.ts +++ b/src/external/backend-api/src/models/ContentForDocumentResponseModel.ts @@ -6,7 +6,7 @@ import type { DocumentValueModel } from './DocumentValueModel'; import type { DocumentVariantResponseModel } from './DocumentVariantResponseModel'; -export type ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel = { +export type ContentForDocumentResponseModel = { values?: Array; variants?: Array; id?: string; diff --git a/src/external/backend-api/src/models/ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel.ts b/src/external/backend-api/src/models/ContentTypeForDocumentTypeResponseModel.ts similarity index 88% rename from src/external/backend-api/src/models/ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel.ts rename to src/external/backend-api/src/models/ContentTypeForDocumentTypeResponseModel.ts index 09501fee4e..f5bff35af2 100644 --- a/src/external/backend-api/src/models/ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel.ts +++ b/src/external/backend-api/src/models/ContentTypeForDocumentTypeResponseModel.ts @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel'; import type { DocumentTypePropertyTypeContainerResponseModel } from './DocumentTypePropertyTypeContainerResponseModel'; import type { DocumentTypePropertyTypeResponseModel } from './DocumentTypePropertyTypeResponseModel'; -export type ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel = { +export type ContentTypeForDocumentTypeResponseModel = { alias?: string; name?: string; description?: string | null; diff --git a/src/external/backend-api/src/models/ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel.ts b/src/external/backend-api/src/models/ContentTypeForMediaTypeResponseModel.ts similarity index 88% rename from src/external/backend-api/src/models/ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel.ts rename to src/external/backend-api/src/models/ContentTypeForMediaTypeResponseModel.ts index 43c6347d03..8f32c8aeb6 100644 --- a/src/external/backend-api/src/models/ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel.ts +++ b/src/external/backend-api/src/models/ContentTypeForMediaTypeResponseModel.ts @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel'; import type { MediaTypePropertyTypeContainerResponseModel } from './MediaTypePropertyTypeContainerResponseModel'; import type { MediaTypePropertyTypeResponseModel } from './MediaTypePropertyTypeResponseModel'; -export type ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel = { +export type ContentTypeForMediaTypeResponseModel = { alias?: string; name?: string; description?: string | null; diff --git a/src/external/backend-api/src/models/CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts b/src/external/backend-api/src/models/CreateContentForDocumentRequestModel.ts similarity index 82% rename from src/external/backend-api/src/models/CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts rename to src/external/backend-api/src/models/CreateContentForDocumentRequestModel.ts index 6591afb200..92ea3d426d 100644 --- a/src/external/backend-api/src/models/CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts +++ b/src/external/backend-api/src/models/CreateContentForDocumentRequestModel.ts @@ -6,7 +6,7 @@ import type { DocumentValueModel } from './DocumentValueModel'; import type { DocumentVariantRequestModel } from './DocumentVariantRequestModel'; -export type CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel = { +export type CreateContentForDocumentRequestModel = { values?: Array; variants?: Array; id?: string | null; diff --git a/src/external/backend-api/src/models/CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts b/src/external/backend-api/src/models/CreateContentForMediaRequestModel.ts similarity index 82% rename from src/external/backend-api/src/models/CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts rename to src/external/backend-api/src/models/CreateContentForMediaRequestModel.ts index dec81140ab..5e2894bdd2 100644 --- a/src/external/backend-api/src/models/CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts +++ b/src/external/backend-api/src/models/CreateContentForMediaRequestModel.ts @@ -6,7 +6,7 @@ import type { MediaValueModel } from './MediaValueModel'; import type { MediaVariantRequestModel } from './MediaVariantRequestModel'; -export type CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel = { +export type CreateContentForMediaRequestModel = { values?: Array; variants?: Array; id?: string | null; diff --git a/src/external/backend-api/src/models/CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel.ts b/src/external/backend-api/src/models/CreateContentTypeForDocumentTypeRequestModel.ts similarity index 88% rename from src/external/backend-api/src/models/CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel.ts rename to src/external/backend-api/src/models/CreateContentTypeForDocumentTypeRequestModel.ts index b9565427c2..0838b10b9a 100644 --- a/src/external/backend-api/src/models/CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel.ts +++ b/src/external/backend-api/src/models/CreateContentTypeForDocumentTypeRequestModel.ts @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel'; import type { CreateDocumentTypePropertyTypeContainerRequestModel } from './CreateDocumentTypePropertyTypeContainerRequestModel'; import type { CreateDocumentTypePropertyTypeRequestModel } from './CreateDocumentTypePropertyTypeRequestModel'; -export type CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel = { +export type CreateContentTypeForDocumentTypeRequestModel = { alias?: string; name?: string; description?: string | null; diff --git a/src/external/backend-api/src/models/CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel.ts b/src/external/backend-api/src/models/CreateContentTypeForMediaTypeRequestModel.ts similarity index 88% rename from src/external/backend-api/src/models/CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel.ts rename to src/external/backend-api/src/models/CreateContentTypeForMediaTypeRequestModel.ts index 6f0432710c..b06f577623 100644 --- a/src/external/backend-api/src/models/CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel.ts +++ b/src/external/backend-api/src/models/CreateContentTypeForMediaTypeRequestModel.ts @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel'; import type { CreateMediaTypePropertyTypeContainerRequestModel } from './CreateMediaTypePropertyTypeContainerRequestModel'; import type { CreateMediaTypePropertyTypeRequestModel } from './CreateMediaTypePropertyTypeRequestModel'; -export type CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel = { +export type CreateContentTypeForMediaTypeRequestModel = { alias?: string; name?: string; description?: string | null; diff --git a/src/external/backend-api/src/models/CreateDocumentRequestModel.ts b/src/external/backend-api/src/models/CreateDocumentRequestModel.ts index 21ac5cb345..90b5b24ac5 100644 --- a/src/external/backend-api/src/models/CreateDocumentRequestModel.ts +++ b/src/external/backend-api/src/models/CreateDocumentRequestModel.ts @@ -3,9 +3,9 @@ /* tslint:disable */ /* eslint-disable */ -import type { CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel'; +import type { CreateContentForDocumentRequestModel } from './CreateContentForDocumentRequestModel'; -export type CreateDocumentRequestModel = (CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel & { +export type CreateDocumentRequestModel = (CreateContentForDocumentRequestModel & { contentTypeId?: string; templateId?: string | null; }); diff --git a/src/external/backend-api/src/models/CreateDocumentTypeRequestModel.ts b/src/external/backend-api/src/models/CreateDocumentTypeRequestModel.ts index 3c55b511b9..b582b89fe3 100644 --- a/src/external/backend-api/src/models/CreateDocumentTypeRequestModel.ts +++ b/src/external/backend-api/src/models/CreateDocumentTypeRequestModel.ts @@ -4,9 +4,9 @@ /* eslint-disable */ import type { ContentTypeCleanupModel } from './ContentTypeCleanupModel'; -import type { CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel } from './CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel'; +import type { CreateContentTypeForDocumentTypeRequestModel } from './CreateContentTypeForDocumentTypeRequestModel'; -export type CreateDocumentTypeRequestModel = (CreateContentTypeRequestModelBaseCreateDocumentTypePropertyTypeRequestModelCreateDocumentTypePropertyTypeContainerRequestModel & { +export type CreateDocumentTypeRequestModel = (CreateContentTypeForDocumentTypeRequestModel & { allowedTemplateIds?: Array; defaultTemplateId?: string | null; cleanup?: ContentTypeCleanupModel; diff --git a/src/external/backend-api/src/models/CreateMediaRequestModel.ts b/src/external/backend-api/src/models/CreateMediaRequestModel.ts index a74da6ef3e..f66a6a6c2f 100644 --- a/src/external/backend-api/src/models/CreateMediaRequestModel.ts +++ b/src/external/backend-api/src/models/CreateMediaRequestModel.ts @@ -3,9 +3,9 @@ /* tslint:disable */ /* eslint-disable */ -import type { CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel } from './CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel'; +import type { CreateContentForMediaRequestModel } from './CreateContentForMediaRequestModel'; -export type CreateMediaRequestModel = (CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel & { +export type CreateMediaRequestModel = (CreateContentForMediaRequestModel & { contentTypeId?: string; }); diff --git a/src/external/backend-api/src/models/CreateMediaTypeRequestModel.ts b/src/external/backend-api/src/models/CreateMediaTypeRequestModel.ts index d4d9646eea..1fcfe485ec 100644 --- a/src/external/backend-api/src/models/CreateMediaTypeRequestModel.ts +++ b/src/external/backend-api/src/models/CreateMediaTypeRequestModel.ts @@ -3,7 +3,7 @@ /* tslint:disable */ /* eslint-disable */ -import type { CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel } from './CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel'; +import type { CreateContentTypeForMediaTypeRequestModel } from './CreateContentTypeForMediaTypeRequestModel'; -export type CreateMediaTypeRequestModel = CreateContentTypeRequestModelBaseCreateMediaTypePropertyTypeRequestModelCreateMediaTypePropertyTypeContainerRequestModel; +export type CreateMediaTypeRequestModel = CreateContentTypeForMediaTypeRequestModel; diff --git a/src/external/backend-api/src/models/DocumentItemResponseModel.ts b/src/external/backend-api/src/models/DocumentItemResponseModel.ts index 352bfc1881..b29d13af4d 100644 --- a/src/external/backend-api/src/models/DocumentItemResponseModel.ts +++ b/src/external/backend-api/src/models/DocumentItemResponseModel.ts @@ -8,5 +8,6 @@ import type { ItemResponseModelBaseModel } from './ItemResponseModelBaseModel'; export type DocumentItemResponseModel = (ItemResponseModelBaseModel & { icon?: string | null; contentTypeId?: string; + isTrashed?: boolean; }); diff --git a/src/external/backend-api/src/models/DocumentResponseModel.ts b/src/external/backend-api/src/models/DocumentResponseModel.ts index 7fe21fee0f..9fdccd00bc 100644 --- a/src/external/backend-api/src/models/DocumentResponseModel.ts +++ b/src/external/backend-api/src/models/DocumentResponseModel.ts @@ -3,11 +3,12 @@ /* tslint:disable */ /* eslint-disable */ -import type { ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel } from './ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel'; +import type { ContentForDocumentResponseModel } from './ContentForDocumentResponseModel'; import type { ContentUrlInfoModel } from './ContentUrlInfoModel'; -export type DocumentResponseModel = (ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel & { +export type DocumentResponseModel = (ContentForDocumentResponseModel & { urls?: Array; templateId?: string | null; + isTrashed?: boolean; }); diff --git a/src/external/backend-api/src/models/DocumentTypeResponseModel.ts b/src/external/backend-api/src/models/DocumentTypeResponseModel.ts index ffca860320..96c44a7e91 100644 --- a/src/external/backend-api/src/models/DocumentTypeResponseModel.ts +++ b/src/external/backend-api/src/models/DocumentTypeResponseModel.ts @@ -4,9 +4,9 @@ /* eslint-disable */ import type { ContentTypeCleanupModel } from './ContentTypeCleanupModel'; -import type { ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel } from './ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel'; +import type { ContentTypeForDocumentTypeResponseModel } from './ContentTypeForDocumentTypeResponseModel'; -export type DocumentTypeResponseModel = (ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel & { +export type DocumentTypeResponseModel = (ContentTypeForDocumentTypeResponseModel & { allowedTemplateIds?: Array; defaultTemplateId?: string | null; cleanup?: ContentTypeCleanupModel; diff --git a/src/external/backend-api/src/models/LoginRequestModel.ts b/src/external/backend-api/src/models/LoginRequestModel.ts deleted file mode 100644 index 798a0a2b4f..0000000000 --- a/src/external/backend-api/src/models/LoginRequestModel.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export type LoginRequestModel = { - username?: string; - password?: string; -}; - diff --git a/src/external/backend-api/src/models/MediaItemResponseModel.ts b/src/external/backend-api/src/models/MediaItemResponseModel.ts index b91a0ed734..6cb8cba386 100644 --- a/src/external/backend-api/src/models/MediaItemResponseModel.ts +++ b/src/external/backend-api/src/models/MediaItemResponseModel.ts @@ -7,5 +7,6 @@ import type { ItemResponseModelBaseModel } from './ItemResponseModelBaseModel'; export type MediaItemResponseModel = (ItemResponseModelBaseModel & { icon?: string | null; + isTrashed?: boolean; }); diff --git a/src/external/backend-api/src/models/MediaTypeResponseModel.ts b/src/external/backend-api/src/models/MediaTypeResponseModel.ts index 99c8666579..10e0737eab 100644 --- a/src/external/backend-api/src/models/MediaTypeResponseModel.ts +++ b/src/external/backend-api/src/models/MediaTypeResponseModel.ts @@ -3,7 +3,7 @@ /* tslint:disable */ /* eslint-disable */ -import type { ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel } from './ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel'; +import type { ContentTypeForMediaTypeResponseModel } from './ContentTypeForMediaTypeResponseModel'; -export type MediaTypeResponseModel = ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel; +export type MediaTypeResponseModel = ContentTypeForMediaTypeResponseModel; diff --git a/src/external/backend-api/src/models/UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts b/src/external/backend-api/src/models/UpdateContentForDocumentRequestModel.ts similarity index 80% rename from src/external/backend-api/src/models/UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts rename to src/external/backend-api/src/models/UpdateContentForDocumentRequestModel.ts index 96919086d9..a8fe313df0 100644 --- a/src/external/backend-api/src/models/UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts +++ b/src/external/backend-api/src/models/UpdateContentForDocumentRequestModel.ts @@ -6,7 +6,7 @@ import type { DocumentValueModel } from './DocumentValueModel'; import type { DocumentVariantRequestModel } from './DocumentVariantRequestModel'; -export type UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel = { +export type UpdateContentForDocumentRequestModel = { values?: Array; variants?: Array; }; diff --git a/src/external/backend-api/src/models/UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts b/src/external/backend-api/src/models/UpdateContentForMediaRequestModel.ts similarity index 80% rename from src/external/backend-api/src/models/UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts rename to src/external/backend-api/src/models/UpdateContentForMediaRequestModel.ts index c586f28188..365d165cc2 100644 --- a/src/external/backend-api/src/models/UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts +++ b/src/external/backend-api/src/models/UpdateContentForMediaRequestModel.ts @@ -6,7 +6,7 @@ import type { MediaValueModel } from './MediaValueModel'; import type { MediaVariantRequestModel } from './MediaVariantRequestModel'; -export type UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel = { +export type UpdateContentForMediaRequestModel = { values?: Array; variants?: Array; }; diff --git a/src/external/backend-api/src/models/UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel.ts b/src/external/backend-api/src/models/UpdateContentTypeForDocumentTypeRequestModel.ts similarity index 87% rename from src/external/backend-api/src/models/UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel.ts rename to src/external/backend-api/src/models/UpdateContentTypeForDocumentTypeRequestModel.ts index 3d80f4a150..753661b097 100644 --- a/src/external/backend-api/src/models/UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel.ts +++ b/src/external/backend-api/src/models/UpdateContentTypeForDocumentTypeRequestModel.ts @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel'; import type { UpdateDocumentTypePropertyTypeContainerRequestModel } from './UpdateDocumentTypePropertyTypeContainerRequestModel'; import type { UpdateDocumentTypePropertyTypeRequestModel } from './UpdateDocumentTypePropertyTypeRequestModel'; -export type UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel = { +export type UpdateContentTypeForDocumentTypeRequestModel = { alias?: string; name?: string; description?: string | null; diff --git a/src/external/backend-api/src/models/UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel.ts b/src/external/backend-api/src/models/UpdateContentTypeForMediaTypeRequestModel.ts similarity index 87% rename from src/external/backend-api/src/models/UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel.ts rename to src/external/backend-api/src/models/UpdateContentTypeForMediaTypeRequestModel.ts index 242af0f64f..d94dbe4802 100644 --- a/src/external/backend-api/src/models/UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel.ts +++ b/src/external/backend-api/src/models/UpdateContentTypeForMediaTypeRequestModel.ts @@ -8,7 +8,7 @@ import type { ContentTypeSortModel } from './ContentTypeSortModel'; import type { UpdateMediaTypePropertyTypeContainerRequestModel } from './UpdateMediaTypePropertyTypeContainerRequestModel'; import type { UpdateMediaTypePropertyTypeRequestModel } from './UpdateMediaTypePropertyTypeRequestModel'; -export type UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel = { +export type UpdateContentTypeForMediaTypeRequestModel = { alias?: string; name?: string; description?: string | null; diff --git a/src/external/backend-api/src/models/UpdateDocumentRequestModel.ts b/src/external/backend-api/src/models/UpdateDocumentRequestModel.ts index d4002165e6..27ff9ea8b3 100644 --- a/src/external/backend-api/src/models/UpdateDocumentRequestModel.ts +++ b/src/external/backend-api/src/models/UpdateDocumentRequestModel.ts @@ -3,9 +3,9 @@ /* tslint:disable */ /* eslint-disable */ -import type { UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel'; +import type { UpdateContentForDocumentRequestModel } from './UpdateContentForDocumentRequestModel'; -export type UpdateDocumentRequestModel = (UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel & { +export type UpdateDocumentRequestModel = (UpdateContentForDocumentRequestModel & { templateId?: string | null; }); diff --git a/src/external/backend-api/src/models/UpdateDocumentTypeRequestModel.ts b/src/external/backend-api/src/models/UpdateDocumentTypeRequestModel.ts index e303da7974..fe96b4966c 100644 --- a/src/external/backend-api/src/models/UpdateDocumentTypeRequestModel.ts +++ b/src/external/backend-api/src/models/UpdateDocumentTypeRequestModel.ts @@ -4,9 +4,9 @@ /* eslint-disable */ import type { ContentTypeCleanupModel } from './ContentTypeCleanupModel'; -import type { UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel } from './UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel'; +import type { UpdateContentTypeForDocumentTypeRequestModel } from './UpdateContentTypeForDocumentTypeRequestModel'; -export type UpdateDocumentTypeRequestModel = (UpdateContentTypeRequestModelBaseUpdateDocumentTypePropertyTypeRequestModelUpdateDocumentTypePropertyTypeContainerRequestModel & { +export type UpdateDocumentTypeRequestModel = (UpdateContentTypeForDocumentTypeRequestModel & { allowedTemplateIds?: Array; defaultTemplateId?: string | null; cleanup?: ContentTypeCleanupModel; diff --git a/src/external/backend-api/src/models/UpdateMediaRequestModel.ts b/src/external/backend-api/src/models/UpdateMediaRequestModel.ts index 4fd0e6bf85..66f8fcd3ca 100644 --- a/src/external/backend-api/src/models/UpdateMediaRequestModel.ts +++ b/src/external/backend-api/src/models/UpdateMediaRequestModel.ts @@ -3,7 +3,7 @@ /* tslint:disable */ /* eslint-disable */ -import type { UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel } from './UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel'; +import type { UpdateContentForMediaRequestModel } from './UpdateContentForMediaRequestModel'; -export type UpdateMediaRequestModel = UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel; +export type UpdateMediaRequestModel = UpdateContentForMediaRequestModel; diff --git a/src/external/backend-api/src/models/UpdateMediaTypeRequestModel.ts b/src/external/backend-api/src/models/UpdateMediaTypeRequestModel.ts index bdb575bcbe..38b1fe4ea3 100644 --- a/src/external/backend-api/src/models/UpdateMediaTypeRequestModel.ts +++ b/src/external/backend-api/src/models/UpdateMediaTypeRequestModel.ts @@ -3,7 +3,7 @@ /* tslint:disable */ /* eslint-disable */ -import type { UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel } from './UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel'; +import type { UpdateContentTypeForMediaTypeRequestModel } from './UpdateContentTypeForMediaTypeRequestModel'; -export type UpdateMediaTypeRequestModel = UpdateContentTypeRequestModelBaseUpdateMediaTypePropertyTypeRequestModelUpdateMediaTypePropertyTypeContainerRequestModel; +export type UpdateMediaTypeRequestModel = UpdateContentTypeForMediaTypeRequestModel; diff --git a/src/external/backend-api/src/services/SecurityResource.ts b/src/external/backend-api/src/services/SecurityResource.ts index e4a240217e..36fc179833 100644 --- a/src/external/backend-api/src/services/SecurityResource.ts +++ b/src/external/backend-api/src/services/SecurityResource.ts @@ -2,7 +2,6 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { LoginRequestModel } from '../models/LoginRequestModel'; import type { ResetPasswordRequestModel } from '../models/ResetPasswordRequestModel'; import type { ResetPasswordTokenRequestModel } from '../models/ResetPasswordTokenRequestModel'; import type { VerifyResetPasswordTokenRequestModel } from '../models/VerifyResetPasswordTokenRequestModel'; @@ -13,34 +12,6 @@ import { request as __request } from '../core/request'; export class SecurityResource { - /** - * @returns any Success - * @throws ApiError - */ - public static getSecurityBackOfficeAuthorize(): CancelablePromise { - return __request(OpenAPI, { - method: 'GET', - url: '/umbraco/management/api/v1/security/back-office/authorize', - }); - } - - /** - * @returns any Success - * @throws ApiError - */ - public static postSecurityBackOfficeLogin({ - requestBody, - }: { - requestBody?: LoginRequestModel, - }): CancelablePromise { - return __request(OpenAPI, { - method: 'POST', - url: '/umbraco/management/api/v1/security/back-office/login', - body: requestBody, - mediaType: 'application/json', - }); - } - /** * @returns any Success * @throws ApiError From 581c6ab120efea6690acc79f87fe3b3ac75add67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 7 Nov 2023 15:46:15 +0100 Subject: [PATCH 2/5] clean up --- src/mocks/data/user.data.ts | 2 +- .../user/user/modals/create/user-create-modal.element.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mocks/data/user.data.ts b/src/mocks/data/user.data.ts index ce681d3a52..b6d161898a 100644 --- a/src/mocks/data/user.data.ts +++ b/src/mocks/data/user.data.ts @@ -1,6 +1,6 @@ -import { UmbId } from '@umbraco-cms/backoffice/id'; import { UmbEntityData } from './entity.data.js'; import { umbUserGroupData } from './user-group.data.js'; +import { UmbId } from '@umbraco-cms/backoffice/id'; import { UmbLoggedInUser } from '@umbraco-cms/backoffice/auth'; import { CreateUserRequestModel, diff --git a/src/packages/user/user/modals/create/user-create-modal.element.ts b/src/packages/user/user/modals/create/user-create-modal.element.ts index 847053c091..a22865d713 100644 --- a/src/packages/user/user/modals/create/user-create-modal.element.ts +++ b/src/packages/user/user/modals/create/user-create-modal.element.ts @@ -2,8 +2,7 @@ import { UmbUserRepository } from '../../repository/user.repository.js'; import { type UmbUserGroupInputElement } from '@umbraco-cms/backoffice/user-group'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, query } from '@umbraco-cms/backoffice/external/lit'; -import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; -import { +import { UmbModalBaseElement , UMB_MODAL_MANAGER_CONTEXT_TOKEN, UMB_CREATE_USER_SUCCESS_MODAL, UmbModalManagerContext, From b31c4283a86eaa0925f29af252c3f2b3c941af26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 7 Nov 2023 15:50:18 +0100 Subject: [PATCH 3/5] fix section type warning --- .../backoffice/components/backoffice-main.element.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/apps/backoffice/components/backoffice-main.element.ts b/src/apps/backoffice/components/backoffice-main.element.ts index 8fa7c7c5f8..f944401e6d 100644 --- a/src/apps/backoffice/components/backoffice-main.element.ts +++ b/src/apps/backoffice/components/backoffice-main.element.ts @@ -75,12 +75,15 @@ export class UmbBackofficeMainElement extends UmbLitElement { this.requestUpdate('_routes', oldValue); } - private _onRouteChange = (event: UmbRouterSlotChangeEvent) => { + private _onRouteChange = async (event: UmbRouterSlotChangeEvent) => { const currentPath = event.target.localActiveViewPath || ''; const section = this._sections.find((s) => this._routePrefix + (s.manifest as any).meta.pathname === currentPath); if (!section) return; - this._backofficeContext?.setActiveSectionAlias(section.alias); - this._provideSectionContext(section.manifest as any); + await section.asPromise(); + if(section.manifest) { + this._backofficeContext?.setActiveSectionAlias(section.alias); + this._provideSectionContext(section.manifest); + } }; private _provideSectionContext(sectionManifest: ManifestSection) { From 397493031baa67d424752fd0421223002f95bd85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 7 Nov 2023 15:52:11 +0100 Subject: [PATCH 4/5] fix another missing type --- src/apps/installer/shared/utils.story-helpers.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/installer/shared/utils.story-helpers.ts b/src/apps/installer/shared/utils.story-helpers.ts index cd4ff83ea0..f6cd8ef1d9 100644 --- a/src/apps/installer/shared/utils.story-helpers.ts +++ b/src/apps/installer/shared/utils.story-helpers.ts @@ -1,7 +1,7 @@ import { UmbInstallerContext } from '../installer.context.js'; -import { html } from '@umbraco-cms/backoffice/external/lit'; +import { html, TemplateResult } from '@umbraco-cms/backoffice/external/lit'; -export const installerContextProvider = (story: any, installerContext = new UmbInstallerContext()) => html` +export const installerContextProvider = (story: () => Node | string | TemplateResult, installerContext = new UmbInstallerContext()) => html` Date: Tue, 7 Nov 2023 15:52:24 +0100 Subject: [PATCH 5/5] add type to import --- src/apps/installer/shared/utils.story-helpers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/installer/shared/utils.story-helpers.ts b/src/apps/installer/shared/utils.story-helpers.ts index f6cd8ef1d9..3e881266d8 100644 --- a/src/apps/installer/shared/utils.story-helpers.ts +++ b/src/apps/installer/shared/utils.story-helpers.ts @@ -1,5 +1,5 @@ import { UmbInstallerContext } from '../installer.context.js'; -import { html, TemplateResult } from '@umbraco-cms/backoffice/external/lit'; +import { html, type TemplateResult } from '@umbraco-cms/backoffice/external/lit'; export const installerContextProvider = (story: () => Node | string | TemplateResult, installerContext = new UmbInstallerContext()) => html`