sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't show an error in the listing if the server is still installing or suspended

This commit is contained in:
Dane Everitt 2020-04-25 17:58:09 -07:00
parent f45c03a449
commit c4f4f1f5c8
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Transformers/Api/Client/ServerTransformer.php
View File

@ -56,6 +56,8 @@ class ServerTransformer extends BaseClientTransformer
'databases' => $server->database_limit, 'databases' => $server->database_limit,
'allocations' => $server->allocation_limit, 'allocations' => $server->allocation_limit,
], ],
'is_suspended' => $server->suspended !== 0,
'is_installing' => $server->installed !== 1,
]; ];
} }

4
resources/scripts/api/server/getServer.ts
View File

@ -30,6 +30,8 @@ export interface Server {
databases: number; databases: number;
allocations: number; allocations: number;
}; };
isSuspended: boolean;
isInstalling: boolean;
} }
export const rawDataToServerObject = (data: any): Server => ({ export const rawDataToServerObject = (data: any): Server => ({
@ -50,6 +52,8 @@ export const rawDataToServerObject = (data: any): Server => ({
} ], } ],
limits: { ...data.limits }, limits: { ...data.limits },
featureLimits: { ...data.feature_limits }, featureLimits: { ...data.feature_limits },
isSuspended: data.is_suspended,
isInstalling: data.is_installing,
}); });
export default (uuid: string): Promise<[ Server, string[] ]> => { export default (uuid: string): Promise<[ Server, string[] ]> => {

7
resources/scripts/components/dashboard/ServerRow.tsx
View File

@ -78,6 +78,13 @@ export default ({ server, className }: { server: Server; className: string | und
!statsError ? !statsError ?
<SpinnerOverlay size={'tiny'} visible={true} backgroundOpacity={0.25}/> <SpinnerOverlay size={'tiny'} visible={true} backgroundOpacity={0.25}/>
: :
(server.isSuspended || server.isInstalling) ?
<div className={'flex-1 text-center'}>
<span className={'bg-neutral-500 rounded px-2 py-1 text-neutral-100 text-xs'}>
{server.isSuspended ? 'Suspended' : 'Installing'}
</span>
</div>
:
<div className={'flex-1 text-center'}> <div className={'flex-1 text-center'}>
<span className={'bg-red-500 rounded px-2 py-1 text-red-100 text-xs'}> <span className={'bg-red-500 rounded px-2 py-1 text-red-100 text-xs'}>
Connection Error Connection Error