Skip to content

New Backoffice: Return TelemetryLevelViewModel from Telemetry/ #13298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elit0451 merged 2 commits into from
Oct 26, 2022
Merged

New Backoffice: Return TelemetryLevelViewModel from Telemetry/ #13298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49f786d
Return TelemetryLevelViewModel instead of TelemetryLevel
nikolajlauridsen Oct 26, 2022
92ede40
Fix schema
nikolajlauridsen Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Umbraco.Cms.ManagementApi/Controllers/Telemetry/AllTelemetryController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
using Umbraco.Cms.ManagementApi.ViewModels.Telemetry;

namespace Umbraco.Cms.ManagementApi.Controllers.Telemetry;

public class AllTelemetryController : TelemetryControllerBase
{
[HttpGet]
[MapToApiVersion("1.0")]
[ProducesResponseType(typeof(PagedViewModel<TelemetryLevel>), StatusCodes.Status200OK)]
public async Task<PagedViewModel<TelemetryLevel>> GetAll(int skip, int take)
[ProducesResponseType(typeof(PagedViewModel<TelemetryLevelViewModel>), StatusCodes.Status200OK)]
public async Task<PagedViewModel<TelemetryLevelViewModel>> GetAll(int skip, int take)
{
TelemetryLevel[] levels = Enum.GetValues<TelemetryLevel>();
return await Task.FromResult(new PagedViewModel<TelemetryLevel>
return await Task.FromResult(new PagedViewModel<TelemetryLevelViewModel>
{
Total = levels.Length,
Items = levels.Skip(skip).Take(take),
Items = levels.Skip(skip).Take(take).Select(level => new TelemetryLevelViewModel { TelemetryLevel = level }),
});
}
}
28 changes: 7 additions & 21 deletions src/Umbraco.Cms.ManagementApi/OpenApi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/PagedViewModelOfTelemetryLevel"
"$ref": "#/components/schemas/PagedViewModelOfTelemetryLevelViewModel"
}
}
}
Expand Down Expand Up @@ -4074,7 +4074,7 @@
}
}
},
"PagedViewModelOfTelemetryLevel": {
"PagedViewModelOfTelemetryLevelViewModel": {
"type": "object",
"additionalProperties": false,
"properties": {
Expand All @@ -4085,35 +4085,21 @@
"items": {
"type": "array",
"items": {
"$ref": "#/components/schemas/TelemetryLevel"
"$ref": "#/components/schemas/TelemetryLevelViewModel"
}
}
}
},
"TelemetryLevel": {
"type": "integer",
"description": "",
"x-enumNames": [
"Minimal",
"Basic",
"Detailed"
],
"enum": [
0,
1,
2
]
},
"TelemetryLevelViewModel": {
"type": "object",
"additionalProperties": false,
"properties": {
"telemetryLevel": {
"$ref": "#/components/schemas/TelemetryLevel2"
"$ref": "#/components/schemas/TelemetryLevel"
}
}
},
"TelemetryLevel2": {
"TelemetryLevel": {
"type": "string",
"description": "",
"x-enumNames": [
Expand Down Expand Up @@ -4629,7 +4615,7 @@
"additionalProperties": false,
"properties": {
"level": {
"$ref": "#/components/schemas/TelemetryLevel2"
"$ref": "#/components/schemas/TelemetryLevel"
},
"description": {
"type": "string"
Expand Down Expand Up @@ -4692,7 +4678,7 @@
"$ref": "#/components/schemas/DatabaseInstallViewModel"
},
"telemetryLevel": {
"$ref": "#/components/schemas/TelemetryLevel2"
"$ref": "#/components/schemas/TelemetryLevel"
}
}
},
Expand Down