Merge branch 'master' of github.com:Squidex/squidex

2 years ago · 9987a069ba
12 changed files with 32 additions and 32 deletions
--- a/.github/workflows/check-updates.yml
+++ b/.github/workflows/check-updates.yml
@ -12,7 +12,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.1
        with:
          token: ${{ secrets.WORKFLOW_SECRET }}

--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Prepare - Checkout
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.1

      - name: Prepare - Inject short Variables
        uses: rlespinasse/github-slug-action@v4.5.0
@ -25,7 +25,7 @@ jobs:
        uses: docker/setup-qemu-action@v3.2.0

      - name: Prepare - Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3.6.1
+        uses: docker/setup-buildx-action@v3.7.1

      - name: Prepare - Setup Node
        uses: actions/setup-node@v4.0.4
@ -33,7 +33,7 @@ jobs:
          node-version: 18

      - name: Build - BUILD
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v6.9.0
        with:
          load: true
          cache-from: type=gha
@ -102,7 +102,7 @@ jobs:

      - name: Test - Upload Playwright Artifacts
        if: always()
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v4.4.3
        with:
          name: playwright-report
          path: tools/e2e/playwright-report/
@ -110,7 +110,7 @@ jobs:
       
      - name: Test - Upload Screenshots
        if: failure()
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v4.4.3
        with:
          path: |
            tools/TestSuite/TestSuite.ApiTests/bin/Debug/net8.0/screenshots/
@ -148,7 +148,7 @@ jobs:

      - name: Publish - Build & Push for Multi-Platforms
        if: github.event_name != 'pull_request'
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v6.9.0
        with:
          build-args: "SQUIDEX__RUNTIME__VERSION=7.0.0-dev-${{ env.BUILD_NUMBER }}"
          cache-from: type=gha
--- a/.github/workflows/make-screenshots.yml
+++ b/.github/workflows/make-screenshots.yml
@ -9,13 +9,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Prepare - Checkout
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.1

      - name: Prepare - Setup QEMU
        uses: docker/setup-qemu-action@v3.2.0

      - name: Prepare - Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3.6.1
+        uses: docker/setup-buildx-action@v3.7.1

      - name: Prepare - Setup Node
        uses: actions/setup-node@v4.0.4
@ -23,7 +23,7 @@ jobs:
          node-version: 18

      - name: Build - BUILD
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v6.9.0
        with:
          load: true
          cache-from: type=gha
@ -50,7 +50,7 @@ jobs:

      - name: Test - Upload Playwright Artifacts
        if: always()
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v4.4.3
        with:
          name: snapshots
          path: tools/e2e/snapshots/
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Prepare - Checkout
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.1

      - name: Prepare - Inject short Variables
        uses: rlespinasse/github-slug-action@v4.5.0
@ -20,7 +20,7 @@ jobs:
        uses: docker/setup-qemu-action@v3.2.0

      - name: Prepare - Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3.6.1
+        uses: docker/setup-buildx-action@v3.7.1

      - name: Prepare - Setup Node
        uses: actions/setup-node@v4.0.4
@ -28,7 +28,7 @@ jobs:
          node-version: 18

      - name: Build - BUILD
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v6.9.0
        with:
          load: true
          build-args: "SQUIDEX__BUILD__VERSION=${{ env.GITHUB_REF_SLUG }},SQUIDEX__RUNTIME__VERSION=${{ env.GITHUB_REF_SLUG }}"
@ -98,7 +98,7 @@ jobs:

      - name: Test - Upload Playwright Artifacts
        if: always()
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v4.4.3
        with:
          name: playwright-report
          path: tools/e2e/playwright-report/
@ -142,7 +142,7 @@ jobs:
          password: ${{ secrets.DOCKER_PASSWORD }}

      - name: Publish - Build & Push for Multi-Platforms
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v6.9.0
        with:
          build-args: "SQUIDEX__BUILD__VERSION=${{ env.GITHUB_REF_SLUG }},SQUIDEX__RUNTIME__VERSION=${{ env.GITHUB_REF_SLUG }}"
          cache-from: type=gha
--- a/backend/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaActionHandler.cs
+++ b/backend/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaActionHandler.cs
@ -50,14 +50,15 @@ public sealed class AlgoliaActionHandler : RuleActionHandler<AlgoliaAction, Algo
        var ruleDescription = string.Empty;
        var contentId = entityEvent.Id.ToString();
        var content = (AlgoliaContent?)null;
