From 22c5c7be1500c7fa0b9d23fd5004aa0839671dcf Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 5 Jul 2022 11:12:14 -0300 Subject: [PATCH] 18975: Improves word wrapping status indication on log viewer. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- src/components/icon/icon.tsx | 4 +++- src/views/process-panel/process-log-card.tsx | 13 +++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 19b4beea..db603597 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -77,6 +77,7 @@ import NotInterested from '@material-ui/icons/NotInterested'; // Import FontAwesome icons import { library } from '@fortawesome/fontawesome-svg-core'; import { faPencilAlt, faSlash, faUsers, faEllipsisH } from '@fortawesome/free-solid-svg-icons'; +import { FormatAlignLeft } from '@material-ui/icons'; library.add( faPencilAlt, faSlash, @@ -180,7 +181,8 @@ export const CanReadIcon: IconType = (props) => ; export const CanWriteIcon: IconType = (props) => ; export const CanManageIcon: IconType = (props) => ; export const AddUserIcon: IconType = (props) => ; -export const WordWrapIcon: IconType = (props) => ; +export const WordWrapOnIcon: IconType = (props) => ; +export const WordWrapOffIcon: IconType = (props) => ; export const TextIncreaseIcon: IconType = (props) => ; export const TextDecreaseIcon: IconType = (props) => ; export const DeactivateUserIcon: IconType = (props) => ; diff --git a/src/views/process-panel/process-log-card.tsx b/src/views/process-panel/process-log-card.tsx index ac409ec1..936b31a5 100644 --- a/src/views/process-panel/process-log-card.tsx +++ b/src/views/process-panel/process-log-card.tsx @@ -24,7 +24,8 @@ import { MaximizeIcon, TextDecreaseIcon, TextIncreaseIcon, - WordWrapIcon + WordWrapOffIcon, + WordWrapOnIcon, } from 'components/icon/icon'; import { Process } from 'store/processes/process'; import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view'; @@ -92,7 +93,7 @@ export const ProcessLogsCard = withStyles(styles)( ({ classes, process, filters, selectedFilter, lines, onLogFilterChange, navigateToLog, onCopy, doHidePanel, doMaximizePanel, panelMaximized, panelName }: ProcessLogsCardProps) => { - const [wordWrapToggle, setWordWrapToggle] = useState(true); + const [wordWrap, setWordWrap] = useState(true); const [fontSize, setFontSize] = useState(3); const fontBaseSize = 10; const fontStepSize = 1; @@ -130,9 +131,9 @@ export const ProcessLogsCard = withStyles(styles)( - - setWordWrapToggle(!wordWrapToggle)}> - + + setWordWrap(!wordWrap)}> + {wordWrap ? : } @@ -166,7 +167,7 @@ export const ProcessLogsCard = withStyles(styles)( spacing={24} direction='column'> - + :