From 9580d69dbd31185c51bbd5a318c78bae93aa26c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Mee=C3=9Fen?=
 <14222414+cmeessen@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:56:57 +0200
Subject: [PATCH] chore: fix sonarcloud issues

---
 .../esciencecenter/rsd/authentication/HelmholtzIdLogin.java  | 4 ++--
 frontend/components/layout/UserMenu.test.tsx                 | 3 ++-
 frontend/config/RsdPluginContext.tsx                         | 5 +++--
 frontend/config/useUserMenuItems.tsx                         | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/authentication/src/main/java/nl/esciencecenter/rsd/authentication/HelmholtzIdLogin.java b/authentication/src/main/java/nl/esciencecenter/rsd/authentication/HelmholtzIdLogin.java
index 27aaa2ef0..72ed9d0f2 100644
--- a/authentication/src/main/java/nl/esciencecenter/rsd/authentication/HelmholtzIdLogin.java
+++ b/authentication/src/main/java/nl/esciencecenter/rsd/authentication/HelmholtzIdLogin.java
@@ -209,12 +209,12 @@ public OpenIdInfo openidInfo() throws IOException, InterruptedException {
 		}
 		String organisation = getOrganisationFromEntitlements(entitlements);
 
-		List<String> eduPersonEntitlements = new ArrayList<String>();
+		List<String> eduPersonEntitlements = new ArrayList<>();
 		for (int i=0; i<entitlements.size(); i++) {
 			eduPersonEntitlements.add(entitlements.get(i).toString());
 		}
 
-		Map<String, List<String>> data = new HashMap<String, List<String>>();
+		Map<String, List<String>> data = new HashMap<>();
 		data.put("eduPersonEntitlements", eduPersonEntitlements);
 
 		return new OpenIdInfo(
diff --git a/frontend/components/layout/UserMenu.test.tsx b/frontend/components/layout/UserMenu.test.tsx
index 50f41a009..ad36ab505 100644
--- a/frontend/components/layout/UserMenu.test.tsx
+++ b/frontend/components/layout/UserMenu.test.tsx
@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
 // SPDX-FileCopyrightText: 2022 dv4all
+// SPDX-FileCopyrightText: 2024 Christian Meeßen (GFZ) <christian.meessen@gfz-potsdam.de>
 // SPDX-FileCopyrightText: 2024 Dusan Mijatovic (Netherlands eScience Center)
+// SPDX-FileCopyrightText: 2024 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences
 // SPDX-FileCopyrightText: 2024 Netherlands eScience Center
 //
 // SPDX-License-Identifier: Apache-2.0
@@ -9,7 +11,6 @@ import {render,screen, fireEvent} from '@testing-library/react'
 import {WithAppContext, mockSession} from '~/utils/jest/WithAppContext'
 
 import UserMenu from './UserMenu'
-import {userMenuItems} from '~/config/menuItems'
 
 it('should render userMenu', () => {
   render (
diff --git a/frontend/config/RsdPluginContext.tsx b/frontend/config/RsdPluginContext.tsx
index 5aba76371..377ea03ed 100644
--- a/frontend/config/RsdPluginContext.tsx
+++ b/frontend/config/RsdPluginContext.tsx
@@ -5,7 +5,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-import {createContext, useContext, useEffect, useState} from 'react'
+import {createContext, useContext, useEffect, useMemo, useState} from 'react'
 
 // Defines the possible names for plugin slots, referred by the individual components
 export type PluginSlot = 'userMenu'|'editSoftwareNav'
@@ -27,9 +27,10 @@ export const RsdPluginContext = createContext<{settings:PluginConfig[]}>({settin
 
 export default function PluginSettingsProvider(props: any) {
   const [settings, setSettings] = useState(props?.settings ?? [])
+  const value = useMemo(() => ({settings, setSettings}), [settings, setSettings])
 
   return <RsdPluginContext.Provider
-    value={{settings,setSettings}}
+    value={value}
     {...props}
   />
 }
diff --git a/frontend/config/useUserMenuItems.tsx b/frontend/config/useUserMenuItems.tsx
index 921abad2e..5ef06eda8 100644
--- a/frontend/config/useUserMenuItems.tsx
+++ b/frontend/config/useUserMenuItems.tsx
@@ -20,7 +20,7 @@ export default function useUserMenuItems(){
   const items: MenuItemType[] = []
 
   userMenuItems.forEach( (item) => {
-    if (item.active && item.active({role: user?.role, modules: host.modules})){
+    if (item.active?.({role: user?.role, modules: host.modules})){
       items.push(item)
     } else if (item.type == 'pluginSlot') {
       // add plugins to user menu