From 117f80806a5b740dbeff5797d1ac9ee1948df47b Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 15 Jan 2024 15:52:56 +0100 Subject: [PATCH] remove stylesheet overview logic --- .../mocks/data/stylesheet/stylesheet.db.ts | 21 -------- .../src/mocks/handlers/stylesheet/index.ts | 10 +--- .../handlers/stylesheet/overview.handlers.ts | 16 ------ .../stylesheets/collection/index.ts | 1 - .../stylesheets/collection/manifests.ts | 3 -- .../collection/repository/index.ts | 1 - .../collection/repository/manifests.ts | 13 ----- .../stylesheet-collection.repository.ts | 24 --------- ...tylesheet-collection.server.data-source.ts | 51 ------------------- .../stylesheets/collection/types.ts | 16 ------ .../templating/stylesheets/manifests.ts | 2 - 11 files changed, 1 insertion(+), 157 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/overview.handlers.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/index.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/manifests.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/index.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/manifests.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/stylesheet-collection.repository.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/stylesheet-collection.server.data-source.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.db.ts index 7c46592e1e..da40be31da 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.db.ts @@ -3,14 +3,7 @@ import { UmbMockFileSystemDetailManager } from '../file-system/file-system-detai import { UmbMockFileSystemFolderManager } from '../file-system/file-system-folder.manager.js'; import { UmbMockFileSystemItemManager } from '../file-system/file-system-item.manager.js'; import { UmbMockFileSystemTreeManager } from '../file-system/file-system-tree.manager.js'; -import { textFileItemMapper } from '../utils.js'; import { UmbMockStylesheetModel, data } from './stylesheet.data.js'; -import { PagedStylesheetOverviewResponseModel } from '@umbraco-cms/backoffice/backend-api'; - -interface UmbMockPaginationModel { - skip?: number; - take?: number; -} class UmbStylesheetMockDb extends UmbFileSystemMockDbBase { tree = new UmbMockFileSystemTreeManager(this); @@ -21,20 +14,6 @@ class UmbStylesheetMockDb extends UmbFileSystemMockDbBase) { super(data); } - - getOverview(filterOptions: UmbMockPaginationModel = { skip: 0, take: 100 }): PagedStylesheetOverviewResponseModel { - const mockItems = this.getData(); - const files = mockItems.filter((item) => item.isFolder === false); - const paginatedFiles = files.slice(filterOptions.skip, filterOptions.skip! + filterOptions.take!); - const responseItems = paginatedFiles.map((item) => { - return { - name: item.name, - path: item.path, - }; - }); - - return { items: responseItems, total: mockItems.length }; - } } export const umbStylesheetMockDb = new UmbStylesheetMockDb(data); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/index.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/index.ts index 6e30e733db..34d8d576a3 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/index.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/index.ts @@ -2,14 +2,6 @@ import { folderHandlers } from './folder.handlers.js'; import { treeHandlers } from './tree.handlers.js'; import { detailHandlers } from './detail.handlers.js'; import { itemHandlers } from './item.handlers.js'; -import { overviewHandlers } from './overview.handlers.js'; import { renameHandlers } from './rename.handlers.js'; -export const handlers = [ - ...treeHandlers, - ...itemHandlers, - ...folderHandlers, - ...overviewHandlers, - ...renameHandlers, - ...detailHandlers, -]; +export const handlers = [...treeHandlers, ...itemHandlers, ...folderHandlers, ...renameHandlers, ...detailHandlers]; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/overview.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/overview.handlers.ts deleted file mode 100644 index 0e914a3218..0000000000 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/overview.handlers.ts +++ /dev/null @@ -1,16 +0,0 @@ -const { rest } = window.MockServiceWorker; -import { umbStylesheetMockDb } from '../../data/stylesheet/stylesheet.db.js'; -import { UMB_SLUG } from './slug.js'; -import { umbracoPath } from '@umbraco-cms/backoffice/utils'; - -export const overviewHandlers = [ - rest.get(umbracoPath(`${UMB_SLUG}/overview`), async (req, res, ctx) => { - const skipParam = req.url.searchParams.get('skip'); - const takeParam = req.url.searchParams.get('take'); - const response = umbStylesheetMockDb.getOverview({ - skip: skipParam ? parseInt(skipParam) : undefined, - take: takeParam ? parseInt(takeParam) : undefined, - }); - return res(ctx.status(200), ctx.json(response)); - }), -]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/index.ts deleted file mode 100644 index 3d76f338dd..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './repository/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/manifests.ts deleted file mode 100644 index 4e1826b900..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/manifests.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { manifests as repositoryManifests } from './repository/manifests.js'; - -export const manifests = [...repositoryManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/index.ts deleted file mode 100644 index 0759be3e3d..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './stylesheet-collection.repository.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/manifests.ts deleted file mode 100644 index 67222a98a1..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/manifests.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { UmbStylesheetCollectionRepository } from './stylesheet-collection.repository.js'; -import { ManifestRepository } from '@umbraco-cms/backoffice/extension-registry'; - -export const UMB_STYLESHEET_COLLECTION_REPOSITORY_ALIAS = 'Umb.Repository.Stylesheet.Collection'; - -const repository: ManifestRepository = { - type: 'repository', - alias: UMB_STYLESHEET_COLLECTION_REPOSITORY_ALIAS, - name: 'Stylesheet Collection Repository', - api: UmbStylesheetCollectionRepository, -}; - -export const manifests = [repository]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/stylesheet-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/stylesheet-collection.repository.ts deleted file mode 100644 index 3cfee0de5d..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/stylesheet-collection.repository.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { UmbStylesheetCollectionFilterModel, UmbStylesheetCollectionItemModel } from '../types.js'; -import { UmbStylesheetCollectionServerDataSource } from './stylesheet-collection.server.data-source.js'; -import { UmbCollectionDataSource, UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; -import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; - -export class UmbStylesheetCollectionRepository extends UmbBaseController implements UmbCollectionRepository { - #collectionSource: UmbCollectionDataSource; - - constructor(host: UmbControllerHost) { - super(host); - this.#collectionSource = new UmbStylesheetCollectionServerDataSource(this._host); - } - - /** - * Requests the stylesheet collection - * @param {UmbStylesheetCollectionFilterModel} [filter={ take: 100, skip: 0 }] - * @return {*} - * @memberof UmbStylesheetCollectionRepository - */ - requestCollection(filter: UmbStylesheetCollectionFilterModel = { take: 100, skip: 0 }) { - return this.#collectionSource.getCollection(filter); - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/stylesheet-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/stylesheet-collection.server.data-source.ts deleted file mode 100644 index fb4f7e78a8..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/repository/stylesheet-collection.server.data-source.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; -import { UmbStylesheetCollectionFilterModel, UmbStylesheetCollectionItemModel } from '../types.js'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; -import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { StylesheetResource } from '@umbraco-cms/backoffice/backend-api'; - -/** - * A data source for the Stylesheet collection that fetches data from the server - * @export - * @class UmbStylesheetCollectionServerDataSource - * @implements {RepositoryDetailDataSource} - */ -export class UmbStylesheetCollectionServerDataSource - implements UmbCollectionDataSource -{ - #host: UmbControllerHost; - #serverFilePathUniqueSerializer = new UmbServerFilePathUniqueSerializer(); - - /** - * Creates an instance of UmbStylesheetCollectionServerDataSource. - * @param {UmbControllerHost} host - * @memberof UmbStylesheetCollectionServerDataSource - */ - constructor(host: UmbControllerHost) { - this.#host = host; - } - - /** - * Gets the stylesheet collection items from the server - * @param {UmbStylesheetCollectionFilterModel} filter - * @return {*} - * @memberof UmbStylesheetCollectionServerDataSource - */ - async getCollection(filter: UmbStylesheetCollectionFilterModel) { - const { data, error } = await tryExecuteAndNotify(this.#host, StylesheetResource.getStylesheetOverview(filter)); - - if (data) { - const items: Array = data.items.map((item) => { - return { - name: item.name, - unique: this.#serverFilePathUniqueSerializer.toUnique(item.path), - }; - }); - - return { data: { items, total: data.total } }; - } - - return { error }; - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/types.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/types.ts deleted file mode 100644 index ade7c382f5..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/collection/types.ts +++ /dev/null @@ -1,16 +0,0 @@ -export interface UmbStylesheetCollectionFilterModel { - /** - * The number of items to take. - */ - take?: number; - - /** - * The number of items to skip. - */ - skip?: number; -} - -export interface UmbStylesheetCollectionItemModel { - name: string; - unique: string; -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/manifests.ts index 9338615157..1c9fbda363 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/manifests.ts @@ -3,7 +3,6 @@ import { manifests as menuItemManifests } from './menu-item/manifests.js'; import { manifests as treeManifests } from './tree/manifests.js'; import { manifests as workspaceManifests } from './workspace/manifests.js'; import { manifests as entityActionManifests } from './entity-actions/manifests.js'; -import { manifests as collectionManifests } from './collection/manifests.js'; import { manifests as componentManifests } from './components/manifests.js'; export const manifests = [ @@ -12,6 +11,5 @@ export const manifests = [ ...treeManifests, ...workspaceManifests, ...entityActionManifests, - ...collectionManifests, ...componentManifests, ];