Merge branch 'main' into guoda-test

guoda-puidokaite · web-flow · commit 245093deeef9 · 2026-03-23T10:16:23.000+01:00
diff --git a/.changeset/polite-apples-invent.md b/.changeset/polite-apples-invent.md
@@ -0,0 +1,8 @@
+---
+"@cloudoperators/juno-messages-provider": patch
+"@cloudoperators/juno-app-greenhouse": patch
+"@cloudoperators/juno-app-supernova": patch
+"@cloudoperators/juno-app-doop": patch
+---
+
+Removes unused variables, imports, functions, and classes identified by static code analysis to improve code quality and maintainability.
diff --git a/.changeset/tricky-moons-wear.md b/.changeset/tricky-moons-wear.md
@@ -0,0 +1,5 @@
+---
+"@cloudoperators/juno-app-greenhouse": patch
+---
+
+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.
diff --git a/.github/workflows/build-push-greenhouse-image.yaml b/.github/workflows/build-push-greenhouse-image.yaml
@@ -143,7 +143,7 @@ jobs:
       failed: ${{ steps.set-failure-output.outputs.failed }}
     steps:
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # 0.34.2
+        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0
         with:
           image-ref: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
           ignore-unfixed: true
@@ -153,7 +153,7 @@ jobs:
 
       - name: Trivy vulnerability scanner (table output)
         id: table-trivy
-        uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # 0.34.2
+        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0
         env:
           TRIVY_SKIP_DB_UPDATE: true
           TRIVY_SKIP_JAVA_DB_UPDATE: true
diff --git a/.github/workflows/build-push-supernova-image.yaml b/.github/workflows/build-push-supernova-image.yaml
@@ -162,7 +162,7 @@ jobs:
       failed: ${{ steps.set-failure-output.outputs.failed }}
     steps:
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # 0.34.2
+        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0
         with:
           image-ref: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
           ignore-unfixed: true
@@ -172,7 +172,7 @@ jobs:
 
       - name: Trivy vulnerability scanner (table output)
         id: table-trivy
-        uses: aquasecurity/trivy-action@97e0b3872f55f89b95b2f65b3dbab56962816478 # 0.34.2
+        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0
         env:
           TRIVY_SKIP_DB_UPDATE: true
           TRIVY_SKIP_JAVA_DB_UPDATE: true
diff --git a/apps/doop/src/App.tsx b/apps/doop/src/App.tsx
@@ -5,7 +5,7 @@
 
 import React, { StrictMode, useLayoutEffect } from "react"
 
-import { AppShellProvider, ContentHeading } from "@cloudoperators/juno-ui-components"
+import { AppShellProvider } from "@cloudoperators/juno-ui-components"
 import { RouterProvider, createBrowserHistory, createHashHistory, createRouter } from "@tanstack/react-router"
 import { decodeV2, encodeV2, registerConsumer } from "@cloudoperators/juno-url-state-provider"
 import styles from "./styles.css?inline"
diff --git a/apps/doop/src/lib/store/index.ts b/apps/doop/src/lib/store/index.ts
@@ -13,11 +13,9 @@ import createGlobalsSlice from "./createGlobalsSlice"
 export default (options: any) =>
   createStore(
     devtools((set, get) => ({
-      // @ts-expect-error TS(2554) FIXME: Expected 1 arguments, but got 2.
-      ...createUserActivitySlice(set, get),
+      ...createUserActivitySlice(set),
       ...createFiltersSlice(set, get, options),
       ...createDataSlice(set, get),
-      // @ts-expect-error TS(2554) FIXME: Expected 1 arguments, but got 2.
-      ...createGlobalsSlice(set, get),
+      ...createGlobalsSlice(set),
     }))
   )
diff --git a/apps/doop/src/routes/violations.tsx b/apps/doop/src/routes/violations.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { useLayoutEffect } from "react"
-import { createFileRoute, retainSearchParams } from "@tanstack/react-router"
+import { createFileRoute } from "@tanstack/react-router"
 import { z } from "zod"
 import AppContent from "../components/AppContent"
 import { convertUrlStateToAppState, getFiltersForUrl } from "../lib/urlStateUtils"
