Browse Source

Small bugfixes.

pull/349/head
Sebastian Stehle 7 years ago
parent
commit
de88cc82db
  1. 16
      src/Squidex.Domain.Apps.Core.Operations/SquidexCoreOperations.cs
  2. 2
      src/Squidex.Infrastructure/Plugins/IWebPlugin.cs
  3. 2
      src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleTriggerDtoFactory.cs
  4. 6
      src/Squidex/Config/Web/WebServices.cs
  5. 20
      src/Squidex/Pipeline/Plugins/PluginExtensions.cs
  6. 3
      src/Squidex/WebStartup.cs
  7. 6
      src/Squidex/app/framework/angular/forms/control-errors.component.ts

16
src/Squidex.Domain.Apps.Core.Operations/SquidexCoreOperations.cs

@ -0,0 +1,16 @@
// ==========================================================================
// Squidex Headless CMS
// ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschränkt)
// All rights reserved. Licensed under the MIT license.
// ==========================================================================
using System.Reflection;
namespace Squidex.Domain.Apps.Core
{
public static class SquidexCoreOperations
{
public static readonly Assembly Assembly = typeof(SquidexCoreOperations).Assembly;
}
}

2
src/Squidex.Infrastructure/Plugins/IWebPlugin.cs

@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Builder;
namespace Squidex.Infrastructure.Plugins
{
public interface IWebPlugin : I
public interface IWebPlugin : IPlugin
{
void Configure(IApplicationBuilder app);
}

2
src/Squidex/Areas/Api/Controllers/Rules/Models/Converters/RuleTriggerDtoFactory.cs

@ -33,7 +33,7 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models.Converters
public RuleTriggerDto Visit(SchemaChangedTrigger trigger)
{
return SimpleMapper.Map(trigger, new AssetChangedRuleTriggerDto());
return SimpleMapper.Map(trigger, new SchemaChangedRuleTriggerDto());
}
public RuleTriggerDto Visit(UsageTrigger trigger)

6
src/Squidex/Config/Web/WebServices.cs

@ -18,7 +18,7 @@ namespace Squidex.Config.Web
{
public static class WebServices
{
public static void AddMyMvc(this IServiceCollection services, IConfiguration config)
public static void AddMyMvcWithPlugins(this IServiceCollection services, IConfiguration config)
{
services.AddSingletonAs<FileCallbackResultExecutor>()
.AsSelf();
@ -50,8 +50,8 @@ namespace Squidex.Config.Web
options.Filters.Add<AppResolver>();
options.Filters.Add<MeasureResultFilter>();
})
.AddMySerializers()
.AddMyPlugins(config);
.AddMyPlugins(config)
.AddMySerializers();
services.AddCors();
services.AddRouting();

20
src/Squidex/Pipeline/Plugins/PluginExtensions.cs

@ -14,6 +14,10 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Squidex.Domain.Apps.Core;
using Squidex.Domain.Apps.Entities;
using Squidex.Domain.Apps.Events;
using Squidex.Infrastructure;
using Squidex.Infrastructure.Log;
using Squidex.Infrastructure.Plugins;
@ -21,9 +25,17 @@ namespace Squidex.Pipeline.Plugins
{
public static class PluginExtensions
{
private static readonly Type[] SharedTypes = { typeof(IPlugin) };
public static void AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration configuration)
private static readonly Type[] SharedTypes =
{
typeof(IPlugin),
typeof(SquidexCoreModel),
typeof(SquidexCoreOperations),
typeof(SquidexEntities),
typeof(SquidexEvents),
typeof(SquidexInfrastructure)
};
public static IMvcBuilder AddMyPlugins(this IMvcBuilder mvcBuilder, IConfiguration configuration)
{
var pluginManager = new PluginManager();
@ -65,6 +77,8 @@ namespace Squidex.Pipeline.Plugins
pluginManager.ConfigureServices(mvcBuilder.Services, configuration);
mvcBuilder.Services.AddSingleton(pluginManager);
return mvcBuilder;
}
private static PluginLoader LoadPlugin(string pluginPath)

3
src/Squidex/WebStartup.cs

@ -54,6 +54,8 @@ namespace Squidex
services.AddMemoryCache();
services.AddOptions();
services.AddMyMvcWithPlugins(config);
services.AddMyAssetServices(config);
services.AddMyAuthentication(config);
services.AddMyEntitiesServices(config);
@ -63,7 +65,6 @@ namespace Squidex
services.AddMyInfrastructureServices(config);
services.AddMyLoggingServices(config);
services.AddMyMigrationServices();
services.AddMyMvc(config);
services.AddMyRuleServices();
services.AddMySerializers();
services.AddMyStoreServices(config);

6
src/Squidex/app/framework/angular/forms/control-errors.component.ts

@ -61,6 +61,10 @@ export class ControlErrorsComponent extends StatefulComponent<State> implements
public ngOnDestroy() {
super.ngOnDestroy();
this.unsubscribe();
}
private unsubscribe() {
if (this.control && this.originalMarkAsTouched) {
this.control['markAsTouched'] = this.originalMarkAsTouched;
}
@ -86,7 +90,7 @@ export class ControlErrorsComponent extends StatefulComponent<State> implements
}
if (this.control !== control) {
this.ngOnDestroy();
this.unsubscribe();
this.control = control;

Loading…
Cancel
Save