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

.github/workflows/dev.yml

@@ -22,27 +22,26 @@ jobs:
  uses: rlespinasse/[email protected]
 
  - name: Prepare - Setup QEMU
- uses: docker/setup-qemu-action@v3.0.0
+ uses: docker/setup-qemu-action@v3.2.0
 
  - name: Prepare - Setup Docker Buildx
- uses: docker/setup-buildx-action@v3.3.0
+ uses: docker/setup-buildx-action@v3.6.1
 
  - name: Prepare - Setup Node
- uses: actions/[email protected].2
+ uses: actions/[email protected].4
  with:
  node-version: 18
 
  - name: Build - BUILD
- uses: docker/build-push-action@v5.4.0
+ uses: docker/build-push-action@v6.7.0
  with:
  load: true
- build-args: "SQUIDEX__RUNTIME__VERSION=7.0.0-dev-${{ env.BUILD_NUMBER }}"
  cache-from: type=gha
  cache-to: type=gha,mode=max
  tags: squidex-local
 
  - name: Test - Start Compose
- run: docker-compose up -d
+ run: docker compose up -d
  working-directory: tools/TestSuite
 
  - name: Test - RUN
@@ -96,22 +95,22 @@ jobs:
  working-directory: './tools/e2e'
 
  - name: Test - Run Playwright Tests
- run: npx playwright test
+ run: npx playwright test --retries=3
  working-directory: './tools/e2e'
  env:
  BASE__URL: http://localhost:8080
 
  - name: Test - Upload Playwright Artifacts
  if: always()
- uses: actions/upload-artifact@v4.3.3
+ uses: actions/upload-artifact@v4.4.0
  with:
  name: playwright-report
  path: tools/e2e/playwright-report/
  retention-days: 30
 
  - name: Test - Upload Screenshots
  if: failure()
- uses: actions/upload-artifact@v4.3.3
+ uses: actions/upload-artifact@v4.4.0
  with:
  path: |
  tools/TestSuite/TestSuite.ApiTests/bin/Debug/net8.0/screenshots/
@@ -125,7 +124,7 @@ jobs:
 
  - name: Test - Cleanup
  if: always()
- run: docker-compose down
+ run: docker compose down
  working-directory: tools/TestSuite
 
  - name: Publish - Remove unnecessary files
@@ -142,14 +141,14 @@ jobs:
 
  - name: Publish - Login to Docker Hub
  if: github.event_name != 'pull_request'
- uses: docker/login-action@v3.2.0
+ uses: docker/login-action@v3.3.0
  with:
  username: ${{ secrets.DOCKER_USERNAME }}
  password: ${{ secrets.DOCKER_PASSWORD }}
 
  - name: Publish - Build & Push for Multi-Platforms
  if: github.event_name != 'pull_request'
- uses: docker/build-push-action@v5.4.0
+ uses: docker/build-push-action@v6.7.0
  with:
  build-args: "SQUIDEX__RUNTIME__VERSION=7.0.0-dev-${{ env.BUILD_NUMBER }}"
  cache-from: type=gha

.github/workflows/make-screenshots.yml

@@ -12,26 +12,26 @@ jobs:
  uses: actions/[email protected]
 
  - name: Prepare - Setup QEMU
- uses: docker/setup-qemu-action@v3.0.0
+ uses: docker/setup-qemu-action@v3.2.0
 
  - name: Prepare - Setup Docker Buildx
- uses: docker/setup-buildx-action@v3.3.0
+ uses: docker/setup-buildx-action@v3.6.1
 
  - name: Prepare - Setup Node
- uses: actions/[email protected].2
+ uses: actions/[email protected].4
  with:
  node-version: 18
 
  - name: Build - BUILD
- uses: docker/build-push-action@v5.4.0
+ uses: docker/build-push-action@v6.7.0
  with:
  load: true
  cache-from: type=gha
  cache-to: type=gha,mode=max
  tags: squidex-local
 
  - name: Test - Start Compose
- run: docker-compose up -d
+ run: docker compose up -d
  working-directory: tools/TestSuite
 
  - name: Test - Install Playwright Dependencies
@@ -50,7 +50,7 @@ jobs:
 
  - name: Test - Upload Playwright Artifacts
  if: always()
- uses: actions/upload-artifact@v4.3.3
+ uses: actions/upload-artifact@v4.4.0
  with:
  name: snapshots
  path: tools/e2e/snapshots/

.github/workflows/release.yml

@@ -17,18 +17,18 @@ jobs:
  uses: rlespinasse/[email protected]
 
  - name: Prepare - Setup QEMU
- uses: docker/setup-qemu-action@v3.0.0
+ uses: docker/setup-qemu-action@v3.2.0
 
  - name: Prepare - Setup Docker Buildx
- uses: docker/setup-buildx-action@v3.3.0
+ uses: docker/setup-buildx-action@v3.6.1
 
  - name: Prepare - Setup Node
- uses: actions/[email protected].2
+ uses: actions/[email protected].4
  with:
  node-version: 18
 
  - name: Build - BUILD