diff --git a/apps/greenhouse/src/components/admin/common/YamlViewer.tsx b/apps/greenhouse/src/components/admin/common/YamlViewer.tsx
@@ -4,9 +4,10 @@
  */
 
 import React, { useMemo, useRef, useEffect } from "react"
-import { EditorView, highlightWhitespace, lineNumbers } from "@codemirror/view"
+import { EditorView, highlightWhitespace, lineNumbers, keymap } from "@codemirror/view"
 import { EditorState } from "@codemirror/state"
 import { yaml } from "@codemirror/lang-yaml"
+import { foldGutter, foldKeymap } from "@codemirror/language"
 import { oneDark } from "@codemirror/theme-one-dark"
 import yamlParser from "js-yaml"
 import { ErrorMessage } from "../common/ErrorBoundary/ErrorMessage"
@@ -22,6 +23,8 @@ function createEditorExtensions() {
     oneDark,
     highlightWhitespace(),
     lineNumbers(),
+    foldGutter(),
+    keymap.of(foldKeymap),
     EditorView.editable.of(false),
     EditorView.lineWrapping,
     EditorView.theme({
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/StoreProvider.tsx b/apps/greenhouse/src/components/core-apps/org-admin/StoreProvider.tsx
@@ -6,16 +6,17 @@
 import React, { createContext, useContext } from "react"
 
 import { useStore as create } from "zustand"
-import createStore from "./lib/store"
+import createStoreFactory from "./lib/store"
 
-// @ts-expect-error TS(2554): Expected 1 arguments, but got 0.
-const StoreContext = createContext()
-const StoreProvider = ({ options, children }: any) => (
-  // @ts-expect-error TS(2554): Expected 0 arguments, but got 1.
-  <StoreContext.Provider value={createStore(options)}>{children}</StoreContext.Provider>
+const StoreContext = createContext<ReturnType<typeof createStoreFactory> | null>(null)
+const StoreProvider = ({ children }: any) => (
+  <StoreContext.Provider value={createStoreFactory()}>{children}</StoreContext.Provider>
 )
-// @ts-expect-error TS(2554): Expected 1 arguments, but got 0.
-const useAppStore = (selector: any) => create(useContext(StoreContext), selector)
+const useAppStore = (selector: any) => {
+  const store = useContext(StoreContext)
+  if (!store) throw new Error("useAppStore must be used within StoreProvider")
+  return create(store, selector)
+}
 
 export const useActivePlugin = () => useAppStore((state: any) => state.active)
 export const useActions = () => useAppStore((state: any) => state.actions)
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/components/clusters/store.test.ts b/apps/greenhouse/src/components/core-apps/org-admin/components/clusters/store.test.ts
@@ -44,8 +44,6 @@ describe("store tests", () => {
   })
 
   describe("Modify Cluster", () => {
-    const version = "greenhouse.sap/v1alpha1"
-
     test("check valid modification", () => {
       const { result } = renderHook(() => useStore())
       act(() => {
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugin-edit/KeyValueInput.tsx b/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugin-edit/KeyValueInput.tsx
@@ -5,7 +5,7 @@
 
 import React from "react"
 
-import { Button, Stack, TextInput, FormSection, InputGroup, FormRow } from "@cloudoperators/juno-ui-components"
+import { Button, TextInput, FormSection, InputGroup, FormRow } from "@cloudoperators/juno-ui-components"
 /*
  * This Element provides a form section for entering and editing key-value pairs.
  * The key-value data and the setData function are passed as props.
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugin-edit/PluginEdit.tsx b/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugin-edit/PluginEdit.tsx
@@ -42,7 +42,6 @@ interface PluginEditProps {
 }
 const PluginEdit: React.FC<PluginEditProps> = (props: PluginEditProps) => {
   const namespace = useStore((state: any) => state.namespace)
-  const showEditForm = useStore((state: any) => state.showEditForm)
   const setShowEditForm = useStore((state: any) => state.setShowEditForm)
 
   const editFormState = useStore((state: any) => state.editFormState)
@@ -148,10 +147,6 @@ const PluginEdit: React.FC<PluginEditProps> = (props: PluginEditProps) => {
 
   const kindName = isPluginPreset ? "Plugin Preset" : "Plugin"
 
-  const onPanelClose = () => {
-    setShowEditForm(false)
-  }
-
   const [submitMessage, setSubmitResultMessage] = React.useState<SubmitMessage>({ message: "", ok: false })
   const onSubmit = async () => {
     if (isPluginPreset) {
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugin-edit/SecretKeySelect.tsx b/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugin-edit/SecretKeySelect.tsx
@@ -4,7 +4,7 @@
  */
 
 import React from "react"
-import { PluginOptionValueFrom, Secret, SecretDataEntry } from "../../../types/types"
+import { PluginOptionValueFrom } from "../../../types/types"
 
 import { Stack, Select, SelectOption } from "@cloudoperators/juno-ui-components"
 import usePluginDefinitionsStore from "../plugindefinitions/store"
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugin-edit/handleFormChange.ts b/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugin-edit/handleFormChange.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Plugin, PluginOptionValue, Secret, SecretDataEntry } from "../../../types/types"
+import { PluginOptionValue } from "../../../types/types"
 import { EditFormData } from "../plugindefinitions/store"
 
 const handleFormChange = (e: React.ChangeEvent<HTMLInputElement>, editFormData: EditFormData): EditFormData => {
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugindefinitions/components/PluginDefinitionDetail.tsx b/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugindefinitions/components/PluginDefinitionDetail.tsx
@@ -12,9 +12,6 @@ import {
   DataGridHeadCell,
   DataGridRow,
   DataGridToolbar,
-  Panel,
-  PanelBody,
-  Stack,
 } from "@cloudoperators/juno-ui-components"
 import React, { useEffect } from "react"
 import ReactMarkDown from "react-markdown"
@@ -34,7 +31,6 @@ interface PluginDefinitionDetailProps {
 }
 
 const PluginDefinitionDetail: React.FC<PluginDefinitionDetailProps> = (props: PluginDefinitionDetailProps) => {
-  const showPluginDefinitionDetails = useStore((state: any) => state.showPluginDefinitionDetails)
   const setShowPluginDefinitionDetails = useStore((state: any) => state.setShowPluginDefinitionDetails)
 
   const setShowPluginDefinitionEdit = useStore((state: any) => state.setShowEditForm)
@@ -43,7 +39,6 @@ const PluginDefinitionDetail: React.FC<PluginDefinitionDetailProps> = (props: Pl
   const { getPluginsByLabelSelector: getPluginsByLabelSelector } = usePluginApi()
 
   const { fetchMarkDown: fetchMarkDown } = useFetchMarkDown()
-  const setIsEditMode = useStore((state: any) => state.setIsPluginEditMode)
 
   const setEditFormData = useStore((state: any) => state.setEditFormData)
   const setEditFormState = useStore((state: any) => state.setEditFormState)
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugins/lib/store/createGlobalsSlice.ts b/apps/greenhouse/src/components/core-apps/org-admin/components/plugins/plugins/lib/store/createGlobalsSlice.ts
@@ -28,7 +28,7 @@ export interface GlobalsSlice {
   globals: GlobalState & { actions: GlobalActions }
 }
 
-const createGlobalsSlice: StateCreator<GlobalsSlice, [], [], GlobalsSlice> = (set) => ({
+const createGlobalsSlice: StateCreator<GlobalsSlice, [], [], GlobalsSlice> = (set, _get, _api) => ({
   globals: {
     urlStateKey: "",
     apiEndpoint: null,
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/components/secrets/hooks/useApi.ts b/apps/greenhouse/src/components/core-apps/org-admin/components/secrets/hooks/useApi.ts
@@ -17,8 +17,6 @@ export const useApi = (debug?: boolean) => {
 
   const get = useCallback(
     async <T extends AllowedApiObject>(url: string, object: T, params?: any): Promise<ApiResponse> => {
-      let response: T
-
       if (!client || !namespace) {
         return { ok: false, message: "Client or namespace not available" }
       }
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/components/secrets/lib/store/index.ts b/apps/greenhouse/src/components/core-apps/org-admin/components/secrets/lib/store/index.ts
@@ -10,7 +10,6 @@ import createGlobalsSlice from "./createGlobalsSlice"
 export default () =>
   createStore(
     devtools((set, get) => ({
-      // @ts-expect-error TS(2554): Expected 1 arguments, but got 2.
-      ...createGlobalsSlice(set, get),
+      ...createGlobalsSlice(set),
     }))
   )
diff --git a/apps/greenhouse/src/components/core-apps/org-admin/components/secrets/store.ts b/apps/greenhouse/src/components/core-apps/org-admin/components/secrets/store.ts
@@ -95,19 +95,4 @@ const useStore = create<State>((set: any) => ({
     })),
 }))
 
-const updateSecrets = (existingSecrets: Secret[], newSecrets: Secret[]): Secret[] => {
-  let returnSecrets = existingSecrets
-  newSecrets.forEach((inputSecret) => {
-    const index = existingSecrets.findIndex((knownSecret: any) => {
-      return knownSecret.metadata!.name === inputSecret.metadata!.name
-    })
-    if (index >= 0) {
-      returnSecrets[index] = inputSecret
-    } else {
-      returnSecrets.push(inputSecret)
-    }
-  })
-  return returnSecrets
-}
-
 export default useStore
diff --git a/apps/supernova/src/App.tsx b/apps/supernova/src/App.tsx
@@ -15,7 +15,6 @@ import styles from "./styles.css?inline"
 import { StoreProvider } from "./components/StoreProvider"
 import { routeTree } from "./routeTree.gen"
 import { convertAppStateToUrlState, extractSearchStringFromHashFragment, readLegacyUrlState } from "./lib/urlStateUtils"
-import { isObjectWithKeys } from "./lib/utils"
 
 // Create a new router instance
 const router = createRouter({
diff --git a/apps/supernova/src/components/StoreProvider.tsx b/apps/supernova/src/components/StoreProvider.tsx
@@ -5,7 +5,6 @@
 
 import React, { createContext, useContext } from "react"
 import { createStore, useStore, StoreApi } from "zustand"
-import { devtools } from "zustand/middleware"
 
 import createSilencesSlice, { SilencesSlice } from "../lib/createSilencesSlice"
 import createAlertsSlice, { AlertsSlice } from "../lib/createAlertsSlice"
diff --git a/packages/messages-provider/src/useMessageStore.test.tsx b/packages/messages-provider/src/useMessageStore.test.tsx
@@ -4,7 +4,7 @@
  */
 
 import * as React from "react"
-import { renderHook, act, waitFor } from "@testing-library/react"
+import { renderHook, act } from "@testing-library/react"
 import { useMessages, useActions, MessagesProvider } from "./index"
 
 const originalConsoleError = global.console.error
diff --git a/packages/url-state-provider/src/index.ts b/packages/url-state-provider/src/index.ts
@@ -276,8 +276,7 @@ function onGlobalChange(callback) {
  * every listener but only if the individual state has changed.
  */
 window.addEventListener("popstate", function (event) {
-  const newUrl = event.target.location.href
-  const state = URLToState(newUrl)
+  const state = URLToState()
   Object.keys(state).forEach((stateID) => {
     informListener(stateID, state[stateID])
   })

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@cloudoperators/juno-app-greenhouse": patch
 +---
++
 +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.