Browse Source

Formatting improvements.

pull/1132/head
Sebastian 2 years ago
parent
commit
dc744850ab
  1. 7
      backend/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaActionHandler.cs
  2. 4
      backend/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchActionHandler.cs
  3. 2
      backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs
  4. 4
      backend/extensions/Squidex.Extensions/Actions/OpenSearch/OpenSearchActionHandler.cs
  5. 5
      backend/extensions/Squidex.Extensions/Actions/Typesense/TypesenseActionHandler.cs
  6. 4
      backend/i18n/frontend_en.json
  7. 4
      backend/i18n/source/frontend_en.json

7
backend/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaActionHandler.cs

@ -50,14 +50,15 @@ public sealed class AlgoliaActionHandler : RuleActionHandler<AlgoliaAction, Algo
var ruleDescription = string.Empty; var ruleDescription = string.Empty;
var contentId = entityEvent.Id.ToString(); var contentId = entityEvent.Id.ToString();
var content = (AlgoliaContent?)null; var content = (AlgoliaContent?)null;
var indexName = (await FormatAsync(action.IndexName, @event))!;
if (delete) if (delete)
{ {
ruleDescription = $"Delete entry from Algolia index: {action.IndexName}"; ruleDescription = $"Delete entry from Algolia index: {indexName}";
} }
else else
{ {
ruleDescription = $"Add entry to Algolia index: {action.IndexName}"; ruleDescription = $"Add entry to Algolia index: {indexName}";
try try
{ {
@ -95,7 +96,7 @@ public sealed class AlgoliaActionHandler : RuleActionHandler<AlgoliaAction, Algo
ApiKey = action.ApiKey, ApiKey = action.ApiKey,
Content = serializer.Serialize(content, true), Content = serializer.Serialize(content, true),
ContentId = contentId, ContentId = contentId,
IndexName = (await FormatAsync(action.IndexName, @event))! IndexName = indexName
}; };
return (ruleDescription, ruleJob); return (ruleDescription, ruleJob);

4
backend/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchActionHandler.cs

@ -70,11 +70,11 @@ public sealed class ElasticSearchActionHandler : RuleActionHandler<ElasticSearch
if (delete) if (delete)
{ {
ruleText = $"Delete entry index: {action.IndexName}"; ruleText = $"Delete entry index: {ruleJob.IndexName}";
} }
else else
{ {
ruleText = $"Upsert to index: {action.IndexName}"; ruleText = $"Upsert to index: {ruleJob.IndexName}";
ElasticSearchContent content; ElasticSearchContent content;
try try

2
backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs

@ -36,7 +36,7 @@ public sealed class EmailActionHandler : RuleActionHandler<EmailAction, EmailJob
MessageBody = (await FormatAsync(action.MessageBody, @event))! MessageBody = (await FormatAsync(action.MessageBody, @event))!
}; };
var description = $"Send an email to {action.MessageTo}"; var description = $"Send an email to {ruleJob.MessageTo}";
return (description, ruleJob); return (description, ruleJob);
} }

4
backend/extensions/Squidex.Extensions/Actions/OpenSearch/OpenSearchActionHandler.cs

@ -70,11 +70,11 @@ public sealed class OpenSearchActionHandler : RuleActionHandler<OpenSearchAction
if (delete) if (delete)
{ {
ruleText = $"Delete entry index: {action.IndexName}"; ruleText = $"Delete entry index: {ruleJob.IndexName}";
} }
else else
{ {
ruleText = $"Upsert to index: {action.IndexName}"; ruleText = $"Upsert to index: {ruleJob.IndexName}";
OpenSearchContent content; OpenSearchContent content;
try try

5
backend/extensions/Squidex.Extensions/Actions/Typesense/TypesenseActionHandler.cs

@ -48,7 +48,6 @@ public sealed class TypesenseActionHandler : RuleActionHandler<TypesenseAction,
} }
var indexName = await FormatAsync(action.IndexName, @event); var indexName = await FormatAsync(action.IndexName, @event);
var ruleText = string.Empty; var ruleText = string.Empty;
var ruleJob = new TypesenseJob var ruleJob = new TypesenseJob
{ {
@ -59,11 +58,11 @@ public sealed class TypesenseActionHandler : RuleActionHandler<TypesenseAction,
if (delete) if (delete)
{ {
ruleText = $"Delete entry index: {action.IndexName}"; ruleText = $"Delete entry index: {indexName}";
} }
else else
{ {
ruleText = $"Upsert to index: {action.IndexName}"; ruleText = $"Upsert to index: {indexName}";
TypesenseContent content; TypesenseContent content;
try try

4
backend/i18n/frontend_en.json

@ -749,9 +749,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": "Replay", "rules.run": "Replay from Events",
"rules.runFailed": "Failed to run rule. Please reload.", "rules.runFailed": "Failed to run rule. Please reload.",
"rules.runFromSnapshots": "Replay from states", "rules.runFromSnapshots": "Replay from actual Data",
"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/i18n/source/frontend_en.json

@ -749,9 +749,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": "Replay", "rules.run": "Replay from Events",
"rules.runFailed": "Failed to run rule. Please reload.", "rules.runFailed": "Failed to run rule. Please reload.",
"rules.runFromSnapshots": "Replay from states", "rules.runFromSnapshots": "Replay from actual Data",
"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",

Loading…
Cancel
Save