Merge branch '20455-noopener' refs #20455
authorPeter Amstutz <peter.amstutz@curii.com>
Mon, 18 Mar 2024 18:22:05 +0000 (14:22 -0400)
committerPeter Amstutz <peter.amstutz@curii.com>
Mon, 18 Mar 2024 18:22:05 +0000 (14:22 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

1  2 
services/workbench2/src/views/process-panel/process-log-code-snippet.tsx

index 091078c4521c0615071ebf217c7baa629975aa49,77857822a4d6df059b2ab5e342f069f6fe194eef..f42dcaf542fc8bea3fbc6129e39b1c13926aa7c8
@@@ -33,13 -33,10 +33,13 @@@ const styles: StyleRulesCallback<CssRul
          },
      },
      logText: {
-         padding: `0 ${theme.spacing.unit*0.5}px`,
+         padding: `0 ${theme.spacing.unit * 0.5}px`,
      },
 -    wordWrap: {
 -        whiteSpace: 'pre-wrap',
 +    wordWrapOn: {
 +        overflowWrap: 'anywhere',
 +    },
 +    wordWrapOff: {
 +        whiteSpace: 'nowrap',
      },
  });
  
@@@ -121,12 -118,12 +121,12 @@@ export const ProcessLogCodeSnippet = wi
                          setFollowMode(false);
                      }
                  }}>
-                 { lines.map((line: string, index: number) =>
-                 <Typography key={index} component="span"
-                     className={classNames(classes.logText, wordWrap ? classes.wordWrapOn : classes.wordWrapOff)}>
-                     {renderLinks(fontSize, auth, dispatch)(line)}
-                 </Typography>
-                 ) }
+                 {lines.map((line: string, index: number) =>
 -                    <Typography key={index} component="pre"
 -                        className={classNames(classes.logText, wordWrap ? classes.wordWrap : undefined)}>
++                    <Typography key={index} component="span"
++                        className={classNames(classes.logText, wordWrap ? classes.wordWrapOn : classes.wordWrapOff)}>
+                         {renderLinks(fontSize, auth, dispatch)(line)}
+                     </Typography>
+                 )}
              </div>
          </MuiThemeProvider>
      }));