require entityType on folders

Author: madsrasmussen

src/packages/core/tree/folder/types.ts

@@ -1,11 +1,13 @@
-export interface UmbFolderModel {
-	unique: string;
+import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
+
+export interface UmbFolderModel extends UmbEntityModel {
 	name: string;
 }
 
 export interface UmbCreateFolderModel {
 	unique: string;
 	parentUnique: string | null;
+	parent: UmbEntityModel;
 	name: string;
 }
 

src/packages/data-type/tree/folder/data-type-folder.server.data-source.ts

@@ -1,3 +1,4 @@
+import { UMB_DATA_TYPE_FOLDER_ENTITY_TYPE } from '../../entity.js';
 import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree';
 import { DataTypeService } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
@@ -38,6 +39,7 @@ export class UmbDataTypeFolderServerDataSource implements UmbFolderDataSource {
 
 		if (data) {
 			const mappedData = {
+				entityType: UMB_DATA_TYPE_FOLDER_ENTITY_TYPE,
 				unique: data.id,
 				name: data.name,
 			};

src/packages/documents/document-blueprints/tree/folder/document-blueprint-folder.server.data-source.ts

@@ -1,3 +1,4 @@
+import { UMB_DOCUMENT_BLUEPRINT_FOLDER_ENTITY_TYPE } from '../../entity.js';
 import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree';
 import { DocumentBlueprintService } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
@@ -38,6 +39,7 @@ export class UmbDocumentBlueprintFolderServerDataSource implements UmbFolderData
 
 		if (data) {
 			const mappedData = {
+				entityType: UMB_DOCUMENT_BLUEPRINT_FOLDER_ENTITY_TYPE,
 				unique: data.id,
 				name: data.name,
 			};

src/packages/documents/document-types/tree/folder/constants.ts

@@ -0,0 +1 @@
+export const UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS = 'Umb.Repository.DocumentType.Folder';

src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts

@@ -1,3 +1,4 @@
+import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from '../../entity.js';
 import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree';
 import { DocumentTypeService } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
@@ -38,6 +39,7 @@ export class UmbDocumentTypeFolderServerDataSource implements UmbFolderDataSourc
 
 		if (data) {
 			const mappedData = {
+				entityType: UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE,
 				unique: data.id,
 				name: data.name,
 			};

src/packages/documents/document-types/tree/folder/index.ts

@@ -1,2 +1,2 @@
 export { UmbDocumentTypeFolderRepository } from './document-type-folder.repository.js';
-export { UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS } from './manifests.js';
+export * from './constants.js';

src/packages/documents/document-types/tree/folder/manifests.ts

@@ -1,8 +1,7 @@
 import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from '../../entity.js';
+import { UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS } from './constants.js';
 import { manifests as workspaceManifests } from './workspace/manifests.js';
 
-export const UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS = 'Umb.Repository.DocumentType.Folder';
-
 export const manifests: Array<UmbExtensionManifest> = [
 	{
 		type: 'repository',

src/packages/media/media-types/tree/folder/media-type-folder.server.data-source.ts

@@ -1,3 +1,4 @@
+import { UMB_MEDIA_TYPE_FOLDER_ENTITY_TYPE } from '../../entity.js';
 import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree';
 import { MediaTypeService } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
@@ -38,6 +39,7 @@ export class UmbMediaTypeFolderServerDataSource implements UmbFolderDataSource {
 
 		if (data) {
 			const mappedData = {
+				entityType: UMB_MEDIA_TYPE_FOLDER_ENTITY_TYPE,
 				unique: data.id,
 				name: data.name,
 			};

src/packages/templating/partial-views/tree/folder/partial-view-folder.server.data-source.ts

@@ -1,3 +1,4 @@
+import { UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE } from '../../entity.js';
 import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system';
 import type { UmbCreateFolderModel, UmbFolderDataSource } from '@umbraco-cms/backoffice/tree';
 import type { CreatePartialViewFolderRequestModel } from '@umbraco-cms/backoffice/external/backend-api';
@@ -44,6 +45,7 @@ export class UmbPartialViewFolderServerDataSource implements UmbFolderDataSource
 
 		if (data) {
 			const mappedData = {
+				entityType: UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE,
 				unique: this.#serverFilePathUniqueSerializer.toUnique(data.path),
 				parentUnique: data.parent ? this.#serverFilePathUniqueSerializer.toUnique(data.parent.path) : null,
 				name: data.name,

src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts

@@ -4,6 +4,7 @@ import type { CreateScriptFolderRequestModel } from '@umbraco-cms/backoffice/ext
 import { ScriptService } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
+import { UMB_SCRIPT_FOLDER_ENTITY_TYPE } from '../../entity';
 
 /**
  * A data source for Script folders that fetches data from the server
@@ -44,6 +45,7 @@ export class UmbScriptFolderServerDataSource implements UmbFolderDataSource {
 
 		if (data) {
 			const mappedData = {
+				entityType: UMB_SCRIPT_FOLDER_ENTITY_TYPE,
 				unique: this.#serverFilePathUniqueSerializer.toUnique(data.path),
 				parentUnique: data.parent ? this.#serverFilePathUniqueSerializer.toUnique(data.parent.path) : null,
 				name: data.name,