merge dev

This commit is contained in:
Olivier Gagnon
2021-10-15 21:39:53 -04:00
14 changed files with 104 additions and 40 deletions
+10 -2
View File
@@ -88,7 +88,6 @@ function LogWindow(props: IProps): React.ReactElement {
killWorkerScript(props.script, props.script.server, true);
props.onClose();
}
//useEffect(() => TerminalEvents.subscribe(_.debounce(async () => rerender(), 25, { maxWait: 50 })), []);
function updateLayer(): void {
const c = container.current;
@@ -98,6 +97,15 @@ function LogWindow(props: IProps): React.ReactElement {
rerender();
}
function title(): string {
const maxLength = 30;
const t = `${props.script.filename} ${props.script.args.map((x: any): string => `${x}`).join(" ")}`;
if (t.length <= maxLength) {
return t;
}
return t.slice(0, maxLength - 3) + "...";
}
return (
<Draggable handle=".drag">
<Paper
@@ -119,7 +127,7 @@ function LogWindow(props: IProps): React.ReactElement {
>
<Box className="drag" display="flex" alignItems="center">
<Typography color="primary" variant="h6">
{props.script.filename} {props.script.args.map((x: any): string => `${x}`).join(" ")}
{title()}
</Typography>
<Box position="absolute" right={0}>
+1 -1
View File
@@ -302,7 +302,7 @@ export function refreshTheme(): void {
border: "1px solid " + Settings.theme.well,
},
standardSuccess: {
color: Settings.theme.successLight,
color: Settings.theme.primaryLight,
},
standardError: {
color: Settings.theme.errorlight,