- uses: docker/build-push-action@v5.4.0
+ uses: docker/build-push-action@v6.7.0
  with:
  load: true
  build-args: "SQUIDEX__BUILD__VERSION=${{ env.GITHUB_REF_SLUG }},SQUIDEX__RUNTIME__VERSION=${{ env.GITHUB_REF_SLUG }}"
@@ -37,7 +37,7 @@ jobs:
  tags: squidex-local
 
  - name: Test - Start Compose
- run: docker-compose up -d
+ run: docker compose up -d
  working-directory: tools/TestSuite
 
  - name: Test - RUN
@@ -91,14 +91,14 @@ jobs:
  working-directory: './tools/e2e'
 
  - name: Test - Run Playwright Tests
- run: npx playwright test
+ run: npx playwright test --retries=3
  working-directory: './tools/e2e'
  env:
  BASE__URL: http://localhost:8080
 
  - name: Test - Upload Playwright Artifacts
  if: always()
- uses: actions/upload-artifact@v4.3.3
+ uses: actions/upload-artifact@v4.4.0
  with:
  name: playwright-report
  path: tools/e2e/playwright-report/
@@ -113,7 +113,7 @@ jobs:
 
  - name: Test - Cleanup
  if: always()
- run: docker-compose down
+ run: docker compose down
  working-directory: tools/TestSuite
 
  - name: Publish - Remove unnecessary files
@@ -136,19 +136,20 @@ jobs:
  fi
 
  - name: Publish - Login to Docker Hub
- uses: docker/login-action@v3.2.0
+ uses: docker/login-action@v3.3.0
  with:
  username: ${{ secrets.DOCKER_USERNAME }}
  password: ${{ secrets.DOCKER_PASSWORD }}
 
  - name: Publish - Build & Push for Multi-Platforms
- uses: docker/build-push-action@v5.3.0
+ uses: docker/build-push-action@v6.7.0
  with:
  build-args: "SQUIDEX__BUILD__VERSION=${{ env.GITHUB_REF_SLUG }},SQUIDEX__RUNTIME__VERSION=${{ env.GITHUB_REF_SLUG }}"
  cache-from: type=gha
  cache-to: type=gha,mode=max
  platforms: linux/amd64,linux/arm64
  tags: squidex/squidex:${{ env.GITHUB_REF_SLUG }},squidex/squidex:${{ steps.version.outputs._0 }}${{env.STABLE_VERSION == 'true' && ',squidex/squidex:latest'}}
+ push: true
 
  - name: Release - Make directories
  run: sudo mkdir /build /release

CHANGELOG.md

@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.15.0] - 2024-08-23
+
+### Fixed
+
+* **Contents**: Fix to also deliver fields that have the same name as meta fields.
+* **Contents**: Never return null statuses for content queries.
+* **Migration**: Fix log message in migration.
+* **UI**: Correctly remove the filter row, when the delete button is returned.
+* **UI**: Fix autocompletion for code editors.
+* **UI**: Fix clipboard behavior for rich text editor.
+* **UI**: Fix seperator in login screen.
+* **UI**: Navigate to the correct page when the back button on the content page is fixed.
+* **UI**: Show filters in query dialog when selecting references.
+* **UI**: Use correct npm packages to prevent version conflicts.
+
+### Added
+
+* **Contents**: New flag to also enrich required fields.
+* **Contents**: New header flag to not enrich queried content items with default values.
+* **UI**: Make the code editor editable in the markdown mode of the rich text editor.
+* **UI**: New event for editor extensions when the context has been changed.
+* **UI**: Support data attributes for Squidex tokens in embed SDK.
+
 ## [7.14.0] - 2024-07-03
 
 ### Fixed

Dockerfile

@@ -2,7 +2,7 @@
 # Stage 1, Build Backend
 #
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 as backend
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS backend
 
 ARG SQUIDEX__BUILD__VERSION=7.0.0
 
@@ -43,7 +43,7 @@ RUN dotnet tool install --tool-path /tools dotnet-counters \
 #
 # Stage 2, Build Frontend
 #
-FROM squidex/frontend-build:20.9 as frontend
+FROM squidex/frontend-build:20.9 AS frontend
 
 WORKDIR /src
 

backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj

@@ -12,22 +12,22 @@
  <ItemGroup>
  <PackageReference Include="Algolia.Search" Version="6.17.0" />
  <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
- <PackageReference Include="Azure.Search.Documents" Version="11.5.1" />
- <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.4.0" />
+ <PackageReference Include="Azure.Search.Documents" Version="11.6.0" />
+ <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.5.2" />
  <PackageReference Include="CoreTweet" Version="1.0.0.483" />
  <PackageReference Include="Elasticsearch.Net" Version="7.17.5" />
  <PackageReference Include="Google.Cloud.Diagnostics.Common" Version="5.2.0" />
  <PackageReference Include="Google.Cloud.Logging.V2" Version="4.4.0" />
  <PackageReference Include="Google.Cloud.Monitoring.V3" Version="3.11.0" />
