Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-04-07 18:56:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't show wsh error for a connection error (#1438)

Browse Source
This commit is contained in:
Sylvie Crowe 2024-12-09 15:18:58 -08:00 committed by GitHub
parent 6a3f72830b
commit 43c134ea9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/app/block/blockframe.tsx
View File

@ -186,10 +186,7 @@ const BlockFrame_Header = ({
const dragHandleRef = preview ? null : nodeModel.dragHandleRef; const dragHandleRef = preview ? null : nodeModel.dragHandleRef;
const connName = blockData?.meta?.connection; const connName = blockData?.meta?.connection;
const connStatus = util.useAtomValueSafe(getConnStatusAtom(connName)); const connStatus = util.useAtomValueSafe(getConnStatusAtom(connName));
const wshEnabled = const wshProblem = connName && !connStatus?.wshenabled && connStatus?.status == "connected";
(connName &&
(connStatus?.status == "connecting" || (connStatus?.wshenabled && connStatus?.status == "connected"))) ??
true;
React.useEffect(() => { React.useEffect(() => {
if (!magnified || preview || prevMagifiedState.current) { if (!magnified || preview || prevMagifiedState.current) {
@ -269,7 +266,7 @@ const BlockFrame_Header = ({
changeConnModalAtom={changeConnModalAtom} changeConnModalAtom={changeConnModalAtom}
/> />
)} )}
{manageConnection && !wshEnabled && ( {manageConnection && wshProblem && (
<IconButton decl={wshInstallButton} className="block-frame-header-iconbutton" /> <IconButton decl={wshInstallButton} className="block-frame-header-iconbutton" />
)} )}
<div className="block-frame-textelems-wrapper">{headerTextElems}</div> <div className="block-frame-textelems-wrapper">{headerTextElems}</div>