From 23fe7f6ad3ab0ed62b0b0f887de2467427b4b5b9 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 8 Jun 2024 15:08:40 +0200 Subject: [PATCH] remove Restart --- interface/src/project/Modules.tsx | 88 +++++++++---------------------- 1 file changed, 26 insertions(+), 62 deletions(-) diff --git a/interface/src/project/Modules.tsx b/interface/src/project/Modules.tsx index d60589721..6d639ba48 100644 --- a/interface/src/project/Modules.tsx +++ b/interface/src/project/Modules.tsx @@ -5,12 +5,9 @@ import { toast } from 'react-toastify'; import CancelIcon from '@mui/icons-material/Cancel'; import CircleIcon from '@mui/icons-material/Circle'; -import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew'; import WarningIcon from '@mui/icons-material/Warning'; import { Box, Button, Typography } from '@mui/material'; -import * as SystemApi from 'api/system'; - import { Body, Cell, @@ -26,11 +23,9 @@ import { BlockNavigation, ButtonRow, FormLoader, - MessageBox, SectionContent, useLayoutTitle } from 'components'; -import RestartMonitor from 'framework/system/RestartMonitor'; import { useI18nContext } from 'i18n/i18n-react'; import * as EMSESP from './api'; @@ -40,13 +35,10 @@ import type { ModuleItem, Modules } from './types'; const Modules: FC = () => { const { LL } = useI18nContext(); const [numChanges, setNumChanges] = useState(0); - const [licenseChanges, setLicenseChanges] = useState(0); const blocker = useBlocker(numChanges !== 0); const [selectedModuleItem, setSelectedModuleItem] = useState(); const [dialogOpen, setDialogOpen] = useState(false); - const [restarting, setRestarting] = useState(false); - const [restartNeeded, setRestartNeeded] = useState(false); const { data: modules, @@ -56,17 +48,6 @@ const Modules: FC = () => { initialData: [] }); - const { send: restartCommand } = useRequest(SystemApi.restart(), { - immediate: false - }); - - const restart = async () => { - await restartCommand().catch((error: Error) => { - toast.error(error.message); - }); - setRestarting(true); - }; - const { send: writeModules } = useRequest( (data: Modules) => EMSESP.writeModules(data), { @@ -140,17 +121,12 @@ const Modules: FC = () => { return mi.enabled !== mi.o_enabled || mi.license !== mi.o_license; } - function hasModuleLicenseChanged(mi: ModuleItem) { - return mi.license !== mi.o_license; - } - const updateModuleItem = (updatedItem: ModuleItem) => { updateState('modules', (data: ModuleItem[]) => { const new_data = data.map((mi) => mi.id === updatedItem.id ? { ...mi, ...updatedItem } : mi ); setNumChanges(new_data.filter((mi) => hasModulesChanged(mi)).length); - setLicenseChanges(new_data.filter((mi) => hasModuleLicenseChanged(mi)).length); return new_data; }); }; @@ -172,7 +148,6 @@ const Modules: FC = () => { .finally(() => { setNumChanges(0); }); - setRestartNeeded(licenseChanges > 0); }; const renderContent = () => { @@ -213,8 +188,10 @@ const Modules: FC = () => { {LL.NAME(0)} + {/* TODO translate */} Author {LL.VERSION()} + {/* TODO translate */} Message {LL.STATUS_OF('')} @@ -247,43 +224,30 @@ const Modules: FC = () => { )} - {restartNeeded ? ( - - - - ) : ( - - - {numChanges !== 0 && ( - - - - - )} - + + + {numChanges !== 0 && ( + + + + + )} - )} + ); }; @@ -291,7 +255,7 @@ const Modules: FC = () => { return ( {blocker ? : null} - {restarting ? : renderContent()} + {renderContent()} {selectedModuleItem && (