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

Squidex · Oct 24, 2024 · 9987a06 · 9987a06
2 parents 3200753 + 1c5f2d1
commit 9987a06
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 32 deletions.
diff --git 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 }}
 

diff --git 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/[email protected]
@@ -25,15 +25,15 @@ jobs:
         uses: docker/[email protected]
 
       - 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/[email protected]
         with:
           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,15 +102,15 @@ jobs:
 
       - name: Test - Upload Playwright Artifacts
         if: always()
-        uses: actions/[email protected].0
+        uses: actions/[email protected].3
         with:
           name: playwright-report
           path: tools/e2e/playwright-report/
           retention-days: 30
 
       - name: Test - Upload Screenshots
         if: failure()
-        uses: actions/[email protected].0
+        uses: actions/[email protected].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

diff --git a/.github/workflows/make-screenshots.yml b/.github/workflows/make-screenshots.yml
@@ -9,21 +9,21 @@ 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/[email protected]
 
       - 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/[email protected]
         with:
           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/[email protected].0
+        uses: actions/[email protected].3
         with:
           name: snapshots
           path: tools/e2e/snapshots/

diff --git 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/[email protected]
@@ -20,15 +20,15 @@ jobs:
         uses: docker/[email protected]
 
       - 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/[email protected]
         with:
           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/[email protected].0
+        uses: actions/[email protected].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

diff --git a/backend/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaActionHandler.cs b/backend/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaActionHandler.cs
@@ -50,14 +50,15 @@ public AlgoliaActionHandler(RuleEventFormatter formatter, IScriptEngine scriptEn
         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 AlgoliaActionHandler(RuleEventFormatter formatter, IScriptEngine scriptEn
             ApiKey = action.ApiKey,
             Content = serializer.Serialize(content, true),
             ContentId = contentId,
-            IndexName = (await FormatAsync(action.IndexName, @event))!
+            IndexName = indexName
         };
 
         return (ruleDescription, ruleJob);

diff --git a/backend/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchActionHandler.cs b/backend/extensions/Squidex.Extensions/Actions/ElasticSearch/ElasticSearchActionHandler.cs
@@ -70,11 +70,11 @@ public ElasticSearchActionHandler(RuleEventFormatter formatter, IScriptEngine sc
 
         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

diff --git a/backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs b/backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs
@@ -36,7 +36,7 @@ public EmailActionHandler(RuleEventFormatter formatter)
             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);
     }

diff --git a/backend/extensions/Squidex.Extensions/Actions/OpenSearch/OpenSearchActionHandler.cs b/backend/extensions/Squidex.Extensions/Actions/OpenSearch/OpenSearchActionHandler.cs
@@ -70,11 +70,11 @@ public OpenSearchActionHandler(RuleEventFormatter formatter, IScriptEngine scrip
 
         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

diff --git a/backend/extensions/Squidex.Extensions/Actions/Typesense/TypesenseActionHandler.cs b/backend/extensions/Squidex.Extensions/Actions/Typesense/TypesenseActionHandler.cs
@@ -48,7 +48,6 @@ public TypesenseActionHandler(RuleEventFormatter formatter, IHttpClientFactory h
         }
 
         var indexName = await FormatAsync(action.IndexName, @event);
-
         var ruleText = string.Empty;
         var ruleJob = new TypesenseJob
         {
@@ -59,11 +58,11 @@ public TypesenseActionHandler(RuleEventFormatter formatter, IHttpClientFactory h
 
         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

diff --git 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",

diff --git 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",

diff --git 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');