+        var indexName = (await FormatAsync(action.IndexName, @event))!;

        if (delete)
        {
-            ruleDescription = $"Delete entry from Algolia index: {action.IndexName}";
+            ruleDescription = $"Delete entry from Algolia index: {indexName}";
        }
        else
        {
-            ruleDescription = $"Add entry to Algolia index: {action.IndexName}";
+            ruleDescription = $"Add entry to Algolia index: {indexName}";

            try
            {
@ -95,7 +96,7 @@ public sealed class AlgoliaActionHandler : RuleActionHandler<AlgoliaAction, Algo
            ApiKey = action.ApiKey,
            Content = serializer.Serialize(content, true),
            ContentId = contentId,
-            IndexName = (await FormatAsync(action.IndexName, @event))!
+            IndexName = indexName
        };

        return (ruleDescription, ruleJob);
--- a/backend/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchActionHandler.cs
+++ b/backend/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchActionHandler.cs
@ -70,11 +70,11 @@ public sealed class ElasticSearchActionHandler : RuleActionHandler<ElasticSearch

        if (delete)
        {
-            ruleText = $"Delete entry index: {action.IndexName}";
+            ruleText = $"Delete entry index: {ruleJob.IndexName}";
        }
        else
        {
-            ruleText = $"Upsert to index: {action.IndexName}";
+            ruleText = $"Upsert to index: {ruleJob.IndexName}";

            ElasticSearchContent content;
            try
--- a/backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs
+++ b/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))!
        };

-        var description = $"Send an email to {action.MessageTo}";
+        var description = $"Send an email to {ruleJob.MessageTo}";

        return (description, ruleJob);
    }
--- a/backend/extensions/Squidex.Extensions/Actions/OpenSearch/OpenSearchActionHandler.cs
+++ b/backend/extensions/Squidex.Extensions/Actions/OpenSearch/OpenSearchActionHandler.cs
@ -70,11 +70,11 @@ public sealed class OpenSearchActionHandler : RuleActionHandler<OpenSearchAction

        if (delete)
        {
-            ruleText = $"Delete entry index: {action.IndexName}";
+            ruleText = $"Delete entry index: {ruleJob.IndexName}";
        }
        else
        {
-            ruleText = $"Upsert to index: {action.IndexName}";
+            ruleText = $"Upsert to index: {ruleJob.IndexName}";

            OpenSearchContent content;
            try
--- a/backend/extensions/Squidex.Extensions/Actions/Typesense/TypesenseActionHandler.cs
+++ b/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 ruleText = string.Empty;
        var ruleJob = new TypesenseJob
        {
@ -59,11 +58,11 @@ public sealed class TypesenseActionHandler : RuleActionHandler<TypesenseAction,

        if (delete)
        {
-            ruleText = $"Delete entry index: {action.IndexName}";
+            ruleText = $"Delete entry index: {indexName}";
        }
        else
        {
-            ruleText = $"Upsert to index: {action.IndexName}";
+            ruleText = $"Upsert to index: {indexName}";

            TypesenseContent content;
            try
--- a/backend/i18n/frontend_en.json
+++ b/backend/i18n/frontend_en.json
@ -761,9 +761,9 @@
  "rules.ruleSimulator.listPageTitle": "Simulator",
  "rules.ruleSyntax.if": "If",
  "rules.ruleSyntax.then": "then",
-  "rules.run": "Replay",
+  "rules.run": "Replay from Events",
  "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.runRuleConfirmText": "Do you really want to run the rule for all events?",
  "rules.runRuleConfirmTitle": "Run rule",
--- a/backend/i18n/source/frontend_en.json
+++ b/backend/i18n/source/frontend_en.json
@ -761,9 +761,9 @@
  "rules.ruleSimulator.listPageTitle": "Simulator",
  "rules.ruleSyntax.if": "If",
  "rules.ruleSyntax.then": "then",
-  "rules.run": "Replay",
+  "rules.run": "Replay from Events",
  "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.runRuleConfirmText": "Do you really want to run the rule for all events?",
  "rules.runRuleConfirmTitle": "Run rule",
--- a/frontend/src/app/framework/angular/tab-router-link.directive.ts
+++ b/frontend/src/app/framework/angular/tab-router-link.directive.ts
@ -30,7 +30,7 @@ export class TabRouterlinkDirective {
            relativeTo: this.route,
        });

-        if (event.ctrlKey) {
+        if (event.ctrlKey || event.metaKey) {
            const url = this.router.serializeUrl(urlTree);

            window.open(url, '_blank');