Skip to content

Commit f23e024

Browse files
authored
Merge branch 'main' into artie-fix-more-codeql-findings
2 parents 76847c2 + 32a4b5f commit f23e024

4 files changed

Lines changed: 13 additions & 5 deletions

File tree

.changeset/tricky-moons-wear.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@cloudoperators/juno-app-greenhouse": patch
3+
---
4+
5+
Add foldGutter and foldKeymap extensions to enable collapsing/expanding YAML attributes in the viewer. Users can now click fold icons in the gutter to collapse nested structures.

.github/workflows/build-push-greenhouse-image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
failed: ${{ steps.set-failure-output.outputs.failed }}
144144
steps:
145145
- name: Run Trivy vulnerability scanner
146-
uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # 0.34.2
146+
uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0
147147
with:
148148
image-ref: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
149149
ignore-unfixed: true
@@ -153,7 +153,7 @@ jobs:
153153

154154
- name: Trivy vulnerability scanner (table output)
155155
id: table-trivy
156-
uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # 0.34.2
156+
uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0
157157
env:
158158
TRIVY_SKIP_DB_UPDATE: true
159159
TRIVY_SKIP_JAVA_DB_UPDATE: true

.github/workflows/build-push-supernova-image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
failed: ${{ steps.set-failure-output.outputs.failed }}
163163
steps:
164164
- name: Run Trivy vulnerability scanner
165-
uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # 0.34.2
165+
uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0
166166
with:
167167
image-ref: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
168168
ignore-unfixed: true
@@ -172,7 +172,7 @@ jobs:
172172

173173
- name: Trivy vulnerability scanner (table output)
174174
id: table-trivy
175-
uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # 0.34.2
175+
uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0
176176
env:
177177
TRIVY_SKIP_DB_UPDATE: true
178178
TRIVY_SKIP_JAVA_DB_UPDATE: true

apps/greenhouse/src/components/admin/common/YamlViewer.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
*/
55

66
import React, { useMemo, useRef, useEffect } from "react"
7-
import { EditorView, highlightWhitespace, lineNumbers } from "@codemirror/view"
7+
import { EditorView, highlightWhitespace, lineNumbers, keymap } from "@codemirror/view"
88
import { EditorState } from "@codemirror/state"
99
import { yaml } from "@codemirror/lang-yaml"
10+
import { foldGutter, foldKeymap } from "@codemirror/language"
1011
import { oneDark } from "@codemirror/theme-one-dark"
1112
import yamlParser from "js-yaml"
1213
import { ErrorMessage } from "../common/ErrorBoundary/ErrorMessage"
@@ -22,6 +23,8 @@ function createEditorExtensions() {
2223
oneDark,
2324
highlightWhitespace(),
2425
lineNumbers(),
26+
foldGutter(),
27+
keymap.of(foldKeymap),
2528
EditorView.editable.of(false),
2629
EditorView.lineWrapping,
2730
EditorView.theme({

0 commit comments

Comments
 (0)