Skip to content

Commit 2459899

Browse files
committed
Merge branch 'dane/restore-backups' into develop
2 parents 6cee108 + 3171b8d commit 2459899

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

resources/scripts/routers/ServerRouter.tsx

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import { faExternalLinkAlt } from '@fortawesome/free-solid-svg-icons';
3131
import RequireServerPermission from '@/hoc/RequireServerPermission';
3232
import ServerInstallSvg from '@/assets/images/server_installing.svg';
3333
import ServerRestoreSvg from '@/assets/images/server_restore.svg';
34+
import ServerErrorSvg from '@/assets/images/server_error.svg';
3435

3536
const ConflictStateRenderer = () => {
3637
const status = ServerContext.useStoreState(state => state.server.data?.status || null);
@@ -44,11 +45,18 @@ const ConflictStateRenderer = () => {
4445
message={'Your server should be ready soon, please try again in a few minutes.'}
4546
/>
4647
:
47-
<ScreenBlock
48-
title={isTransferring ? 'Transferring' : 'Restoring from Backup'}
49-
image={ServerRestoreSvg}
50-
message={isTransferring ? 'Your server is being transfered to a new node, please check back later.' : 'Your server is currently being restored from a backup, please check back in a few minutes.'}
51-
/>
48+
status === 'suspended' ?
49+
<ScreenBlock
50+
title={'Server Suspended'}
51+
image={ServerErrorSvg}
52+
message={'This server is suspended and cannot be accessed.'}
53+
/>
54+
:
55+
<ScreenBlock
56+
title={isTransferring ? 'Transferring' : 'Restoring from Backup'}
57+
image={ServerRestoreSvg}
58+
message={isTransferring ? 'Your server is being transfered to a new node, please check back later.' : 'Your server is currently being restored from a backup, please check back in a few minutes.'}
59+
/>
5260
);
5361
};
5462

0 commit comments

Comments
 (0)