Browse Source

Fix rule update. (#748)

* Fix rule update.

* Just a naming.
pull/749/head
Sebastian Stehle 4 years ago
committed by GitHub
parent
commit
8617fcb299
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      backend/i18n/frontend_en.json
  2. 2
      backend/i18n/frontend_nl.json
  3. 4
      backend/i18n/source/frontend_en.json
  4. 4
      backend/src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleEditCommand.cs
  5. 2
      backend/src/Squidex.Domain.Apps.Entities/Rules/DomainObject/RuleDomainObject.State.cs
  6. 4
      backend/src/Squidex/Areas/Api/Controllers/Rules/Models/UpdateRuleDto.cs
  7. 4
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/DomainObject/RuleDomainObjectTests.cs

4
backend/i18n/frontend_en.json

@ -670,9 +670,9 @@
"rules.ruleSimulator.listPageTitle": "Simulator", "rules.ruleSimulator.listPageTitle": "Simulator",
"rules.ruleSyntax.if": "If", "rules.ruleSyntax.if": "If",
"rules.ruleSyntax.then": "then", "rules.ruleSyntax.then": "then",
"rules.run": "Run", "rules.run": "Replay",
"rules.runFailed": "Failed to run rule. Please reload.", "rules.runFailed": "Failed to run rule. Please reload.",
"rules.runFromSnapshots": "Run with latest states", "rules.runFromSnapshots": "Replay from states",
"rules.runningRule": "Rule '{name}' is currently running.", "rules.runningRule": "Rule '{name}' is currently running.",
"rules.runRuleConfirmText": "Do you really want to run the rule for all events?", "rules.runRuleConfirmText": "Do you really want to run the rule for all events?",
"rules.runRuleConfirmTitle": "Run rule", "rules.runRuleConfirmTitle": "Run rule",

2
backend/i18n/frontend_nl.json

@ -672,7 +672,7 @@
"rules.ruleSyntax.then": "then", "rules.ruleSyntax.then": "then",
"rules.run": "Uitvoeren", "rules.run": "Uitvoeren",
"rules.runFailed": "Uitvoeren van regel mislukt. Laad opnieuw.", "rules.runFailed": "Uitvoeren van regel mislukt. Laad opnieuw.",
"rules.runFromSnapshots": "Run with latest states", "rules.runFromSnapshots": "Replay from states",
"rules.runningRule": "Regel '{name}' is momenteel actief.", "rules.runningRule": "Regel '{name}' is momenteel actief.",
"rules.runRuleConfirmText": "Wil je de regel echt voor alle evenementen uitvoeren?", "rules.runRuleConfirmText": "Wil je de regel echt voor alle evenementen uitvoeren?",
"rules.runRuleConfirmTitle": "Regel uitvoeren", "rules.runRuleConfirmTitle": "Regel uitvoeren",

4
backend/i18n/source/frontend_en.json

@ -670,9 +670,9 @@
"rules.ruleSimulator.listPageTitle": "Simulator", "rules.ruleSimulator.listPageTitle": "Simulator",
"rules.ruleSyntax.if": "If", "rules.ruleSyntax.if": "If",
"rules.ruleSyntax.then": "then", "rules.ruleSyntax.then": "then",
"rules.run": "Run", "rules.run": "Replay",
"rules.runFailed": "Failed to run rule. Please reload.", "rules.runFailed": "Failed to run rule. Please reload.",
"rules.runFromSnapshots": "Run with latest states", "rules.runFromSnapshots": "Replay from states",
"rules.runningRule": "Rule '{name}' is currently running.", "rules.runningRule": "Rule '{name}' is currently running.",
"rules.runRuleConfirmText": "Do you really want to run the rule for all events?", "rules.runRuleConfirmText": "Do you really want to run the rule for all events?",
"rules.runRuleConfirmTitle": "Run rule", "rules.runRuleConfirmTitle": "Run rule",

4
backend/src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleEditCommand.cs

@ -13,9 +13,9 @@ namespace Squidex.Domain.Apps.Entities.Rules.Commands
{ {
public string? Name { get; set; } public string? Name { get; set; }
public RuleTrigger Trigger { get; set; } public RuleTrigger? Trigger { get; set; }
public RuleAction Action { get; set; } public RuleAction? Action { get; set; }
public bool? IsEnabled { get; set; } public bool? IsEnabled { get; set; }
} }

2
backend/src/Squidex.Domain.Apps.Entities/Rules/DomainObject/RuleDomainObject.State.cs

@ -68,7 +68,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.DomainObject
{ {
RuleDef = RuleDef.Enable(); RuleDef = RuleDef.Enable();
} }
else else if (e.IsEnabled == false)
{ {
RuleDef = RuleDef.Disable(); RuleDef = RuleDef.Disable();
} }

4
backend/src/Squidex/Areas/Api/Controllers/Rules/Models/UpdateRuleDto.cs

@ -23,13 +23,13 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models
/// <summary> /// <summary>
/// The trigger properties. /// The trigger properties.
/// </summary> /// </summary>
public RuleTriggerDto Trigger { get; set; } public RuleTriggerDto? Trigger { get; set; }
/// <summary> /// <summary>
/// The action properties. /// The action properties.
/// </summary> /// </summary>
[JsonConverter(typeof(RuleActionConverter))] [JsonConverter(typeof(RuleActionConverter))]
public RuleAction Action { get; set; } public RuleAction? Action { get; set; }
/// <summary> /// <summary>
/// Enable or disable the rule. /// Enable or disable the rule.

4
backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/DomainObject/RuleDomainObjectTests.cs

@ -67,7 +67,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.DomainObject
LastEvents LastEvents
.ShouldHaveSameEvents( .ShouldHaveSameEvents(
CreateRuleEvent(new RuleCreated { Trigger = command.Trigger, Action = command.Action }) CreateRuleEvent(new RuleCreated { Trigger = command.Trigger!, Action = command.Action! })
); );
} }
@ -82,6 +82,8 @@ namespace Squidex.Domain.Apps.Entities.Rules.DomainObject
result.ShouldBeEquivalent(sut.Snapshot); result.ShouldBeEquivalent(sut.Snapshot);
Assert.True(sut.Snapshot.RuleDef.IsEnabled);
Assert.Same(command.Trigger, sut.Snapshot.RuleDef.Trigger); Assert.Same(command.Trigger, sut.Snapshot.RuleDef.Trigger);
Assert.Same(command.Action, sut.Snapshot.RuleDef.Action); Assert.Same(command.Action, sut.Snapshot.RuleDef.Action);

Loading…
Cancel
Save