From 32e2b0ade5fb8660231bbed1214bcac0a138ac82 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Thu, 22 Feb 2024 11:51:32 +0000 Subject: [PATCH 1/2] Updates the mock data with the Collections API amends --- .../src/mocks/data/document-type/document-type.data.ts | 2 +- .../src/mocks/data/document-type/document-type.db.ts | 1 + .../src/mocks/data/document/document.data.ts | 1 + src/Umbraco.Web.UI.Client/src/mocks/data/media/media.db.ts | 2 +- .../src/packages/core/content-type/types.ts | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts index b6ee696086..c108e83cfd 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts @@ -754,8 +754,8 @@ export const data: Array = [ keepAllVersionsNewerThanDays: null, keepLatestVersionPerDayForDays: null, }, + collection: { id: 'dt-collectionView' }, }, - { allowedTemplates: [], defaultTemplate: null, diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.db.ts index a04baedb89..a1ef7a9e34 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.db.ts @@ -118,6 +118,7 @@ const documentTypeDetailMapper = (item: UmbMockDocumentTypeModel): DocumentTypeR compositions: item.compositions, allowedTemplates: item.allowedTemplates, cleanup: item.cleanup, + collection: item.collection, }; }; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts index 132ffb3e8e..46ee3ea935 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts @@ -704,6 +704,7 @@ export const data: Array = [ documentType: { id: 'simple-document-type-id', icon: 'icon-document', + collection: { id: 'dt-collectionView'}, }, hasChildren: false, noAccess: false, diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.db.ts index bf828dbff5..a87acd02d9 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.db.ts @@ -57,7 +57,7 @@ const createMockMediaMapper = (request: CreateMediaRequestModel): UmbMockMediaMo mediaType: { id: mediaType.id, icon: mediaType.icon, - collection: undefined, // TODO: get list from doc type when ready + collection: mediaType.collection, }, hasChildren: false, id: request.id ? request.id : UmbId.new(), diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/types.ts index f0ae416c43..dd28d8a300 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/types.ts @@ -24,6 +24,7 @@ export interface UmbContentTypeModel { containers: Array; allowedContentTypes: Array; compositions: Array; + collection: { unique: string } | null; } export interface UmbPropertyTypeScaffoldModel extends Omit { From 3a5caaca48f95c2012eb5832ac521943c81fd36c Mon Sep 17 00:00:00 2001 From: leekelleher Date: Thu, 22 Feb 2024 11:57:22 +0000 Subject: [PATCH 2/2] Maps `collections` to frontend content-type models --- .../detail/document-type-detail.server.data-source.ts | 2 ++ .../repository/detail/media-type-detail.server.data-source.ts | 2 ++ .../repository/detail/member-type-detail.server.data-source.ts | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts index 1fbd784718..5ad807ec15 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts @@ -59,6 +59,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc keepAllVersionsNewerThanDays: null, keepLatestVersionPerDayForDays: null, }, + collection: null, }; return { data }; @@ -126,6 +127,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc allowedTemplates: data.allowedTemplates, defaultTemplate: data.defaultTemplate ? { id: data.defaultTemplate.id } : null, cleanup: data.cleanup, + collection: data.collection ? { unique: data.collection?.id } : null, }; return { data: DocumentType }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts index 291f8babae..f968627d42 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts @@ -52,6 +52,7 @@ export class UmbMediaTypeServerDataSource implements UmbDetailDataSource