refactor(redirect): replace redirect calls with redirectRoute helper for consistency
This commit is contained in:
parent
5d98847e49
commit
ef1abe17b8
20 changed files with 25 additions and 25 deletions
|
|
@ -95,7 +95,7 @@ public function submit()
|
|||
]);
|
||||
}
|
||||
}
|
||||
$this->redirect(route('destination.show', $docker->uuid));
|
||||
redirectRoute($this, 'destination.show', [$docker->uuid]);
|
||||
} catch (\Throwable $e) {
|
||||
return handleError($e, $this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1314,10 +1314,10 @@ private function completeResourceCreation()
|
|||
'server_id' => $this->selectedServerId,
|
||||
];
|
||||
|
||||
$this->redirect(route('project.resource.create', [
|
||||
redirectRoute($this, 'project.resource.create', [
|
||||
'project_uuid' => $this->selectedProjectUuid,
|
||||
'environment_uuid' => $this->selectedEnvironmentUuid,
|
||||
] + $queryParams));
|
||||
] + $queryParams);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public function delete($password)
|
|||
|
||||
refreshSession();
|
||||
|
||||
return redirect()->route('team.index');
|
||||
return redirectRoute($this, 'team.index');
|
||||
}
|
||||
|
||||
public function render()
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ public function rollbackImage($commit)
|
|||
return;
|
||||
}
|
||||
|
||||
return redirect()->route('project.application.deployment.show', [
|
||||
return redirectRoute($this, 'project.application.deployment.show', [
|
||||
'project_uuid' => $this->parameters['project_uuid'],
|
||||
'application_uuid' => $this->parameters['application_uuid'],
|
||||
'deployment_uuid' => $deployment_uuid,
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ public function delete()
|
|||
if ($environment->isEmpty()) {
|
||||
$environment->delete();
|
||||
|
||||
return redirect()->route('project.show', parameters: ['project_uuid' => $this->parameters['project_uuid']]);
|
||||
return redirectRoute($this, 'project.show', ['project_uuid' => $this->parameters['project_uuid']]);
|
||||
}
|
||||
|
||||
return $this->dispatch('error', "<strong>Environment {$environment->name}</strong> has defined resources, please delete them first.");
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public function delete()
|
|||
if ($project->isEmpty()) {
|
||||
$project->delete();
|
||||
|
||||
return redirect()->route('project.index');
|
||||
return redirectRoute($this, 'project.index');
|
||||
}
|
||||
|
||||
return $this->dispatch('error', "<strong>Project {$project->name}</strong> has resources defined, please delete them first.");
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public function submit()
|
|||
{
|
||||
try {
|
||||
$this->syncData(true);
|
||||
$this->redirectRoute('project.environment.edit', [
|
||||
redirectRoute($this, 'project.environment.edit', [
|
||||
'environment_uuid' => $this->environment->uuid,
|
||||
'project_uuid' => $this->project->uuid,
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ public function submit()
|
|||
'fqdn' => $fqdn,
|
||||
]);
|
||||
|
||||
return redirect()->route('project.application.configuration', [
|
||||
return redirectRoute($this, 'project.application.configuration', [
|
||||
'application_uuid' => $application->uuid,
|
||||
'environment_uuid' => $environment->uuid,
|
||||
'project_uuid' => $project->uuid,
|
||||
|
|
|
|||
|
|
@ -16,6 +16,6 @@ public function createEmptyProject()
|
|||
'uuid' => (string) new Cuid2,
|
||||
]);
|
||||
|
||||
return redirect()->route('project.show', ['project_uuid' => $project->uuid, 'environment_uuid' => $project->environments->first()->uuid]);
|
||||
return redirectRoute($this, 'project.show', ['project_uuid' => $project->uuid, 'environment_uuid' => $project->environments->first()->uuid]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ public function delete($password)
|
|||
$this->database->delete();
|
||||
$this->dispatch('success', 'Database deleted.');
|
||||
|
||||
return redirect()->route('project.service.configuration', $this->parameters);
|
||||
return redirectRoute($this, 'project.service.configuration', $this->parameters);
|
||||
} catch (\Throwable $e) {
|
||||
return handleError($e, $this);
|
||||
}
|
||||
|
|
@ -164,7 +164,7 @@ public function convertToApplication()
|
|||
$serviceDatabase->delete();
|
||||
});
|
||||
|
||||
return redirect()->route('project.service.configuration', $redirectParams);
|
||||
return redirectRoute($this, 'project.service.configuration', $redirectParams);
|
||||
} catch (\Throwable $e) {
|
||||
return handleError($e, $this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ public function redeploy(int $network_id, int $server_id)
|
|||
return;
|
||||
}
|
||||
|
||||
return redirect()->route('project.application.deployment.show', [
|
||||
return redirectRoute($this, 'project.application.deployment.show', [
|
||||
'project_uuid' => data_get($this->resource, 'environment.project.uuid'),
|
||||
'application_uuid' => data_get($this->resource, 'uuid'),
|
||||
'deployment_uuid' => $deployment_uuid,
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public function submit()
|
|||
'uuid' => (string) new Cuid2,
|
||||
]);
|
||||
|
||||
return redirect()->route('project.resource.index', [
|
||||
return redirectRoute($this, 'project.resource.index', [
|
||||
'project_uuid' => $this->project->uuid,
|
||||
'environment_uuid' => $environment->uuid,
|
||||
]);
|
||||
|
|
@ -59,7 +59,7 @@ public function submit()
|
|||
|
||||
public function navigateToEnvironment($projectUuid, $environmentUuid)
|
||||
{
|
||||
return redirect()->route('project.resource.index', [
|
||||
return redirectRoute($this, 'project.resource.index', [
|
||||
'project_uuid' => $projectUuid,
|
||||
'environment_uuid' => $environmentUuid,
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ private function validatePrivateKey()
|
|||
private function redirectAfterCreation(PrivateKey $privateKey)
|
||||
{
|
||||
return $this->from === 'server'
|
||||
? redirect()->route('dashboard')
|
||||
: redirect()->route('security.private-key.show', ['private_key_uuid' => $privateKey->uuid]);
|
||||
? redirectRoute($this, 'dashboard')
|
||||
: redirectRoute($this, 'security.private-key.show', ['private_key_uuid' => $privateKey->uuid]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ public function delete()
|
|||
$this->private_key->safeDelete();
|
||||
currentTeam()->privateKeys = PrivateKey::where('team_id', currentTeam()->id)->get();
|
||||
|
||||
return redirect()->route('security.private-key.index');
|
||||
return redirectRoute($this, 'security.private-key.index');
|
||||
} catch (\Exception $e) {
|
||||
$this->dispatch('error', $e->getMessage());
|
||||
} catch (\Throwable $e) {
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public function delete($password)
|
|||
$this->server->team_id
|
||||
);
|
||||
|
||||
return redirect()->route('server.index');
|
||||
return redirectRoute($this, 'server.index');
|
||||
} catch (\Throwable $e) {
|
||||
return handleError($e, $this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -567,10 +567,10 @@ public function submit()
|
|||
]);
|
||||
refreshSession();
|
||||
|
||||
return $this->redirect(route('server.show', $server->uuid));
|
||||
return redirectRoute($this, 'server.show', [$server->uuid]);
|
||||
}
|
||||
|
||||
return redirect()->route('server.show', $server->uuid);
|
||||
return redirectRoute($this, 'server.show', [$server->uuid]);
|
||||
} catch (\Throwable $e) {
|
||||
return handleError($e, $this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ public function submit()
|
|||
$server->settings->is_build_server = $this->is_build_server;
|
||||
$server->settings->save();
|
||||
|
||||
return redirect()->route('server.show', $server->uuid);
|
||||
return redirectRoute($this, 'server.show', [$server->uuid]);
|
||||
} catch (\Throwable $e) {
|
||||
return handleError($e, $this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ public function createGitHubApp()
|
|||
session(['from' => session('from') + ['source_id' => $github_app->id]]);
|
||||
}
|
||||
|
||||
return redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
|
||||
return redirectRoute($this, 'source.github.show', ['github_app_uuid' => $github_app->uuid]);
|
||||
} catch (\Throwable $e) {
|
||||
return handleError($e, $this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ public function submit()
|
|||
$this->storage->testConnection();
|
||||
$this->storage->save();
|
||||
|
||||
return redirect()->route('storage.show', $this->storage->uuid);
|
||||
return redirectRoute($this, 'storage.show', [$this->storage->uuid]);
|
||||
} catch (\Throwable $e) {
|
||||
$this->dispatch('error', 'Failed to create storage.', $e->getMessage());
|
||||
// return handleError($e, $this);
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public function submit()
|
|||
auth()->user()->teams()->attach($team, ['role' => 'admin']);
|
||||
refreshSession($team);
|
||||
|
||||
return redirect()->route('team.index');
|
||||
return redirectRoute($this, 'team.index');
|
||||
} catch (\Throwable $e) {
|
||||
return handleError($e, $this);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue