Merge branch 'master' of github.com:Squidex/squidex into improve-queries

# Conflicts:
#	backend/src/Squidex.Data.EntityFramework/Providers/Postgres/json_function.sql
#	backend/tests/Squidex.Data.Tests/EntityFramework/Infrastructure/Queries/EFQueryTests.cs
#	frontend/src/app/features/schemas/pages/schema/common/schema-edit-form.component.html

helm/index.yaml

@@ -3,7 +3,7 @@ entries:
   squidex:
   - apiVersion: v2
     appVersion: 5.9.0
-    created: "2026-02-20T10:26:30.547962074-07:00"
+    created: "2026-03-03T10:35:52.918231417-07:00"
     dependencies:
     - condition: mongodb-replicaset.enabled
       name: mongodb-replicaset
@@ -29,7 +29,33 @@ entries:
   squidex7:
   - apiVersion: v2
     appVersion: 7.18.0
-    created: "2026-02-20T10:26:30.63470164-07:00"
+    created: "2026-03-03T10:35:52.996989795-07:00"
+    dependencies:
+    - condition: mongodb.enabled
+      name: mongodb
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.5.45
+    description: Squidex CMS v7.0 and newer
+    digest: 69f8cf3c004879b536ad7b818c20906da2a499b7aef2fd1ea9c4c3cdf96d99af
+    home: https://squidex.io/
+    icon: https://raw.githubusercontent.com/Squidex/squidex/master/media/logo-squared.png
+    keywords:
+    - cms
+    - headless-cms
+    - mongodb
+    - csharp
+    - asp-net-core
+    - asp-net
+    name: squidex7
+    sources:
+    - https://github.com/Squidex/squidex
+    type: application
+    urls:
+    - squidex7-2.1.2.tgz
+    version: 2.1.2
+  - apiVersion: v2
+    appVersion: 7.18.0
+    created: "2026-03-03T10:35:52.985804988-07:00"
     dependencies:
     - condition: mongodb.enabled
       name: mongodb
@@ -55,7 +81,7 @@ entries:
     version: 2.1.1
   - apiVersion: v2
     appVersion: 7.18.0
-    created: "2026-02-20T10:26:30.622158546-07:00"
+    created: "2026-03-03T10:35:52.973606631-07:00"
     dependencies:
     - condition: mongodb.enabled
       name: mongodb
@@ -81,7 +107,7 @@ entries:
     version: 2.1.0
   - apiVersion: v2
     appVersion: 7.18.0
-    created: "2026-02-20T10:26:30.609293597-07:00"
+    created: "2026-03-03T10:35:52.961805079-07:00"
     dependencies:
     - condition: mongodb.enabled
       name: mongodb
@@ -107,7 +133,7 @@ entries:
     version: 2.0.3
   - apiVersion: v2
     appVersion: 7.18.0
-    created: "2026-02-20T10:26:30.596559635-07:00"
+    created: "2026-03-03T10:35:52.954012441-07:00"
     dependencies:
     - condition: mongodb.enabled
       name: mongodb
@@ -133,7 +159,7 @@ entries:
     version: 2.0.2
   - apiVersion: v2
     appVersion: 7.18.0
-    created: "2026-02-20T10:26:30.583618202-07:00"
+    created: "2026-03-03T10:35:52.942174029-07:00"
     dependencies:
     - condition: mongodb.enabled
       name: mongodb
@@ -159,7 +185,7 @@ entries:
     version: 2.0.1
   - apiVersion: v2
     appVersion: 7.18.0
-    created: "2026-02-20T10:26:30.570287148-07:00"
+    created: "2026-03-03T10:35:52.929526039-07:00"
     dependencies:
     - condition: mongodb.enabled
       name: mongodb
@@ -185,7 +211,7 @@ entries:
     version: 2.0.0
   - apiVersion: v2
     appVersion: 7.15.0
-    created: "2026-02-20T10:26:30.55824258-07:00"
+    created: "2026-03-03T10:35:52.923824251-07:00"
     dependencies:
     - condition: mongodb-replicaset.enabled
       name: mongodb-replicaset
