diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-base.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-base.ts index 15d9992ea5..c9a252c4de 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-base.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-base.ts @@ -1,8 +1,7 @@ import { UmbMockDBBase } from '../mock-db-base.js'; -import type { FileSystemResponseModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; export abstract class UmbFileSystemMockDbBase< - MockItemType extends FileSystemResponseModelBaseModel, + MockItemType extends { path: string }, > extends UmbMockDBBase { constructor(data: Array) { super(data); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-detail.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-detail.manager.ts index e18d6aacd8..d847ba3e70 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-detail.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-detail.manager.ts @@ -1,19 +1,14 @@ import type { UmbFileSystemMockDbBase } from './file-system-base.js'; -import type { - FileSystemFileCreateRequestModelBaseModel, - FileSystemFileResponseModelBaseModel, - FileSystemFileUpdateRequestModelBaseModel, - FileSystemResponseModelBaseModel, -} from '@umbraco-cms/backoffice/external/backend-api'; +import type { CreateFileRequestModel, FileResponseModel, UpdateFileRequestModel } from './types.js'; -export class UmbMockFileSystemDetailManager { +export class UmbMockFileSystemDetailManager { #db: UmbFileSystemMockDbBase; constructor(db: UmbFileSystemMockDbBase) { this.#db = db; } - create(request: FileSystemFileCreateRequestModelBaseModel) { + create(request: CreateFileRequestModel) { let path = request.parent ? `${request.parent.path}/${request.name}` : request.name; // ensure dash prefix if its not there path = path.startsWith('/') ? path : `/${path}`; @@ -24,14 +19,14 @@ export class UmbMockFileSystemDetailManager { + #defaultCreateMockItemMapper = (path: string, request: CreateFileRequestModel): MockItemType => { return { name: request.name, content: request.content, @@ -72,7 +67,7 @@ export class UmbMockFileSystemDetailManager { + #defaultReadResponseMapper = (item: MockItemType): FileResponseModel => { return { path: item.path, parent: item.parent, diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-folder.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-folder.manager.ts index b61ec4fe91..e2a3cccbc9 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-folder.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-folder.manager.ts @@ -1,11 +1,7 @@ import type { UmbFileSystemMockDbBase } from './file-system-base.js'; -import type { - FileSystemCreateRequestModelBaseModel, - FileSystemResponseModelBaseModel, -} from '@umbraco-cms/backoffice/external/backend-api'; export class UmbMockFileSystemFolderManager< - MockItemType extends FileSystemResponseModelBaseModel & { isFolder: boolean }, + MockItemType extends { path: string; name: string; parent?: { path: string } | null; isFolder: boolean }, > { #db: UmbFileSystemMockDbBase; @@ -13,7 +9,7 @@ export class UmbMockFileSystemFolderManager< this.#db = db; } - create(request: FileSystemCreateRequestModelBaseModel) { + create(request: any) { let path = request.parent ? `${request.parent.path}/${request.name}` : request.name; // ensure dash prefix if its not there path = path.startsWith('/') ? path : `/${path}`; @@ -48,7 +44,7 @@ export class UmbMockFileSystemFolderManager< } } - #defaultReadMapper = (item: MockItemType): FileSystemResponseModelBaseModel => { + #defaultReadMapper = (item: MockItemType) => { return { path: item.path, name: item.name, diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-item.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-item.manager.ts index 0576c24737..38be839e1b 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-item.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-item.manager.ts @@ -1,7 +1,7 @@ import type { UmbMockDBBase } from '../mock-db-base.js'; -import type { FileSystemItemResponseModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import type { FileItemResponseModel } from './types.js'; -export class UmbMockFileSystemItemManager { +export class UmbMockFileSystemItemManager { #db: UmbMockDBBase; constructor(db: UmbMockDBBase) { @@ -14,7 +14,7 @@ export class UmbMockFileSystemItemManager ({ +const createFileItemResponseModelBaseModel = (item: any): FileItemResponseModel => ({ path: item.path, name: item.name, parent: item.parent,