From ebad04d56aff98f66cef0fe497d9a08dbfc2f9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 21 Feb 2023 15:26:19 +0100 Subject: [PATCH] update mock models --- .../src/models/RelationItemModel.ts | 1 + .../src/services/TrackedReferenceResource.ts | 34 +++++++++---------- .../src/core/mocks/data/media-type.data.ts | 2 ++ .../src/core/mocks/data/media.data.ts | 8 +++++ .../src/core/mocks/data/member-group.data.ts | 1 + .../src/core/mocks/data/member-type.data.ts | 1 + .../src/core/mocks/data/member.data.ts | 1 + .../src/core/mocks/data/template.data.ts | 5 +++ .../src/core/mocks/data/utils.ts | 1 + 9 files changed, 37 insertions(+), 17 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationItemModel.ts index aee9a307a8..d99d9050a5 100644 --- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationItemModel.ts +++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationItemModel.ts @@ -6,6 +6,7 @@ export type RelationItemModel = { nodeKey?: string; nodeName?: string | null; nodeType?: string | null; + nodePublished?: boolean | null; contentTypeIcon?: string | null; contentTypeAlias?: string | null; contentTypeName?: string | null; diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TrackedReferenceResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TrackedReferenceResource.ts index 064786e451..4eb25900ec 100644 --- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TrackedReferenceResource.ts +++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TrackedReferenceResource.ts @@ -13,22 +13,22 @@ export class TrackedReferenceResource { * @returns PagedRelationItemModel Success * @throws ApiError */ - public static getTrackedReferenceById({ - id, + public static getTrackedReferenceByKey({ + key, skip, - take, - filterMustBeIsDependency, + take = 20, + filterMustBeIsDependency = false, }: { - id: number, + key: string, skip?: number, take?: number, filterMustBeIsDependency?: boolean, }): CancelablePromise { return __request(OpenAPI, { method: 'GET', - url: '/umbraco/management/api/v1/tracked-reference/{id}', + url: '/umbraco/management/api/v1/tracked-reference/{key}', path: { - 'id': id, + 'key': key, }, query: { 'skip': skip, @@ -42,22 +42,22 @@ export class TrackedReferenceResource { * @returns PagedRelationItemModel Success * @throws ApiError */ - public static getTrackedReferenceDescendantsByParentId({ - parentId, + public static getTrackedReferenceDescendantsByParentKey({ + parentKey, skip, take, filterMustBeIsDependency, }: { - parentId: number, + parentKey: string, skip?: number, take?: number, filterMustBeIsDependency?: boolean, }): CancelablePromise { return __request(OpenAPI, { method: 'GET', - url: '/umbraco/management/api/v1/tracked-reference/descendants/{parentId}', + url: '/umbraco/management/api/v1/tracked-reference/descendants/{parentKey}', path: { - 'parentId': parentId, + 'parentKey': parentKey, }, query: { 'skip': skip, @@ -72,12 +72,12 @@ export class TrackedReferenceResource { * @throws ApiError */ public static getTrackedReferenceItem({ - ids, + key, skip, - take, - filterMustBeIsDependency, + take = 20, + filterMustBeIsDependency = true, }: { - ids?: Array, + key?: Array, skip?: number, take?: number, filterMustBeIsDependency?: boolean, @@ -86,7 +86,7 @@ export class TrackedReferenceResource { method: 'GET', url: '/umbraco/management/api/v1/tracked-reference/item', query: { - 'ids': ids, + 'key': key, 'skip': skip, 'take': take, 'filterMustBeIsDependency': filterMustBeIsDependency, diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/media-type.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/media-type.data.ts index 58b259ca46..e5189fbd01 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/media-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/media-type.data.ts @@ -5,6 +5,7 @@ import type { MediaTypeDetails } from '@umbraco-cms/models'; export const data: Array = [ { + $type: 'media-type', name: 'Media Type 1', type: 'media-type', hasChildren: false, @@ -17,6 +18,7 @@ export const data: Array = [ properties: [], }, { + $type: 'media-type', name: 'Media Type 2', type: 'media-type', hasChildren: false, diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts index f342ed610f..e77e6d2691 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts @@ -5,6 +5,7 @@ import type { MediaDetails } from '@umbraco-cms/models'; export const data: Array = [ { + $type: '', name: 'Flipped Car', type: 'media', icon: 'picture', @@ -31,6 +32,7 @@ export const data: Array = [ variants: [], }, { + $type: '', name: 'Umbracoffee', type: 'media', icon: 'picture', @@ -57,6 +59,7 @@ export const data: Array = [ variants: [], }, { + $type: '', name: 'People', type: 'media', icon: 'folder', @@ -71,6 +74,7 @@ export const data: Array = [ variants: [], }, { + $type: '', name: 'Products', type: 'media', icon: 'folder', @@ -85,6 +89,7 @@ export const data: Array = [ variants: [], }, { + $type: '', name: 'John Smith', type: 'media', icon: 'picture', @@ -111,6 +116,7 @@ export const data: Array = [ variants: [], }, { + $type: '', name: 'Jane Doe', type: 'media', icon: 'picture', @@ -137,6 +143,7 @@ export const data: Array = [ variants: [], }, { + $type: '', name: 'A very nice hat', type: 'media', icon: 'picture', @@ -163,6 +170,7 @@ export const data: Array = [ variants: [], }, { + $type: '', name: 'Fancy old chair', type: 'media', icon: 'picture', diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-group.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-group.data.ts index c6b8bfbfad..5e88700348 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-group.data.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-group.data.ts @@ -5,6 +5,7 @@ import { EntityTreeItemModel, PagedEntityTreeItemModel } from '@umbraco-cms/back export const data: Array = [ { + $type: '', name: 'Member Group AAA', type: 'member-group', icon: 'umb:document', diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-type.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-type.data.ts index 3932700986..5220847f6b 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-type.data.ts @@ -5,6 +5,7 @@ import type { MemberTypeDetails } from '@umbraco-cms/models'; export const data: Array = [ { + $type: '', name: 'Member Type 1', type: 'member-type', icon: 'icon-user', diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member.data.ts index fdfd580baf..2a77411e27 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member.data.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member.data.ts @@ -5,6 +5,7 @@ import type { EntityTreeItemModel, PagedEntityTreeItemModel } from '@umbraco-cms export const data: Array = [ { + $type: '', name: 'Member AAA', type: 'member', icon: 'umb:user', diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/template.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/template.data.ts index 295993abd3..e7ad3d0c8c 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/template.data.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/template.data.ts @@ -13,6 +13,7 @@ type TemplateDBItem = TemplateModel & EntityTreeItemModel; const createTemplate = (dbItem: TemplateDBItem): TemplateModel => { return { + $type: '', key: dbItem.key, name: dbItem.name, alias: dbItem.alias, @@ -22,6 +23,7 @@ const createTemplate = (dbItem: TemplateDBItem): TemplateModel => { export const data: Array = [ { + $type: '', key: '2bf464b6-3aca-4388-b043-4eb439cc2643', isContainer: false, parentKey: null, @@ -34,6 +36,7 @@ export const data: Array = [ '@using Umbraco.Cms.Web.Common.PublishedModels;\n@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n@using ContentModels = Umbraco.Cms.Web.Common.PublishedModels;\r\n@{\r\n\tLayout = null;\r\n}', }, { + $type: '', key: '9a84c0b3-03b4-4dd4-84ac-706740ac0f71', isContainer: false, parentKey: null, @@ -46,6 +49,7 @@ export const data: Array = [ '@using Umbraco.Cms.Web.Common.PublishedModels;\n@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\r\n@using ContentModels = Umbraco.Cms.Web.Common.PublishedModels;\r\n@{\r\n\tLayout = null;\r\n}', }, { + $type: '', key: '9a84c0b3-03b4-4dd4-84ac-706740ac0f72', isContainer: false, parentKey: '9a84c0b3-03b4-4dd4-84ac-706740ac0f71', @@ -85,6 +89,7 @@ class UmbTemplateData extends UmbEntityData { create(templateData: TemplateCreateModel) { const template = { + $type: '', key: uuid(), ...templateData, }; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/utils.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/utils.ts index 5465a4d385..2b470d3ebc 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/utils.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/utils.ts @@ -10,6 +10,7 @@ import type { export const createEntityTreeItem = (item: any): EntityTreeItemModel => { return { + $type: '', name: item.name, type: item.type, icon: item.icon,