- <PackageReference Include="Meziantou.Analyzer" Version="2.0.159">
+ <PackageReference Include="Meziantou.Analyzer" Version="2.0.163">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>
  <PackageReference Include="Microsoft.Azure.CognitiveServices.Vision.ComputerVision" Version="7.0.1" />
- <PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.25.2" />
+ <PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.27.0" />
  <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
  <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
- <PackageReference Include="Microsoft.OData.Core" Version="7.21.3" />
+ <PackageReference Include="Microsoft.OData.Core" Version="8.0.1" />
  <PackageReference Include="NodaTime" Version="3.1.11" />
  <PackageReference Include="OpenSearch.Net" Version="1.7.1" />
  <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />

backend/extensions/Squidex.Extensions/Text/Azure/AzureIndexDefinition.cs

@@ -25,7 +25,7 @@ static AzureIndexDefinition()
  .GetProperties(BindingFlags.Public | BindingFlags.Static)
  .Select(x => x.GetValue(null)!)
  .Select(x => x.ToString()!)
- .OrderBy(x => x)
+ .Order()
  .ToList();
 
  var addedLanguage = new HashSet<string>();

backend/i18n/frontend_en.json

@@ -180,6 +180,8 @@
  "clients.connectWizard.step0Title": "Setup client",
  "clients.connectWizard.step1Title": "Choose connection method",
  "clients.connectWizard.step2Title": "Connect",
+ "clients.copyClientId": "Copy Client ID",
+ "clients.copyClientSecret": "Copy Client Secret",
  "clients.deleteConfirmText": "Do you really want to revoke the client?",
  "clients.deleteConfirmTitle": "Revoke client",
  "clients.empty": "No client created yet.",
@@ -194,6 +196,7 @@
  "comments.follow": "Follow",
  "comments.title": "Comments",
  "common.actions": "Actions",
+ "common.add": "Add",
  "common.administration": "Administration",
  "common.administrationPageTitle": "Administration",
  "common.api": "API",
@@ -251,6 +254,7 @@
  "common.disabled": "Disabled",
  "common.displayName": "Display Name",
  "common.documentation": "Documentation",
+ "common.download": "Download",
  "common.edit": "Edit",
  "common.editing": "Editing",
  "common.editInNewTab": "Open in new tab",
@@ -310,6 +314,7 @@
  "common.more": "More",
  "common.name": "Name",
  "common.next": "Continue",
+ "common.nextPage": "Next Page",
  "common.no": "No",
  "common.nothingChanged": "Nothing has been changed.",
  "common.notSupported": "Not Supported",
@@ -320,6 +325,7 @@
  "common.pagerInfo": "{itemFirst}-{itemLast} of {numberOfItems}",
  "common.pagerInfoNoTotal": "{itemFirst}-{itemLast} of total?",
  "common.pagerReload": "Click to reload view and get total number of items",
+ "common.pageSize": "Page Size",
  "common.password": "Password",
  "common.passwordConfirm": "Confirm Password",
  "common.pattern": "Pattern",
@@ -328,6 +334,7 @@
  "common.permissions": "Permissions",
  "common.prev": "Back",
  "common.preview": "Preview",
+ "common.prevPage": "Previous Page",
  "common.product": "Squidex Headless CMS",
  "common.project": "Project",
  "common.queryOperators.contains": "contains",
@@ -359,6 +366,9 @@
  "common.rules": "Rules",
  "common.sampleCodeLabel": "Sample Code at",
  "common.save": "Save",
+ "common.saveAdd": "Save & add another",
+ "common.saveClose": "Save & close",
+ "common.saveEdit": "Save & editor",
  "common.schema": "Schema",
  "common.schemas": "Schemas",
  "common.search": "Search",
@@ -480,6 +490,8 @@
  "contents.removeConfirmText": "Do you really want to remove the content?",
  "contents.removeConfirmTitle": "Remove content",
  "contents.saveAndPublish": "Save and Publish",
+ "contents.saveAndPublishAdd": "Save and Publish & add another",
+ "contents.saveAndPublishClose": "Save and Publish & close",
  "contents.scheduledAt": "at",
  "contents.scheduledBy": "by",
  "contents.scheduledTo": "to",
@@ -785,9 +797,9 @@
  "rules.updateFailed": "Failed to update rule. Please reload.",
  "rules.when": "When",
  "schemas.addField": "Add Field",
- "schemas.addFieldAndClose": "Create and close",
- "schemas.addFieldAndCreate": "Create and add field",
- "schemas.addFieldAndEdit": "Create and edit field",
+ "schemas.addFieldAndClose": "Create",
+ "schemas.addFieldAndCreate": "Create & add another",
+ "schemas.addFieldAndEdit": "Create & edit properties",
  "schemas.addFieldButton": "Add Field",
  "schemas.addFieldFailed": "Failed to add field. Please reload.",
  "schemas.addNestedField": "Add Nested Field",