Skip to content

Commit dab1d1f

Browse files
BrunoQuaresmaBrunoQuaresma
authored
fix(site): Fix terminal elements size (#7527)
1 parent 8778449 commit dab1d1f

File tree

2 files changed

+45
-105
lines changed

2 files changed

+45
-105
lines changed

‎site/src/pages/TerminalPage/TerminalPage.tsx

+34-26
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { pageTitle } from "../../utils/page"
1919
import { terminalMachine } from "../../xServices/terminal/terminalXService"
2020
import { useProxy } from "contexts/ProxyContext"
2121
import { combineClasses } from "utils/combineClasses"
22+
import Box from "@mui/material/Box"
2223

2324
export const Language = {
2425
workspaceErrorMessagePrefix: "Unable to fetch workspace: ",
@@ -313,34 +314,40 @@ const TerminalPage: FC<
313314
</div>
314315
</div>
315316
)}
316-
{shouldDisplayStartupWarning && (
317-
<div className={styles.alert} role="alert">
318-
<WarningIcon className={styles.alertIcon} />
319-
<div>
320-
<div className={styles.alertTitle}>
321-
Startup script is still running
317+
<Box display="flex" flexDirection="column" height="100vh">
318+
{shouldDisplayStartupWarning && (
319+
<div className={styles.alert} role="alert">
320+
<WarningIcon className={styles.alertIcon} />
321+
<div>
322+
<div className={styles.alertTitle}>
323+
Startup script is still running
324+
</div>
325+
<div className={styles.alertMessage}>
326+
You can continue using this terminal, but something may be
327+
missing or not fully set up.
328+
</div>
322329
</div>
323-
<div className={styles.alertMessage}>
324-
You can continue using this terminal, but something may be missing
325-
or not fully set up.
330+
<div className={styles.alertActions}>
331+
<Button
332+
startIcon={<RefreshOutlined />}
333+
size="small"
334+
onClick={() => {
335+
// By redirecting the user without the session in the URL we
336+
// create a new one
337+
window.location.href = window.location.pathname
338+
}}
339+
>
340+
Refresh session
341+
</Button>
326342
</div>
327343
</div>
328-
<div className={styles.alertActions}>
329-
<Button
330-
startIcon={<RefreshOutlined />}
331-
size="small"
332-
onClick={() => {
333-
// By redirecting the user without the session in the URL we
334-
// create a new one
335-
window.location.href = window.location.pathname
336-
}}
337-
>
338-
Refresh session
339-
</Button>
340-
</div>
341-
</div>
342-
)}
343-
<div className={styles.terminal} ref={xtermRef} data-testid="terminal" />
344+
)}
345+
<div
346+
className={styles.terminal}
347+
ref={xtermRef}
348+
data-testid="terminal"
349+
/>
350+
</Box>
344351
</>
345352
)
346353
}
@@ -403,10 +410,10 @@ const useStyles = makeStyles((theme) => ({
403410
},
404411
terminal: {
405412
width: "100vw",
406-
height: "100vh",
407413
overflow: "hidden",
408414
padding: theme.spacing(1),
409415
backgroundColor: theme.palette.background.paper,
416+
flex: 1,
410417
// These styles attempt to mimic the VS Code scrollbar.
411418
"& .xterm": {
412419
padding: 4,
@@ -436,6 +443,7 @@ const useStyles = makeStyles((theme) => ({
436443
padding: theme.spacing(2),
437444
gap: theme.spacing(2),
438445
borderBottom: `1px solid ${theme.palette.divider}`,
446+
...theme.typography.body2,
439447
},
440448
alertIcon: {
441449
color: theme.palette.warning.light,

‎site/yarn.lock

+11-79
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
json5 "^2.2.2"
6363
semver "^6.3.0"
6464

65-
"@babel/generator@^7.12.11", "@babel/generator@^7.21.0", "@babel/generator@^7.21.4", "@babel/generator@^7.7.2", "@babel/generator@~7.21.1":
65+
"@babel/generator@^7.12.11", "@babel/generator@^7.21.4", "@babel/generator@^7.7.2", "@babel/generator@~7.21.1":
6666
version "7.21.4"
6767
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc"
6868
integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
@@ -173,7 +173,7 @@
173173
dependencies:
174174
"@babel/types" "^7.21.4"
175175

176-
"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.0", "@babel/helper-module-transforms@^7.21.2":
176+
"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2":
177177
version "7.21.2"
178178
resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
179179
integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
@@ -252,7 +252,7 @@
252252
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
253253
integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
254254

255-
"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0":
255+
"@babel/helper-validator-option@^7.21.0":
256256
version "7.21.0"
257257
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
258258
integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
@@ -285,7 +285,7 @@
285285
chalk "^2.0.0"
286286
js-tokens "^4.0.0"
287287

288-
"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.21.4", "@babel/parser@~7.21.2":
288+
"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4", "@babel/parser@~7.21.2":
289289
version "7.21.4"
290290
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
291291
integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
@@ -1457,7 +1457,7 @@
14571457
"@types/node" "*"
14581458
jest-mock "^29.5.0"
14591459

1460-
"@jest/expect-utils@^29.4.3", "@jest/expect-utils@^29.5.0":
1460+
"@jest/expect-utils@^29.5.0":
14611461
version "29.5.0"
14621462
resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036"
14631463
integrity sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==
@@ -1599,7 +1599,7 @@
15991599
"@types/yargs" "^16.0.0"
16001600
chalk "^4.0.0"
16011601

1602-
"@jest/types@^29.4.3", "@jest/types@^29.5.0":
1602+
"@jest/types@^29.5.0":
16031603
version "29.5.0"
16041604
resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593"
16051605
integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==
@@ -3549,22 +3549,6 @@
35493549
"@typescript-eslint/types" "5.50.0"
35503550
"@typescript-eslint/visitor-keys" "5.50.0"
35513551

3552-
"@typescript-eslint/scope-manager@5.53.0":
3553-
version "5.53.0"
3554-
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.53.0.tgz#42b54f280e33c82939275a42649701024f3fafef"
3555-
integrity sha512-Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w==
3556-
dependencies:
3557-
"@typescript-eslint/types" "5.53.0"
3558-
"@typescript-eslint/visitor-keys" "5.53.0"
3559-
3560-
"@typescript-eslint/scope-manager@5.57.0":
3561-
version "5.57.0"
3562-
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.57.0.tgz#79ccd3fa7bde0758059172d44239e871e087ea36"
3563-
integrity sha512-NANBNOQvllPlizl9LatX8+MHi7bx7WGIWYjPHDmQe5Si/0YEYfxSljJpoTyTWFTgRy3X8gLYSE4xQ2U+aCozSw==
3564-
dependencies:
3565-
"@typescript-eslint/types" "5.57.0"
3566-
"@typescript-eslint/visitor-keys" "5.57.0"
3567-
35683552
"@typescript-eslint/scope-manager@5.58.0":
35693553
version "5.58.0"
35703554
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz#5e023a48352afc6a87be6ce3c8e763bc9e2f0bc8"
@@ -3593,16 +3577,6 @@
35933577
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.50.0.tgz#c461d3671a6bec6c2f41f38ed60bd87aa8a30093"
35943578
integrity sha512-atruOuJpir4OtyNdKahiHZobPKFvZnBnfDiyEaBf6d9vy9visE7gDjlmhl+y29uxZ2ZDgvXijcungGFjGGex7w==
35953579

3596-
"@typescript-eslint/types@5.53.0":
3597-
version "5.53.0"
3598-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.53.0.tgz#f79eca62b97e518ee124086a21a24f3be267026f"
3599-
integrity sha512-5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A==
3600-
3601-
"@typescript-eslint/types@5.57.0":
3602-
version "5.57.0"
3603-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.57.0.tgz#727bfa2b64c73a4376264379cf1f447998eaa132"
3604-
integrity sha512-mxsod+aZRSyLT+jiqHw1KK6xrANm19/+VFALVFP5qa/aiJnlP38qpyaTd0fEKhWvQk6YeNZ5LGwI1pDpBRBhtQ==
3605-
36063580
"@typescript-eslint/types@5.58.0":
36073581
version "5.58.0"
36083582
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.58.0.tgz#54c490b8522c18986004df7674c644ffe2ed77d8"
@@ -3634,32 +3608,6 @@
36343608
semver "^7.3.7"
36353609
tsutils "^3.21.0"
36363610

3637-
"@typescript-eslint/typescript-estree@5.53.0":
3638-
version "5.53.0"
3639-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz#bc651dc28cf18ab248ecd18a4c886c744aebd690"
3640-
integrity sha512-eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w==
3641-
dependencies:
3642-
"@typescript-eslint/types" "5.53.0"
3643-
"@typescript-eslint/visitor-keys" "5.53.0"
3644-
debug "^4.3.4"
3645-
globby "^11.1.0"
3646-
is-glob "^4.0.3"
3647-
semver "^7.3.7"
3648-
tsutils "^3.21.0"
3649-
3650-
"@typescript-eslint/typescript-estree@5.57.0":
3651-
version "5.57.0"
3652-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.0.tgz#ebcd0ee3e1d6230e888d88cddf654252d41e2e40"
3653-
integrity sha512-LTzQ23TV82KpO8HPnWuxM2V7ieXW8O142I7hQTxWIHDcCEIjtkat6H96PFkYBQqGFLW/G/eVVOB9Z8rcvdY/Vw==
3654-
dependencies:
3655-
"@typescript-eslint/types" "5.57.0"
3656-
"@typescript-eslint/visitor-keys" "5.57.0"
3657-
debug "^4.3.4"
3658-
globby "^11.1.0"
3659-
is-glob "^4.0.3"
3660-
semver "^7.3.7"
3661-
tsutils "^3.21.0"
3662-
36633611
"@typescript-eslint/typescript-estree@5.58.0":
36643612
version "5.58.0"
36653613
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz#4966e6ff57eaf6e0fce2586497edc097e2ab3e61"
@@ -3717,22 +3665,6 @@
37173665
"@typescript-eslint/types" "5.50.0"
37183666
eslint-visitor-keys "^3.3.0"
37193667

3720-
"@typescript-eslint/visitor-keys@5.53.0":
3721-
version "5.53.0"
3722-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz#8a5126623937cdd909c30d8fa72f79fa56cc1a9f"
3723-
integrity sha512-JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w==
3724-
dependencies:
3725-
"@typescript-eslint/types" "5.53.0"
3726-
eslint-visitor-keys "^3.3.0"
3727-
3728-
"@typescript-eslint/visitor-keys@5.57.0":
3729-
version "5.57.0"
3730-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.0.tgz#e2b2f4174aff1d15eef887ce3d019ecc2d7a8ac1"
3731-
integrity sha512-ery2g3k0hv5BLiKpPuwYt9KBkAp2ugT6VvyShXdLOkax895EC55sP0Tx5L0fZaQueiK3fBLvHVvEl3jFS5ia+g==
3732-
dependencies:
3733-
"@typescript-eslint/types" "5.57.0"
3734-
eslint-visitor-keys "^3.3.0"
3735-
37363668
"@typescript-eslint/visitor-keys@5.58.0":
37373669
version "5.58.0"
37383670
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz#eb9de3a61d2331829e6761ce7fd13061781168b4"
@@ -7517,7 +7449,7 @@ jest-diff@^28.0.2:
75177449
jest-get-type "^28.0.2"
75187450
pretty-format "^28.1.3"
75197451

7520-
jest-diff@^29.4.3, jest-diff@^29.5.0:
7452+
jest-diff@^29.5.0:
75217453
version "29.5.0"
75227454
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63"
75237455
integrity sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==
@@ -7629,7 +7561,7 @@ jest-location-mock@1.0.9:
76297561
"@jedmao/location" "^3.0.0"
76307562
jest-diff "^27.0.1"
76317563

7632-
jest-matcher-utils@^29.4.3, jest-matcher-utils@^29.5.0:
7564+
jest-matcher-utils@^29.5.0:
76337565
version "29.5.0"
76347566
resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5"
76357567
integrity sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==
@@ -7639,7 +7571,7 @@ jest-matcher-utils@^29.4.3, jest-matcher-utils@^29.5.0:
76397571
jest-get-type "^29.4.3"
76407572
pretty-format "^29.5.0"
76417573

7642-
jest-message-util@^29.4.3, jest-message-util@^29.5.0:
7574+
jest-message-util@^29.5.0:
76437575
version "29.5.0"
76447576
resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e"
76457577
integrity sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==
@@ -7790,7 +7722,7 @@ jest-snapshot@^29.5.0:
77907722
pretty-format "^29.5.0"
77917723
semver "^7.3.5"
77927724

7793-
jest-util@^29.4.3, jest-util@^29.5.0:
7725+
jest-util@^29.5.0:
77947726
version "29.5.0"
77957727
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f"
77967728
integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==
@@ -9702,7 +9634,7 @@ pretty-format@^28.1.3:
97029634
ansi-styles "^5.0.0"
97039635
react-is "^18.0.0"
97049636

9705-
pretty-format@^29.0.0, pretty-format@^29.4.3, pretty-format@^29.5.0:
9637+
pretty-format@^29.0.0, pretty-format@^29.5.0:
97069638
version "29.5.0"
97079639
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a"
97089640
integrity sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==

0 commit comments

Comments
 (0)