From a97d3bb0af823fcb5a009f08949495e0a1d3fd91 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Mar 2024 10:56:19 +0100
Subject: [PATCH] clean up mocks

---
 .../src/mocks/data/data-type/data-type.data.ts         |  4 +---
 .../src/mocks/data/dictionary/dictionary.data.ts       |  4 +---
 .../src/mocks/data/dictionary/dictionary.db.ts         |  2 +-
 .../src/mocks/data/document-type/document-type.data.ts |  4 +---
 .../src/mocks/data/document-type/document-type.db.ts   |  4 +---
 .../src/mocks/data/document/document.data.ts           |  4 +---
 .../src/mocks/data/document/document.db.ts             |  2 +-
 .../src/mocks/data/media-type/media-type.data.ts       | 10 ++++------
 .../src/mocks/data/media-type/media-type.db.ts         |  2 +-
 .../src/mocks/data/media/media.data.ts                 |  4 +---
 .../src/mocks/data/media/media.db.ts                   |  2 +-
 .../src/mocks/data/partial-view/partial-view.data.ts   |  4 +---
 .../src/mocks/data/relations/relation-type.data.ts     |  5 -----
 .../src/mocks/data/script/script.data.ts               |  4 +---
 .../src/mocks/data/static-file/static-file.data.ts     |  3 +--
 .../src/mocks/data/stylesheet/stylesheet.data.ts       |  4 +---
 .../src/mocks/data/template/template.data.ts           |  4 +---
 src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts      |  3 +--
 .../mocks/data/utils/entity/entity-folder.manager.ts   |  2 +-
 .../src/mocks/data/utils/entity/entity-recycle-bin.ts  |  4 +---
 .../src/mocks/data/utils/entity/entity-tree.manager.ts |  2 +-
 .../data/utils/file-system/file-system-tree.manager.ts |  6 +++---
 22 files changed, 26 insertions(+), 57 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts
