diff --git a/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md b/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md index ec8849123a..3d02d924c6 100644 --- a/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md +++ b/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md @@ -66,16 +66,16 @@ The simplest approach is to copy over the HTML from the old backoffice into a ne **Controller** -The old AngularJS controllers will have to be converted into modern TypeScript and will have to use our new services and stores. We try to abstract as much away as possible, and mostly you will have to make API calls and let the rest of the system handle things like error handling and so on. In the case of this dashboard, we only have a few GET and POST requests. Looking at the new Management API, we find the PublishedCacheResource, which is the new API controller to serve data to the dashboard. +The old AngularJS controllers will have to be converted into modern TypeScript and will have to use our new services and stores. We try to abstract as much away as possible, and mostly you will have to make API calls and let the rest of the system handle things like error handling and so on. In the case of this dashboard, we only have a few GET and POST requests. Looking at the new Management API, we find the PublishedCacheService, which is the new API controller to serve data to the dashboard. -To make the first button work, which simply just requests a new status from the server, we must make a call to `PublishedCacheResource.getPublishedCacheStatus()`. An additional thing here is to wrap that in a friendly function called `tryExecuteAndNotify`, which is something we make available to developers to automatically handle the responses coming from the server and additionally use the Notifications to notify of any errors: +To make the first button work, which simply just requests a new status from the server, we must make a call to `PublishedCacheService.getPublishedCacheStatus()`. An additional thing here is to wrap that in a friendly function called `tryExecuteAndNotify`, which is something we make available to developers to automatically handle the responses coming from the server and additionally use the Notifications to notify of any errors: ```typescript import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { PublishedCacheResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { PublishedCacheService } from '@umbraco-cms/backoffice/external/backend-api'; private _getStatus() { - const { data: status } = await tryExecuteAndNotify(this, PublishedCacheResource.getPublishedCacheStatus()); + const { data: status } = await tryExecuteAndNotify(this, PublishedCacheService.getPublishedCacheStatus()); if (status) { // we now have the status diff --git a/src/Umbraco.Web.UI.Client/devops/eslint/rules/no-direct-api-import.cjs b/src/Umbraco.Web.UI.Client/devops/eslint/rules/no-direct-api-import.cjs index efb6e7c4b0..b051ad64fa 100644 --- a/src/Umbraco.Web.UI.Client/devops/eslint/rules/no-direct-api-import.cjs +++ b/src/Umbraco.Web.UI.Client/devops/eslint/rules/no-direct-api-import.cjs @@ -11,12 +11,12 @@ module.exports = { }, create: function (context) { return { - // If methods called on *Resource classes are not already wrapped with `await tryExecuteAndNotify()`, then we should suggest to wrap them. + // If methods called on *Service classes are not already wrapped with `await tryExecuteAndNotify()`, then we should suggest to wrap them. CallExpression: function (node) { if ( node.callee.type === 'MemberExpression' && node.callee.object.type === 'Identifier' && - node.callee.object.name.endsWith('Resource') && + node.callee.object.name.endsWith('Service') && node.callee.property.type === 'Identifier' && node.callee.property.name !== 'constructor' ) { diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts b/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts index d0e53c6559..d4e24cb350 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts @@ -1,4 +1,4 @@ -import { RuntimeLevelModel, ServerResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { RuntimeLevelModel, ServerService } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; import { tryExecute } from '@umbraco-cms/backoffice/resources'; @@ -51,7 +51,7 @@ export class UmbServerConnection { } async #setStatus() { - const { data, error } = await tryExecute(ServerResource.getServerStatus()); + const { data, error } = await tryExecute(ServerService.getServerStatus()); if (error) { throw error; } diff --git a/src/Umbraco.Web.UI.Client/src/apps/installer/database/installer-database.element.ts b/src/Umbraco.Web.UI.Client/src/apps/installer/database/installer-database.element.ts index 2e4409f1bb..5747fb78c7 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/installer/database/installer-database.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/installer/database/installer-database.element.ts @@ -9,7 +9,7 @@ import type { DatabaseSettingsPresentationModel, ProblemDetails, } from '@umbraco-cms/backoffice/external/backend-api'; -import { ApiError, InstallResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { ApiError, InstallService } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecute } from '@umbraco-cms/backoffice/resources'; @@ -165,7 +165,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement { }; const { error } = await tryExecute( - InstallResource.postInstallValidateDatabase({ requestBody: databaseDetails }), + InstallService.postInstallValidateDatabase({ requestBody: databaseDetails }), ); if (error) { @@ -196,7 +196,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement { this._installerContext.nextStep(); const { error: _error } = await tryExecute( - InstallResource.postInstallSetup({ requestBody: this._installerContext.getData() }), + InstallService.postInstallSetup({ requestBody: this._installerContext.getData() }), ); const error = _error as ProblemDetails | undefined; if (error) { diff --git a/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts b/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts index 5510d4847b..37c76e05b0 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts @@ -4,7 +4,7 @@ import type { ProblemDetails, InstallRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { InstallResource, TelemetryLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { InstallService, TelemetryLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecute } from '@umbraco-cms/backoffice/resources'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbObjectState, UmbNumberState } from '@umbraco-cms/backoffice/observable-api'; @@ -119,7 +119,7 @@ export class UmbInstallerContext { * @memberof UmbInstallerContext */ private async _loadInstallerSettings() { - const { data, error: _error } = await tryExecute(InstallResource.getInstallSettings()); + const { data, error: _error } = await tryExecute(InstallService.getInstallSettings()); const error: any = _error; if (data) { this._settings.setValue(data); diff --git a/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader.element.ts b/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader.element.ts index 54f5a14b90..26a68ea5e6 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader.element.ts @@ -1,6 +1,6 @@ import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { UpgradeResource, ApiError } from '@umbraco-cms/backoffice/external/backend-api'; +import { UpgradeService, ApiError } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecute } from '@umbraco-cms/backoffice/resources'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @@ -43,7 +43,7 @@ export class UmbUpgraderElement extends UmbLitElement { private async _setup() { this.fetching = true; - const { data, error } = await tryExecute(UpgradeResource.getUpgradeSettings()); + const { data, error } = await tryExecute(UpgradeService.getUpgradeSettings()); if (data) { this.upgradeSettings = data; @@ -59,7 +59,7 @@ export class UmbUpgraderElement extends UmbLitElement { this.errorMessage = ''; this.upgrading = true; - const { error } = await tryExecute(UpgradeResource.postUpgradeAuthorize()); + const { error } = await tryExecute(UpgradeService.postUpgradeAuthorize()); if (error) { this.errorMessage = diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/server-extension-registrator.controller.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/server-extension-registrator.controller.ts index a20359fd72..d582f2f307 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/server-extension-registrator.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/server-extension-registrator.controller.ts @@ -1,6 +1,6 @@ import type { ManifestBase } from '../types/index.js'; import { isManifestBaseType } from '../type-guards/index.js'; -import { OpenAPI, ManifestResource, type ManifestResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { OpenAPI, ManifestService, type ManifestResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry'; @@ -22,7 +22,7 @@ export class UmbServerExtensionRegistrator extends UmbControllerBase { * @remark Users must have the BACKOFFICE_ACCESS permission to access this method. */ public async registerAllExtensions() { - const { data: packages } = await tryExecuteAndNotify(this, ManifestResource.getManifestManifest()); + const { data: packages } = await tryExecuteAndNotify(this, ManifestService.getManifestManifest()); if (packages) { await this.#loadServerPackages(packages); } @@ -34,7 +34,7 @@ export class UmbServerExtensionRegistrator extends UmbControllerBase { * @remark Users must have the BACKOFFICE_ACCESS permission to access this method. */ public async registerPrivateExtensions() { - const { data: packages } = await tryExecuteAndNotify(this, ManifestResource.getManifestManifestPrivate()); + const { data: packages } = await tryExecuteAndNotify(this, ManifestService.getManifestManifestPrivate()); if (packages) { await this.#loadServerPackages(packages); } @@ -46,7 +46,7 @@ export class UmbServerExtensionRegistrator extends UmbControllerBase { * @remark Any user can access this method without any permissions. */ public async registerPublicExtensions() { - const { data: packages } = await tryExecuteAndNotify(this, ManifestResource.getManifestManifestPublic()); + const { data: packages } = await tryExecuteAndNotify(this, ManifestService.getManifestManifestPublic()); if (packages) { await this.#loadServerPackages(packages); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.server.data.ts index e3e365046f..634ee8eeef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.server.data.ts @@ -1,5 +1,5 @@ import type { DirectionModel, AuditTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { AuditLogResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { AuditLogService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -39,7 +39,7 @@ export class UmbAuditLogServerDataSource { }) { return await tryExecuteAndNotify( this.#host, - AuditLogResource.getAuditLog({ orderDirection, sinceDate, skip, take }), + AuditLogService.getAuditLog({ orderDirection, sinceDate, skip, take }), ); } @@ -58,7 +58,7 @@ export class UmbAuditLogServerDataSource { }) { return await tryExecuteAndNotify( this.#host, - AuditLogResource.getAuditLogById({ id, orderDirection, sinceDate, skip, take }), + AuditLogService.getAuditLogById({ id, orderDirection, sinceDate, skip, take }), ); } @@ -75,7 +75,7 @@ export class UmbAuditLogServerDataSource { }) { return await tryExecuteAndNotify( this.#host, - AuditLogResource.getAuditLogTypeByLogType({ logType, sinceDate, skip, take }), + AuditLogService.getAuditLogTypeByLogType({ logType, sinceDate, skip, take }), ); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/culture.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/culture.server.data.ts index d7cca0cc46..7ac0ac1a6f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/culture.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/culture.server.data.ts @@ -1,5 +1,5 @@ import type { UmbCultureDataSource } from './index.js'; -import { CultureResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { CultureService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -27,6 +27,6 @@ export class UmbCultureServerDataSource implements UmbCultureDataSource { * @memberof UmbLanguageServerDataSource */ async getCollection({ skip, take }: { skip: number; take: number }) { - return tryExecuteAndNotify(this.#host, CultureResource.getCulture({ skip, take })); + return tryExecuteAndNotify(this.#host, CultureService.getCulture({ skip, take })); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file.server.data-source.ts index 02d0335653..c5393ee8ff 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file.server.data-source.ts @@ -1,4 +1,4 @@ -import { TemporaryFileResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { TemporaryFileService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -30,7 +30,7 @@ export class UmbTemporaryFileServerDataSource { async create(id: string, file: File) { return tryExecuteAndNotify( this.#host, - TemporaryFileResource.postTemporaryFile({ + TemporaryFileService.postTemporaryFile({ formData: { Id: id, File: file, @@ -47,7 +47,7 @@ export class UmbTemporaryFileServerDataSource { */ read(id: string) { if (!id) throw new Error('Id is missing'); - return tryExecuteAndNotify(this.#host, TemporaryFileResource.getTemporaryFileById({ id })); + return tryExecuteAndNotify(this.#host, TemporaryFileService.getTemporaryFileById({ id })); } /** @@ -58,6 +58,6 @@ export class UmbTemporaryFileServerDataSource { */ delete(id: string) { if (!id) throw new Error('Id is missing'); - return tryExecuteAndNotify(this.#host, TemporaryFileResource.deleteTemporaryFileById({ id })); + return tryExecuteAndNotify(this.#host, TemporaryFileService.deleteTemporaryFileById({ id })); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/collection/repository/data-type-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/collection/repository/data-type-collection.server.data-source.ts index 558131b3e8..d323766736 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/collection/repository/data-type-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/collection/repository/data-type-collection.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbDataTypeCollectionFilterModel } from '../types.js'; import type { UmbDataTypeItemModel } from '../../repository/index.js'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { DataTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DataTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import type { DataTypeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -39,7 +39,7 @@ export class UmbDataTypeCollectionServerDataSource implements UmbCollectionDataS * @DataTypeof UmbDataTypeCollectionServerDataSource */ async getCollection(filter: UmbDataTypeCollectionFilterModel) { - const { data, error } = await tryExecuteAndNotify(this.#host, DataTypeResource.getFilterDataType(filter)); + const { data, error } = await tryExecuteAndNotify(this.#host, DataTypeService.getFilterDataType(filter)); if (error) { return { error }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/data-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/data-type-detail.server.data-source.ts index 67d697e9eb..0fbed19899 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/data-type-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/detail/data-type-detail.server.data-source.ts @@ -6,7 +6,7 @@ import type { CreateDataTypeRequestModel, UpdateDataTypeRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { DataTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DataTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -57,7 +57,7 @@ export class UmbDataTypeServerDataSource implements UmbDetailDataSource) => DataTypeResource.getItemDataType({ id: uniques }); +const getItems = (uniques: Array) => DataTypeService.getItemDataType({ id: uniques }); const mapper = (item: DataTypeItemResponseModel): UmbDataTypeItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/data-type-move.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/data-type-move.server.data-source.ts index bcbe3a9b25..8152c3e0c5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/data-type-move.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/repository/move/data-type-move.server.data-source.ts @@ -1,4 +1,4 @@ -import { DataTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DataTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbMoveDataSource } from '@umbraco-cms/backoffice/repository'; @@ -33,7 +33,7 @@ export class UmbDataTypeMoveServerDataSource implements UmbMoveDataSource { return tryExecuteAndNotify( this.#host, - DataTypeResource.putDataTypeByIdMove({ + DataTypeService.putDataTypeByIdMove({ id: unique, requestBody: { target: targetUnique ? { id: targetUnique } : null, diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.server.data-source.ts index 8063d1407f..add7e96529 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.server.data-source.ts @@ -6,7 +6,7 @@ import type { } from '@umbraco-cms/backoffice/tree'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; import type { DataTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { DataTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DataTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { type ManifestPropertyEditorUi, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; @@ -45,7 +45,7 @@ export class UmbDataTypeTreeServerDataSource extends UmbTreeServerDataSourceBase const getRootItems = async (args: UmbTreeRootItemsRequestArgs) => { // eslint-disable-next-line local-rules/no-direct-api-import - return DataTypeResource.getTreeDataTypeRoot({ skip: args.skip, take: args.take }); + return DataTypeService.getTreeDataTypeRoot({ skip: args.skip, take: args.take }); }; const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { @@ -53,7 +53,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return DataTypeResource.getTreeDataTypeChildren({ + return DataTypeService.getTreeDataTypeChildren({ parentId: args.parentUnique, skip: args.skip, take: args.take, @@ -63,7 +63,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - DataTypeResource.getTreeDataTypeAncestors({ + DataTypeService.getTreeDataTypeAncestors({ descendantId: args.descendantUnique, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/data-type-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/data-type-folder.server.data-source.ts index e5f5be8799..2068a8ac25 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/data-type-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/data-type-folder.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; -import { DataTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DataTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -32,7 +32,7 @@ export class UmbDataTypeFolderServerDataSource implements UmbFolderDataSource { const { data, error } = await tryExecuteAndNotify( this.#host, - DataTypeResource.getDataTypeFolderById({ + DataTypeService.getDataTypeFolderById({ id: unique, }), ); @@ -67,7 +67,7 @@ export class UmbDataTypeFolderServerDataSource implements UmbFolderDataSource { const { error } = await tryExecuteAndNotify( this.#host, - DataTypeResource.postDataTypeFolder({ + DataTypeService.postDataTypeFolder({ requestBody, }), ); @@ -91,7 +91,7 @@ export class UmbDataTypeFolderServerDataSource implements UmbFolderDataSource { const { error } = await tryExecuteAndNotify( this.#host, - DataTypeResource.putDataTypeFolderById({ + DataTypeService.putDataTypeFolderById({ id: args.unique, requestBody: { name: args.name }, }), @@ -114,7 +114,7 @@ export class UmbDataTypeFolderServerDataSource implements UmbFolderDataSource { if (!unique) throw new Error('Unique is missing'); return tryExecuteAndNotify( this.#host, - DataTypeResource.deleteDataTypeFolderById({ + DataTypeService.deleteDataTypeFolderById({ id: unique, }), ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts index f1c9e01e53..b19167af1a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbDictionaryCollectionFilterModel, UmbDictionaryCollectionModel } from '../types.js'; import { UMB_DICTIONARY_ENTITY_TYPE } from '../../entity.js'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; -import { DictionaryResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DictionaryService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -30,7 +30,7 @@ export class UmbDictionaryCollectionServerDataSource implements UmbCollectionDat * @memberof UmbDictionaryCollectionServerDataSource */ async getCollection(filter: UmbDictionaryCollectionFilterModel) { - const { data, error } = await tryExecuteAndNotify(this.#host, DictionaryResource.getDictionary(filter)); + const { data, error } = await tryExecuteAndNotify(this.#host, DictionaryService.getDictionary(filter)); if (data) { const items = data.items.map((item) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/detail/dictionary-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/detail/dictionary-detail.server.data-source.ts index a41b6389f8..e77fa63992 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/detail/dictionary-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/detail/dictionary-detail.server.data-source.ts @@ -6,7 +6,7 @@ import type { CreateDictionaryItemRequestModel, UpdateDictionaryItemRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { DictionaryResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DictionaryService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -53,7 +53,7 @@ export class UmbDictionaryServerDataSource implements UmbDetailDataSource) => DictionaryResource.getItemDictionary({ id: uniques }); +const getItems = (uniques: Array) => DictionaryService.getItemDictionary({ id: uniques }); const mapper = (item: DictionaryItemItemResponseModel): UmbDictionaryItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.server.data-source.ts index 3cc46577e0..626ae02e76 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.server.data-source.ts @@ -8,7 +8,7 @@ import type { import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { DictionaryResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DictionaryService } from '@umbraco-cms/backoffice/external/backend-api'; /** * A data source for the Dictionary tree that fetches data from the server @@ -37,14 +37,14 @@ export class UmbDictionaryTreeServerDataSource extends UmbTreeServerDataSourceBa const getRootItems = (args: UmbTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - DictionaryResource.getTreeDictionaryRoot({ skip: args.skip, take: args.take }); + DictionaryService.getTreeDictionaryRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { if (args.parentUnique === null) { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return DictionaryResource.getTreeDictionaryChildren({ + return DictionaryService.getTreeDictionaryChildren({ parentId: args.parentUnique, skip: args.skip, take: args.take, @@ -54,7 +54,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - DictionaryResource.getTreeDictionaryAncestors({ + DictionaryService.getTreeDictionaryAncestors({ descendantId: args.descendantUnique, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts index 55c4451cfd..227cf67cca 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts @@ -3,7 +3,7 @@ import { css, html, nothing, customElement, state, query, property } from '@umbr import { umbConfirmModal } from '@umbraco-cms/backoffice/modal'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { RedirectUrlResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { RedirectManagementResource, RedirectStatusModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { RedirectManagementService, RedirectStatusModel } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; @@ -43,7 +43,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement { } async #getTrackerStatus() { - const { data } = await tryExecuteAndNotify(this, RedirectManagementResource.getRedirectManagementStatus()); + const { data } = await tryExecuteAndNotify(this, RedirectManagementService.getRedirectManagementStatus()); if (data && data.status) this._trackerEnabled = data.status === RedirectStatusModel.ENABLED ? true : false; } @@ -52,7 +52,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement { const skip = this.page * this.itemsPerPage - this.itemsPerPage; const { data } = await tryExecuteAndNotify( this, - RedirectManagementResource.getRedirectManagement({ filter, take: this.itemsPerPage, skip }), + RedirectManagementService.getRedirectManagement({ filter, take: this.itemsPerPage, skip }), ); if (!data) return; @@ -89,7 +89,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement { this.#redirectDelete(data.id!); } async #redirectDelete(id: string) { - const { error } = await tryExecuteAndNotify(this, RedirectManagementResource.deleteRedirectManagementById({ id })); + const { error } = await tryExecuteAndNotify(this, RedirectManagementService.deleteRedirectManagementById({ id })); if (error) return; this._redirectData = this._redirectData?.filter((x) => x.id !== id); @@ -129,7 +129,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement { const status = this._trackerEnabled ? RedirectStatusModel.DISABLED : RedirectStatusModel.ENABLED; const { error } = await tryExecuteAndNotify( this, - RedirectManagementResource.postRedirectManagementStatus({ status }), + RedirectManagementService.postRedirectManagementStatus({ status }), ); if (error) return; this._trackerEnabled = !this._trackerEnabled; @@ -173,10 +173,10 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement { ${this._redirectData?.length ? html` ${this._trackerEnabled ? '' : html`
`} ${this.#renderTable()} - ` + ` : this._filter !== undefined - ? this.#renderZeroResults() - : this.#renderNoRedirects()} + ? this.#renderZeroResults() + : this.#renderNoRedirects()} ${this.#renderPagination()}`; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/document-type-composition.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/document-type-composition.server.data-source.ts index e49f351ddc..0422becef4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/document-type-composition.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/document-type-composition.server.data-source.ts @@ -5,7 +5,7 @@ import type { } from '../../types.js'; import { type DocumentTypeCompositionRequestModel, - DocumentTypeResource, + DocumentTypeService, } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -35,7 +35,7 @@ export class UmbDocumentTypeCompositionServerDataSource { async getReferences(unique: string) { const response = await tryExecuteAndNotify( this.#host, - DocumentTypeResource.getDocumentTypeByIdCompositionReferences({ id: unique }), + DocumentTypeService.getDocumentTypeByIdCompositionReferences({ id: unique }), ); const error = response.error; const data: Array | undefined = response.data?.map((reference) => { @@ -64,7 +64,7 @@ export class UmbDocumentTypeCompositionServerDataSource { const response = await tryExecuteAndNotify( this.#host, - DocumentTypeResource.postDocumentTypeAvailableCompositions({ requestBody }), + DocumentTypeService.postDocumentTypeAvailableCompositions({ requestBody }), ); const error = response.error; const data: Array | undefined = response.data?.map((composition) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts index 1d6e7f12a3..23019e7fa2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts @@ -6,7 +6,7 @@ import type { CreateDocumentTypeRequestModel, UpdateDocumentTypeRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { DocumentTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbPropertyTypeContainerModel } from '@umbraco-cms/backoffice/content-type'; @@ -76,7 +76,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc const { data, error } = await tryExecuteAndNotify( this.#host, - DocumentTypeResource.getDocumentTypeById({ id: unique }), + DocumentTypeService.getDocumentTypeById({ id: unique }), ); if (error || !data) { @@ -190,7 +190,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc const { data, error } = await tryExecuteAndNotify( this.#host, - DocumentTypeResource.postDocumentType({ + DocumentTypeService.postDocumentType({ requestBody, }), ); @@ -257,7 +257,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc const { error } = await tryExecuteAndNotify( this.#host, - DocumentTypeResource.putDocumentTypeById({ + DocumentTypeService.putDocumentTypeById({ id: model.unique, requestBody, }), @@ -281,7 +281,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc return tryExecuteAndNotify( this.#host, - DocumentTypeResource.deleteDocumentTypeById({ + DocumentTypeService.deleteDocumentTypeById({ id: unique, }), ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts index 608de5c6d7..3c14064764 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbDocumentTypeItemModel } from './types.js'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; import type { DocumentTypeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { DocumentTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** @@ -25,7 +25,7 @@ export class UmbDocumentTypeItemServerDataSource extends UmbItemServerDataSource } /* eslint-disable local-rules/no-direct-api-import */ -const getItems = (uniques: Array) => DocumentTypeResource.getItemDocumentType({ id: uniques }); +const getItems = (uniques: Array) => DocumentTypeService.getItemDocumentType({ id: uniques }); const mapper = (item: DocumentTypeItemResponseModel): UmbDocumentTypeItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts index 1a4dc8b280..aead8f5ff7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts @@ -1,6 +1,6 @@ import type { UmbAllowedDocumentTypeModel } from './types.js'; import type { AllowedDocumentTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { DocumentTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbContentTypeStructureServerDataSourceBase } from '@umbraco-cms/backoffice/content-type'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -22,10 +22,10 @@ export class UmbDocumentTypeStructureServerDataSource extends UmbContentTypeStru const getAllowedChildrenOf = (unique: string | null) => { if (unique) { // eslint-disable-next-line local-rules/no-direct-api-import - return DocumentTypeResource.getDocumentTypeByIdAllowedChildren({ id: unique }); + return DocumentTypeService.getDocumentTypeByIdAllowedChildren({ id: unique }); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return DocumentTypeResource.getDocumentTypeAllowedAtRoot({}); + return DocumentTypeService.getDocumentTypeAllowedAtRoot({}); } }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts index 6988ebde67..f8df358f0f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts @@ -7,7 +7,7 @@ import type { } from '@umbraco-cms/backoffice/tree'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; import type { DocumentTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { DocumentTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** @@ -37,14 +37,14 @@ export class UmbDocumentTypeTreeServerDataSource extends UmbTreeServerDataSource const getRootItems = (args: UmbTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - DocumentTypeResource.getTreeDocumentTypeRoot({ skip: args.skip, take: args.take }); + DocumentTypeService.getTreeDocumentTypeRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { if (args.parentUnique === null) { return getRootItems({ skip: args.skip, take: args.take }); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return DocumentTypeResource.getTreeDocumentTypeChildren({ + return DocumentTypeService.getTreeDocumentTypeChildren({ parentId: args.parentUnique, skip: args.skip, take: args.take, @@ -54,7 +54,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - DocumentTypeResource.getTreeDocumentTypeAncestors({ + DocumentTypeService.getTreeDocumentTypeAncestors({ descendantId: args.descendantUnique, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts index 5371e5c03f..03d1fcee78 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; -import { DocumentTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -32,7 +32,7 @@ export class UmbDocumentTypeFolderServerDataSource implements UmbFolderDataSourc const { data, error } = await tryExecuteAndNotify( this.#host, - DocumentTypeResource.getDocumentTypeFolderById({ + DocumentTypeService.getDocumentTypeFolderById({ id: unique, }), ); @@ -67,7 +67,7 @@ export class UmbDocumentTypeFolderServerDataSource implements UmbFolderDataSourc const { error } = await tryExecuteAndNotify( this.#host, - DocumentTypeResource.postDocumentTypeFolder({ + DocumentTypeService.postDocumentTypeFolder({ requestBody, }), ); @@ -91,7 +91,7 @@ export class UmbDocumentTypeFolderServerDataSource implements UmbFolderDataSourc const { error } = await tryExecuteAndNotify( this.#host, - DocumentTypeResource.putDocumentTypeFolderById({ + DocumentTypeService.putDocumentTypeFolderById({ id: args.unique, requestBody: { name: args.name }, }), @@ -114,7 +114,7 @@ export class UmbDocumentTypeFolderServerDataSource implements UmbFolderDataSourc if (!unique) throw new Error('Unique is missing'); return tryExecuteAndNotify( this.#host, - DocumentTypeResource.deleteDocumentTypeFolderById({ + DocumentTypeService.deleteDocumentTypeFolderById({ id: unique, }), ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.server.data-source.ts index 1b31e47ebd..a4e93c3b58 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbDocumentCollectionFilterModel, UmbDocumentCollectionItemModel } from '../types.js'; -import { DirectionModel, DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DirectionModel, DocumentService } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { DocumentCollectionResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; @@ -28,7 +28,7 @@ export class UmbDocumentCollectionServerDataSource implements UmbCollectionDataS take: query.take ?? 100, }; - const { data, error } = await tryExecuteAndNotify(this.#host, DocumentResource.getCollectionDocumentById(params)); + const { data, error } = await tryExecuteAndNotify(this.#host, DocumentService.getCollectionDocumentById(params)); if (data) { const items = data.items.map((item: DocumentCollectionResponseModel) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts index 213f6406c0..94d47ff21f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts @@ -1,4 +1,4 @@ -import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UpdateDomainsRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -28,7 +28,7 @@ export class UmbDocumentCultureAndHostnamesServerDataSource { */ async read(unique: string) { if (!unique) throw new Error('Unique is missing'); - return tryExecuteAndNotify(this.#host, DocumentResource.getDocumentByIdDomains({ id: unique })); + return tryExecuteAndNotify(this.#host, DocumentService.getDocumentByIdDomains({ id: unique })); } /** @@ -39,6 +39,6 @@ export class UmbDocumentCultureAndHostnamesServerDataSource { */ async update(unique: string, data: UpdateDomainsRequestModel) { if (!unique) throw new Error('Unique is missing'); - return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdDomains({ id: unique, requestBody: data })); + return tryExecuteAndNotify(this.#host, DocumentService.putDocumentByIdDomains({ id: unique, requestBody: data })); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.server.data.ts index 41e9453d94..61d9fac657 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.server.data.ts @@ -1,4 +1,4 @@ -import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api'; import type { PublicAccessRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -31,7 +31,7 @@ export class UmbDocumentPublicAccessServerDataSource { if (!unique) throw new Error('unique is missing'); return tryExecuteAndNotify( this.#host, - DocumentResource.postDocumentByIdPublicAccess({ id: unique, requestBody: data }), + DocumentService.postDocumentByIdPublicAccess({ id: unique, requestBody: data }), ); } @@ -42,7 +42,7 @@ export class UmbDocumentPublicAccessServerDataSource { */ async read(unique: string) { if (!unique) throw new Error('unique is missing'); - return tryExecuteAndNotify(this.#host, DocumentResource.getDocumentByIdPublicAccess({ id: unique })); + return tryExecuteAndNotify(this.#host, DocumentService.getDocumentByIdPublicAccess({ id: unique })); } /** @@ -53,7 +53,7 @@ export class UmbDocumentPublicAccessServerDataSource { */ async update(unique: string, requestBody: PublicAccessRequestModel) { if (!unique) throw new Error('unique is missing'); - return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdPublicAccess({ id: unique, requestBody })); + return tryExecuteAndNotify(this.#host, DocumentService.putDocumentByIdPublicAccess({ id: unique, requestBody })); } /** @@ -63,6 +63,6 @@ export class UmbDocumentPublicAccessServerDataSource { */ async delete(unique: string) { if (!unique) throw new Error('unique is missing'); - return tryExecuteAndNotify(this.#host, DocumentResource.deleteDocumentByIdPublicAccess({ id: unique })); + return tryExecuteAndNotify(this.#host, DocumentService.deleteDocumentByIdPublicAccess({ id: unique })); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/sort-children-of/repository/sort-children-of.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/sort-children-of/repository/sort-children-of.server.data.ts index e958faa93d..d820a02ffb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/sort-children-of/repository/sort-children-of.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/sort-children-of/repository/sort-children-of.server.data.ts @@ -1,5 +1,5 @@ import type { UmbSortChildrenOfArgs } from './types.js'; -import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -33,7 +33,7 @@ export class UmbSortChildrenOfDocumentServerDataSource { return tryExecuteAndNotify( this.#host, - DocumentResource.putDocumentSort({ + DocumentService.putDocumentSort({ requestBody: { parent: args.unique ? { id: args.unique } : null, sorting: sortingMapping, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/global-contexts/document-configuration.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/global-contexts/document-configuration.context.ts index c7d28e8905..b69994d8a9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/global-contexts/document-configuration.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/global-contexts/document-configuration.context.ts @@ -2,10 +2,7 @@ import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; -import { - DocumentResource, - type DocumentConfigurationResponseModel, -} from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentService, type DocumentConfigurationResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; // TODO: Turn this into a Repository with a Store that holds the cache [NL] @@ -37,7 +34,7 @@ export class UmbDocumentConfigurationContext extends UmbControllerBase implement * @returns A promise that resolves to the document configuration, or null if the configuration could not be fetched. */ async fetchDocumentConfiguration() { - const { data } = await tryExecuteAndNotify(this, DocumentResource.getDocumentConfiguration()); + const { data } = await tryExecuteAndNotify(this, DocumentService.getDocumentConfiguration()); return data ?? null; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/repository/rollback.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/repository/rollback.server.data-source.ts index 2344bdf802..9d2837a7c0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/repository/rollback.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/repository/rollback.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { DocumentVersionResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentVersionService } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; /** @@ -26,7 +26,7 @@ export class UmbRollbackServerDataSource { * @memberof UmbRollbackServerDataSource */ getVersionsByDocumentId(id: string, culture?: string) { - return tryExecuteAndNotify(this.#host, DocumentVersionResource.getDocumentVersion({ documentId: id, culture })); + return tryExecuteAndNotify(this.#host, DocumentVersionService.getDocumentVersion({ documentId: id, culture })); } /** @@ -35,20 +35,20 @@ export class UmbRollbackServerDataSource { * @memberof UmbRollbackServerDataSource */ getVersionById(versionId: string) { - return tryExecuteAndNotify(this.#host, DocumentVersionResource.getDocumentVersionById({ id: versionId })); + return tryExecuteAndNotify(this.#host, DocumentVersionService.getDocumentVersionById({ id: versionId })); } setPreventCleanup(versionId: string, preventCleanup: boolean) { return tryExecuteAndNotify( this.#host, - DocumentVersionResource.putDocumentVersionByIdPreventCleanup({ id: versionId, preventCleanup }), + DocumentVersionService.putDocumentVersionByIdPreventCleanup({ id: versionId, preventCleanup }), ); } rollback(versionId: string, culture?: string) { return tryExecuteAndNotify( this.#host, - DocumentVersionResource.postDocumentVersionByIdRollback({ id: versionId, culture }), + DocumentVersionService.postDocumentVersionByIdRollback({ id: versionId, culture }), ); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/repository/document-recycle-bin.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/repository/document-recycle-bin.server.data-source.ts index 7c8dda0721..4db3dbe660 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/repository/document-recycle-bin.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/repository/document-recycle-bin.server.data-source.ts @@ -5,7 +5,7 @@ import type { UmbRecycleBinOriginalParentRequestArgs, } from '@umbraco-cms/backoffice/recycle-bin'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; export class UmbDocumentRecycleBinServerDataSource implements UmbRecycleBinDataSource { @@ -16,13 +16,13 @@ export class UmbDocumentRecycleBinServerDataSource implements UmbRecycleBinDataS } trash(args: UmbRecycleBinTrashRequestArgs) { - return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdMoveToRecycleBin({ id: args.unique })); + return tryExecuteAndNotify(this.#host, DocumentService.putDocumentByIdMoveToRecycleBin({ id: args.unique })); } restore(args: UmbRecycleBinRestoreRequestArgs) { return tryExecuteAndNotify( this.#host, - DocumentResource.putRecycleBinDocumentByIdRestore({ + DocumentService.putRecycleBinDocumentByIdRestore({ id: args.unique, requestBody: { target: args.destination.unique ? { id: args.destination.unique } : null, @@ -32,13 +32,13 @@ export class UmbDocumentRecycleBinServerDataSource implements UmbRecycleBinDataS } empty() { - return tryExecuteAndNotify(this.#host, DocumentResource.deleteRecycleBinDocument()); + return tryExecuteAndNotify(this.#host, DocumentService.deleteRecycleBinDocument()); } async getOriginalParent(args: UmbRecycleBinOriginalParentRequestArgs) { const { data, error } = await tryExecuteAndNotify( this.#host, - DocumentResource.getRecycleBinDocumentByIdOriginalParent({ id: args.unique }), + DocumentService.getRecycleBinDocumentByIdOriginalParent({ id: args.unique }), ); // only check for undefined because data can be null if the parent is the root diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/document-recycle-bin-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/document-recycle-bin-tree.server.data-source.ts index 4fa19adbd0..45adeddff3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/document-recycle-bin-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/document-recycle-bin-tree.server.data-source.ts @@ -1,7 +1,7 @@ import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js'; import type { UmbDocumentRecycleBinTreeItemModel } from './types.js'; import type { DocumentRecycleBinItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbTreeAncestorsOfRequestArgs, @@ -37,14 +37,14 @@ export class UmbDocumentRecycleBinTreeServerDataSource extends UmbTreeServerData const getRootItems = (args: UmbTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - DocumentResource.getRecycleBinDocumentRoot({ skip: args.skip, take: args.take }); + DocumentService.getRecycleBinDocumentRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { if (args.parentUnique === null) { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return DocumentResource.getRecycleBinDocumentChildren({ + return DocumentService.getRecycleBinDocumentChildren({ parentId: args.parentUnique, skip: args.skip, take: args.take, @@ -54,7 +54,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - DocumentResource.getTreeDocumentAncestors({ + DocumentService.getTreeDocumentAncestors({ descendantId: args.descendantUnique, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/reference/repository/document-reference.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/reference/repository/document-reference.server.data.ts index 1b8cae5e0c..2a872130a3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/reference/repository/document-reference.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/reference/repository/document-reference.server.data.ts @@ -1,4 +1,4 @@ -import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -26,6 +26,6 @@ export class UmbDocumentReferenceServerDataSource { * @memberof UmbDocumentReferenceServerDataSource */ async getReferencedBy(id: string, skip = 0, take = 20) { - return await tryExecuteAndNotify(this.#host, DocumentResource.getDocumentByIdReferencedBy({ id, skip, take })); + return await tryExecuteAndNotify(this.#host, DocumentService.getDocumentByIdReferencedBy({ id, skip, take })); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts index aa8516e2b5..82913b426a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts @@ -6,7 +6,7 @@ import type { CreateDocumentRequestModel, UpdateDocumentRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -80,7 +80,7 @@ export class UmbDocumentServerDataSource implements UmbDetailDataSource) => DocumentResource.getItemDocument({ id: uniques }); +const getItems = (uniques: Array) => DocumentService.getItemDocument({ id: uniques }); const mapper = (item: DocumentItemResponseModel): UmbDocumentItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/publishing/document-publishing.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/publishing/document-publishing.server.data-source.ts index 20cc82657a..af96d59a88 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/publishing/document-publishing.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/publishing/document-publishing.server.data-source.ts @@ -5,7 +5,7 @@ import type { PublishDocumentWithDescendantsRequestModel, UnpublishDocumentRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbVariantId } from '@umbraco-cms/backoffice/variant'; @@ -52,7 +52,7 @@ export class UmbDocumentPublishingServerDataSource { publishSchedules, }; - return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdPublish({ id: unique, requestBody })); + return tryExecuteAndNotify(this.#host, DocumentService.putDocumentByIdPublish({ id: unique, requestBody })); } /** @@ -75,14 +75,14 @@ export class UmbDocumentPublishingServerDataSource { cultures: null, }; - return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdUnpublish({ id: unique, requestBody })); + return tryExecuteAndNotify(this.#host, DocumentService.putDocumentByIdUnpublish({ id: unique, requestBody })); } const requestBody: UnpublishDocumentRequestModel = { cultures: variantIds.map((variant) => variant.toCultureString()), }; - return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdUnpublish({ id: unique, requestBody })); + return tryExecuteAndNotify(this.#host, DocumentService.putDocumentByIdUnpublish({ id: unique, requestBody })); } /** @@ -103,7 +103,7 @@ export class UmbDocumentPublishingServerDataSource { return tryExecuteAndNotify( this.#host, - DocumentResource.putDocumentByIdPublishWithDescendants({ id: unique, requestBody }), + DocumentService.putDocumentByIdPublishWithDescendants({ id: unique, requestBody }), ); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts index 7ca165460b..c10981c388 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts @@ -7,7 +7,7 @@ import type { } from '@umbraco-cms/backoffice/tree'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; import type { DocumentTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** @@ -37,14 +37,14 @@ export class UmbDocumentTreeServerDataSource extends UmbTreeServerDataSourceBase const getRootItems = (args: UmbTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - DocumentResource.getTreeDocumentRoot({ skip: args.skip, take: args.take }); + DocumentService.getTreeDocumentRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { if (args.parentUnique === null) { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return DocumentResource.getTreeDocumentChildren({ + return DocumentService.getTreeDocumentChildren({ parentId: args.parentUnique, skip: args.skip, take: args.take, @@ -54,7 +54,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - DocumentResource.getTreeDocumentAncestors({ + DocumentService.getTreeDocumentAncestors({ descendantId: args.descendantUnique, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.server.data.ts index 9553724bdc..4cd544752f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.server.data.ts @@ -1,4 +1,4 @@ -import { DynamicRootResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DynamicRootService } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { DynamicRootRequestModel, DynamicRootResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -19,7 +19,7 @@ export class UmbDynamicRootServerDataSource { query: args.query, }; - const { data } = await tryExecuteAndNotify(this.#host, DynamicRootResource.postDynamicRootQuery({ requestBody })); + const { data } = await tryExecuteAndNotify(this.#host, DynamicRootService.postDynamicRootQuery({ requestBody })); return data; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/dashboard-health-check.element.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/dashboard-health-check.element.ts index 42455e3a5d..2b2ab13032 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/dashboard-health-check.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/dashboard-health-check.element.ts @@ -2,7 +2,7 @@ import type { UmbDashboardHealthCheckGroupElement } from './views/health-check-g import { UmbHealthCheckDashboardContext, UMB_HEALTHCHECK_DASHBOARD_CONTEXT } from './health-check-dashboard.context.js'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { HealthCheckGroupResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { HealthCheckResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthCheckService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestHealthCheck } from '@umbraco-cms/backoffice/extension-registry'; @@ -43,7 +43,7 @@ export class UmbDashboardHealthCheckElement extends UmbLitElement { } #registerHealthChecks = async () => { - const { data } = await tryExecuteAndNotify(this, HealthCheckResource.getHealthCheckGroup({ skip: 0, take: 9999 })); + const { data } = await tryExecuteAndNotify(this, HealthCheckService.getHealthCheckGroup({ skip: 0, take: 9999 })); if (!data) return; const manifests = this.#createManifests(data.items); this.#register(manifests); diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/health-check.context.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/health-check.context.ts index ba0d2a3631..8c827fbade 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/health-check.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/health-check.context.ts @@ -2,7 +2,7 @@ import type { HealthCheckGroupPresentationModel, HealthCheckGroupWithResultResponseModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { HealthCheckResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthCheckService } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; @@ -17,7 +17,7 @@ export class UmbHealthCheckContext extends UmbControllerBase implements UmbApi { public readonly results = this.#results.asObservable(); async getGroupChecks(name: string) { - const { data } = await tryExecuteAndNotify(this, HealthCheckResource.getHealthCheckGroupByName({ name })); + const { data } = await tryExecuteAndNotify(this, HealthCheckService.getHealthCheckGroupByName({ name })); if (data) { this.#checks.setValue(data); @@ -27,7 +27,7 @@ export class UmbHealthCheckContext extends UmbControllerBase implements UmbApi { } async checkGroup(name: string) { - const { data } = await tryExecuteAndNotify(this, HealthCheckResource.postHealthCheckGroupByNameCheck({ name })); + const { data } = await tryExecuteAndNotify(this, HealthCheckService.postHealthCheckGroupByNameCheck({ name })); if (data) { this.#results.setValue(data); diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-action.element.ts index 9165ea0ff6..33b882d25e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-action.element.ts @@ -2,7 +2,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import type { HealthCheckActionRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { HealthCheckResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthCheckService } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -19,7 +19,7 @@ export class UmbDashboardHealthCheckActionElement extends UmbLitElement { this._buttonState = 'waiting'; const { error } = await tryExecuteAndNotify( this, - HealthCheckResource.postHealthCheckExecuteAction({ requestBody: this.action }), + HealthCheckService.postHealthCheckExecuteAction({ requestBody: this.action }), ); if (error) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts index 4e79bd47bc..7b9b341661 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts @@ -2,7 +2,7 @@ import type { UmbLanguageCollectionFilterModel } from '../types.js'; import type { UmbLanguageDetailModel } from '../../types.js'; import { UMB_LANGUAGE_ENTITY_TYPE } from '../../entity.js'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; -import { LanguageResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { LanguageService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -31,7 +31,7 @@ export class UmbLanguageCollectionServerDataSource implements UmbCollectionDataS * @memberof UmbLanguageCollectionServerDataSource */ async getCollection(filter: UmbLanguageCollectionFilterModel) { - const { data, error } = await tryExecuteAndNotify(this.#host, LanguageResource.getLanguage(filter)); + const { data, error } = await tryExecuteAndNotify(this.#host, LanguageService.getLanguage(filter)); if (data) { const items = data.items.map((item) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/repository/detail/language-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/language/repository/detail/language-detail.server.data-source.ts index b7c7070d0f..46d8e93d94 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/repository/detail/language-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/repository/detail/language-detail.server.data-source.ts @@ -6,7 +6,7 @@ import type { CreateLanguageRequestModel, UpdateLanguageRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { LanguageResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { LanguageService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -59,7 +59,7 @@ export class UmbLanguageServerDataSource implements UmbDetailDataSource) => LanguageResource.getItemLanguage({ isoCode: uniques }); +const getItems = (uniques: Array) => LanguageService.getItemLanguage({ isoCode: uniques }); const mapper = (item: LanguageItemResponseModel): UmbLanguageItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/log-viewer.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/log-viewer.server.data.ts index 8454adbed1..402a34696a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/log-viewer.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/log-viewer.server.data.ts @@ -4,7 +4,7 @@ import type { LogLevelModel, SavedLogSearchResponseModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { LogViewerResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { LogViewerService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -34,7 +34,7 @@ export class UmbLogSearchesServerDataSource implements LogSearchDataSource { * @memberof UmbLogSearchesServerDataSource */ async getAllSavedSearches({ skip = 0, take = 100 }: { skip?: number; take?: number }) { - return await tryExecuteAndNotify(this.#host, LogViewerResource.getLogViewerSavedSearch({ skip, take })); + return await tryExecuteAndNotify(this.#host, LogViewerService.getLogViewerSavedSearch({ skip, take })); } /** * Get a log viewer saved search by name from the server @@ -44,7 +44,7 @@ export class UmbLogSearchesServerDataSource implements LogSearchDataSource { * @memberof UmbLogSearchesServerDataSource */ async getSavedSearchByName({ name }: { name: string }) { - return await tryExecuteAndNotify(this.#host, LogViewerResource.getLogViewerSavedSearchByName({ name })); + return await tryExecuteAndNotify(this.#host, LogViewerService.getLogViewerSavedSearchByName({ name })); } /** @@ -57,7 +57,7 @@ export class UmbLogSearchesServerDataSource implements LogSearchDataSource { async postLogViewerSavedSearch({ name, query }: SavedLogSearchResponseModel) { return await tryExecuteAndNotify( this.#host, - LogViewerResource.postLogViewerSavedSearch({ requestBody: { name, query } }), + LogViewerService.postLogViewerSavedSearch({ requestBody: { name, query } }), ); } /** @@ -68,7 +68,7 @@ export class UmbLogSearchesServerDataSource implements LogSearchDataSource { * @memberof UmbLogSearchesServerDataSource */ async deleteSavedSearchByName({ name }: { name: string }) { - return await tryExecuteAndNotify(this.#host, LogViewerResource.deleteLogViewerSavedSearchByName({ name })); + return await tryExecuteAndNotify(this.#host, LogViewerService.deleteLogViewerSavedSearchByName({ name })); } } /** @@ -98,7 +98,7 @@ export class UmbLogMessagesServerDataSource implements LogMessagesDataSource { * @memberof UmbLogMessagesServerDataSource */ async getLogViewerLevel({ skip = 0, take = 100 }: { skip?: number; take?: number }) { - return await tryExecuteAndNotify(this.#host, LogViewerResource.getLogViewerLevel({ skip, take })); + return await tryExecuteAndNotify(this.#host, LogViewerService.getLogViewerLevel({ skip, take })); } /** @@ -111,7 +111,7 @@ export class UmbLogMessagesServerDataSource implements LogMessagesDataSource { async getLogViewerLevelCount({ startDate, endDate }: { startDate?: string; endDate?: string }) { return await tryExecuteAndNotify( this.#host, - LogViewerResource.getLogViewerLevelCount({ + LogViewerService.getLogViewerLevelCount({ startDate, endDate, }), @@ -159,7 +159,7 @@ export class UmbLogMessagesServerDataSource implements LogMessagesDataSource { }) { return await tryExecuteAndNotify( this.#host, - LogViewerResource.getLogViewerLog({ + LogViewerService.getLogViewerLog({ skip, take, orderDirection, @@ -200,7 +200,7 @@ export class UmbLogMessagesServerDataSource implements LogMessagesDataSource { }) { return await tryExecuteAndNotify( this.#host, - LogViewerResource.getLogViewerMessageTemplate({ + LogViewerService.getLogViewerMessageTemplate({ skip, take, startDate, @@ -212,7 +212,7 @@ export class UmbLogMessagesServerDataSource implements LogMessagesDataSource { async getLogViewerValidateLogsSize({ startDate, endDate }: { startDate?: string; endDate?: string }) { return await tryExecuteAndNotify( this.#host, - LogViewerResource.getLogViewerValidateLogsSize({ + LogViewerService.getLogViewerValidateLogsSize({ startDate, endDate, }), diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts index 2254f77db9..a8908fa616 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts @@ -6,7 +6,7 @@ import type { CreateMediaTypeRequestModel, UpdateMediaTypeRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { MediaTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbPropertyTypeContainerModel } from '@umbraco-cms/backoffice/content-type'; @@ -67,7 +67,7 @@ export class UmbMediaTypeServerDataSource implements UmbDetailDataSource) => MediaTypeResource.getItemMediaType({ id: uniques }); +const getItems = (uniques: Array) => MediaTypeService.getItemMediaType({ id: uniques }); const mapper = (item: MediaTypeItemResponseModel): UmbMediaTypeItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/structure/media-type-structure.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/structure/media-type-structure.server.data-source.ts index 6dc2d1767c..22b833b379 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/structure/media-type-structure.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/structure/media-type-structure.server.data-source.ts @@ -2,7 +2,7 @@ import type { UmbAllowedMediaTypeModel } from './types.js'; import { UmbContentTypeStructureServerDataSourceBase } from '@umbraco-cms/backoffice/content-type'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { AllowedMediaTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { MediaTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaTypeService } from '@umbraco-cms/backoffice/external/backend-api'; /** * @@ -22,10 +22,10 @@ export class UmbMediaTypeStructureServerDataSource extends UmbContentTypeStructu const getAllowedChildrenOf = (unique: string | null) => { if (unique) { // eslint-disable-next-line local-rules/no-direct-api-import - return MediaTypeResource.getMediaTypeByIdAllowedChildren({ id: unique }); + return MediaTypeService.getMediaTypeByIdAllowedChildren({ id: unique }); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return MediaTypeResource.getMediaTypeAllowedAtRoot({}); + return MediaTypeService.getMediaTypeAllowedAtRoot({}); } }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/folder/media-type-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/folder/media-type-folder.server.data-source.ts index 080558d0f0..a83e9ae676 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/folder/media-type-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/folder/media-type-folder.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; -import { MediaTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -32,7 +32,7 @@ export class UmbMediaTypeFolderServerDataSource implements UmbFolderDataSource { const { data, error } = await tryExecuteAndNotify( this.#host, - MediaTypeResource.getMediaTypeFolderById({ + MediaTypeService.getMediaTypeFolderById({ id: unique, }), ); @@ -67,7 +67,7 @@ export class UmbMediaTypeFolderServerDataSource implements UmbFolderDataSource { const { error } = await tryExecuteAndNotify( this.#host, - MediaTypeResource.postMediaTypeFolder({ + MediaTypeService.postMediaTypeFolder({ requestBody, }), ); @@ -91,7 +91,7 @@ export class UmbMediaTypeFolderServerDataSource implements UmbFolderDataSource { const { error } = await tryExecuteAndNotify( this.#host, - MediaTypeResource.putMediaTypeFolderById({ + MediaTypeService.putMediaTypeFolderById({ id: args.unique, requestBody: { name: args.name }, }), @@ -114,7 +114,7 @@ export class UmbMediaTypeFolderServerDataSource implements UmbFolderDataSource { if (!unique) throw new Error('Unique is missing'); return tryExecuteAndNotify( this.#host, - MediaTypeResource.deleteMediaTypeFolderById({ + MediaTypeService.deleteMediaTypeFolderById({ id: unique, }), ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.server.data-source.ts index 203056945e..45ab65334e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.server.data-source.ts @@ -1,7 +1,7 @@ import { UMB_MEDIA_TYPE_ENTITY_TYPE, UMB_MEDIA_TYPE_FOLDER_ENTITY_TYPE } from '../entity.js'; import type { UmbMediaTypeTreeItemModel } from './types.js'; import type { MediaTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { MediaTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbTreeAncestorsOfRequestArgs, @@ -37,14 +37,14 @@ export class UmbMediaTypeTreeServerDataSource extends UmbTreeServerDataSourceBas const getRootItems = (args: UmbTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - MediaTypeResource.getTreeMediaTypeRoot({ skip: args.skip, take: args.take }); + MediaTypeService.getTreeMediaTypeRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { if (args.parentUnique === null) { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return MediaTypeResource.getTreeMediaTypeChildren({ + return MediaTypeService.getTreeMediaTypeChildren({ parentId: args.parentUnique, skip: args.skip, take: args.take, @@ -54,7 +54,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - MediaTypeResource.getTreeMediaTypeAncestors({ + MediaTypeService.getTreeMediaTypeAncestors({ descendantId: args.descendantUnique, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.server.data-source.ts index 14331f9dfc..d8a243868f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbMediaCollectionFilterModel, UmbMediaCollectionItemModel } from '../types.js'; -import { DirectionModel, MediaResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { DirectionModel, MediaService } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { MediaCollectionResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; @@ -23,7 +23,7 @@ export class UmbMediaCollectionServerDataSource implements UmbCollectionDataSour take: query.take ?? 100, }; - const { data, error } = await tryExecuteAndNotify(this.#host, MediaResource.getCollectionMedia(params)); + const { data, error } = await tryExecuteAndNotify(this.#host, MediaService.getCollectionMedia(params)); if (data) { const items = data.items.map((item: MediaCollectionResponseModel) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/repository/media-recycle-bin.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/repository/media-recycle-bin.server.data-source.ts index 91eedae21f..6348f879fa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/repository/media-recycle-bin.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/repository/media-recycle-bin.server.data-source.ts @@ -5,7 +5,7 @@ import type { UmbRecycleBinOriginalParentRequestArgs, } from '@umbraco-cms/backoffice/recycle-bin'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { MediaResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaService } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; export class UmbMediaRecycleBinServerDataSource implements UmbRecycleBinDataSource { @@ -16,13 +16,13 @@ export class UmbMediaRecycleBinServerDataSource implements UmbRecycleBinDataSour } trash(args: UmbRecycleBinTrashRequestArgs) { - return tryExecuteAndNotify(this.#host, MediaResource.putMediaByIdMoveToRecycleBin({ id: args.unique })); + return tryExecuteAndNotify(this.#host, MediaService.putMediaByIdMoveToRecycleBin({ id: args.unique })); } restore(args: UmbRecycleBinRestoreRequestArgs) { return tryExecuteAndNotify( this.#host, - MediaResource.putRecycleBinMediaByIdRestore({ + MediaService.putRecycleBinMediaByIdRestore({ id: args.unique, requestBody: { target: args.destination.unique ? { id: args.destination.unique } : null, @@ -32,13 +32,13 @@ export class UmbMediaRecycleBinServerDataSource implements UmbRecycleBinDataSour } empty() { - return tryExecuteAndNotify(this.#host, MediaResource.deleteRecycleBinMedia()); + return tryExecuteAndNotify(this.#host, MediaService.deleteRecycleBinMedia()); } async getOriginalParent(args: UmbRecycleBinOriginalParentRequestArgs) { const { data, error } = await tryExecuteAndNotify( this.#host, - MediaResource.getRecycleBinMediaByIdOriginalParent({ id: args.unique }), + MediaService.getRecycleBinMediaByIdOriginalParent({ id: args.unique }), ); // only check for undefined because data can be null if the parent is the root diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/tree/media-recycle-bin-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/tree/media-recycle-bin-tree.server.data-source.ts index a9fa6bdf6c..9907d34e88 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/tree/media-recycle-bin-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/recycle-bin/tree/media-recycle-bin-tree.server.data-source.ts @@ -1,7 +1,7 @@ import { UMB_MEDIA_ENTITY_TYPE } from '../../entity.js'; import type { UmbMediaRecycleBinTreeItemModel } from './types.js'; import type { MediaRecycleBinItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { MediaResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbTreeAncestorsOfRequestArgs, @@ -37,14 +37,14 @@ export class UmbMediaRecycleBinTreeServerDataSource extends UmbTreeServerDataSou const getRootItems = (args: UmbTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - MediaResource.getRecycleBinMediaRoot({ skip: args.skip, take: args.take }); + MediaService.getRecycleBinMediaRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { if (args.parentUnique === null) { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return MediaResource.getRecycleBinMediaChildren({ + return MediaService.getRecycleBinMediaChildren({ parentId: args.parentUnique, skip: args.skip, take: args.take, @@ -54,7 +54,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - MediaResource.getTreeMediaAncestors({ + MediaService.getTreeMediaAncestors({ descendantId: args.descendantUnique, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/reference/repository/media-reference.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/reference/repository/media-reference.server.data.ts index b8f1177398..7def339e28 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/reference/repository/media-reference.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/reference/repository/media-reference.server.data.ts @@ -1,5 +1,5 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { MediaResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaService } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; /** @@ -26,6 +26,6 @@ export class UmbMediaReferenceServerDataSource { * @memberof UmbMediaReferenceServerDataSource */ async getReferencedBy(id: string, skip = 0, take = 20) { - return await tryExecuteAndNotify(this.#host, MediaResource.getMediaByIdReferencedBy({ id, skip, take })); + return await tryExecuteAndNotify(this.#host, MediaService.getMediaByIdReferencedBy({ id, skip, take })); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts index 5aba5c5b97..29cd802d92 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts @@ -3,7 +3,7 @@ import { UMB_MEDIA_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; import type { CreateMediaRequestModel, UpdateMediaRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { MediaResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -66,7 +66,7 @@ export class UmbMediaServerDataSource implements UmbDetailDataSource) => MediaResource.getItemMedia({ id: uniques }); +const getItems = (uniques: Array) => MediaService.getItemMedia({ id: uniques }); const mapper = (item: MediaItemResponseModel): UmbMediaItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.server.data-source.ts index a9223242b6..3522d289fd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.server.data-source.ts @@ -6,7 +6,7 @@ import type { UmbTreeRootItemsRequestArgs, } from '@umbraco-cms/backoffice/tree'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; -import { MediaResource, type MediaTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaService, type MediaTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** @@ -36,14 +36,14 @@ export class UmbMediaTreeServerDataSource extends UmbTreeServerDataSourceBase< const getRootItems = (args: UmbTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - MediaResource.getTreeMediaRoot({ skip: args.skip, take: args.take }); + MediaService.getTreeMediaRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { if (args.parentUnique === null) { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return MediaResource.getTreeMediaChildren({ + return MediaService.getTreeMediaChildren({ parentId: args.parentUnique, skip: args.skip, take: args.take, @@ -53,7 +53,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - MediaResource.getTreeMediaAncestors({ + MediaService.getTreeMediaAncestors({ descendantId: args.descendantUnique, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.server.data-source.ts index 4ba9a19e08..5ca4fe119d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.server.data-source.ts @@ -5,7 +5,7 @@ import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { MemberGroupResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { MemberGroupResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MemberGroupService } from '@umbraco-cms/backoffice/external/backend-api'; /** * A data source that fetches the member collection data from the server. @@ -32,7 +32,7 @@ export class UmbMemberGroupCollectionServerDataSource implements UmbCollectionDa * @memberof UmbMemberGroupCollectionServerDataSource */ async getCollection(filter: UmbMemberGroupCollectionFilterModel) { - const { data, error } = await tryExecuteAndNotify(this.#host, MemberGroupResource.getMemberGroup(filter)); + const { data, error } = await tryExecuteAndNotify(this.#host, MemberGroupService.getMemberGroup(filter)); if (error) { return { error }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/repository/detail/member-group-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/repository/detail/member-group-detail.server.data-source.ts index 099082a55e..a81abc353d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/repository/detail/member-group-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/repository/detail/member-group-detail.server.data-source.ts @@ -5,7 +5,7 @@ import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { CreateMemberGroupRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { MemberGroupResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MemberGroupService } from '@umbraco-cms/backoffice/external/backend-api'; /** * A data source for the Member Group that fetches data from the server @@ -52,7 +52,7 @@ export class UmbMemberGroupServerDataSource implements UmbDetailDataSource) => MemberGroupResource.getItemMemberGroup({ id: uniques }); +const getItems = (uniques: Array) => MemberGroupService.getItemMemberGroup({ id: uniques }); const mapper = (item: MemberGroupItemResponseModel): UmbMemberGroupItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/repository/detail/member-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/repository/detail/member-type-detail.server.data-source.ts index cf717ef3df..aac637749c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/repository/detail/member-type-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/repository/detail/member-type-detail.server.data-source.ts @@ -6,7 +6,7 @@ import type { CreateMemberTypeRequestModel, UpdateMemberTypeRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { MemberTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MemberTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbPropertyContainerTypes } from '@umbraco-cms/backoffice/content-type'; @@ -67,7 +67,7 @@ export class UmbMemberTypeServerDataSource implements UmbDetailDataSource) => MemberTypeResource.getItemMemberType({ id: uniques }); +const getItems = (uniques: Array) => MemberTypeService.getItemMemberType({ id: uniques }); const mapper = (item: MemberTypeItemResponseModel): UmbMemberTypeItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/member-type-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/member-type-tree.server.data-source.ts index c593f6fa68..41be9cbe23 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/member-type-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/member-type-tree.server.data-source.ts @@ -3,7 +3,7 @@ import type { UmbMemberTypeTreeItemModel } from './types.js'; import type { UmbTreeChildrenOfRequestArgs, UmbTreeRootItemsRequestArgs } from '@umbraco-cms/backoffice/tree'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { MemberTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MemberTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** @@ -33,7 +33,7 @@ export class UmbMemberTypeTreeServerDataSource extends UmbTreeServerDataSourceBa const getRootItems = (args: UmbTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - MemberTypeResource.getTreeMemberTypeRoot({ skip: args.skip, take: args.take }); + MemberTypeService.getTreeMemberTypeRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { if (args.parentUnique === null) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts index d9df07980f..ca64ad7003 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts @@ -4,7 +4,7 @@ import type { UmbMemberCollectionFilterModel } from '../types.js'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import type { MemberResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { MemberResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MemberService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbVariantModel } from '@umbraco-cms/backoffice/variant'; @@ -33,7 +33,7 @@ export class UmbMemberCollectionServerDataSource implements UmbCollectionDataSou * @memberof UmbMemberCollectionServerDataSource */ async getCollection(filter: UmbMemberCollectionFilterModel) { - const { data, error } = await tryExecuteAndNotify(this.#host, MemberResource.getFilterMember(filter)); + const { data, error } = await tryExecuteAndNotify(this.#host, MemberService.getFilterMember(filter)); if (error) { return { error }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts index 4a1a62c604..a3a123d02c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts @@ -3,7 +3,7 @@ import { UMB_MEMBER_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; import type { CreateMemberRequestModel, UpdateMemberRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { MemberResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { MemberService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -73,7 +73,7 @@ export class UmbMemberServerDataSource implements UmbDetailDataSource) => MemberResource.getItemMember({ id: uniques }); +const getItems = (uniques: Array) => MemberService.getItemMember({ id: uniques }); const mapper = (item: MemberItemResponseModel): UmbMemberItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/models-builder/models-builder-dashboard.element.ts b/src/Umbraco.Web.UI.Client/src/packages/models-builder/models-builder-dashboard.element.ts index e9f08b1220..03f5c50531 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/models-builder/models-builder-dashboard.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/models-builder/models-builder-dashboard.element.ts @@ -2,7 +2,7 @@ import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { ModelsBuilderResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { ModelsBuilderResource, ModelsModeModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { ModelsBuilderService, ModelsModeModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; @@ -24,7 +24,7 @@ export class UmbModelsBuilderDashboardElement extends UmbLitElement { } private async _getDashboardData() { - const { data } = await tryExecuteAndNotify(this, ModelsBuilderResource.getModelsBuilderDashboard()); + const { data } = await tryExecuteAndNotify(this, ModelsBuilderService.getModelsBuilderDashboard()); if (data) { this._modelsBuilder = data; return true; @@ -39,7 +39,7 @@ export class UmbModelsBuilderDashboardElement extends UmbLitElement { } private async _postGenerateModels() { - const { error } = await tryExecuteAndNotify(this, ModelsBuilderResource.postModelsBuilderBuild()); + const { error } = await tryExecuteAndNotify(this, ModelsBuilderService.postModelsBuilderBuild()); if (error) { return false; } @@ -74,7 +74,7 @@ export class UmbModelsBuilderDashboardElement extends UmbLitElement { ${this._modelsBuilder?.mode ? html`
  • The ModelsMode is '${this._modelsBuilder.mode}'. ${this.renderModelsMode()} -
    • ` + ` : nothing} ${this.renderList()} @@ -90,7 +90,7 @@ export class UmbModelsBuilderDashboardElement extends UmbLitElement { label="Generate models" @click="${this._onGenerateModels}"> Generate models - ` + ` : nothing}

    ${this._modelsBuilder?.lastError @@ -109,8 +109,8 @@ export class UmbModelsBuilderDashboardElement extends UmbLitElement { ${this._modelsBuilder?.trackingOutOfDateModels === true ? html`
  • Tracking of out-of-date models is enabled.
    • ` : this._modelsBuilder?.trackingOutOfDateModels === false - ? html`
  • Tracking of out-of-date models is not enabled.
    • ` - : nothing}`; + ? html`
  • Tracking of out-of-date models is not enabled.
    • ` + : nothing}`; } return nothing; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/object-type/object-type.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/object-type/object-type.repository.ts index 7669921f21..ab9fa73ee5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/object-type/object-type.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/object-type/object-type.repository.ts @@ -1,4 +1,4 @@ -import { ObjectTypesResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { ObjectTypesService } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; @@ -14,7 +14,7 @@ export class UmbObjectTypeRepository extends UmbControllerBase implements UmbApi } async #read() { - return tryExecuteAndNotify(this.#host, ObjectTypesResource.getObjectTypes({})); + return tryExecuteAndNotify(this.#host, ObjectTypesService.getObjectTypes({})); } async read() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts index 324658656f..bf2ac4e49b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts @@ -1,6 +1,6 @@ import { html, css, nothing, ifDefined, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; -import { PackageResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { PackageService } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import { umbConfirmModal } from '@umbraco-cms/backoffice/modal'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; @@ -101,7 +101,7 @@ export class UmbInstalledPackagesSectionViewItemElement extends UmbLitElement { this._migrationButtonState = 'waiting'; const { error } = await tryExecuteAndNotify( this, - PackageResource.postPackageByNameRunMigration({ name: this.name }), + PackageService.postPackageByNameRunMigration({ name: this.name }), ); if (error) return; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/sources/package.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/sources/package.server.data.ts index a3e1aa7974..ae20261028 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/sources/package.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/sources/package.server.data.ts @@ -1,5 +1,5 @@ import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { ManifestResource, PackageResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { ManifestService, PackageService } from '@umbraco-cms/backoffice/external/backend-api'; import type { CreatePackageRequestModel, UpdatePackageRequestModel, @@ -14,19 +14,19 @@ export class UmbPackageServerDataSource { constructor(private readonly host: UmbControllerHost) {} async deleteCreatedPackage(unique: string) { - return await tryExecuteAndNotify(this.host, PackageResource.deletePackageCreatedById({ id: unique })); + return await tryExecuteAndNotify(this.host, PackageService.deletePackageCreatedById({ id: unique })); } getCreatedPackage(unique: string) { - return tryExecuteAndNotify(this.host, PackageResource.getPackageCreatedById({ id: unique })); + return tryExecuteAndNotify(this.host, PackageService.getPackageCreatedById({ id: unique })); } getCreatedPackages({ skip, take }: { skip: number; take: number }) { - return tryExecuteAndNotify(this.host, PackageResource.getPackageCreated({ skip, take })); + return tryExecuteAndNotify(this.host, PackageService.getPackageCreated({ skip, take })); } getCreatePackageDownload(unique: string) { - return tryExecuteAndNotify(this.host, PackageResource.getPackageCreatedByIdDownload({ id: unique })); + return tryExecuteAndNotify(this.host, PackageService.getPackageCreatedByIdDownload({ id: unique })); } /** @@ -34,7 +34,7 @@ export class UmbPackageServerDataSource { * @memberof UmbPackageServerDataSource */ getRootItems() { - return tryExecuteAndNotify(this.host, ManifestResource.getManifestManifest()); + return tryExecuteAndNotify(this.host, ManifestService.getManifestManifest()); } /** @@ -42,7 +42,7 @@ export class UmbPackageServerDataSource { * @memberof UmbPackageServerDataSource */ getPackageConfiguration() { - return tryExecuteAndNotify(this.host, PackageResource.getPackageConfiguration()); + return tryExecuteAndNotify(this.host, PackageService.getPackageConfiguration()); } /** @@ -50,14 +50,14 @@ export class UmbPackageServerDataSource { * @memberof UmbPackageServerDataSource */ getPackageMigrations() { - return tryExecuteAndNotify(this.host, PackageResource.getPackageMigrationStatus({ skip: 0, take: 9999 })); + return tryExecuteAndNotify(this.host, PackageService.getPackageMigrationStatus({ skip: 0, take: 9999 })); } async saveCreatedPackage(requestBody: CreatePackageRequestModel) { - return await tryExecuteAndNotify(this.host, PackageResource.postPackageCreated({ requestBody })); + return await tryExecuteAndNotify(this.host, PackageService.postPackageCreated({ requestBody })); } async updateCreatedPackage(id: string, requestBody: UpdatePackageRequestModel) { - return await tryExecuteAndNotify(this.host, PackageResource.putPackageCreatedById({ id, requestBody })); + return await tryExecuteAndNotify(this.host, PackageService.putPackageCreatedById({ id, requestBody })); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/relation-type-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/relation-type-collection.server.data-source.ts index b1fb2a947a..0759a38fbb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/relation-type-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/relation-type-collection.server.data-source.ts @@ -2,7 +2,7 @@ import type { UmbRelationTypeCollectionFilterModel } from '../types.js'; import type { UmbRelationTypeDetailModel } from '../../types.js'; import { UMB_RELATION_TYPE_ENTITY_TYPE } from '../../entity.js'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; -import { RelationTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { RelationTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -31,7 +31,7 @@ export class UmbRelationTypeCollectionServerDataSource implements UmbCollectionD * @memberof UmbRelationTypeCollectionServerDataSource */ async getCollection(filter: UmbRelationTypeCollectionFilterModel) { - const { data, error } = await tryExecuteAndNotify(this.#host, RelationTypeResource.getRelationType(filter)); + const { data, error } = await tryExecuteAndNotify(this.#host, RelationTypeService.getRelationType(filter)); if (data) { const items = data.items.map((item) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/relation-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/relation-type-detail.server.data-source.ts index 897b3bdb28..a196655e7f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/relation-type-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/relation-type-detail.server.data-source.ts @@ -1,6 +1,6 @@ import type { UmbRelationTypeDetailModel } from '../../types.js'; import { UMB_RELATION_TYPE_ENTITY_TYPE } from '../../entity.js'; -import { RelationTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { RelationTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbReadDetailDataSource } from '@umbraco-cms/backoffice/repository'; @@ -34,7 +34,7 @@ export class UmbRelationTypeDetailServerDataSource implements UmbReadDetailDataS const { data, error } = await tryExecuteAndNotify( this.#host, - RelationTypeResource.getRelationTypeById({ id: unique }), + RelationTypeService.getRelationTypeById({ id: unique }), ); if (error || !data) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relations/collection/repository/relation-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relations/collection/repository/relation-collection.server.data-source.ts index 48d9103712..96abd9cbc7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relations/collection/repository/relation-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relations/collection/repository/relation-collection.server.data-source.ts @@ -2,7 +2,7 @@ import type { UmbRelationCollectionFilterModel } from '../types.js'; import type { UmbRelationDetailModel } from '../../types.js'; import { UMB_RELATION_ENTITY_TYPE } from '../../entity.js'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; -import { RelationResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { RelationService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -37,7 +37,7 @@ export class UmbRelationCollectionServerDataSource implements UmbCollectionDataS id: filter.relationType.unique, }; - const { data, error } = await tryExecuteAndNotify(this.#host, RelationResource.getRelationTypeById(requestBody)); + const { data, error } = await tryExecuteAndNotify(this.#host, RelationService.getRelationTypeById(requestBody)); if (data) { const items = data.items.map((item) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts index 0f0a80fa9e..9d86f91654 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts @@ -2,7 +2,7 @@ import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { umbConfirmModal } from '@umbraco-cms/backoffice/modal'; import type { IndexResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { HealthStatusModel, IndexerResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthStatusModel, IndexerService } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -31,7 +31,7 @@ export class UmbDashboardExamineIndexElement extends UmbLitElement { private async _getIndexData() { const { data } = await tryExecuteAndNotify( this, - IndexerResource.getIndexerByIndexName({ indexName: this.indexName }), + IndexerService.getIndexerByIndexName({ indexName: this.indexName }), ); this._indexData = data; @@ -62,7 +62,7 @@ export class UmbDashboardExamineIndexElement extends UmbLitElement { this._buttonState = 'waiting'; const { error } = await tryExecuteAndNotify( this, - IndexerResource.postIndexerByIndexNameRebuild({ indexName: this.indexName }), + IndexerService.postIndexerByIndexNameRebuild({ indexName: this.indexName }), ); if (error) { this._buttonState = 'failed'; @@ -123,7 +123,7 @@ export class UmbDashboardExamineIndexElement extends UmbLitElement { ${entry[0]} ${entry[1]} `; - }) + }) : ''} `; diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-overview.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-overview.ts index dbd33c3214..c14200b221 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-overview.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-overview.ts @@ -2,7 +2,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { IndexResponseModel, SearcherResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { HealthStatusModel, IndexerResource, SearcherResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthStatusModel, IndexerService, SearcherService } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -28,14 +28,14 @@ export class UmbDashboardExamineOverviewElement extends UmbLitElement { private async _getIndexers() { this._loadingIndexers = true; - const { data } = await tryExecuteAndNotify(this, IndexerResource.getIndexer({ take: 9999, skip: 0 })); + const { data } = await tryExecuteAndNotify(this, IndexerService.getIndexer({ take: 9999, skip: 0 })); this._indexers = data?.items ?? []; this._loadingIndexers = false; } private async _getSearchers() { this._loadingSearchers = true; - const { data } = await tryExecuteAndNotify(this, SearcherResource.getSearcher({ take: 9999, skip: 0 })); + const { data } = await tryExecuteAndNotify(this, SearcherService.getSearcher({ take: 9999, skip: 0 })); this._searchers = data?.items ?? []; this._loadingSearchers = false; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts index ac6fcb3c92..05d8649b00 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts @@ -2,7 +2,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, state, query, property } from '@umbraco-cms/backoffice/external/lit'; import { UMB_MODAL_MANAGER_CONTEXT, UMB_EXAMINE_FIELDS_SETTINGS_MODAL } from '@umbraco-cms/backoffice/modal'; import type { SearchResultResponseModel, FieldPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { SearcherResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { SearcherService } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -46,7 +46,7 @@ export class UmbDashboardExamineSearcherElement extends UmbLitElement { const { data } = await tryExecuteAndNotify( this, - SearcherResource.getSearcherBySearcherNameQuery({ + SearcherService.getSearcherBySearcherNameQuery({ searcherName: this.searcherName, term: this._searchInput.value, take: 100, @@ -73,10 +73,10 @@ export class UmbDashboardExamineSearcherElement extends UmbLitElement { this._exposedFields = this._exposedFields ? this._exposedFields.filter((field) => { return { name: field.name, exposed: field.exposed }; - }) + }) : newFieldNames?.map((name) => { return { name, exposed: false }; - }); + }); } }); } @@ -194,7 +194,7 @@ export class UmbDashboardExamineSearcherElement extends UmbLitElement { >x - ` + ` : html``; })}`; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts index 5cb5371c94..ad9fe8097d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts @@ -1,7 +1,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state, query, unsafeHTML } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; -import { ProfilingResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { ProfilingService } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @customElement('umb-dashboard-performance-profiling') @@ -26,7 +26,7 @@ export class UmbDashboardPerformanceProfilingElement extends UmbLitElement { } private async _getProfilingStatus() { - const { data } = await tryExecuteAndNotify(this, ProfilingResource.getProfilingStatus()); + const { data } = await tryExecuteAndNotify(this, ProfilingService.getProfilingStatus()); if (!data) return; this._profilingStatus = data.enabled ?? false; @@ -35,7 +35,7 @@ export class UmbDashboardPerformanceProfilingElement extends UmbLitElement { private async _changeProfilingStatus() { const { error } = await tryExecuteAndNotify( this, - ProfilingResource.putProfilingStatus({ requestBody: { enabled: !this._profilingStatus } }), + ProfilingService.putProfilingStatus({ requestBody: { enabled: !this._profilingStatus } }), ); if (error) { @@ -60,7 +60,7 @@ export class UmbDashboardPerformanceProfilingElement extends UmbLitElement {

    ${this.localize.term('profiling_reminder')}

    ${unsafeHTML(this.localize.term('profiling_reminderDescription'))} - ` + ` : html` ${unsafeHTML(this.localize.term('profiling_profilerEnabledDescription'))} `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts index 526de9e794..190b775b43 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts @@ -1,7 +1,7 @@ import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { umbConfirmModal } from '@umbraco-cms/backoffice/modal'; -import { PublishedCacheResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { PublishedCacheService } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; @@ -30,7 +30,7 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement { // Refresh private async _getPublishedStatus() { - const { data } = await tryExecuteAndNotify(this, PublishedCacheResource.getPublishedCacheStatus()); + const { data } = await tryExecuteAndNotify(this, PublishedCacheService.getPublishedCacheStatus()); if (data) { this._publishedStatusText = data; } @@ -46,7 +46,7 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement { private async _reloadMemoryCache() { this._buttonStateReload = 'waiting'; this._buttonState = 'waiting'; - const { error } = await tryExecuteAndNotify(this, PublishedCacheResource.postPublishedCacheReload()); + const { error } = await tryExecuteAndNotify(this, PublishedCacheService.postPublishedCacheReload()); if (error) { this._buttonStateReload = 'failed'; this._buttonState = 'failed'; @@ -70,7 +70,7 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement { // Rebuild private async _rebuildDatabaseCache() { this._buttonStateRebuild = 'waiting'; - const { error } = await tryExecuteAndNotify(this, PublishedCacheResource.postPublishedCacheRebuild()); + const { error } = await tryExecuteAndNotify(this, PublishedCacheService.postPublishedCacheRebuild()); if (error) { this._buttonStateRebuild = 'failed'; } else { @@ -92,7 +92,7 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement { //Collect private async _cacheCollect() { this._buttonStateCollect = 'waiting'; - const { error } = await tryExecuteAndNotify(this, PublishedCacheResource.postPublishedCacheCollect()); + const { error } = await tryExecuteAndNotify(this, PublishedCacheService.postPublishedCacheCollect()); if (error) { this._buttonStateCollect = 'failed'; } else { diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.element.ts index 237a7e1669..d4bad8ee8d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.element.ts @@ -1,7 +1,7 @@ import { css, html, customElement, state, unsafeHTML } from '@umbraco-cms/backoffice/external/lit'; import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import type { TelemetryResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { TelemetryLevelModel, TelemetryResource, ApiError } from '@umbraco-cms/backoffice/external/backend-api'; +import { TelemetryLevelModel, TelemetryService, ApiError } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; @@ -26,10 +26,10 @@ export class UmbDashboardTelemetryElement extends UmbLitElement { } private async _setup() { - const telemetryLevels = await tryExecuteAndNotify(this, TelemetryResource.getTelemetry({ skip: 0, take: 3 })); + const telemetryLevels = await tryExecuteAndNotify(this, TelemetryService.getTelemetry({ skip: 0, take: 3 })); this._telemetryLevels = telemetryLevels.data?.items ?? []; - const telemetryLevel = await tryExecuteAndNotify(this, TelemetryResource.getTelemetryLevel()); + const telemetryLevel = await tryExecuteAndNotify(this, TelemetryService.getTelemetryLevel()); this._telemetryFormData = telemetryLevel.data?.telemetryLevel ?? TelemetryLevelModel.BASIC; } @@ -40,7 +40,7 @@ export class UmbDashboardTelemetryElement extends UmbLitElement { const { error } = await tryExecuteAndNotify( this, - TelemetryResource.postTelemetryLevel({ + TelemetryService.postTelemetryLevel({ requestBody: { telemetryLevel: this._telemetryFormData }, }), ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/repository/item/static-file-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/repository/item/static-file-item.server.data-source.ts index 294314b69c..0bd42e077f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/static-file/repository/item/static-file-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/repository/item/static-file-item.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbStaticFileItemModel } from './types.js'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; import type { StaticFileItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { StaticFileResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { StaticFileService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** @@ -28,7 +28,7 @@ export class UmbStaticFileItemServerDataSource extends UmbItemServerDataSourceBa } /* eslint-disable local-rules/no-direct-api-import */ -const getItems = (uniques: Array) => StaticFileResource.getItemStaticFile({ path: uniques }); +const getItems = (uniques: Array) => StaticFileService.getItemStaticFile({ path: uniques }); const mapper = (item: StaticFileItemResponseModel): UmbStaticFileItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.server.data-source.ts index 0d7345bdda..53dc833a15 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.server.data-source.ts @@ -8,7 +8,7 @@ import type { } from '@umbraco-cms/backoffice/tree'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; import { - StaticFileResource, + StaticFileService, type FileSystemTreeItemPresentationModel, } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -40,7 +40,7 @@ export class UmbStaticFileTreeServerDataSource extends UmbTreeServerDataSourceBa const getRootItems = (args: UmbTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - StaticFileResource.getTreeStaticFileRoot({ skip: args.skip, take: args.take }); + StaticFileService.getTreeStaticFileRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parentUnique); @@ -49,7 +49,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return StaticFileResource.getTreeStaticFileChildren({ + return StaticFileService.getTreeStaticFileChildren({ parentPath, skip: args.skip, take: args.take, @@ -59,7 +59,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - StaticFileResource.getTreeStaticFileAncestors({ + StaticFileService.getTreeStaticFileAncestors({ descendantPath: args.descendantUnique, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/repository/sources/tag.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/repository/sources/tag.server.data.ts index 5f88952d4b..af9a893f1d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/repository/sources/tag.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/repository/sources/tag.server.data.ts @@ -1,4 +1,4 @@ -import { TagResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { TagService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -38,6 +38,6 @@ export class UmbTagServerDataSource { tagGroup?: string; culture?: string; }) { - return tryExecuteAndNotify(this.#host, TagResource.getTag({ query, skip, take, tagGroup, culture })); + return tryExecuteAndNotify(this.#host, TagService.getTag({ query, skip, take, tagGroup, culture })); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.ts index 6e38934bd0..8aed2e2718 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.ts @@ -3,7 +3,7 @@ import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { PartialViewSnippetItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { PartialViewResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { PartialViewService } from '@umbraco-cms/backoffice/external/backend-api'; interface UmbSnippetLinkModel { name: string; @@ -25,7 +25,7 @@ export class UmbPartialViewCreateFromSnippetModalElement extends UmbModalBaseEle } protected async firstUpdated() { - const { data } = await tryExecuteAndNotify(this, PartialViewResource.getPartialViewSnippet({ take: 10000 })); + const { data } = await tryExecuteAndNotify(this, PartialViewService.getPartialViewSnippet({ take: 10000 })); if (data) { this._snippets = data.items.map((snippet) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.server.data-source.ts index df91eb5c04..5f178979f4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.server.data-source.ts @@ -4,7 +4,7 @@ import { appendFileExtensionIfNeeded, } from '@umbraco-cms/backoffice/server-file-system'; import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { PartialViewResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { PartialViewService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -38,7 +38,7 @@ export class UmbRenamePartialViewServerDataSource { const { data, error } = await tryExecuteAndNotify( this.#host, - PartialViewResource.putPartialViewByPathRename({ + PartialViewService.putPartialViewByPathRename({ path: encodeURIComponent(path), requestBody, }), diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/item/partial-view-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/item/partial-view-item.server.data-source.ts index 0dcd3f2a06..96b2840354 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/item/partial-view-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/item/partial-view-item.server.data-source.ts @@ -4,7 +4,7 @@ import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/serve import type { UmbItemDataSource } from '@umbraco-cms/backoffice/repository'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { PartialViewResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { PartialViewService } from '@umbraco-cms/backoffice/external/backend-api'; /** * A data source for script items that fetches data from the server @@ -43,7 +43,7 @@ export class UmbPartialViewItemServerDataSource implements UmbItemDataSource // eslint-disable-next-line local-rules/no-direct-api-import - PartialViewResource.getTreePartialViewRoot({ skip: args.skip, take: args.take }); + PartialViewService.getTreePartialViewRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parentUnique); @@ -47,7 +47,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return PartialViewResource.getTreePartialViewChildren({ + return PartialViewService.getTreePartialViewChildren({ parentPath, skip: args.skip, take: args.take, @@ -60,7 +60,7 @@ const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => { if (!descendantPath) throw new Error('Descendant path is not available'); // eslint-disable-next-line local-rules/no-direct-api-import - return PartialViewResource.getTreePartialViewAncestors({ + return PartialViewService.getTreePartialViewAncestors({ descendantPath, }); }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts index df336252cb..4015da4f95 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts @@ -12,7 +12,7 @@ import { } from '@umbraco-cms/backoffice/workspace'; import { loadCodeEditor } from '@umbraco-cms/backoffice/code-editor'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { PartialViewResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { PartialViewService } from '@umbraco-cms/backoffice/external/backend-api'; import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action'; import { UmbRequestReloadTreeItemChildrenEvent } from '@umbraco-cms/backoffice/tree'; import { UmbRequestReloadStructureForEntityEvent } from '@umbraco-cms/backoffice/entity-action'; @@ -205,7 +205,7 @@ export class UmbPartialViewWorkspaceContext #getSnippet(snippetId: string) { return tryExecuteAndNotify( this, - PartialViewResource.getPartialViewSnippetById({ + PartialViewService.getPartialViewSnippetById({ id: snippetId, }), ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.server.data-source.ts index c6b077f36b..9361984091 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.server.data-source.ts @@ -4,7 +4,7 @@ import { appendFileExtensionIfNeeded, } from '@umbraco-cms/backoffice/server-file-system'; import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { ScriptResource } from '@umbraco-cms/backoffice/external/backend-api'; +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'; @@ -38,7 +38,7 @@ export class UmbRenameScriptServerDataSource { const { data, error } = await tryExecuteAndNotify( this.#host, - ScriptResource.putScriptByPathRename({ + ScriptService.putScriptByPathRename({ path: encodeURIComponent(path), requestBody, }), diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/item/script-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/item/script-item.server.data-source.ts index be426ae292..11b9ccb95d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/item/script-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/item/script-item.server.data-source.ts @@ -4,7 +4,7 @@ import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/serve import type { UmbItemDataSource } from '@umbraco-cms/backoffice/repository'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { ScriptResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { ScriptService } from '@umbraco-cms/backoffice/external/backend-api'; /** * A data source for script items that fetches data from the server @@ -43,7 +43,7 @@ export class UmbScriptItemServerDataSource implements UmbItemDataSource // eslint-disable-next-line local-rules/no-direct-api-import - ScriptResource.getTreeScriptRoot({ skip: args.skip, take: args.take }); + ScriptService.getTreeScriptRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parentUnique); @@ -47,7 +47,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return ScriptResource.getTreeScriptChildren({ + return ScriptService.getTreeScriptChildren({ parentPath, skip: args.skip, take: args.take, @@ -60,7 +60,7 @@ const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => { if (!descendantPath) throw new Error('Descendant path is not available'); // eslint-disable-next-line local-rules/no-direct-api-import - return ScriptResource.getTreeScriptAncestors({ + return ScriptService.getTreeScriptAncestors({ descendantPath, }); }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/rename/rename-stylesheet.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/rename/rename-stylesheet.server.data-source.ts index fd1425c44f..d3a8cd1698 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/rename/rename-stylesheet.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/rename/rename-stylesheet.server.data-source.ts @@ -4,7 +4,7 @@ import { appendFileExtensionIfNeeded, } from '@umbraco-cms/backoffice/server-file-system'; import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { StylesheetResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { StylesheetService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -38,7 +38,7 @@ export class UmbRenameStylesheetServerDataSource { const { data, error } = await tryExecuteAndNotify( this.#host, - StylesheetResource.putStylesheetByPathRename({ + StylesheetService.putStylesheetByPathRename({ path: encodeURIComponent(path), requestBody, }), diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/item/stylesheet-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/item/stylesheet-item.server.data-source.ts index 9fe4f6e62a..ebdb50678e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/item/stylesheet-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/item/stylesheet-item.server.data-source.ts @@ -4,7 +4,7 @@ import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/serve import type { UmbItemDataSource } 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/external/backend-api'; +import { StylesheetService } from '@umbraco-cms/backoffice/external/backend-api'; /** * A data source for stylesheet items that fetches data from the server @@ -43,7 +43,7 @@ export class UmbStylesheetItemServerDataSource implements UmbItemDataSource // eslint-disable-next-line local-rules/no-direct-api-import - StylesheetResource.getTreeStylesheetRoot({ skip: args.skip, take: args.take }); + StylesheetService.getTreeStylesheetRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const parentPath = new UmbServerFilePathUniqueSerializer().toServerPath(args.parentUnique); @@ -47,7 +47,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return StylesheetResource.getTreeStylesheetChildren({ + return StylesheetService.getTreeStylesheetChildren({ parentPath, skip: args.skip, take: args.take, @@ -60,7 +60,7 @@ const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => { if (!descendantPath) throw new Error('Descendant path is not available'); // eslint-disable-next-line local-rules/no-direct-api-import - return StylesheetResource.getTreeStylesheetAncestors({ + return StylesheetService.getTreeStylesheetAncestors({ descendantPath, }); }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/detail/template-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/detail/template-detail.server.data-source.ts index 3bf44f6deb..e119e9f8ee 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/detail/template-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/detail/template-detail.server.data-source.ts @@ -6,7 +6,7 @@ import type { CreateTemplateRequestModel, UpdateTemplateRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { TemplateResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { TemplateService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -60,7 +60,7 @@ export class UmbTemplateServerDataSource implements UmbDetailDataSource) => TemplateResource.getItemTemplate({ id: uniques }); +const getItems = (uniques: Array) => TemplateService.getItemTemplate({ id: uniques }); const mapper = (item: TemplateItemResponseModel): UmbTemplateItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts index 84dbbe7b75..ad525b57b0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts @@ -1,6 +1,6 @@ import type { UmbExecuteTemplateQueryRequestModel } from './types.js'; import type { TemplateQueryExecuteModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { TemplateResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { TemplateService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -30,7 +30,7 @@ export class UmbTemplateQueryServerDataSource { * @memberof UmbTemplateQueryServerDataSource */ async getTemplateQuerySettings() { - return tryExecuteAndNotify(this.#host, TemplateResource.getTemplateQuerySettings()); + return tryExecuteAndNotify(this.#host, TemplateService.getTemplateQuerySettings()); } /** * Executes a query builder query on the server @@ -47,6 +47,6 @@ export class UmbTemplateQueryServerDataSource { take: args.take, }; - return tryExecuteAndNotify(this.#host, TemplateResource.postTemplateQueryExecute({ requestBody })); + return tryExecuteAndNotify(this.#host, TemplateService.postTemplateQueryExecute({ requestBody })); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.server.data-source.ts index 8c8f0a8d76..9dc8e27799 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.server.data-source.ts @@ -7,7 +7,7 @@ import type { } from '@umbraco-cms/backoffice/tree'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { TemplateResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { TemplateService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** @@ -37,14 +37,14 @@ export class UmbTemplateTreeServerDataSource extends UmbTreeServerDataSourceBase const getRootItems = (args: UmbTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - TemplateResource.getTreeTemplateRoot({ skip: args.skip, take: args.take }); + TemplateService.getTreeTemplateRoot({ skip: args.skip, take: args.take }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { if (args.parentUnique === null) { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import - return TemplateResource.getTreeTemplateChildren({ + return TemplateService.getTreeTemplateChildren({ parentId: args.parentUnique, skip: args.skip, take: args.take, @@ -54,7 +54,7 @@ const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { const getAncestorsOf = (args: UmbTreeAncestorsOfRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - TemplateResource.getTreeTemplateAncestors({ + TemplateService.getTreeTemplateAncestors({ descendantId: args.descendantUnique, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/components/mfa-provider-default.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/components/mfa-provider-default.element.ts index 8ac35065ef..9f975cec2c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/components/mfa-provider-default.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/components/mfa-provider-default.element.ts @@ -1,5 +1,5 @@ import type { UmbMfaProviderConfigurationCallback, UmbMfaProviderConfigurationElementProps } from '../types.js'; -import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserService } from '@umbraco-cms/backoffice/external/backend-api'; import { css, customElement, html, property, state, query } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { isApiError, tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -63,7 +63,7 @@ export class UmbMfaProviderDefaultElement extends UmbLitElement implements UmbMf } const { data: _data } = await tryExecuteAndNotify( this, - UserResource.getUserCurrent2FaByProviderName({ providerName: this.providerName }), + UserService.getUserCurrent2FaByProviderName({ providerName: this.providerName }), ); const data: any = _data; if (!data) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.server.data-source.ts index 1d0fcb88aa..46bfc12a3c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbCurrentUserModel } from '../types.js'; -import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecute, tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -26,7 +26,7 @@ export class UmbCurrentUserServerDataSource { * @memberof UmbCurrentUserServerDataSource */ async getCurrentUser() { - const { data, error } = await tryExecuteAndNotify(this.#host, UserResource.getUserCurrent()); + const { data, error } = await tryExecuteAndNotify(this.#host, UserService.getUserCurrent()); if (data) { const user: UmbCurrentUserModel = { @@ -56,7 +56,7 @@ export class UmbCurrentUserServerDataSource { * @memberof UmbCurrentUserServerDataSource */ async getMfaLoginProviders() { - const { data, error } = await tryExecuteAndNotify(this.#host, UserResource.getUserCurrent2Fa()); + const { data, error } = await tryExecuteAndNotify(this.#host, UserService.getUserCurrent2Fa()); if (data) { return { data }; @@ -70,7 +70,7 @@ export class UmbCurrentUserServerDataSource { */ async enableMfaProvider(providerName: string, code: string, secret: string) { const { error } = await tryExecute( - UserResource.postUserCurrent2FaByProviderName({ providerName, requestBody: { code, secret } }), + UserService.postUserCurrent2FaByProviderName({ providerName, requestBody: { code, secret } }), ); if (error) { @@ -84,7 +84,7 @@ export class UmbCurrentUserServerDataSource { * Disable an MFA provider */ async disableMfaProvider(providerName: string, code: string) { - const { error } = await tryExecute(UserResource.deleteUserCurrent2FaByProviderName({ providerName, code })); + const { error } = await tryExecute(UserService.deleteUserCurrent2FaByProviderName({ providerName, code })); if (error) { return { error }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts index 35d0a587e3..fa5f6d9b0c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbUserGroupCollectionFilterModel } from '../types.js'; import type { UmbUserGroupDetailModel } from '../../types.js'; import { UMB_USER_GROUP_ENTITY_TYPE } from '../../entity.js'; -import { UserGroupResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserGroupService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -27,7 +27,7 @@ export class UmbUserGroupCollectionServerDataSource implements UmbCollectionData async getCollection(filter: UmbUserGroupCollectionFilterModel) { const { data, error } = await tryExecuteAndNotify( this.#host, - UserGroupResource.getUserGroup({ skip: filter.skip, take: filter.take }), + UserGroupService.getUserGroup({ skip: filter.skip, take: filter.take }), ); if (data) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.server.data-source.ts index 5a118326e4..15cc4b51a2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.server.data-source.ts @@ -4,7 +4,7 @@ import type { CreateUserGroupRequestModel, UpdateUserGroupRequestModel, } from '@umbraco-cms/backoffice/external/backend-api'; -import { UserGroupResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserGroupService } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -64,7 +64,7 @@ export class UmbUserGroupServerDataSource implements UmbDetailDataSource) => UserGroupResource.getItemUserGroup({ id: uniques }); +const getItems = (uniques: Array) => UserGroupService.getItemUserGroup({ id: uniques }); const mapper = (item: UserGroupItemResponseModel): UmbUserGroupItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts index a6aeed6726..96c87e5046 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts @@ -3,7 +3,7 @@ import { UMB_USER_ENTITY_TYPE } from '../../entity.js'; import type { UmbUserCollectionFilterModel } from '../types.js'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import type { UserResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -32,7 +32,7 @@ export class UmbUserCollectionServerDataSource implements UmbCollectionDataSourc * @memberof UmbUserCollectionServerDataSource */ async getCollection(filter: UmbUserCollectionFilterModel) { - const { data, error } = await tryExecuteAndNotify(this.#host, UserResource.getFilterUser(filter)); + const { data, error } = await tryExecuteAndNotify(this.#host, UserService.getFilterUser(filter)); if (data) { const { items, total } = data; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/invite-user-server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/invite-user-server.data-source.ts index 8f0debf574..f78309c6c5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/invite-user-server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/invite-user-server.data-source.ts @@ -1,6 +1,6 @@ import { UmbUserServerDataSource } from '../../repository/detail/user-detail.server.data-source.js'; import type { UmbInviteUserDataSource, UmbInviteUserRequestModel, UmbResendUserInviteRequestModel } from './types.js'; -import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -41,7 +41,7 @@ export class UmbInviteUserServerDataSource implements UmbInviteUserDataSource { const { data, error } = await tryExecuteAndNotify( this.#host, - UserResource.postUserInvite({ + UserService.postUserInvite({ requestBody, }), ); @@ -72,7 +72,7 @@ export class UmbInviteUserServerDataSource implements UmbInviteUserDataSource { return tryExecuteAndNotify( this.#host, - UserResource.postUserInviteResend({ + UserService.postUserInviteResend({ requestBody, }), ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/user-avatar.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/user-avatar.server.data-source.ts index 88418d929f..774d5c2365 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/user-avatar.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/user-avatar.server.data-source.ts @@ -1,5 +1,5 @@ import type { SetAvatarRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbDataSourceErrorResponse } from '@umbraco-cms/backoffice/repository'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -25,7 +25,7 @@ export class UmbUserAvatarServerDataSource { }, }; - return tryExecuteAndNotify(this.#host, UserResource.postUserAvatarById({ id: unique, requestBody })); + return tryExecuteAndNotify(this.#host, UserService.postUserAvatarById({ id: unique, requestBody })); } /** @@ -35,6 +35,6 @@ export class UmbUserAvatarServerDataSource { * @memberof UmbUserServerDataSource */ deleteAvatar(unique: string): Promise { - return tryExecuteAndNotify(this.#host, UserResource.deleteUserAvatarById({ id: unique })); + return tryExecuteAndNotify(this.#host, UserService.deleteUserAvatarById({ id: unique })); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data-source.ts index 0cd130fe16..a9f1a79f45 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data-source.ts @@ -1,4 +1,4 @@ -import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -31,7 +31,7 @@ export class UmbChangeUserPasswordServerDataSource { return tryExecuteAndNotify( this.#host, - UserResource.postUserByIdChangePassword({ + UserService.postUserByIdChangePassword({ id, requestBody: { newPassword, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts index 419c410264..eef9a30525 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts @@ -3,7 +3,7 @@ import { UMB_USER_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; import type { CreateUserRequestModel, UpdateUserRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -65,7 +65,7 @@ export class UmbUserServerDataSource implements UmbDetailDataSource) => UserResource.getItemUser({ id: uniques }); +const getItems = (uniques: Array) => UserService.getItemUser({ id: uniques }); const mapper = (item: UserItemResponseModel): UmbUserItemModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/new-user-password.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/new-user-password.server.data-source.ts index 1a62b2d7cd..511602abf5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/new-user-password.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/new-password/new-user-password.server.data-source.ts @@ -1,4 +1,4 @@ -import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -30,7 +30,7 @@ export class UmbNewUserPasswordServerDataSource { return tryExecuteAndNotify( this.#host, - UserResource.postUserByIdResetPassword({ + UserService.postUserByIdResetPassword({ id: unique, }), ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-mfa.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-mfa.server.data-source.ts index 2c7b3c42f8..393b98291a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-mfa.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-mfa.server.data-source.ts @@ -1,4 +1,4 @@ -import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecute, tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -29,7 +29,7 @@ export class UmbUserMfaServerDataSource { return tryExecuteAndNotify( this.#host, - UserResource.getUserById2Fa({ + UserService.getUserById2Fa({ id: unique, }), ); @@ -46,7 +46,7 @@ export class UmbUserMfaServerDataSource { if (!providerName) throw new Error('Provider is missing'); return tryExecute( - UserResource.deleteUserById2FaByProviderName({ + UserService.deleteUserById2FaByProviderName({ id: unique, providerName, }), diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data-source.ts index f5af122ed2..45ca8f6e5b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data-source.ts @@ -1,4 +1,4 @@ -import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -31,7 +31,7 @@ export class UmbUserSetGroupsServerDataSource { return tryExecuteAndNotify( this.#host, - UserResource.postUserSetUserGroups({ + UserService.postUserSetUserGroups({ requestBody: { userIds, userGroupIds, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data-source.ts index d6cc3c5d93..8383b9154b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbUnlockUserDataSource } from './types.js'; -import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -31,7 +31,7 @@ export class UmbUnlockUserServerDataSource implements UmbUnlockUserDataSource { return tryExecuteAndNotify( this.#host, - UserResource.postUserUnlock({ + UserService.postUserUnlock({ requestBody: { userIds, }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/repository/webhook-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/repository/webhook-collection.server.data-source.ts index 2a59759ad9..87f296bc35 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/repository/webhook-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/repository/webhook-collection.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbWebhookCollectionFilterModel } from '../types.js'; import type { UmbWebhookDetailModel } from '../../types.js'; import { UMB_WEBHOOK_ENTITY_TYPE } from '../../entity.js'; -import { WebhookResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { WebhookService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -30,7 +30,7 @@ export class UmbWebhookCollectionServerDataSource implements UmbWebhookCollectio * @memberof UmbWebhookCollectionServerDataSource */ async getCollection(_filter: UmbWebhookCollectionFilterModel) { - const { data, error } = await tryExecuteAndNotify(this.#host, WebhookResource.getWebhookItem({})); + const { data, error } = await tryExecuteAndNotify(this.#host, WebhookService.getWebhookItem({})); if (data) { const items = data.map((item) => {