Skip to content

Add a Scrollbar to the SSH Error Popup #1741

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.

Sign up for GitHub

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

Merged
oneirocosm merged 5 commits into from
Jan 17, 2025
Merged

Add a Scrollbar to the SSH Error Popup #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e199aa
fix: allow the ssh error popup to scroll
oneirocosm Jan 15, 2025
6812296
fix: add copy button for connection error
oneirocosm Jan 16, 2025
6f084b2
feat: implement copy behavior
oneirocosm Jan 16, 2025
be7872d
merge branch 'main' into sylvie/sshpopup-scroll
oneirocosm Jan 17, 2025
f029d9a
fix: error message alignment with title
oneirocosm Jan 17, 2025
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
29 changes: 25 additions & 4 deletions frontend/app/block/block.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@
width: 100%;
font: var(--base-font);
color: var(--secondary-text-color);
gap: 12px;

.connstatus-status-icon-wrapper {
display: flex;
Expand Down Expand Up @@ -338,7 +337,6 @@
width: 100%;

.connstatus-status-text {
@include mixins.ellipsis();
max-width: 100%;
font-size: 11px;
font-style: normal;
Expand All @@ -349,13 +347,36 @@
}

.connstatus-error {
@include mixins.ellipsis();
width: 94%;
font-size: 11px;
font-style: normal;
font-weight: 400;
line-height: 15px;
letter-spacing: 0.11px;
text-wrap: wrap;
max-height: 80px;
border-radius: 8px;
padding: 5px;
padding-left: 0;
position: relative;

.copy-button {
visibility: hidden;
display: flex;
position: sticky;
top: 0;
right: 4px;
float: right;
border-radius: 4px;
backdrop-filter: blur(8px);
padding: 0.286em;
align-items: center;
justify-content: flex-end;
gap: 0.286em;
}

&:hover .copy-button {
visibility: visible;
}
}
}
}
Expand Down
30 changes: 26 additions & 4 deletions frontend/app/block/blockframe.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ import * as keyutil from "@/util/keyutil";
import * as util from "@/util/util";
import clsx from "clsx";
import * as jotai from "jotai";
import { OverlayScrollbarsComponent } from "overlayscrollbars-react";
import * as React from "react";
import { CopyButton } from "../element/copybutton";
import { BlockFrameProps } from "./blocktypes";

const NumActiveConnColors = 8;
Expand Down Expand Up @@ -420,6 +422,22 @@ const ConnStatusOverlay = React.memo(
setShowWshError(showWshErrorTemp);
}, [connStatus, wshConfigEnabled]);

const errorText = React.useMemo(() => {
const errTexts = [];
if (showError) {
errTexts.push(`error: ${connStatus.error}`);
}
if (showWshError) {
errTexts.push(`unable to use wsh: ${connStatus.error}`);
}
return errTexts.join("\n");
}, [showError, connStatus.error, showWshError, connStatus.wsherror]);

const handleCopy = async (e: React.MouseEvent) => {
let textToCopy = errorText;
await navigator.clipboard.writeText(textToCopy);
};

if (!showWshError && (isLayoutMode || connStatus.status == "connected" || connModalOpen)) {
return null;
}
Expand All @@ -431,10 +449,14 @@ const ConnStatusOverlay = React.memo(
{showIcon && <i className="fa-solid fa-triangle-exclamation"></i>}
<div className="connstatus-status">
<div className="connstatus-status-text">{statusText}</div>
{showError ? <div className="connstatus-error">error: {connStatus.error}</div> : null}
{showWshError ? (
<div className="connstatus-error">unable to use wsh: {connStatus.wsherror}</div>
) : null}
<OverlayScrollbarsComponent
className="connstatus-error"
options={{ scrollbars: { autoHide: "leave" } }}
>
<CopyButton className="copy-button" onClick={handleCopy} title="Copy" />
{showError ? <div>error: {connStatus.error}</div> : null}
{showWshError ? <div>unable to use wsh: {connStatus.wsherror}</div> : null}
</OverlayScrollbarsComponent>
{showWshError && (
<Button className={reconClassName} onClick={handleDisableWsh}>
always disable wsh
Expand Down
Loading