index 52f12c19dc..492fd72563 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts
@@ -4,9 +4,7 @@ import type {
 	DataTypeTreeItemResponseModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 
-type UmbMockDataTypeModelHack = DataTypeResponseModel & DataTypeTreeItemResponseModel & DataTypeItemResponseModel;
-
-export interface UmbMockDataTypeModel extends Omit<UmbMockDataTypeModelHack, 'type'> {}
+export type UmbMockDataTypeModel = DataTypeResponseModel & DataTypeTreeItemResponseModel & DataTypeItemResponseModel;
 
 export const data: Array<UmbMockDataTypeModel> = [
 	{
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.data.ts
index b135a1b516..3f68fa97f5 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.data.ts
@@ -5,13 +5,11 @@ import type {
 	NamedEntityTreeItemResponseModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 
-type UmbMockDictionaryModelHack = DictionaryItemResponseModel &
+export type UmbMockDictionaryModel = DictionaryItemResponseModel &
 	NamedEntityTreeItemResponseModel &
 	DictionaryItemItemResponseModel &
 	DictionaryOverviewResponseModel;
 
-export interface UmbMockDictionaryModel extends Omit<UmbMockDictionaryModelHack, 'type'> {}
-
 export const data: Array<UmbMockDictionaryModel> = [
 	{
 		name: 'Hello',
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts
index 191f854604..bc8977c9ab 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts
@@ -38,7 +38,7 @@ export class UmbDictionaryMockDB extends UmbEntityMockDbBase<UmbMockDictionaryMo
 	}
 }
 
-const treeItemMapper = (model: UmbMockDictionaryModel): Omit<NamedEntityTreeItemResponseModel, 'type'> => {
+const treeItemMapper = (model: UmbMockDictionaryModel): NamedEntityTreeItemResponseModel => {
 	return {
 		name: model.name,
 		id: model.id,
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 182e04ef9c..22a13f84ce 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
@@ -5,12 +5,10 @@ import type {
 	DocumentTypeTreeItemResponseModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 
-type UmbMockDocumentTypeModelHack = DocumentTypeResponseModel &
+export type UmbMockDocumentTypeModel = DocumentTypeResponseModel &
 	DocumentTypeTreeItemResponseModel &
 	DocumentTypeItemResponseModel;
 
-export interface UmbMockDocumentTypeModel extends Omit<UmbMockDocumentTypeModelHack, 'type'> {}
-
 export const data: Array<UmbMockDocumentTypeModel> = [
 	{
 		allowedTemplates: [],
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 47428a85b5..24a362a1cb 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
@@ -122,9 +122,7 @@ const documentTypeDetailMapper = (item: UmbMockDocumentTypeModel): DocumentTypeR
 	};
 };
 
-const documentTypeTreeItemMapper = (
-	item: UmbMockDocumentTypeModel,
-): Omit<DocumentTypeTreeItemResponseModel, 'type'> => {
+const documentTypeTreeItemMapper = (item: UmbMockDocumentTypeModel): DocumentTypeTreeItemResponseModel => {
 	return {
 		name: item.name,
 		hasChildren: item.hasChildren,
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 cf47af845a..1c0a6b60a2 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
@@ -5,9 +5,7 @@ import type {
 } from '@umbraco-cms/backoffice/external/backend-api';
 import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api';
 
-type UmbMockDocumentTypeModelHack = DocumentResponseModel & DocumentTreeItemResponseModel & DocumentItemResponseModel;
-
-export interface UmbMockDocumentModel extends Omit<UmbMockDocumentTypeModelHack, 'type'> {}
+export type UmbMockDocumentModel = DocumentResponseModel & DocumentTreeItemResponseModel & DocumentItemResponseModel;
 
 export const data: Array<UmbMockDocumentModel> = [
 	{
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts
index 76e2dfaafd..fdd0e3f23e 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts
@@ -41,7 +41,7 @@ export class UmbDocumentMockDB extends UmbEntityMockDbBase<UmbMockDocumentModel>
 	}
 }
 
-const treeItemMapper = (model: UmbMockDocumentModel): Omit<DocumentTreeItemResponseModel, 'type'> => {
+const treeItemMapper = (model: UmbMockDocumentModel): DocumentTreeItemResponseModel => {
 	const documentType = umbDocumentTypeMockDb.read(model.documentType.id);
 	if (!documentType) throw new Error(`Document type with id ${model.documentType.id} not found`);
 
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.data.ts
index a7d235712b..aeba10c756 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.data.ts
@@ -4,9 +4,9 @@ import type {
 	MediaTypeTreeItemResponseModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 
-type UmbMockMediaTypeModelHack = MediaTypeResponseModel & MediaTypeTreeItemResponseModel & MediaTypeItemResponseModel;
-
-export interface UmbMockMediaTypeModel extends Omit<UmbMockMediaTypeModelHack, 'type'> {}
+export type UmbMockMediaTypeModel = MediaTypeResponseModel &
+	MediaTypeTreeItemResponseModel &
+	MediaTypeItemResponseModel;
 
 export const data: Array<UmbMockMediaTypeModel> = [
 	{
@@ -91,9 +91,7 @@ export const data: Array<UmbMockMediaTypeModel> = [
 		variesByCulture: false,
 		variesBySegment: false,
 		isElement: false,
-		allowedMediaTypes: [
-			{ mediaType: { id: 'media-type-1-id' }, sortOrder: 0 },
-		],
+		allowedMediaTypes: [{ mediaType: { id: 'media-type-1-id' }, sortOrder: 0 }],
 		compositions: [],
 		isFolder: false,
 		hasChildren: false,
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.db.ts
index 630e0d7e7c..874a4e4374 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.db.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.db.ts
@@ -110,7 +110,7 @@ const mediaTypeDetailMapper = (item: UmbMockMediaTypeModel): MediaTypeResponseMo
 	};
 };
 
-const mediaTypeTreeItemMapper = (item: UmbMockMediaTypeModel): Omit<MediaTypeTreeItemResponseModel, 'type'> => {
+const mediaTypeTreeItemMapper = (item: UmbMockMediaTypeModel): MediaTypeTreeItemResponseModel => {
 	return {
 		name: item.name,
 		hasChildren: item.hasChildren,
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.data.ts
index 211c9aa3f2..012ab54620 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.data.ts
@@ -4,9 +4,7 @@ import type {
 	MediaTreeItemResponseModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 
-type UmbMockMediaModelHack = MediaResponseModel & MediaTreeItemResponseModel & MediaItemResponseModel;
-
-export interface UmbMockMediaModel extends Omit<UmbMockMediaModelHack, 'type'> {}
+export type UmbMockMediaModel = MediaResponseModel & MediaTreeItemResponseModel & MediaItemResponseModel;
 
 export const data: Array<UmbMockMediaModel> = [
 	{
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 a87acd02d9..e0a6337152 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
@@ -28,7 +28,7 @@ export class UmbMediaMockDB extends UmbEntityMockDbBase<UmbMockMediaModel> {
 	}
 }
 
-const treeItemMapper = (model: UmbMockMediaModel): Omit<MediaTreeItemResponseModel, 'type'> => {
+const treeItemMapper = (model: UmbMockMediaModel): MediaTreeItemResponseModel => {
 	const mediaType = umbMediaTypeMockDb.read(model.mediaType.id);
 	if (!mediaType) throw new Error(`Media type with id ${model.mediaType.id} not found`);
 
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.data.ts
index 86efd983d6..0fa1bf78c7 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.data.ts
@@ -5,12 +5,10 @@ import type {
 	PartialViewSnippetResponseModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 
-type UmbMockPartialViewModelHack = PartialViewResponseModel &
+export type UmbMockPartialViewModel = PartialViewResponseModel &
 	FileSystemTreeItemPresentationModel &
 	PartialViewItemResponseModel;
 
-export interface UmbMockPartialViewModel extends Omit<UmbMockPartialViewModelHack, 'type' | 'icon'> {}
-
 export const data: Array<UmbMockPartialViewModel> = [
 	{
 		name: 'blockgrid',
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation-type.data.ts
index ae17352881..77d6c8cb05 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation-type.data.ts
@@ -79,7 +79,6 @@ export const treeData: Array<NamedEntityTreeItemResponseModel> = [
 		id: 'e0d39ff5-71d8-453f-b682-9d8d31ee5e06',
 		parent: null,
 		name: 'Relate Document On Copy',
-		type: 'relation-type',
 		hasChildren: false,
 	},
 	{
@@ -87,28 +86,24 @@ export const treeData: Array<NamedEntityTreeItemResponseModel> = [
 
 		parent: null,
 		name: 'Relate Parent Document On Delete',
-		type: 'relation-type',
 		hasChildren: false,
 	},
 	{
 		id: '6f9b800c-762c-42d4-85d9-bf40a77d689e',
 		parent: null,
 		name: 'Relate Parent Media Folder On Delete',
-		type: 'relation-type',
 		hasChildren: false,
 	},
 	{
 		id: 'd421727d-43de-4205-b4c6-037404f309ad',
 		parent: null,
 		name: 'Related Media',
-		type: 'relation-type',
 		hasChildren: false,
 	},
 	{
 		id: 'e9a0a28e-2d5b-4229-ac00-66f2df230513',
 		parent: null,
 		name: 'Related Document',
-		type: 'relation-type',
 		hasChildren: false,
 	},
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/script/script.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/script/script.data.ts
index a71cfe367d..24b7fb53e0 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/script/script.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/script/script.data.ts
@@ -4,9 +4,7 @@ import type {
 	ScriptResponseModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 
-type UmbMockScriptModelHack = ScriptResponseModel & FileSystemTreeItemPresentationModel & ScriptItemResponseModel;
-
-export interface UmbMockScriptModel extends Omit<UmbMockScriptModelHack, 'type' | 'icon'> {}
+export type UmbMockScriptModel = ScriptResponseModel & FileSystemTreeItemPresentationModel & ScriptItemResponseModel;
 
 export const data: Array<UmbMockScriptModel> = [
 	{
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/static-file/static-file.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/static-file/static-file.data.ts
index 052cdaca11..b0eb91d277 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/static-file/static-file.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/static-file/static-file.data.ts
@@ -3,8 +3,7 @@ import type {
 	StaticFileItemResponseModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 
-type UmbMockStaticFileModelHack = StaticFileItemResponseModel & FileSystemTreeItemPresentationModel;
-export interface UmbMockStaticFileModel extends Omit<UmbMockStaticFileModelHack, 'type'> {}
+export type UmbMockStaticFileModel = StaticFileItemResponseModel & FileSystemTreeItemPresentationModel;
 
 export const data: Array<UmbMockStaticFileModel> = [
 	{
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.data.ts
index 2ce1bcde20..1145bb66e9 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.data.ts
@@ -4,12 +4,10 @@ import type {
 	StylesheetResponseModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 
-type UmbMockStylesheetModelHack = StylesheetResponseModel &
+export type UmbMockStylesheetModel = StylesheetResponseModel &
 	FileSystemTreeItemPresentationModel &
 	StylesheetItemResponseModel;
 
-export interface UmbMockStylesheetModel extends Omit<UmbMockStylesheetModelHack, 'type' | 'icon'> {}
-
 export const data: Array<UmbMockStylesheetModel> = [
 	{
 		name: 'Stylesheet File 1.css',
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.data.ts
index fd6988429a..4aadfd758e 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.data.ts
@@ -7,9 +7,7 @@ import type {
 } from '@umbraco-cms/backoffice/external/backend-api';
 import { TemplateQueryPropertyTypeModel, OperatorModel } from '@umbraco-cms/backoffice/external/backend-api';
 
-type UmbMockTemplateModelHack = TemplateResponseModel & NamedEntityTreeItemResponseModel & TemplateItemResponseModel;
-
-export interface UmbMockTemplateModel extends Omit<UmbMockTemplateModelHack, 'type'> {}
+export type UmbMockTemplateModel = TemplateResponseModel & NamedEntityTreeItemResponseModel & TemplateItemResponseModel;
 
 export const data: Array<UmbMockTemplateModel> = [
 	{
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 54e1eee8ff..f3a9ac812e 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts
@@ -7,7 +7,6 @@ import type {
 export const createEntityTreeItem = (item: any): NamedEntityTreeItemResponseModel => {
 	return {
 		name: item.name,
-		type: item.type,
 		hasChildren: item.hasChildren,
 		id: item.id,
 		parent: item.parent,
@@ -21,7 +20,7 @@ export const folderTreeItemMapper = (item: any): FolderTreeItemResponseModel =>
 	};
 };
 
-export const createFileSystemTreeItem = (item: any): Omit<FileSystemTreeItemPresentationModel, 'type'> => {
+export const createFileSystemTreeItem = (item: any): FileSystemTreeItemPresentationModel => {
 	return {
 		path: item.path,
 		parent: item.parent ?? null,
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-folder.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-folder.manager.ts
index 968fe7f8e7..87eaef9361 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-folder.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-folder.manager.ts
@@ -6,7 +6,7 @@ import type {
 	UpdateFolderResponseModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 
-export class UmbMockEntityFolderManager<MockItemType extends Omit<FolderTreeItemResponseModel, 'type'>> {
+export class UmbMockEntityFolderManager<MockItemType extends FolderTreeItemResponseModel> {
 	#db: UmbEntityMockDbBase<MockItemType>;
 	#createMockFolderMapper: (request: CreateFolderRequestModel) => MockItemType;
 
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-recycle-bin.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-recycle-bin.ts
index fb6940cc7a..2cb6918b2d 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-recycle-bin.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-recycle-bin.ts
@@ -2,9 +2,7 @@ import { UmbEntityMockDbBase } from './entity-base.js';
 import { UmbMockEntityTreeManager } from './entity-tree.manager.js';
 import type { ContentTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
 
-export class UmbEntityRecycleBin<
-	MockType extends Omit<ContentTreeItemResponseModel, 'type'>,
-> extends UmbEntityMockDbBase<MockType> {
+export class UmbEntityRecycleBin<MockType extends ContentTreeItemResponseModel> extends UmbEntityMockDbBase<MockType> {
 	tree;
 
 	constructor(data: Array<MockType>, treeItemMapper: (model: MockType) => any) {
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-tree.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-tree.manager.ts
index 38c08ccad5..def3178707 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-tree.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-tree.manager.ts
@@ -3,7 +3,7 @@ import type { UmbEntityMockDbBase } from './entity-base.js';
 import { UmbId } from '@umbraco-cms/backoffice/id';
 import type { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
 
-export class UmbMockEntityTreeManager<T extends Omit<EntityTreeItemResponseModel, 'type'>> {
+export class UmbMockEntityTreeManager<T extends EntityTreeItemResponseModel> {
 	#db: UmbEntityMockDbBase<T>;
 	#treeItemMapper: (item: T) => any;
 
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-tree.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-tree.manager.ts
index cad195d8f9..2641be20f2 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-tree.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-tree.manager.ts
@@ -3,7 +3,7 @@ import { createFileSystemTreeItem } from '../../utils.js';
 import { pagedResult } from '../paged-result.js';
 import type { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/external/backend-api';
 
-export class UmbMockFileSystemTreeManager<T extends Omit<FileSystemTreeItemPresentationModel, 'type'>> {
+export class UmbMockFileSystemTreeManager<T extends FileSystemTreeItemPresentationModel> {
 	#db: UmbMockDBBase<T>;
 
 	constructor(mockDb: UmbMockDBBase<T>) {
@@ -11,7 +11,7 @@ export class UmbMockFileSystemTreeManager<T extends Omit<FileSystemTreeItemPrese
 	}
 
 	getRoot({ skip = 0, take = 100 }: { skip?: number; take?: number } = {}): {
-		items: Array<Omit<FileSystemTreeItemPresentationModel, 'type'>>;
+		items: Array<FileSystemTreeItemPresentationModel>;
 		total: number;
 	} {
 		const items = this.#db.getAll().filter((item) => item.parent === null);
@@ -19,7 +19,7 @@ export class UmbMockFileSystemTreeManager<T extends Omit<FileSystemTreeItemPrese
 	}
 
 	getChildrenOf({ parentPath, skip = 0, take = 100 }: { parentPath: string; skip?: number; take?: number }): {
-		items: Array<Omit<FileSystemTreeItemPresentationModel, 'type'>>;
+		items: Array<FileSystemTreeItemPresentationModel>;
 		total: number;
 	} {
 		const items = this.#db.getAll().filter((item) => item.parent?.path === parentPath);