Skip to content

Commit 2f9f052

Browse files
authored
Improve recovery status message spacing (#603)
* Improve safe mode status rendering. Feedback from @jimmackenzie. * Update interface-manager.
1 parent 3f103cc commit 2f9f052

File tree

4 files changed

+32
-23
lines changed

4 files changed

+32
-23
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@sentry/node": "^7.17.2",
5757
"@sentry/tracing": "^7.17.2",
5858
"@sinclair/typebox": "0.32.34",
59-
"@the-draupnir-project/interface-manager": "2.4.1",
59+
"@the-draupnir-project/interface-manager": "2.5.0",
6060
"@the-draupnir-project/matrix-basic-types": "^0.2.0",
6161
"await-lock": "^2.2.2",
6262
"better-sqlite3": "^9.4.3",

src/safemode/RecoveryOptions.tsx

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,22 @@ export function renderRecoveryOptions(cause: SafeModeCause): DocumentNode {
2626
}
2727
return (
2828
<fragment>
29-
Recovery options are available for this failure mode:
30-
<ol>
31-
{recoveryOptions.map((option) => (
32-
<li>{option.description}</li>
33-
))}
34-
</ol>
35-
To use a recovery option, click on one of the reactions (
36-
{recoveryOptions
37-
.map((_, index) => MatrixReactionHandler.numberToEmoji(index + 1))
38-
.join(", ")}
39-
), or use the recover command: <code>!draupnir recover 1</code>.
29+
<p>
30+
Recovery options are available for this failure mode:
31+
<ol>
32+
{recoveryOptions.map((option) => (
33+
<li>{option.description}</li>
34+
))}
35+
</ol>
36+
</p>
37+
<hr />
38+
<p>
39+
To use a <b>recovery option</b>, click on one of the reactions (
40+
{recoveryOptions
41+
.map((_, index) => MatrixReactionHandler.numberToEmoji(index + 1))
42+
.join(", ")}
43+
), or use the recover command: <code>!draupnir recover 1</code>.
44+
</p>
4045
</fragment>
4146
);
4247
}

src/safemode/commands/StatusCommand.tsx

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ function renderSafeModeCauseError(error: ResultError): DocumentNode {
3838
if (error instanceof ActionException) {
3939
return (
4040
<fragment>
41-
Draupnir is in safe mode because Draupnir failed to start.
41+
<p>Draupnir is in safe mode because Draupnir failed to start.</p>
4242
<details>
43-
<summary>{error.mostRelevantElaboration}</summary>
43+
<summary>
44+
<code>{error.mostRelevantElaboration}</code>
45+
</summary>
4446
Details can be found by providing the reference{" "}
4547
<code>{error.uuid}</code>
4648
to an administrator.
@@ -53,7 +55,9 @@ function renderSafeModeCauseError(error: ResultError): DocumentNode {
5355
<fragment>
5456
Draupnir is in safe mode because Draupnir failed to start.
5557
<details>
56-
<summary>{error.mostRelevantElaboration}</summary>
58+
<summary>
59+
<code>{error.mostRelevantElaboration}</code>
60+
</summary>
5761
<pre>{error.toReadableString()}</pre>
5862
</details>
5963
</fragment>
@@ -86,12 +90,12 @@ export function renderSafeModeStatusInfo(
8690
): DocumentNode {
8791
return (
8892
<fragment>
89-
⚠️ Draupnir is in safe mode ⚠️
90-
<br />
93+
<h3>
94+
⚠️ <b>Draupnir is in safe mode</b> ⚠️
95+
</h3>
9196
{renderSafeModeCause(info.safeModeCause)}
92-
<br />
9397
{renderRecoveryOptions(info.safeModeCause)}
94-
<br />
98+
<hr />
9599
{StandardPersistentConfigRenderer.renderAdaptorStatus(info.configStatus)}
96100
<b>Version: </b>
97101
<code>{info.version}</code>

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,10 @@
256256
resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
257257
integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
258258

259-
"@the-draupnir-project/interface-manager@2.4.1":
260-
version "2.4.1"
261-
resolved "https://registry.yarnpkg.com/@the-draupnir-project/interface-manager/-/interface-manager-2.4.1.tgz#fc93eac495cf89fee0c87786b405a2fbae826b49"
262-
integrity sha512-7L9QzsH/BAgdPSoNaB78ENJKAqbD4sqA0J7LmAUDiM7ygLS1yVrrI2VRN9aCdguVcbuD//fnOCJhSlfL2vr6YQ==
259+
"@the-draupnir-project/interface-manager@2.5.0":
260+
version "2.5.0"
261+
resolved "https://registry.yarnpkg.com/@the-draupnir-project/interface-manager/-/interface-manager-2.5.0.tgz#5a41cbbb62d890fb2d539483d046750ef36d4944"
262+
integrity sha512-J7h19l5uejb7eniOL8Uz+ByvLrIfiFQNrPJON7nJRGpnQ2oqZIEqic5f186zSWwEOlE2KhNFAz6bfOiQJDm5qg==
263263
dependencies:
264264
"@gnuxie/super-cool-stream" "^0.2.1"
265265
"@gnuxie/typescript-result" "^1.0.0"

0 commit comments

Comments
 (0)