Skip to content

Commit c4f4f1f

Browse files
committed
Don't show an error in the listing if the server is still installing or suspended
1 parent f45c03a commit c4f4f1f

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

app/Transformers/Api/Client/ServerTransformer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ public function transform(Server $server): array
5656
'databases' => $server->database_limit,
5757
'allocations' => $server->allocation_limit,
5858
],
59+
'is_suspended' => $server->suspended !== 0,
60+
'is_installing' => $server->installed !== 1,
5961
];
6062
}
6163

resources/scripts/api/server/getServer.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ export interface Server {
3030
databases: number;
3131
allocations: number;
3232
};
33+
isSuspended: boolean;
34+
isInstalling: boolean;
3335
}
3436

3537
export const rawDataToServerObject = (data: any): Server => ({
@@ -50,6 +52,8 @@ export const rawDataToServerObject = (data: any): Server => ({
5052
} ],
5153
limits: { ...data.limits },
5254
featureLimits: { ...data.feature_limits },
55+
isSuspended: data.is_suspended,
56+
isInstalling: data.is_installing,
5357
});
5458

5559
export default (uuid: string): Promise<[ Server, string[] ]> => {

resources/scripts/components/dashboard/ServerRow.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,18 @@ export default ({ server, className }: { server: Server; className: string | und
7878
!statsError ?
7979
<SpinnerOverlay size={'tiny'} visible={true} backgroundOpacity={0.25}/>
8080
:
81-
<div className={'flex-1 text-center'}>
82-
<span className={'bg-red-500 rounded px-2 py-1 text-red-100 text-xs'}>
83-
Connection Error
84-
</span>
85-
</div>
81+
(server.isSuspended || server.isInstalling) ?
82+
<div className={'flex-1 text-center'}>
83+
<span className={'bg-neutral-500 rounded px-2 py-1 text-neutral-100 text-xs'}>
84+
{server.isSuspended ? 'Suspended' : 'Installing'}
85+
</span>
86+
</div>
87+
:
88+
<div className={'flex-1 text-center'}>
89+
<span className={'bg-red-500 rounded px-2 py-1 text-red-100 text-xs'}>
90+
Connection Error
91+
</span>
92+
</div>
8693
:
8794
<React.Fragment>
8895
<div className={'flex-1 flex ml-4 justify-center'}>

0 commit comments

Comments
 (0)