Merge branch 'main' into upgradeV5

digitalservicebund · Dec 13, 2024 · 4608eab · 4608eab
2 parents dc51b5d + a8fe50e
commit 4608eab
Show file tree

Hide file tree

Showing 8 changed files with 839 additions and 773 deletions.
diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
@@ -66,14 +66,14 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Generate cosign vulnerability scan record
-        uses: aquasecurity/trivy-action@915b19bbe73b92a6cf82a1bc12b087c9a19a5fe2
+        uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0
         with:
           image-ref: ${{ env.IMAGE_NAME }}:${{ github.sha }}
           format: "cosign-vuln"
           output: "vulnerabilities.json"
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@915b19bbe73b92a6cf82a1bc12b087c9a19a5fe2
+        uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0
         with:
           image-ref: "${{ env.IMAGE_NAME }}:${{ github.sha }}"
           format: "template"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "styled-components": "^6.1.13"
   },
   "devDependencies": {
-    "better-sqlite3": "^11.5.0",
+    "better-sqlite3": "^11.7.0",
     "jest": "^29.7.0",
     "supertest": "^7.0.0"
   },

diff --git a/src/api/element-with-id/content-types/element-with-id/schema.json b/src/api/element-with-id/content-types/element-with-id/schema.json
@@ -35,17 +35,10 @@
       "type": "dynamiczone",
       "components": [
         "basic.heading",
-        "basic.link",
         "basic.paragraph",
-        "form-elements.button",
-        "form-elements.input",
-        "form-elements.select",
-        "form-helper.errors",
-        "page.info-box-item",
         "page.info-box",
         "page.box",
         "page.box-with-image",
-        "form-elements.dropdown",
         "page.inline-notice",
         "page.link-list-box",
         "page.list",

diff --git a/src/api/result-page/content-types/result-page/schema.json b/src/api/result-page/content-types/result-page/schema.json
@@ -61,7 +61,6 @@
         "basic.link",
         "basic.paragraph",
         "page.info-box",
-        "page.info-box-item",
         "page.box-with-image",
         "page.list",
         "page.inline-notice",
@@ -96,11 +95,6 @@
       },
       "component": "basic.link"
     },
-    "reasonings": {
-      "type": "relation",
-      "relation": "oneToMany",
-      "target": "api::element-with-id.element-with-id"
-    },
     "documents": {
       "type": "relation",
       "relation": "oneToOne",

diff --git a/src/components/form-elements/textarea.json b/src/components/form-elements/textarea.json
@@ -28,6 +28,12 @@
       "type": "component",
       "repeatable": false,
       "component": "page.details-summary"
+    },
+    "maxLength": {
+      "type": "integer",
+      "required": false,
+      "max": 5000,
+      "default": 5000
     }
   }
 }