From 421e3d6c39b107897ca60d410f101dfcaf3b7f1d Mon Sep 17 00:00:00 2001 From: Roland Date: Wed, 17 Dec 2025 18:54:48 -0700 Subject: [PATCH] Combining status column on with service column on controller page. --- app/src/components/admin/ControllerPage.js | 59 +++++++++++----------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/app/src/components/admin/ControllerPage.js b/app/src/components/admin/ControllerPage.js index a97f92d2..b4dd3e39 100644 --- a/app/src/components/admin/ControllerPage.js +++ b/app/src/components/admin/ControllerPage.js @@ -1,29 +1,24 @@ import React from 'react'; -import {Container, Dropdown, Icon, Confirm, Input, Checkbox, Form} from "semantic-ui-react"; +import {Checkbox, Confirm, Container, Dropdown, Form, Icon, Input} from "semantic-ui-react"; import {Button, Header, Loader, Modal, Segment, Table} from "../Theme"; -import { - APIButton, - HotspotToggle, - ThrottleToggle, - Toggle, -} from "../Common"; +import {APIButton, HotspotToggle, ThrottleToggle, Toggle,} from "../Common"; import {useDockerized} from "../../hooks/customHooks"; import {Media} from "../../contexts/contexts"; import { + addFstabEntry, + disableService, + enableService, + getDisks, + getFstabEntries, + getServiceLogs, getServices, + getSmartStatus, + mountDisk, + removeFstabEntry, + restartService, + restartServices, startService, stopService, - restartService, - enableService, - disableService, - getServiceLogs, - getDisks, - getSmartStatus, - restartServices, - getFstabEntries, - addFstabEntry, - removeFstabEntry, - mountDisk, unmountDisk, } from "../../api/controller"; import {toast} from "react-semantic-toasts-2"; @@ -165,13 +160,26 @@ function useServiceRow(service, onAction) { } // Logs modal component (shared between mobile and desktop) -function ServiceLogsModal({service, logsOpen, setLogsOpen, logs, logsLoading, logsRef, linesCount, countdown, handleViewLogs, handleLinesChange, handleDownloadLogs, fetchLogs}) { +function ServiceLogsModal({ + service, + logsOpen, + setLogsOpen, + logs, + logsLoading, + logsRef, + linesCount, + countdown, + handleViewLogs, + handleLinesChange, + handleDownloadLogs, + fetchLogs + }) { return ( setLogsOpen(false)} onOpen={handleViewLogs} - trigger={