Browse Source

Bugs fixed.

pull/195/head
Sebastian Stehle 8 years ago
parent
commit
0c78bc077b
  1. 17
      src/Squidex.Domain.Apps.Read/State/Grains/AppStateGrain.cs
  2. 25
      src/Squidex/Config/Domain/ReadServices.cs
  3. 2
      src/Squidex/app/features/schemas/pages/schema/schema-page.component.html

17
src/Squidex.Domain.Apps.Read/State/Grains/AppStateGrain.cs

@ -113,7 +113,7 @@ namespace Squidex.Domain.Apps.Read.State.Grains
public virtual Task HandleAsync(Envelope<IEvent> message)
{
return taskFactory.StartNew(() =>
return taskFactory.StartNew(async () =>
{
if (exception != null)
{
@ -130,12 +130,23 @@ namespace Squidex.Domain.Apps.Read.State.Grains
if (message.Payload is AppEvent appEvent)
{
if (State.App == null || State.App.Id == appEvent.AppId.Id)
{
try
{
State.Apply(message);
await WriteStateAsync();
}
}
catch (InconsistentStateException)
{
await ReadStateAsync();
return WriteStateAsync();
State.Apply(message);
await WriteStateAsync();
}
}
}
}).Unwrap();
}
}

25
src/Squidex/Config/Domain/ReadServices.cs

@ -60,6 +60,10 @@ namespace Squidex.Config.Domain
exposeSourceUrl))
.As<IGraphQLUrlGenerator>();
services.AddSingletonAs<StateFactory>()
.As<IExternalSystem>()
.As<IStateFactory>();
services.AddSingletonAs(c => c.GetService<IOptions<MyUsageOptions>>()?.Value?.Plans.OrEmpty());
services.AddSingletonAs<CachingGraphQLService>()
@ -86,27 +90,24 @@ namespace Squidex.Config.Domain
services.AddSingletonAs<NoopAppPlanBillingManager>()
.As<IAppPlanBillingManager>();
services.AddSingletonAs<DefaultEventNotifier>()
.As<IEventNotifier>();
services.AddSingletonAs<AppProvider>()
.As<IAppProvider>();
services.AddSingletonAs<AppStateEventConsumer>()
.As<IEventConsumer>();
services.AddSingletonAs<RuleEnqueuer>()
.As<IEventConsumer>();
services.AddSingletonAs<StateFactory>()
.As<IStateFactory>();
services.AddSingletonAs<ContentChangedTriggerHandler>()
.As<IRuleTriggerHandler>();
services.AddSingletonAs<WebhookActionHandler>()
.As<IRuleActionHandler>();
services.AddSingletonAs<DefaultEventNotifier>()
.As<IEventNotifier>();
services.AddSingletonAs<AppStateEventConsumer>()
.As<IEventConsumer>();
services.AddSingletonAs<RuleEnqueuer>()
.As<IEventConsumer>();
services.AddSingletonAs<IEventConsumer>(c =>
new CompoundEventConsumer(c.GetServices<IAssetEventConsumer>().ToArray()));

2
src/Squidex/app/features/schemas/pages/schema/schema-page.component.html

@ -85,7 +85,7 @@
</div>
<div class="row no-gutters mt-3">
<div class="col">
<div class="col pr-2">
<div class="form-check">
<label class="form-check-label">
<input class="form-check-input" type="checkbox" formControlName="isLocalizable"> Localizable

Loading…
Cancel
Save