Allow deletion of multiple allocations at once (#1322)
This commit is contained in:
parent
053d7917ae
commit
262ef78fae
6 changed files with 164 additions and 7 deletions
|
@ -285,6 +285,27 @@ class NodesController extends Controller
|
||||||
return response('', 204);
|
return response('', 204);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes multiple individual allocations from a node.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Http\Request $request
|
||||||
|
* @param int $node
|
||||||
|
* @return \Illuminate\Http\Response
|
||||||
|
*
|
||||||
|
* @throws \Pterodactyl\Exceptions\Service\Allocation\ServerUsingAllocationException
|
||||||
|
*/
|
||||||
|
public function allocationRemoveMultiple(Request $request, int $node): Response
|
||||||
|
{
|
||||||
|
$allocations = $request->input('allocations');
|
||||||
|
foreach ($allocations as $rawAllocation) {
|
||||||
|
$allocation = new Allocation();
|
||||||
|
$allocation->id = $rawAllocation['id'];
|
||||||
|
$this->allocationRemoveSingle($node, $allocation);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response('', 204);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove all allocations for a specific IP at once on a node.
|
* Remove all allocations for a specific IP at once on a node.
|
||||||
*
|
*
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -113,7 +113,7 @@ class FileManager {
|
||||||
addFolderButton() {
|
addFolderButton() {
|
||||||
$('[data-action="add-folder"]').unbind().on('click', () => {
|
$('[data-action="add-folder"]').unbind().on('click', () => {
|
||||||
new ActionsClass().folder($('#file_listing').data('current-dir') || '/');
|
new ActionsClass().folder($('#file_listing').data('current-dir') || '/');
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
selectRow() {
|
selectRow() {
|
||||||
|
|
|
@ -258,6 +258,10 @@ return [
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
'allocations' => [
|
||||||
|
'mass_actions' => 'Mass Actions',
|
||||||
|
'delete' => 'Delete Allocations',
|
||||||
|
],
|
||||||
'files' => [
|
'files' => [
|
||||||
'exceptions' => [
|
'exceptions' => [
|
||||||
'invalid_mime' => 'This type of file cannot be edited via the Panel\'s built-in editor.',
|
'invalid_mime' => 'This type of file cannot be edited via the Panel\'s built-in editor.',
|
||||||
|
|
|
@ -39,23 +39,42 @@
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h3 class="box-title">Existing Allocations</h3>
|
<h3 class="box-title">Existing Allocations</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-body table-responsive no-padding">
|
<div class="box-body table-responsive no-padding" style="overflow-x: visible">
|
||||||
<table class="table table-hover" style="margin-bottom:0;">
|
<table class="table table-hover" style="margin-bottom:0;">
|
||||||
<tr>
|
<tr>
|
||||||
|
<th>
|
||||||
|
<input type="checkbox" class="select-all-files hidden-xs" data-action="selectAll">
|
||||||
|
</th>
|
||||||
<th>IP Address <i class="fa fa-fw fa-minus-square" style="font-weight:normal;color:#d9534f;cursor:pointer;" data-toggle="modal" data-target="#allocationModal"></i></th>
|
<th>IP Address <i class="fa fa-fw fa-minus-square" style="font-weight:normal;color:#d9534f;cursor:pointer;" data-toggle="modal" data-target="#allocationModal"></i></th>
|
||||||
<th>IP Alias</th>
|
<th>IP Alias</th>
|
||||||
<th>Port</th>
|
<th>Port</th>
|
||||||
<th>Assigned To</th>
|
<th>Assigned To</th>
|
||||||
<th></th>
|
<th>
|
||||||
|
<div class="btn-group hidden-xs">
|
||||||
|
<button type="button" id="mass_actions" class="btn btn-sm btn-default dropdown-toggle disabled"
|
||||||
|
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">@lang('server.allocations.mass_actions') <span class="caret"></span>
|
||||||
|
</button>
|
||||||
|
<ul class="dropdown-menu dropdown-massactions">
|
||||||
|
<li><a href="#" id="selective-deletion" data-action="selective-deletion">@lang('server.allocations.delete') <i class="fa fa-fw fa-trash-o"></i></a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
@foreach($node->allocations as $allocation)
|
@foreach($node->allocations as $allocation)
|
||||||
<tr>
|
<tr>
|
||||||
<td class="col-sm-3 middle">{{ $allocation->ip }}</td>
|
<td class="middle min-size" data-identifier="type">
|
||||||
|
@if(is_null($allocation->server_id))
|
||||||
|
<input type="checkbox" class="select-file hidden-xs" data-action="addSelection">
|
||||||
|
@else
|
||||||
|
<input disabled="disabled" type="checkbox" class="select-file hidden-xs" data-action="addSelection">
|
||||||
|
@endif
|
||||||
|
</td>
|
||||||
|
<td class="col-sm-3 middle" data-identifier="ip">{{ $allocation->ip }}</td>
|
||||||
<td class="col-sm-3 middle">
|
<td class="col-sm-3 middle">
|
||||||
<input class="form-control input-sm" type="text" value="{{ $allocation->ip_alias }}" data-action="set-alias" data-id="{{ $allocation->id }}" placeholder="none" />
|
<input class="form-control input-sm" type="text" value="{{ $allocation->ip_alias }}" data-action="set-alias" data-id="{{ $allocation->id }}" placeholder="none" />
|
||||||
<span class="input-loader"><i class="fa fa-refresh fa-spin fa-fw"></i></span>
|
<span class="input-loader"><i class="fa fa-refresh fa-spin fa-fw"></i></span>
|
||||||
</td>
|
</td>
|
||||||
<td class="col-sm-2 middle">{{ $allocation->port }}</td>
|
<td class="col-sm-2 middle" data-identifier="port">{{ $allocation->port }}</td>
|
||||||
<td class="col-sm-3 middle">
|
<td class="col-sm-3 middle">
|
||||||
@if(! is_null($allocation->server))
|
@if(! is_null($allocation->server))
|
||||||
<a href="{{ route('admin.servers.view', $allocation->server_id) }}">{{ $allocation->server->name }}</a>
|
<a href="{{ route('admin.servers.view', $allocation->server_id) }}">{{ $allocation->server->name }}</a>
|
||||||
|
@ -153,17 +172,35 @@
|
||||||
@section('footer-scripts')
|
@section('footer-scripts')
|
||||||
@parent
|
@parent
|
||||||
<script>
|
<script>
|
||||||
|
$('[data-action="addSelection"]').on('click', function () {
|
||||||
|
updateMassActions();
|
||||||
|
});
|
||||||
|
|
||||||
|
$('[data-action="selectAll"]').on('click', function () {
|
||||||
|
$('input.select-file').not(':disabled').prop('checked', function (i, val) {
|
||||||
|
return !val;
|
||||||
|
});
|
||||||
|
|
||||||
|
updateMassActions();
|
||||||
|
});
|
||||||
|
|
||||||
|
$('[data-action="selective-deletion"]').on('mousedown', function () {
|
||||||
|
deleteSelected();
|
||||||
|
});
|
||||||
|
|
||||||
$('#pAllocationIP').select2({
|
$('#pAllocationIP').select2({
|
||||||
tags: true,
|
tags: true,
|
||||||
maximumSelectionLength: 1,
|
maximumSelectionLength: 1,
|
||||||
selectOnClose: true,
|
selectOnClose: true,
|
||||||
tokenSeparators: [',', ' '],
|
tokenSeparators: [',', ' '],
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#pAllocationPorts').select2({
|
$('#pAllocationPorts').select2({
|
||||||
tags: true,
|
tags: true,
|
||||||
selectOnClose: true,
|
selectOnClose: true,
|
||||||
tokenSeparators: [',', ' '],
|
tokenSeparators: [',', ' '],
|
||||||
});
|
});
|
||||||
|
|
||||||
$('button[data-action="deallocate"]').click(function (event) {
|
$('button[data-action="deallocate"]').click(function (event) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
var element = $(this);
|
var element = $(this);
|
||||||
|
@ -216,7 +253,7 @@
|
||||||
alias: element.val(),
|
alias: element.val(),
|
||||||
allocation_id: element.data('id'),
|
allocation_id: element.data('id'),
|
||||||
}
|
}
|
||||||
}).done(function (data) {
|
}).done(function () {
|
||||||
element.parent().addClass('has-success');
|
element.parent().addClass('has-success');
|
||||||
}).fail(function (jqXHR) {
|
}).fail(function (jqXHR) {
|
||||||
console.error(jqXHR);
|
console.error(jqXHR);
|
||||||
|
@ -230,5 +267,99 @@
|
||||||
function clearHighlight(element) {
|
function clearHighlight(element) {
|
||||||
element.parent().removeClass('has-error has-success');
|
element.parent().removeClass('has-error has-success');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateMassActions() {
|
||||||
|
if ($('input.select-file:checked').length > 0) {
|
||||||
|
$('#mass_actions').removeClass('disabled');
|
||||||
|
} else {
|
||||||
|
$('#mass_actions').addClass('disabled');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function deleteSelected() {
|
||||||
|
var selectedIds = [];
|
||||||
|
var selectedItems = [];
|
||||||
|
var selectedItemsElements = [];
|
||||||
|
|
||||||
|
$('input.select-file:checked').each(function () {
|
||||||
|
var $parent = $($(this).closest('tr'));
|
||||||
|
var id = $parent.find('[data-action="deallocate"]').data('id');
|
||||||
|
var $ip = $parent.find('td[data-identifier="ip"]');
|
||||||
|
var $port = $parent.find('td[data-identifier="port"]');
|
||||||
|
var block = `${$ip.text()}:${$port.text()}`;
|
||||||
|
|
||||||
|
selectedIds.push({
|
||||||
|
id: id
|
||||||
|
});
|
||||||
|
selectedItems.push(block);
|
||||||
|
selectedItemsElements.push($parent);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (selectedItems.length !== 0) {
|
||||||
|
var formattedItems = "";
|
||||||
|
var i = 0;
|
||||||
|
$.each(selectedItems, function (key, value) {
|
||||||
|
formattedItems += ("<code>" + value + "</code>, ");
|
||||||
|
i++;
|
||||||
|
return i < 5;
|
||||||
|
});
|
||||||
|
|
||||||
|
formattedItems = formattedItems.slice(0, -2);
|
||||||
|
if (selectedItems.length > 5) {
|
||||||
|
formattedItems += ', and ' + (selectedItems.length - 5) + ' other(s)';
|
||||||
|
}
|
||||||
|
|
||||||
|
swal({
|
||||||
|
type: 'warning',
|
||||||
|
title: '',
|
||||||
|
text: 'Are you sure you want to delete the following allocations: ' + formattedItems + '?',
|
||||||
|
html: true,
|
||||||
|
showCancelButton: true,
|
||||||
|
showConfirmButton: true,
|
||||||
|
closeOnConfirm: false,
|
||||||
|
showLoaderOnConfirm: true
|
||||||
|
}, function () {
|
||||||
|
$.ajax({
|
||||||
|
method: 'DELETE',
|
||||||
|
url: Router.route('admin.nodes.view.allocation.removeMultiple', {
|
||||||
|
node: Pterodactyl.node.id
|
||||||
|
}),
|
||||||
|
headers: {'X-CSRF-TOKEN': $('meta[name="_token"]').attr('content')},
|
||||||
|
data: JSON.stringify({
|
||||||
|
allocations: selectedIds
|
||||||
|
}),
|
||||||
|
contentType: 'application/json',
|
||||||
|
processData: false
|
||||||
|
}).done(function () {
|
||||||
|
$('#file_listing input:checked').each(function () {
|
||||||
|
$(this).prop('checked', false);
|
||||||
|
});
|
||||||
|
|
||||||
|
$.each(selectedItemsElements, function () {
|
||||||
|
$(this).addClass('warning').delay(200).fadeOut();
|
||||||
|
});
|
||||||
|
|
||||||
|
swal({
|
||||||
|
type: 'success',
|
||||||
|
title: 'Allocations Deleted'
|
||||||
|
});
|
||||||
|
}).fail(function (jqXHR) {
|
||||||
|
console.error(jqXHR);
|
||||||
|
swal({
|
||||||
|
type: 'error',
|
||||||
|
title: 'Whoops!',
|
||||||
|
html: true,
|
||||||
|
text: 'An error occurred while attempting to delete these allocations. Please try again.',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
swal({
|
||||||
|
type: 'warning',
|
||||||
|
title: '',
|
||||||
|
text: 'Please select allocation(s) to delete.',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -153,6 +153,7 @@ Route::group(['prefix' => 'nodes'], function () {
|
||||||
|
|
||||||
Route::delete('/view/{node}/delete', 'NodesController@delete')->name('admin.nodes.view.delete');
|
Route::delete('/view/{node}/delete', 'NodesController@delete')->name('admin.nodes.view.delete');
|
||||||
Route::delete('/view/{node}/allocation/remove/{allocation}', 'NodesController@allocationRemoveSingle')->name('admin.nodes.view.allocation.removeSingle');
|
Route::delete('/view/{node}/allocation/remove/{allocation}', 'NodesController@allocationRemoveSingle')->name('admin.nodes.view.allocation.removeSingle');
|
||||||
|
Route::delete('/view/{node}/allocations', 'NodesController@allocationRemoveMultiple')->name('admin.nodes.view.allocation.removeMultiple');
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue