From be8023a0877a346e68939764e0969ef18b65c66c Mon Sep 17 00:00:00 2001 From: Denis Papec Date: Thu, 14 Sep 2023 00:26:06 +0100 Subject: [PATCH] Simplified code, removed not needed code --- src/pages/index.jsx | 18 +++++++----------- src/utils/config/service-helpers.js | 1 - 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/pages/index.jsx b/src/pages/index.jsx index 8a8e0fc4..f115f8a7 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -236,17 +236,13 @@ function Home({ initialSettings }) { } }) - const tabs = useMemo( () => { - if (!settings.layout) return []; - - return [ - ...new Set( - Object.keys(settings.layout).map( - (groupName) => settings.layout[groupName]?.tab - ).filter(group => group) - ) - ] - }, [settings.layout]); + const tabs = useMemo( () => [ + ...new Set( + Object.keys(settings.layout ?? {}).map( + (groupName) => settings.layout[groupName]?.tab + ).filter(group => group) + ) + ], [settings.layout]); if (!activeTab) { const initialTab = decodeURI(asPath.substring(asPath.indexOf("#") + 1)); diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index 63c5c34c..023c89e3 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -286,7 +286,6 @@ export async function servicesFromKubernetes() { export function cleanServiceGroups(groups) { return groups.map((serviceGroup) => ({ name: serviceGroup.name, - tabs: serviceGroup?.tabs, services: serviceGroup.services.map((service) => { const cleanedService = { ...service }; if (cleanedService.showStats !== undefined) cleanedService.showStats = JSON.parse(cleanedService.showStats);