From 0236776abcb50abd71a1b46ec3fe2c71871115ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 1 Jun 2023 10:14:02 +0200 Subject: [PATCH 1/2] generate api --- src/Umbraco.Web.UI.Client/package.json | 2 +- .../src/external/backend-api/src/index.ts | 2 ++ .../src/models/DocumentItemResponseModel.ts | 1 + .../src/models/DocumentTreeItemResponseModel.ts | 3 +++ .../src/models/PropertyTypeResponseModelBaseModel.ts | 1 + .../backend-api/src/models/PublishedStateModel.ts | 10 ++++++++++ .../backend-api/src/models/VariantTreeItemModel.ts | 12 ++++++++++++ 7 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/PublishedStateModel.ts create mode 100644 src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/VariantTreeItemModel.ts diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 9cf83e3235..1deee7cc5a 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -79,7 +79,7 @@ "format": "prettier 'src/**/*.ts'", "format:fix": "npm run format -- --write", "generate:api": "openapi --input https://raw.githubusercontent.com/umbraco/Umbraco-CMS/v14/dev/src/Umbraco.Cms.Api.Management/OpenApi.json --output src/external/backend-api/src --postfixServices Resource --useOptions", - "generate:api-dev": "openapi --input http://localhost:11000/umbraco/swagger/v1/swagger.json --output src/external/backend-api/src --postfixServices Resource --useOptions", + "generate:api-dev": "openapi --input http://localhost:11000/umbraco/swagger/management/swagger.json --output src/external/backend-api/src --postfixServices Resource --useOptions", "generate:jsonschema": "typescript-json-schema --required --include \"./src/packages/core/extension-registry/*.ts\"", "generate:jsonschema:dist": "typescript-json-schema --required --include \"./src/packages/core/extension-registry/umbraco-package.ts\" --out dist-cms/umbraco-package-schema.json tsconfig.json UmbracoPackage", "storybook": "npm run wc-analyze && storybook dev -p 6006", diff --git a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/index.ts b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/index.ts index 1206b6c1c5..30a7c34aea 100644 --- a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/index.ts +++ b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/index.ts @@ -189,6 +189,7 @@ export type { PropertyTypeAppearanceModel } from './models/PropertyTypeAppearanc export type { PropertyTypeContainerResponseModelBaseModel } from './models/PropertyTypeContainerResponseModelBaseModel'; export type { PropertyTypeResponseModelBaseModel } from './models/PropertyTypeResponseModelBaseModel'; export type { PropertyTypeValidationModel } from './models/PropertyTypeValidationModel'; +export { PublishedStateModel } from './models/PublishedStateModel'; export type { RecycleBinItemResponseModel } from './models/RecycleBinItemResponseModel'; export { RedirectStatusModel } from './models/RedirectStatusModel'; export type { RedirectUrlResponseModel } from './models/RedirectUrlResponseModel'; @@ -277,6 +278,7 @@ export { UserStateModel } from './models/UserStateModel'; export type { ValueModelBaseModel } from './models/ValueModelBaseModel'; export type { VariantModelBaseModel } from './models/VariantModelBaseModel'; export type { VariantResponseModelBaseModel } from './models/VariantResponseModelBaseModel'; +export type { VariantTreeItemModel } from './models/VariantTreeItemModel'; export type { VersionResponseModel } from './models/VersionResponseModel'; export { AuditLogResource } from './services/AuditLogResource'; diff --git a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DocumentItemResponseModel.ts b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DocumentItemResponseModel.ts index 3bf495dc8d..6fba4de084 100644 --- a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DocumentItemResponseModel.ts +++ b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DocumentItemResponseModel.ts @@ -6,5 +6,6 @@ import type { ItemResponseModelBaseModel } from './ItemResponseModelBaseModel'; export type DocumentItemResponseModel = (ItemResponseModelBaseModel & { icon?: string | null; + contentTypeId?: string; }); diff --git a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DocumentTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DocumentTreeItemResponseModel.ts index d9d187c704..44a29c8b7c 100644 --- a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DocumentTreeItemResponseModel.ts +++ b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DocumentTreeItemResponseModel.ts @@ -3,11 +3,14 @@ /* eslint-disable */ import type { ContentTreeItemResponseModel } from './ContentTreeItemResponseModel'; +import type { VariantTreeItemModel } from './VariantTreeItemModel'; export type DocumentTreeItemResponseModel = (ContentTreeItemResponseModel & { $type: string; isProtected?: boolean; isPublished?: boolean; isEdited?: boolean; + contentTypeId?: string; + variants?: Array; }); diff --git a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/PropertyTypeResponseModelBaseModel.ts b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/PropertyTypeResponseModelBaseModel.ts index ad3a59bbbf..c8fe5753df 100644 --- a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/PropertyTypeResponseModelBaseModel.ts +++ b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/PropertyTypeResponseModelBaseModel.ts @@ -8,6 +8,7 @@ import type { PropertyTypeValidationModel } from './PropertyTypeValidationModel' export type PropertyTypeResponseModelBaseModel = { id?: string; containerId?: string | null; + sortOrder?: number; alias?: string; name?: string; description?: string | null; diff --git a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/PublishedStateModel.ts b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/PublishedStateModel.ts new file mode 100644 index 0000000000..23d04c6dca --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/PublishedStateModel.ts @@ -0,0 +1,10 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +export enum PublishedStateModel { + PUBLISHED = 'Published', + UNPUBLISHED = 'Unpublished', + PUBLISHING = 'Publishing', + UNPUBLISHING = 'Unpublishing', +} diff --git a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/VariantTreeItemModel.ts b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/VariantTreeItemModel.ts new file mode 100644 index 0000000000..52256a8568 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/VariantTreeItemModel.ts @@ -0,0 +1,12 @@ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +import type { PublishedStateModel } from './PublishedStateModel'; + +export type VariantTreeItemModel = { + name?: string; + culture?: string | null; + state?: PublishedStateModel; +}; + From 687f54e49b04a0489d5d8af8575e9580099f3df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 1 Jun 2023 11:45:02 +0200 Subject: [PATCH 2/2] correct model to use the right model --- src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts index d035861e81..f6a4e102ee 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts @@ -5,7 +5,6 @@ import type { EntityTreeItemResponseModel, FolderTreeItemResponseModel, DocumentTypeResponseModel, - DocumentResponseModel, FileSystemTreeItemPresentationModel, } from '@umbraco-cms/backoffice/backend-api'; @@ -41,7 +40,7 @@ export const createContentTreeItem = (item: any): ContentTreeItemResponseModel & // TODO: remove isTrashed type extension when we have found a solution to trashed items export const createDocumentTreeItem = ( - item: DocumentResponseModel + item: DocumentTreeItemResponseModel ): DocumentTreeItemResponseModel & { isTrashed: boolean } => { return { ...createContentTreeItem(item),