Skip to content

Commit e906ada

Browse files
DaneEverittDaneEveritt
committed
Better handling when deleting a database
1 parent 0999ec9 commit e906ada

File tree

5 files changed

+166
-54
lines changed

5 files changed

+166
-54
lines changed

‎app/Http/Controllers/Api/Client/Servers/DatabaseController.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Illuminate\Http\Response;
66
use Pterodactyl\Models\Server;
7+
use Pterodactyl\Models\Database;
78
use Pterodactyl\Transformers\Api\Client\DatabaseTransformer;
89
use Pterodactyl\Services\Databases\DatabaseManagementService;
910
use Pterodactyl\Services\Databases\DeployServerDatabaseService;
@@ -88,7 +89,8 @@ public function store(StoreDatabaseRequest $request): array
8889
*/
8990
public function delete(DeleteDatabaseRequest $request): Response
9091
{
92+
$this->managementService->delete($request->getModel(Database::class)->id);
93+
9194
return Response::create('', Response::HTTP_NO_CONTENT);
92-
// $this->managementService->delete($request->input('database'));
9395
}
9496
}

resources/assets/scripts/components/server/components/CreateDatabaseModal.vue renamed to resources/assets/scripts/components/server/components/database/CreateDatabaseModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</template>
3232

3333
<script>
34-
import MessageBox from '../../MessageBox';
34+
import MessageBox from '../../../MessageBox';
3535
import get from 'lodash/get';
3636
3737
export default {

‎resources/assets/scripts/components/server/components/database/DatabaseRow.vue‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<template>
2+
<div class="content-box mb-6 hover:border-grey">
3+
<div class="flex items-center text-grey-darker">
4+
<database-icon class="flex-none text-green"></database-icon>
5+
<div class="flex-1 px-4">
6+
<p class="uppercase text-xs text-grey pb-1 select-none">Database Name</p>
7+
<p>{{database.name}}</p>
8+
</div>
9+
<div class="flex-1 px-4">
10+
<p class="uppercase text-xs text-grey pb-1 select-none">Username</p>
11+
<p>{{database.username}}</p>
12+
</div>
13+
<div class="flex-1 px-4">
14+
<p class="uppercase text-xs text-grey pb-1 select-none">Password</p>
15+
<p>
16+
<code class="text-sm cursor-pointer" v-on:click="revealPassword">
17+
<span class="select-none" v-if="!database.showPassword">
18+
<lock-icon class="h-3"/> &bull;&bull;&bull;&bull;&bull;&bull;
19+
</span>
20+
<span v-else>{{database.password}}</span>
21+
</code>
22+
</p>
23+
</div>
24+
<div class="flex-1 px-4">
25+
<p class="uppercase text-xs text-grey pb-1 select-none">Server</p>
26+
<p><code class="text-sm">{{database.host.address}}:{{database.host.port}}</code></p>
27+
</div>
28+
<div class="flex-none px-4">
29+
<button class="btn btn-xs btn-secondary btn-red" v-on:click="showDeleteModal = true">
30+
<trash2-icon class="w-3 h-3 mx-1"/>
31+
</button>
32+
</div>
33+
</div>
34+
<modal :show="showDeleteModal" v-on:close="showDeleteModal = false">
35+
<delete-database-modal
36+
:database="database"
37+
v-on:close="showDeleteModal = false"
38+
v-if="showDeleteModal"
39+
/>
40+
</modal>
41+
</div>
42+
</template>
43+
44+
<script>
45+
import { LockIcon, Trash2Icon, DatabaseIcon } from 'vue-feather-icons';
46+
import Modal from '../../../core/Modal';
47+
import DeleteDatabaseModal from './DeleteDatabaseModal';
48+
49+
export default {
50+
name: 'database-row',
51+
components: {DeleteDatabaseModal, Modal, LockIcon, Trash2Icon, DatabaseIcon},
52+
props: {
53+
database: {type: Object, required: true}
54+
},
55+
56+
data: function () {
57+
return {
58+
showDeleteModal: false,
59+
};
60+
},
61+
62+
methods: {
63+
revealPassword: function () {
64+
this.database.showPassword = !this.database.showPassword;
65+
},
66+
},
67+
};
68+
</script>

‎resources/assets/scripts/components/server/components/database/DeleteDatabaseModal.vue‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<template>
2+
<div>
3+
<h2 class="font-medium text-grey-darkest mb-6">Delete this database?</h2>
4+
<p class="text-grey-darkest text-sm">This action <strong>cannot</strong> be undone. This will permanetly delete the <strong>{{database.name}}</strong> database and remove all associated data.</p>
5+
<div class="mt-6">
6+
<label class="input-label">Confirm database name</label>
7+
<input type="text" class="input" v-model="nameConfirmation"/>
8+
</div>
9+
<div class="mt-6 text-right">
10+
<button class="btn btn-sm btn-secondary mr-2" v-on:click="$emit('close')">Cancel</button>
11+
<button class="btn btn-sm btn-red" :disabled="disabled" v-on:click="deleteDatabase">
12+
<span class="spinner white" v-bind:class="{ hidden: !showSpinner }">&nbsp;</span>
13+
<span :class="{ hidden: showSpinner }">
14+
Confirm Deletion
15+
</span>
16+
</button>
17+
</div>
18+
</div>
19+
</template>
20+
21+
<script>
22+
export default {
23+
name: 'delete-database-modal',
24+
props: {
25+
database: { type: Object, required: true },
26+
},
27+
28+
data: function () {
29+
return {
30+
showSpinner: false,
31+
nameConfirmation: '',
32+
};
33+
},
34+
35+
computed: {
36+
/**
37+
* Determine if the 'Delete' button should be enabled or not. This requires the user
38+
* to enter the database name before actually deleting the DB.
39+
*/
40+
disabled: function () {
41+
return (
42+
this.nameConfirmation !== this.database.name
43+
&& this.nameConfirmation !== this.database.name.split('_', 2)[1]
44+
);
45+
}
46+
},
47+
48+
methods: {
49+
/**
50+
* Handle deleting the database for the server instance.
51+
*/
52+
deleteDatabase: function () {
53+
this.nameConfirmation = '';
54+
this.showSpinner = true;
55+
56+
window.axios.delete(this.route('api.client.servers.databases.delete', {
57+
server: this.$route.params.id,
58+
database: this.database.id,
59+
}))
60+
.then(() => {
61+
window.events.$emit('server:deleted-database', this.database.id);
62+
})
63+
.catch(err => {
64+
this.clearFlashes();
65+
console.error({ err });
66+
67+
const response = err.response;
68+
if (response.data && typeof response.data.errors === 'object') {
69+
response.data.errors.forEach((error) => {
70+
this.error(error.detail);
71+
});
72+
}
73+
})
74+
.then(() => {
75+
this.$emit('close');
76+
})
77+
},
78+
}
79+
};
80+
</script>
81+

‎resources/assets/scripts/components/server/subpages/Databases.vue‎

Lines changed: 13 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,7 @@
1212
</div>
1313
</div>
1414
<div v-else>
15-
<div class="content-box mb-6 hover:border-grey" v-for="database in databases" :key="database.name">
16-
<div class="flex items-center text-grey-darker">
17-
<database-icon class="flex-none text-green"></database-icon>
18-
<div class="flex-1 px-4">
19-
<p class="uppercase text-xs text-grey pb-1 select-none">Database Name</p>
20-
<p>{{database.name}}</p>
21-
</div>
22-
<div class="flex-1 px-4">
23-
<p class="uppercase text-xs text-grey pb-1 select-none">Username</p>
24-
<p>{{database.username}}</p>
25-
</div>
26-
<div class="flex-1 px-4">
27-
<p class="uppercase text-xs text-grey pb-1 select-none">Password</p>
28-
<p>
29-
<code class="text-sm cursor-pointer" v-on:click="revealPassword(database)">
30-
<span class="select-none" v-if="!database.showPassword">
31-
<lock-icon class="h-3"/> &bull;&bull;&bull;&bull;&bull;&bull;
32-
</span>
33-
<span v-else>{{database.password}}</span>
34-
</code>
35-
</p>
36-
</div>
37-
<div class="flex-1 px-4">
38-
<p class="uppercase text-xs text-grey pb-1 select-none">Server</p>
39-
<p><code class="text-sm">{{database.host.address}}:{{database.host.port}}</code></p>
40-
</div>
41-
<div class="flex-none px-4">
42-
<button class="btn btn-xs btn-secondary btn-red" v-on:click="deleteDatabase(database)">
43-
<trash2-icon class="w-3 h-3 mx-1"/>
44-
</button>
45-
</div>
46-
</div>
47-
</div>
15+
<database-row v-for="database in databases" :database="database" :key="database.name"/>
4816
</div>
4917
<div>
5018
<button class="btn btn-blue btn-lg" v-on:click="showCreateModal = true">Create new database</button>
@@ -62,12 +30,14 @@
6230
<script>
6331
import { DatabaseIcon, LockIcon, Trash2Icon } from 'vue-feather-icons';
6432
import map from 'lodash/map';
33+
import filter from 'lodash/filter';
6534
import Modal from '../../core/Modal';
66-
import CreateDatabaseModal from '../components/CreateDatabaseModal';
35+
import CreateDatabaseModal from '../components/database/CreateDatabaseModal';
36+
import DatabaseRow from '../components/database/DatabaseRow';
6737
6838
export default {
6939
name: 'databases-page',
70-
components: {CreateDatabaseModal, Modal, DatabaseIcon, LockIcon, Trash2Icon },
40+
components: {DatabaseRow, CreateDatabaseModal, Modal, DatabaseIcon, LockIcon, Trash2Icon },
7141
7242
data: function () {
7343
return {
@@ -79,6 +49,8 @@
7949
8050
mounted: function () {
8151
this.getDatabases();
52+
53+
window.events.$on('server:deleted-database', this.removeDatabase);
8254
},
8355
8456
methods: {
@@ -130,26 +102,15 @@
130102
},
131103
132104
/**
133-
* Show the password for a given database object.
105+
* Handle event that is removing a database.
134106
*
135-
* @param {Object} database
107+
* @param databaseId
136108
*/
137-
revealPassword: function (database) {
138-
this.databases.forEach((d) => {
139-
d.showPassword = d === database ? d.showPassword : false;
109+
removeDatabase: function (databaseId) {
110+
this.databases = filter(this.databases, (database) => {
111+
return database.id !== databaseId;
140112
});
141-
142-
database.showPassword = !database.showPassword;
143-
},
144-
145-
deleteDatabase: function (database) {
146-
window.axios.delete(this.route('api.client.servers.databases.delete', {
147-
server: this.$route.params.id,
148-
database: database.id,
149-
}))
150-
.then(response => console.log(response))
151-
.catch(err => console.error(err.response));
152-
},
113+
}
153114
}
154115
};
155116
</script>

0 commit comments

Comments
 (0)