Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend size of individual log message display #657

Merged
merged 4 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Version History
v6.3.0
------

* Extend size of individual log message display `<https://github.com/lsst-ts/LOVE-frontend/pull/657>`_
* Add RA, Dec and Rotator parameters to the ATDome component `<https://github.com/lsst-ts/LOVE-frontend/pull/656>`_

v6.2.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,42 @@ You should have received a copy of the GNU General Public License along with
this program. If not, see <http://www.gnu.org/licenses/>.
*/

import React, { useState, memo } from 'react';
import React, { useState, useEffect, memo } from 'react';
import PropTypes from 'prop-types';
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 Button from 'components/GeneralPurpose/Button/Button';
import DebugIcon from 'components/icons/CSCExpanded/DebugIcon/DebugIcon';
import InfoIcon from 'components/icons/CSCExpanded/InfoIcon/InfoIcon';
import WarningIcon from 'components/icons/CSCExpanded/WarningIcon/WarningIcon';
import ErrorIcon from 'components/icons/CSCExpanded/ErrorIcon/ErrorIcon';
import CopyIcon from 'components/icons/CopyIcon/CopyIcon';
import styles from './LogMessageDisplay.module.css';
import { formatTimestamp } from '../../../Utils';
import { formatTimestamp, copyToClipboard } from 'Utils';

function CopyToClipboard({ text }) {
const [copied, setCopied] = useState(false);

useEffect(() => {
let timeout;
if (copied) {
timeout = setTimeout(() => {
setCopied(false);
}, 2000);
}
return () => clearTimeout(timeout);
}, [copied]);

const handleCopyToClipboard = () => {
copyToClipboard(text);
setCopied(true);
};

return (
<div className={styles.copyToClipboardBtn} onClick={handleCopyToClipboard}>
{copied && <span>Copied to clipboard</span>}
<CopyIcon title="Copy to clipboard" />
</div>
);
}

function LogMessageDisplay({ logMessageData, clearCSCLogMessages }) {
const [messageFilters, setMessageFilters] = useState({
Expand All @@ -40,6 +67,7 @@ function LogMessageDisplay({ logMessageData, clearCSCLogMessages }) {
filters[key].value = value;
setMessageFilters({ ...filters });
};

return (
<div className={[styles.logContainer, styles.messageLogContainer].join(' ')}>
<div className={styles.logContainerTopBar}>
Expand Down Expand Up @@ -77,6 +105,9 @@ function LogMessageDisplay({ logMessageData, clearCSCLogMessages }) {
if (msg.level.value === 20) icon = <InfoIcon title="Information" />;
if (msg.level.value === 30) icon = <WarningIcon title="Warning" />;
if (msg.level.value === 40) icon = <ErrorIcon title="Error" />;

const copyToClipboardText =
msg.message?.value + (msg.traceback?.value ? '\n\n' + msg.traceback?.value : '');
return (
<div key={`${msg.private_rcvStamp.value}-${msg.level.value}-${index}`} className={styles.logMessage}>
<div className={styles.messageIcon}>{icon}</div>
Expand All @@ -86,6 +117,7 @@ function LogMessageDisplay({ logMessageData, clearCSCLogMessages }) {
</div>
<div className={styles.messageText}>
{msg.ScriptID && <div className={styles.scriptID}>Script {msg.ScriptID?.value}</div>}
<CopyToClipboard text={copyToClipboardText} />
<pre className={styles.preText}>{msg.message?.value}</pre>
</div>
<pre className={styles.preText}>{msg.traceback.value}</pre>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ this program. If not, see <http://www.gnu.org/licenses/>.
.log {
background: var(--second-tertiary-background-color);
border-radius: 5px;
overflow-y: scroll;
}

.logContainerTopBar {
Expand Down Expand Up @@ -73,6 +72,7 @@ this program. If not, see <http://www.gnu.org/licenses/>.
}

.messageText {
position: relative;
max-width: 50vw;
padding-bottom: 0.5em;
}
Expand Down Expand Up @@ -101,3 +101,23 @@ this program. If not, see <http://www.gnu.org/licenses/>.
.preText {
white-space: pre-wrap;
}

.copyToClipboardBtn {
display: flex;
align-items: center;
gap: var(--small-padding);
position: absolute;
top: 0;
right: 0;
}

.copyToClipboardBtn > svg {
cursor: pointer;
width: 1em;
height: 1em;
}

.copyToClipboardBtn:hover > svg {
fill: var(--default-active-background-color);
stroke: var(--default-active-background-color);
}
Loading