@@ -211,7 +237,7 @@ entries:
     version: 1.0.3
   - apiVersion: v2
     appVersion: 7.15.0
-    created: "2026-02-20T10:26:30.555719321-07:00"
+    created: "2026-03-03T10:35:52.921763859-07:00"
     dependencies:
     - condition: mongodb-replicaset.enabled
       name: mongodb-replicaset
@@ -237,7 +263,7 @@ entries:
     version: 1.0.2
   - apiVersion: v2
     appVersion: 7.0.2
-    created: "2026-02-20T10:26:30.5531889-07:00"
+    created: "2026-03-03T10:35:52.920517312-07:00"
     dependencies:
     - condition: mongodb-replicaset.enabled
       name: mongodb-replicaset
@@ -263,7 +289,7 @@ entries:
     version: 1.0.1
   - apiVersion: v2
     appVersion: 7.0.2
-    created: "2026-02-20T10:26:30.550596822-07:00"
+    created: "2026-03-03T10:35:52.919340345-07:00"
     dependencies:
     - condition: mongodb-replicaset.enabled
       name: mongodb-replicaset
@@ -287,4 +313,4 @@ entries:
     urls:
     - squidex7-1.0.0.tgz
     version: 1.0.0
-generated: "2026-02-20T10:26:30.544981347-07:00"
+generated: "2026-03-03T10:35:52.91679264-07:00"

helm/squidex7/Chart.yaml

@@ -5,7 +5,7 @@ name: squidex7
 icon: https://raw.githubusercontent.com/Squidex/squidex/master/media/logo-squared.png
 description: Squidex CMS v7.0 and newer
 
-version: 2.1.1
+version: 2.1.2
 appVersion: "7.18.0"
 
 home: https://squidex.io/

helm/squidex7/templates/deployment-worker.yaml

@@ -80,6 +80,7 @@ spec:
             - name: CLUSTERING__WORKER
               value: "true"
           
+          {{- if (.Values.mongodb.enabled) }}
           {{- $mongoDefaultConnectionString := printf "mongodb://%s" (include "squidex.mongoDefaultHostname" .) }}
           {{- if (not .Values.env.EVENTSTORE__MONGODB__CONFIGURATION) }}
             - name: "EVENTSTORE__MONGODB__CONFIGURATION"
@@ -95,6 +96,28 @@ spec:
             - name: "ASSETSTORE__MONGODB__CONFIGURATION"
               value: {{ $mongoDefaultConnectionString | quote }}
           {{- end }}
+          {{- end }}
+          {{- if .Values.extraConfigMaps | or .Values.extraSecrets }}
+          envFrom:
+          {{- range $configMap := .Values.extraConfigMaps }}
+          - configMapRef:
+              name: {{ $configMap }}
+          {{- end }}
+          {{- range $secret := .Values.extraSecrets }}
+          - secretRef:
+              name: {{ $secret }}
+          {{- end }}
+          {{- end }}
+        
+          {{- if .Values.extraVolumeMounts }}
+          volumeMounts:
+          {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+          {{- end }}
+    
+      {{- if .Values.extraVolumes }}
+      volumes:
+      {{- toYaml .Values.extraVolumes | nindent 8 }}
+      {{- end }}  
       nodeSelector:
         {{- toYaml .Values.nodeSelector | nindent 8 }}
       affinity:

helm/squidex7/templates/deployment.yaml

@@ -99,13 +99,13 @@ spec:
               value: {{ $mongoDefaultConnectionString | quote }}
           {{- end }}
           {{- end }}
-          {{- if .Values.additionalConfigMaps | or .Values.additionalSecrets }}
+          {{- if .Values.extraConfigMaps | or .Values.extraSecrets }}
           envFrom:
-          {{- range $configMap := .Values.additionalConfigMaps }}
+          {{- range $configMap := .Values.extraConfigMaps }}
           - configMapRef:
               name: {{ $configMap }}
           {{- end }}
-          {{- range $secret := .Values.additionalSecrets }}
+          {{- range $secret := .Values.extraSecrets }}
           - secretRef:
               name: {{ $secret }}
           {{- end }}