diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts index 2c88da8717..5dd7a94003 100644 --- a/src/Umbraco.Web.UI.Client/src/app.ts +++ b/src/Umbraco.Web.UI.Client/src/app.ts @@ -78,7 +78,7 @@ export class UmbApp extends UmbContextProviderMixin(LitElement) { private async _setInitStatus() { try { - const serverStatus = await ServerResource.getUmbracoManagementApiV1ServerStatus(); + const serverStatus = await ServerResource.status(); if (serverStatus.serverStatus) { this._runtimeLevel = serverStatus.serverStatus; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts index e9e49086b7..b1d24322e1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts @@ -60,11 +60,11 @@ export class UmbDashboardPublishedStatusElement extends UmbContextConsumerMixin( private async _getPublishedStatus() { try { - const data = await PublishedCacheResource.getUmbracoManagementApiV1PublishedCacheStatus(); + const data = await PublishedCacheResource.status(); this._publishedStatusText = data; } catch (e) { if (e instanceof ApiError) { - const error = e.body as ProblemDetails + const error = e.body as ProblemDetails; const data: UmbNotificationDefaultData = { message: error.detail ?? 'Something went wrong' }; this._notificationService?.peek('danger', { data }); } @@ -81,7 +81,7 @@ export class UmbDashboardPublishedStatusElement extends UmbContextConsumerMixin( this._buttonStateReload = 'waiting'; this._buttonState = 'waiting'; try { - await PublishedCacheResource.postUmbracoManagementApiV1PublishedCacheReload(); + await PublishedCacheResource.reload(); this._buttonStateReload = 'success'; this._getPublishedStatus(); this._buttonState = 'success'; @@ -111,7 +111,7 @@ export class UmbDashboardPublishedStatusElement extends UmbContextConsumerMixin( private async _rebuildDatabaseCache() { this._buttonStateRebuild = 'waiting'; try { - await PublishedCacheResource.postUmbracoManagementApiV1PublishedCacheRebuild(); + await PublishedCacheResource.rebuild(); this._buttonStateRebuild = 'success'; } catch (e) { this._buttonStateRebuild = 'failed'; @@ -137,7 +137,7 @@ export class UmbDashboardPublishedStatusElement extends UmbContextConsumerMixin( //Collect private async _cacheCollect() { try { - await PublishedCacheResource.postUmbracoManagementApiV1PublishedCacheCollect(); + await PublishedCacheResource.collect(); this._buttonStateCollect = 'success'; } catch (e) { this._buttonStateCollect = 'failed'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts index 8250f4108c..e3f917b6b6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts @@ -37,7 +37,7 @@ export class UmbDashboardTelemetryElement extends LitElement { private async _setup() { try { - const consentLevels = await TelemetryResource.getUmbracoManagementApiV1Telemetry({}); + const consentLevels = await TelemetryResource.getAll({}); this._telemetryLevels = consentLevels.items ?? []; } catch (e) { if (e instanceof ApiError) { @@ -47,7 +47,7 @@ export class UmbDashboardTelemetryElement extends LitElement { } try { - const consentSetting = await TelemetryResource.getUmbracoManagementApiV1TelemetryLevel(); + const consentSetting = await TelemetryResource.get(); this._telemetryFormData = consentSetting.telemetryLevel ?? TelemetryLevel.BASIC; } catch (e) { if (e instanceof ApiError) { @@ -60,7 +60,7 @@ export class UmbDashboardTelemetryElement extends LitElement { private _handleSubmit = async (e: CustomEvent) => { e.stopPropagation(); try { - await TelemetryResource.postUmbracoManagementApiV1TelemetryLevel({ + await TelemetryResource.setConsentLevel({ requestBody: { telemetryLevel: this._telemetryFormData }, }); } catch (e) { diff --git a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts index 854b96b4ef..2660a927d3 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts @@ -208,7 +208,7 @@ export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(UmbObse providerName: selectedDatabase.providerName, }; } - await InstallResource.postUmbracoManagementApiV1InstallValidateDatabase({ requestBody: databaseDetails }); + await InstallResource.validateDatabase({ requestBody: databaseDetails }); } catch (e) { if (e instanceof ApiError) { const error = e.body as ProblemDetails; @@ -241,7 +241,7 @@ export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(UmbObse this._installerContext .requestInstall() .then(() => this._handleFulfilled()) - .catch((error) => this._handleRejected(error)); + .catch((error: unknown) => this._handleRejected(error)); }; private _handleFulfilled() { diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts index 9b24478fce..0c930dd542 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts @@ -103,7 +103,7 @@ export class UmbInstallerContext { */ public requestInstall() { // TODO: The post install will probably return a user in the future, so we have to set that context somewhere to let the client know that it is authenticated - return InstallResource.postUmbracoManagementApiV1InstallSetup({ requestBody: this.getData() }); + return InstallResource.setup({ requestBody: this.getData() }); } /** @@ -122,7 +122,7 @@ export class UmbInstallerContext { * @memberof UmbInstallerContext */ private _loadInstallerSettings() { - InstallResource.getUmbracoManagementApiV1InstallSettings().then((installSettings) => { + InstallResource.settings().then((installSettings) => { this._settings.next(installSettings); }); } diff --git a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts index af9b384dea..6753bc5a20 100644 --- a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts +++ b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts @@ -42,7 +42,7 @@ export class UmbUpgrader extends LitElement { this.fetching = true; try { - const data = await UpgradeResource.getUmbracoManagementApiV1UpgradeSettings(); + const data = await UpgradeResource.settings(); this.upgradeSettings = data; } catch (e) { if (e instanceof ApiError) { @@ -60,7 +60,7 @@ export class UmbUpgrader extends LitElement { this.upgrading = true; try { - await UpgradeResource.postUmbracoManagementApiV1UpgradeAuthorize(); + await UpgradeResource.authorize(); history.pushState(null, '', '/'); } catch (e) { if (e instanceof ApiError) {