yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes up controller code

Browse Source
This commit is contained in:
Shannon
2021-01-20 19:37:34 +11:00
parent 8d86d54bda
commit 54fa16fd89
1 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
View File

@@ -6,11 +6,8 @@ using Microsoft.Extensions.Options;
using Umbraco.Configuration;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Exceptions;
using Umbraco.Core.Hosting;
using Umbraco.ModelsBuilder.Embedded.Building;
using Umbraco.Web.BackOffice.Controllers;
using Umbraco.Web.BackOffice.Filters;
using Umbraco.Web.Common.Authorization;
namespace Umbraco.ModelsBuilder.Embedded.BackOffice
@@ -31,17 +28,14 @@ namespace Umbraco.ModelsBuilder.Embedded.BackOffice
private readonly OutOfDateModelsStatus _outOfDateModels;
private readonly ModelsGenerationError _mbErrors;
private readonly DashboardReport _dashboardReport;
private readonly IHostingEnvironment _hostingEnvironment;
public ModelsBuilderDashboardController(IOptions<ModelsBuilderSettings> config, ModelsGenerator modelsGenerator, OutOfDateModelsStatus outOfDateModels, ModelsGenerationError mbErrors, IHostingEnvironment hostingEnvironment)
public ModelsBuilderDashboardController(IOptions<ModelsBuilderSettings> config, ModelsGenerator modelsGenerator, OutOfDateModelsStatus outOfDateModels, ModelsGenerationError mbErrors)
{
//_umbracoServices = umbracoServices;
_config = config.Value;
_modelGenerator = modelsGenerator;
_outOfDateModels = outOfDateModels;
_mbErrors = mbErrors;
_dashboardReport = new DashboardReport(config, outOfDateModels, mbErrors);
_hostingEnvironment = hostingEnvironment;
}
// invoked by the dashboard
@@ -52,19 +46,12 @@ namespace Umbraco.ModelsBuilder.Embedded.BackOffice
{
try
{
var config = _config;
if (!config.ModelsMode.SupportsExplicitGeneration())
if (!_config.ModelsMode.SupportsExplicitGeneration())
{
var result2 = new BuildResult { Success = false, Message = "Models generation is not enabled." };
return Ok(result2);
}
var bin = _hostingEnvironment.MapPathContentRoot("~/bin");
if (bin == null)
throw new PanicException("bin is null.");
// EnableDllModels will recycle the app domain - but this request will end properly
_modelGenerator.GenerateModels();
_mbErrors.Clear();
}
@@ -94,10 +81,7 @@ namespace Umbraco.ModelsBuilder.Embedded.BackOffice
// requires that the user is logged into the backoffice and has access to the settings section
// beware! the name of the method appears in modelsbuilder.controller.js
[HttpGet] // use the http one, not mvc, with api controllers!
public ActionResult<Dashboard> GetDashboard()
{
return GetDashboardResult();
}
public ActionResult<Dashboard> GetDashboard() => GetDashboardResult();
private Dashboard GetDashboardResult() => new Dashboard
{
@@ -112,24 +96,29 @@ namespace Umbraco.ModelsBuilder.Embedded.BackOffice
public class BuildResult
{
[DataMember(Name = "success")]
public bool Success;
public bool Success { get; set; }
[DataMember(Name = "message")]
public string Message;
public string Message { get; set; }
}
[DataContract]
public class Dashboard
{
[DataMember(Name = "mode")]
public ModelsMode Mode;
public ModelsMode Mode { get; set; }
[DataMember(Name = "text")]
public string Text;
public string Text { get; set; }
[DataMember(Name = "canGenerate")]
public bool CanGenerate;
public bool CanGenerate { get; set; }
[DataMember(Name = "outOfDateModels")]
public bool OutOfDateModels;
public bool OutOfDateModels { get; set; }
[DataMember(Name = "lastError")]
public string LastError;
public string LastError { get; set; }
}
public enum OutOfDateType