Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into v2

Browse source
This commit is contained in:
Matthew Penner 2021-08-04 21:40:38 -06:00
commit 4b32828423
No known key found for this signature in database
GPG key ID: 5396CC4C3C1C9704
7 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/scripts/api/swr/getServerBackups.ts
View file

@ -12,7 +12,7 @@ interface ctx {
export const Context = createContext<ctx>({ page: 1, setPage: () => 1 });
type BackupResponse = PaginatedResult<ServerBackup> & { usedBackupCount: number };
type BackupResponse = PaginatedResult<ServerBackup> & { backupCount: number };
export default () => {
const { page } = useContext(Context);
@ -24,7 +24,7 @@ export default () => {
return ({
items: (data.data || []).map(rawDataToServerBackup),
pagination: getPaginationSet(data.meta.pagination),
usedBackupCount: data.meta.used_backup_count,
backupCount: data.meta.backup_count,
});
});
};

6
resources/scripts/components/server/backups/BackupContainer.tsx
View file

@ -65,12 +65,12 @@ const BackupContainer = () => {
}
<Can action={'backup.create'}>
<div css={tw`mt-6 sm:flex items-center justify-end`}>
{(backupLimit > 0 && backups.usedBackupCount > 0) &&
{(backupLimit > 0 && backups.backupCount > 0) &&
<p css={tw`text-sm text-neutral-300 mb-4 sm:mr-6 sm:mb-0`}>
{backups.usedBackupCount} of {backupLimit} backups have been created for this server.
{backups.backupCount} of {backupLimit} backups have been created for this server.
</p>
}
{backupLimit > 0 && backupLimit > backups.usedBackupCount &&
{backupLimit > 0 && backupLimit > backups.backupCount &&
<CreateBackupButton css={tw`w-full sm:w-auto`}/>
}
</div>

2
resources/scripts/components/server/backups/BackupContextMenu.tsx
View file

@ -51,7 +51,7 @@ export default ({ backup }: Props) => {
.then(() => mutate(data => ({
...data!,
items: data!.items.filter(b => b.uuid !== backup.uuid),
usedBackupCount: data!.usedBackupCount - 1,
backupCount: data!.backupCount - 1,
}), false))
.catch(error => {
console.error(error);

2
resources/scripts/components/server/backups/CreateBackupButton.tsx
View file

@ -81,7 +81,7 @@ export default () => {
clearFlashes('backups:create');
createServerBackup(uuid, values)
.then(backup => {
mutate(data => ({ ...data!, items: data!.items.concat(backup), usedBackupCount: data!.usedBackupCount + 1 }), false);
mutate(data => ({ ...data!, items: data!.items.concat(backup), backupCount: data!.backupCount + 1 }), false);
setVisible(false);
})
.catch(error => {