Complete new service, option, and variable management interface in Admin CP
This commit is contained in:
parent
bccbb309b2
commit
d7682bb7c9
16 changed files with 698 additions and 925 deletions
|
@ -28,10 +28,74 @@ use DB;
|
|||
use Validator;
|
||||
use Pterodactyl\Models\ServiceOption;
|
||||
use Pterodactyl\Exceptions\DisplayException;
|
||||
use Pterodactyl\Repositories\VariableRepository;
|
||||
use Pterodactyl\Exceptions\DisplayValidationException;
|
||||
|
||||
class OptionRepository
|
||||
{
|
||||
/**
|
||||
* Creates a new service option on the system.
|
||||
*
|
||||
* @param array $data
|
||||
* @return \Pterodactyl\Models\ServiceOption
|
||||
*
|
||||
* @throws \Pterodactyl\Exceptions\DisplayException
|
||||
* @throws \Pterodactyl\Exceptions\DisplayValidationException
|
||||
*/
|
||||
public function create(array $data)
|
||||
{
|
||||
$validator = Validator::make($data, [
|
||||
'service_id' => 'required|numeric|exists:services,id',
|
||||
'name' => 'required|string|max:255',
|
||||
'description' => 'required|string',
|
||||
'tag' => 'required|string|max:255|unique:service_options,tag',
|
||||
'docker_image' => 'required|string|max:255',
|
||||
'startup' => 'required|string',
|
||||
'config_from' => 'sometimes|required|numeric|exists:service_options,id',
|
||||
'config_startup' => 'required_without:config_from|json',
|
||||
'config_stop' => 'required_without:config_from|string|max:255',
|
||||
'config_logs' => 'required_without:config_from|json',
|
||||
'config_files' => 'required_without:config_from|json',
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
throw new DisplayValidationException($validator->errors());
|
||||
}
|
||||
|
||||
if (isset($data['config_from'])) {
|
||||
if (! ServiceOption::where('service_id', $data['service_id'])->where('id', $data['config_from'])->first()) {
|
||||
throw new DisplayException('The `configuration from` directive must be a child of the assigned service.');
|
||||
}
|
||||
}
|
||||
|
||||
return ServiceOption::create($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a service option from the system.
|
||||
*
|
||||
* @param int $id
|
||||
* @return void
|
||||
*
|
||||
* @throws \Pterodactyl\Exceptions\DisplayException
|
||||
*/
|
||||
public function delete($id)
|
||||
{
|
||||
$option = ServiceOption::with('variables')->withCount('servers')->findOrFail($id);
|
||||
|
||||
if ($option->servers_count > 0) {
|
||||
throw new DisplayException('You cannot delete a service option that has servers associated with it.');
|
||||
}
|
||||
|
||||
DB::transaction(function () use ($option) {
|
||||
foreach($option->variables as $variable) {
|
||||
(new VariableRepository)->delete($variable->id);
|
||||
}
|
||||
|
||||
$option->delete();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates a service option in the database which can then be used
|
||||
* on nodes.
|
||||
|
@ -39,11 +103,25 @@ class OptionRepository
|
|||
* @param int $id
|
||||
* @param array $data
|
||||
* @return \Pterodactyl\Models\ServiceOption
|
||||
*
|
||||
* @throws \Pterodactyl\Exceptions\DisplayException
|
||||
* @throws \Pterodactyl\Exceptions\DisplayValidationException
|
||||
*/
|
||||
public function update($id, array $data)
|
||||
{
|
||||
$option = ServiceOption::findOrFail($id);
|
||||
|
||||
// Due to code limitations (at least when I am writing this currently)
|
||||
// we have to make an assumption that if config_from is not passed
|
||||
// that we should be telling it that no config is wanted anymore.
|
||||
//
|
||||
// This really is only an issue if we open API access to this function,
|
||||
// in which case users will always need to pass `config_from` in order
|
||||
// to keep it assigned.
|
||||
if (! isset($data['config_from']) && ! is_null($option->config_from)) {
|
||||
$option->config_from = null;
|
||||
}
|
||||
|
||||
$validator = Validator::make($data, [
|
||||
'name' => 'sometimes|required|string|max:255',
|
||||
'description' => 'sometimes|required|string',
|
||||
|
@ -73,6 +151,12 @@ class OptionRepository
|
|||
throw new DisplayValidationException($validator->errors());
|
||||
}
|
||||
|
||||
if (isset($data['config_from'])) {
|
||||
if (! ServiceOption::where('service_id', $option->service_id)->where('id', $data['config_from'])->first()) {
|
||||
throw new DisplayException('The `configuration from` directive must be a child of the assigned service.');
|
||||
}
|
||||
}
|
||||
|
||||
$option->fill($data)->save();
|
||||
|
||||
return $option;
|
||||
|
|
Reference in a new issue