diff --git a/love/src/components/CommandPanel/DomeCloseButton/DomeCloseButton.module.css b/love/src/components/CommandPanel/DomeCloseButton/DomeCloseButton.module.css
index 0f5ea2bda..b4108ecb4 100644
--- a/love/src/components/CommandPanel/DomeCloseButton/DomeCloseButton.module.css
+++ b/love/src/components/CommandPanel/DomeCloseButton/DomeCloseButton.module.css
@@ -1,15 +1,15 @@
.buttonWrapper {
+ height: 200px;
+ width: 200px;
+ text-align: center;
}
.button {
- display: grid;
- grid-template-columns: min-content;
- grid-template-rows: min-content min-content;
+ width: 100%;
+ height: 100%;
border-radius: 5px;
- overflow: hidden;
- width: fit-content;
- border: none;
- padding: 0;
+ border: 0;
+ padding: 16px;
cursor: pointer;
background: var(--status-alert-color);
}
@@ -18,32 +18,23 @@
background: var(--status-alert-dimmed-color-2);
}
-.domeSVG {
-}
-
-.domeSVG path {
- transform: translate(-140px, -120px);
- fill: #fde8df;
-}
-
-.domePath {
-}
-
-.domeXPath {
- stroke: var(--status-alert-color);
- stroke-width: 3;
- stroke-miterlimit: 10;
+.button[disabled] {
+ cursor: not-allowed;
+ background: var(--status-alert-dimmed-color-2);
}
-.button:hover .domeXPath {
- stroke: var(--status-alert-dimmed-color-2);
- stroke-width: 3;
- stroke-miterlimit: 10;
+.svg {
+ height: 100px;
+ width: 100px;
}
.buttonLabel {
+ display: block;
padding: 0.5em 1em;
- padding-top: 0;
color: white;
font-size: var(--font-size-large);
}
+
+.cls-1 {
+ fill: #fbe6dd;
+}
diff --git a/love/src/components/CommandPanel/StopAllTSCButton/StopAllTSCButton.jsx b/love/src/components/CommandPanel/StopAllTSCButton/StopAllTSCButton.jsx
new file mode 100644
index 000000000..db9d2dd33
--- /dev/null
+++ b/love/src/components/CommandPanel/StopAllTSCButton/StopAllTSCButton.jsx
@@ -0,0 +1,37 @@
+import React, { Component } from 'react';
+import styles from './StopAllTSCButton.module.css';
+import ManagerInterface from 'Utils';
+// import { TCSCommands } from 'Config.js';
+
+export default class StopAllTSCButton extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {};
+ }
+
+ callTSCStopAll() {
+ // TODO: Reference command from variable
+ ManagerInterface.runATCSCommand('stop_all');
+ }
+
+ render() {
+ return (
+
+
+
+ );
+ }
+}
diff --git a/love/src/components/CommandPanel/StopAllTSCButton/StopAllTSCButton.module.css b/love/src/components/CommandPanel/StopAllTSCButton/StopAllTSCButton.module.css
new file mode 100644
index 000000000..b4108ecb4
--- /dev/null
+++ b/love/src/components/CommandPanel/StopAllTSCButton/StopAllTSCButton.module.css
@@ -0,0 +1,40 @@
+.buttonWrapper {
+ height: 200px;
+ width: 200px;
+ text-align: center;
+}
+
+.button {
+ width: 100%;
+ height: 100%;
+ border-radius: 5px;
+ border: 0;
+ padding: 16px;
+ cursor: pointer;
+ background: var(--status-alert-color);
+}
+
+.button:hover {
+ background: var(--status-alert-dimmed-color-2);
+}
+
+.button[disabled] {
+ cursor: not-allowed;
+ background: var(--status-alert-dimmed-color-2);
+}
+
+.svg {
+ height: 100px;
+ width: 100px;
+}
+
+.buttonLabel {
+ display: block;
+ padding: 0.5em 1em;
+ color: white;
+ font-size: var(--font-size-large);
+}
+
+.cls-1 {
+ fill: #fbe6dd;
+}
diff --git a/love/src/components/EventLog/EventLog.container.jsx b/love/src/components/EventLog/EventLog.container.jsx
index c996812ce..2432c3e36 100644
--- a/love/src/components/EventLog/EventLog.container.jsx
+++ b/love/src/components/EventLog/EventLog.container.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import { connect } from 'react-redux';
import EventLog from './EventLog';
-import { addGroup } from '../../redux/actions/ws';
+import { addGroup, removeGroup } from '../../redux/actions/ws';
import { removeCSCLogMessages, removeCSCErrorCodeData } from '../../redux/actions/summaryData';
import { getGroupSortedErrorCodeData, getGroupSortedLogMessageData } from '../../redux/selectors';
import { CSCSummaryHierarchy } from '../../Config';
@@ -48,6 +48,7 @@ const EventLogContainer = ({
logMessageData,
errorCodeData,
subscribeToStreams,
+ unsubscribeToStreams,
heartbeatData,
...props
}) => {
@@ -61,6 +62,7 @@ const EventLogContainer = ({
errorCodeData={errorCodeData}
summaryStateData={summaryStateData}
subscribeToStreams={subscribeToStreams}
+ unsubscribeToStreams={unsubscribeToStreams}
logMessageData={logMessageData}
heartbeatData={heartbeatData}
clearCSCLogMessages={clearCSCLogMessages}
@@ -77,7 +79,13 @@ const mapDispatchToProps = (dispatch) => {
dispatch(addGroup(`event-${nameIndex}-logMessage`));
dispatch(addGroup(`event-${nameIndex}-errorCode`));
});
- // dispatch(addGroup('event-Heartbeat-0-stream'));
+ },
+ unsubscribeToStreams: (cscList) => {
+ cscList.forEach((cscNameIndex) => {
+ const nameIndex = Object.values(cscNameIndex).join('-');
+ dispatch(removeGroup(`event-${nameIndex}-logMessage`));
+ dispatch(removeGroup(`event-${nameIndex}-errorCode`));
+ });
},
clearCSCLogMessages: (cscList) => {
cscList.forEach((cscNameIndex) => {
diff --git a/love/src/components/EventLog/EventLog.jsx b/love/src/components/EventLog/EventLog.jsx
index 65d8e657e..c3f64674b 100644
--- a/love/src/components/EventLog/EventLog.jsx
+++ b/love/src/components/EventLog/EventLog.jsx
@@ -17,6 +17,7 @@ export default class EventLog extends PureComponent {
clearCSCErrorCodes: PropTypes.func,
clearCSCLogMessages: PropTypes.func,
subscribeToStream: PropTypes.func,
+ unsubscribeToStream: PropTypes.func,
errorCodeData: PropTypes.array,
embedded: PropTypes.bool,
};
@@ -58,6 +59,10 @@ export default class EventLog extends PureComponent {
this.props.subscribeToStreams(this.props.cscList);
};
+ componentWillUnmount = () => {
+ this.props.unsubscribeToStreams(this.props.cscList);
+ };
+
clearGroupErrorCodes = () => {
// this.props.cscList.forEach(({ name, salindex }) => {
// this.props.clearCSCErrorCodes(name, salindex);
diff --git a/love/src/components/GeneralPurpose/LogMessageDisplay/LogMessageDisplay.jsx b/love/src/components/GeneralPurpose/LogMessageDisplay/LogMessageDisplay.jsx
index 8f4b0a140..16fa86497 100644
--- a/love/src/components/GeneralPurpose/LogMessageDisplay/LogMessageDisplay.jsx
+++ b/love/src/components/GeneralPurpose/LogMessageDisplay/LogMessageDisplay.jsx
@@ -1,18 +1,19 @@
import React, { useState, memo } from 'react';
import PropTypes from 'prop-types';
-import InfoIcon from '../../icons/InfoIcon/InfoIcon';
-import WarningIcon from '../../icons/WarningIcon/WarningIcon';
-import ErrorIcon from '../../icons/ErrorIcon/ErrorIcon';
+import DebugIcon from '../../icons/CSCExpanded/DebugIcon/DebugIcon';
+import InfoIcon from '../../icons/CSCExpanded/InfoIcon/InfoIcon';
+import WarningIcon from '../../icons/CSCExpanded/WarningIcon/WarningIcon';
+import ErrorIcon from '../../icons/CSCExpanded/ErrorIcon/ErrorIcon';
import Button from '../../GeneralPurpose/Button/Button';
import styles from './LogMessageDisplay.module.css';
import { formatTimestamp } from '../../../Utils';
function LogMessageDisplay({ logMessageData, clearCSCLogMessages }) {
const [messageFilters, setMessageFilters] = useState({
- 10: { value: true, name: 'Debug' },
- 20: { value: true, name: 'Info' },
- 30: { value: true, name: 'Warning' },
- 40: { value: true, name: 'Error' },
+ 10: { value: true, name: 'Debug', icon:
},
+ 20: { value: true, name: 'Info', icon:
},
+ 30: { value: true, name: 'Warning', icon:
},
+ 40: { value: true, name: 'Error', icon:
},
});
const updateFilter = (key, value) => {
@@ -35,13 +36,14 @@ function LogMessageDisplay({ logMessageData, clearCSCLogMessages }) {
return (
);
diff --git a/love/src/components/GeneralPurpose/Plot/PolarPlot/PolarPlot.container.jsx b/love/src/components/GeneralPurpose/Plot/PolarPlot/PolarPlot.container.jsx
index a2da2aad1..b0eac2e6d 100644
--- a/love/src/components/GeneralPurpose/Plot/PolarPlot/PolarPlot.container.jsx
+++ b/love/src/components/GeneralPurpose/Plot/PolarPlot/PolarPlot.container.jsx
@@ -1,13 +1,9 @@
import React from 'react';
import { connect } from 'react-redux';
-import { addGroup, requestGroupRemoval } from 'redux/actions/ws';
+import { addGroup, removeGroup } from 'redux/actions/ws';
import { getStreamsData, getTaiToUtc } from 'redux/selectors/selectors';
import PolarPlot from './PolarPlot';
import ManagerInterface, { parseTimestamp, parsePlotInputs, parseCommanderData } from 'Utils';
-import Moment from 'moment';
-import { extendMoment } from 'moment-range';
-
-const moment = extendMoment(Moment);
export const defaultStyles = [
{
@@ -384,7 +380,7 @@ const mapDispatchToProps = (dispatch, ownProps) => {
const displayDome = ownProps.displayDome || schema.props.displayDome.default;
const groupNames = getGroupNames(inputs, displayDome);
groupNames.forEach((groupName) => {
- dispatch(requestGroupRemoval(groupName));
+ dispatch(removeGroup(groupName));
});
},
};
diff --git a/love/src/components/Layout/Layout.jsx b/love/src/components/Layout/Layout.jsx
index 08cda3a84..b40ce3cca 100644
--- a/love/src/components/Layout/Layout.jsx
+++ b/love/src/components/Layout/Layout.jsx
@@ -75,7 +75,7 @@ class Layout extends Component {
tokenSwapStatus: PropTypes.string,
/** Function to be called when requiring a user swap, similar to a logout */
requireUserSwap: PropTypes.func,
- /** Function to call in order to rese4t subscriptions (when the manager heartbeat is missed) */
+ /** Function to call in order to reset subscriptions (when the manager heartbeat is missed) */
resetSubscriptions: PropTypes.func,
};
@@ -116,9 +116,10 @@ class Layout extends Component {
componentDidMount = () => {
this.moveCustomTopbar();
this.props.subscribeToStreams();
+ this.checkHeartbeat();
this.heartbeatInterval = setInterval(() => {
this.checkHeartbeat();
- }, 3000);
+ }, 10000);
};
componentWillUnmount = () => {
@@ -305,20 +306,22 @@ class Layout extends Component {
};
renderHeartbeatsMenu = () => {
- const producerHeartbeats = [
- HEARTBEAT_COMPONENTS.EVENTS,
- HEARTBEAT_COMPONENTS.TELEMETRIES,
- HEARTBEAT_COMPONENTS.HEARTBEATS,
- HEARTBEAT_COMPONENTS.LOVE,
- HEARTBEAT_COMPONENTS.SCRIPTQUEUE,
- ].map((source) => this.state.heartbeatStatus[source]);
- let producerHeartbeatStatus;
- if (!producerHeartbeats.every((hb) => hb === undefined)) {
- producerHeartbeatStatus = producerHeartbeats.includes('alert') ? 'alert' : 'ok';
- }
+ // const producerHeartbeats = [
+ // HEARTBEAT_COMPONENTS['LOVE:0'],
+ // HEARTBEAT_COMPONENTS['ATDome:0'],
+ // HEARTBEAT_COMPONENTS['ATMCS:0'],
+ // HEARTBEAT_COMPONENTS['Watcher:0'],
+ // HEARTBEAT_COMPONENTS['GenericCamera:0'],
+ // HEARTBEAT_COMPONENTS['ScriptQueue:1'],
+ // HEARTBEAT_COMPONENTS['WeatherStation:1'],
+ // ].map((source) => this.state.heartbeatStatus[source]);
+ // let producerHeartbeatStatus;
+ // if (!producerHeartbeats.every((hb) => hb === undefined)) {
+ // producerHeartbeatStatus = producerHeartbeats.includes('alert') ? 'alert' : 'ok';
+ // }
const summaryHeartbeats = [
- producerHeartbeatStatus,
+ // producerHeartbeatStatus,
this.state.heartbeatStatus[HEARTBEAT_COMPONENTS.MANAGER],
this.state.heartbeatStatus[HEARTBEAT_COMPONENTS.COMMANDER],
];
@@ -326,6 +329,7 @@ class Layout extends Component {
if (!summaryHeartbeats.every((hb) => hb === undefined)) {
summaryHeartbeatStatus = summaryHeartbeats.includes('alert') ? 'alert' : 'ok';
}
+
return (
LOVE manager
-