From 46c57bcc16c1d698e6cf95c4c0af7e43f13a5e1a Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 30 Jan 2024 12:35:47 +0100 Subject: [PATCH] rename base --- .../src/mocks/data/data.ts | 15 ----------- .../src/mocks/data/entity.data.ts | 11 ++------ .../src/mocks/data/languages.data.ts | 4 +-- .../src/mocks/data/log-viewer.data.ts | 8 +++--- .../src/mocks/data/member-type.data.ts | 4 +-- .../src/mocks/data/user/user.db.ts | 2 +- .../mocks/data/utils/entity/entity-base.ts | 14 ++--------- .../data/utils/entity/entity-item.manager.ts | 8 +++--- .../data/utils/entity/entity-tree.manager.ts | 4 +-- .../utils/file-system/file-system-base.ts | 4 +-- .../file-system/file-system-item.manager.ts | 8 +++--- .../file-system/file-system-tree.manager.ts | 11 ++++---- .../src/mocks/data/utils/mock-db-base.ts | 25 +++++++++++++++++++ 13 files changed, 55 insertions(+), 63 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/mocks/data/data.ts create mode 100644 src/Umbraco.Web.UI.Client/src/mocks/data/utils/mock-db-base.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/data.ts deleted file mode 100644 index d26dc233ff..0000000000 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/data.ts +++ /dev/null @@ -1,15 +0,0 @@ -export class UmbData { - protected data: Array = []; - - constructor(data: Array) { - this.data = data; - } - - getData() { - return this.data; - } - - get total() { - return this.data.length; - } -} diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts index 8bb43d20c8..d5f8976d8c 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts @@ -1,20 +1,13 @@ -import { UmbData } from './data.js'; +import { UmbMockDBBase } from './utils/mock-db-base.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbEntityBase } from '@umbraco-cms/backoffice/models'; // Temp mocked database -export class UmbEntityData extends UmbData { +export class UmbEntityData extends UmbMockDBBase { constructor(data: Array) { super(data); } - getAll() { - return { - total: this.data.length, - items: this.data, - }; - } - getList(skip: number, take: number) { return this.data.slice(skip, skip + take); } diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/languages.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/languages.data.ts index 5d221d082c..c24f636a8a 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/languages.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/languages.data.ts @@ -1,8 +1,8 @@ -import { UmbData } from './data.js'; +import { UmbMockDBBase } from './utils/mock-db-base.js'; import type { LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api'; // Temp mocked database -class UmbLanguagesData extends UmbData { +class UmbLanguagesData extends UmbMockDBBase { constructor(data: LanguageResponseModel[]) { super(data); } diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts index 30be1e924e..061d6d91e7 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts @@ -1,5 +1,5 @@ import { logs } from './logs.data.js'; -import { UmbData } from './data.js'; +import { UmbMockDBBase } from './utils/mock-db-base.js'; import type { LogMessageResponseModel, LogTemplateResponseModel, @@ -7,7 +7,7 @@ import type { } from '@umbraco-cms/backoffice/backend-api'; // Temp mocked database -class UmbLogViewerSearchesData extends UmbData { +class UmbLogViewerSearchesData extends UmbMockDBBase { constructor(data: SavedLogSearchResponseModel[]) { super(data); } @@ -22,7 +22,7 @@ class UmbLogViewerSearchesData extends UmbData { } } -class UmbLogViewerTemplatesData extends UmbData { +class UmbLogViewerTemplatesData extends UmbMockDBBase { constructor(data: LogTemplateResponseModel[]) { super(data); } @@ -33,7 +33,7 @@ class UmbLogViewerTemplatesData extends UmbData { } } -class UmbLogViewerMessagesData extends UmbData { +class UmbLogViewerMessagesData extends UmbMockDBBase { constructor(data: LogMessageResponseModel[]) { super(data); } diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts index 4297f341a4..b82cc59920 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts @@ -1,5 +1,5 @@ import type { MemberTypeDetails } from '../../packages/members/member-types/types.js'; -import { UmbData } from './data.js'; +import { UmbMockDBBase } from './utils/mock-db-base.js'; import { createEntityTreeItem } from './utils.js'; import type { NamedEntityTreeItemResponseModel, @@ -20,7 +20,7 @@ export const data: Array = [ ]; // Temp mocked database -class UmbMemberTypeData extends UmbData { +class UmbMemberTypeData extends UmbMockDBBase { constructor() { super(data); } diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts index e4ab0b3af6..3dadcc41e3 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts @@ -165,7 +165,7 @@ class UmbUserData extends UmbEntityData { } filter(options: any): PagedUserResponseModel { - const { items: allItems } = this.getAll(); + const allItems = this.getAll(); const filterOptions = { skip: options.skip || 0, diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-base.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-base.ts index 664e25642e..38cb749ebb 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-base.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-base.ts @@ -1,6 +1,6 @@ -import { UmbData } from '../../data.js'; +import { UmbMockDBBase } from '../mock-db-base.js'; -export abstract class UmbEntityMockDbBase extends UmbData { +export abstract class UmbEntityMockDbBase extends UmbMockDBBase { constructor(data: Array) { super(data); } @@ -21,14 +21,4 @@ export abstract class UmbEntityMockDbBase e delete(id: string) { this.data = this.data.filter((item) => item.id !== id); } - - get(options: { skip: number | undefined; take: number | undefined }) { - const skip = options.skip ? options.skip : 0; - const take = options.take ? options.take : 100; - - const mockItems = this.data; - const paginatedItems = mockItems.slice(skip, skip + take); - - return { items: paginatedItems, total: mockItems.length }; - } } diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-item.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-item.manager.ts index 4c42f0fd75..c45a5272f4 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-item.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-item.manager.ts @@ -1,16 +1,16 @@ -import type { UmbData } from '../../data.js'; +import type { UmbMockDBBase } from '../mock-db-base.js'; export class UmbMockEntityItemManager { - #db: UmbData; + #db: UmbMockDBBase; #itemReadMapper: (item: T) => any; - constructor(db: UmbData, itemReadMapper: (item: T) => any) { + constructor(db: UmbMockDBBase, itemReadMapper: (item: T) => any) { this.#db = db; this.#itemReadMapper = itemReadMapper; } getItems(ids: Array) { - const items = this.#db.getData().filter((item) => ids.includes(item.id)); + const items = this.#db.getAll().filter((item) => ids.includes(item.id)); return items.map((item) => this.#itemReadMapper(item)); } } 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 b066aa74b3..02adbec8b0 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 @@ -12,14 +12,14 @@ export class UmbMockEntityTreeManager item.parent === null); + const items = this.#db.getAll().filter((item) => item.parent === null); const treeItems = items.map((item) => this.#treeItemMapper(item)); const total = items.length; return { items: treeItems, total }; } getChildrenOf(parentId: string) { - const items = this.#db.getData().filter((item) => item.parent?.id === parentId); + const items = this.#db.getAll().filter((item) => item.parent?.id === parentId); const treeItems = items.map((item) => this.#treeItemMapper(item)); const total = items.length; return { items: treeItems, total }; 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 c8b5a15bda..35617f24c3 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,9 +1,9 @@ -import { UmbData } from '../../data.js'; +import { UmbMockDBBase } from '../mock-db-base.js'; import type { FileSystemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; export abstract class UmbFileSystemMockDbBase< MockItemType extends FileSystemResponseModelBaseModel, -> extends UmbData { +> extends UmbMockDBBase { constructor(data: Array) { super(data); } 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 142f22b585..27f34c9693 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,15 +1,15 @@ -import type { UmbData } from '../../data.js'; +import type { UmbMockDBBase } from '../mock-db-base.js'; import type { FileSystemItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; export class UmbMockFileSystemItemManager { - #db: UmbData; + #db: UmbMockDBBase; - constructor(db: UmbData) { + constructor(db: UmbMockDBBase) { this.#db = db; } getItems(paths: Array) { - const items = this.#db.getData().filter((item) => paths.includes(item.path)); + const items = this.#db.getAll().filter((item) => paths.includes(item.path)); return items.map((item) => createFileItemResponseModelBaseModel(item)); } } 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 b205c11f22..221c885621 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 @@ -1,17 +1,16 @@ -import type { UmbData } from '../../data.js'; +import type { UmbMockDBBase } from '../mock-db-base.js'; import { createFileSystemTreeItem } from '../../utils.js'; import type { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; -import { PagedFileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; export class UmbMockFileSystemTreeManager> { - #db: UmbData; + #db: UmbMockDBBase; - constructor(mockDb: UmbData) { + constructor(mockDb: UmbMockDBBase) { this.#db = mockDb; } getRoot(): { items: Array>; total: number } { - const items = this.#db.getData().filter((item) => item.parent === null); + const items = this.#db.getAll().filter((item) => item.parent === null); const treeItems = items.map((item) => createFileSystemTreeItem(item)); const total = items.length; return { items: treeItems, total }; @@ -21,7 +20,7 @@ export class UmbMockFileSystemTreeManager>; total: number; } { - const items = this.#db.getData().filter((item) => item.parent?.path === parentPath); + const items = this.#db.getAll().filter((item) => item.parent?.path === parentPath); const treeItems = items.map((item) => createFileSystemTreeItem(item)); const total = items.length; return { items: treeItems, total }; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/mock-db-base.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/mock-db-base.ts new file mode 100644 index 0000000000..b07a412623 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/mock-db-base.ts @@ -0,0 +1,25 @@ +export abstract class UmbMockDBBase { + protected data: Array = []; + + constructor(data: Array) { + this.data = data; + } + + getAll() { + return this.data; + } + + get total() { + return this.data.length; + } + + get(options: { skip: number | undefined; take: number | undefined }) { + const skip = options.skip ? options.skip : 0; + const take = options.take ? options.take : 100; + + const mockItems = this.getAll(); + const paginatedItems = mockItems.slice(skip, skip + take); + + return { items: paginatedItems, total: mockItems.length }; + } +}