dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: routing, switch back to old one

Browse Source
This commit is contained in:
Andras Bacsai
2023-12-27 16:45:01 +01:00
parent 8c20c833ba
commit f03aa57758
70 changed files with 961 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Livewire/Project/AddEmpty.php
View File

@@ -27,7 +27,7 @@ class AddEmpty extends Component
'description' => $this->description,
'team_id' => currentTeam()->id,
]);
return $this->redirectRoute('project.show', $project->uuid, navigate: true);
return redirect()->route('project.show', $project->uuid);
} catch (\Throwable $e) {
return handleError($e, $this);
} finally {

4
app/Livewire/Project/AddEnvironment.php
View File

@@ -27,10 +27,10 @@ class AddEnvironment extends Component
'project_id' => $this->project->id,
]);
return $this->redirectRoute('project.resources', [
return redirect()->route('project.resources', [
'project_uuid' => $this->project->uuid,
'environment_name' => $environment->name,
], navigate: true);
]);
} catch (\Throwable $e) {
handleError($e, $this);
} finally {

6
app/Livewire/Project/Application/Configuration.php
View File

@@ -15,15 +15,15 @@ class Configuration extends Component
{
$project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
if (!$project) {
return $this->redirectRoute('dashboard', navigate: true);
return redirect()->route('dashboard');
}
$environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
if (!$environment) {
return $this->redirectRoute('dashboard', navigate: true);
return redirect()->route('dashboard');
}
$application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
if (!$application) {
return $this->redirectRoute('dashboard', navigate: true);
return redirect()->route('dashboard');
}
$this->application = $application;
$mainServer = $this->application->destination->server;

16
app/Livewire/Project/Application/Heading.php
View File

@@ -60,12 +60,12 @@ class Heading extends Component
force_rebuild: false,
is_new_deployment: true,
);
return $this->redirectRoute('project.application.deployment', [
return redirect()->route('project.application.deployment', [
'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $this->deploymentUuid,
'environment_name' => $this->parameters['environment_name'],
], navigate: true);
]);
}
public function deploy(bool $force_rebuild = false)
{
@@ -83,12 +83,12 @@ class Heading extends Component
deployment_uuid: $this->deploymentUuid,
force_rebuild: $force_rebuild,
);
$this->redirectRoute('project.application.deployment', [
return redirect()->route('project.application.deployment', [
'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $this->deploymentUuid,
'environment_name' => $this->parameters['environment_name'],
], navigate: true);
]);
}
protected function setDeploymentUuid()
@@ -113,12 +113,12 @@ class Heading extends Component
restart_only: true,
is_new_deployment: true,
);
return $this->redirectRoute('project.application.deployment', [
return redirect()->route('project.application.deployment', [
'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $this->deploymentUuid,
'environment_name' => $this->parameters['environment_name'],
], navigate: true);
]);
}
public function restart()
{
@@ -128,11 +128,11 @@ class Heading extends Component
deployment_uuid: $this->deploymentUuid,
restart_only: true,
);
return $this->redirectRoute('project.application.deployment', [
return redirect()->route('project.application.deployment', [
'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $this->deploymentUuid,
'environment_name' => $this->parameters['environment_name'],
], navigate: true);
]);
}
}

4
app/Livewire/Project/Application/Previews.php
View File

@@ -52,12 +52,12 @@ class Previews extends Component
force_rebuild: true,
pull_request_id: $pull_request_id,
);
return $this->redirectRoute('project.application.deployment', [
return redirect()->route('project.application.deployment', [
'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $this->deployment_uuid,
'environment_name' => $this->parameters['environment_name'],
], navigate: true);
]);
} catch (\Throwable $e) {
return handleError($e, $this);
}

4
app/Livewire/Project/Application/Rollback.php
View File

@@ -29,12 +29,12 @@ class Rollback extends Component
commit: $commit,
force_rebuild: false,
);
return $this->redirectRoute('project.application.deployment', [
return redirect()->route('project.application.deployment', [
'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $deployment_uuid,
'environment_name' => $this->parameters['environment_name'],
], navigate: true);
]);
}
public function loadImages($showToast = false)

4
app/Livewire/Project/CloneProject.php
View File

@@ -152,10 +152,10 @@ class CloneProject extends Component
}
$newService->parse();
}
return $this->redirectRoute('project.resources', [
return redirect()->route('project.resources', [
'project_uuid' => $newProject->uuid,
'environment_name' => $newEnvironment->name,
], navigate: true);
]);
} catch (\Exception $e) {
return handleError($e, $this);
}

4
app/Livewire/Project/Database/BackupEdit.php
View File

@@ -50,9 +50,9 @@ class BackupEdit extends Component
$url = $url->withoutQueryParameter('selectedBackupId');
$url = $url->withFragment('backups');
$url = $url->getPath() . "#{$url->getFragment()}";
return $this->redirect($url,navigate: true);
return redirect($url);
} else {
return $this->redirectRoute('project.database.backups.all', $this->parameters);
return redirect()->route('project.database.backups.all', $this->parameters);
}
}

2
app/Livewire/Project/DeleteEnvironment.php
View File

@@ -23,7 +23,7 @@ class DeleteEnvironment extends Component
$environment = Environment::findOrFail($this->environment_id);
if ($environment->isEmpty()) {
$environment->delete();
return $this->redirectRoute('project.show', ['project_uuid' => $this->parameters['project_uuid']], navigate: true);
return redirect()->route('project.show', ['project_uuid' => $this->parameters['project_uuid']]);
}
return $this->dispatch('error', 'Environment has defined resources, please delete them first.');
}

2
app/Livewire/Project/DeleteProject.php
View File

@@ -25,6 +25,6 @@ class DeleteProject extends Component
return $this->dispatch('error', 'Project has resources defined, please delete them first.');
}
$project->delete();
return $this->redirectRoute('projects', navigate: true);
return redirect()->route('projects');
}
}

4
app/Livewire/Project/New/DockerCompose.php
View File

@@ -69,12 +69,12 @@ class DockerCompose extends Component
$service->parse(isNew: true);
return $this->redirectRoute('project.service.configuration', [
return redirect()->route('project.service.configuration', [
'service_uuid' => $service->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
]);
} catch (\Throwable $e) {
return handleError($e, $this);
}

4
app/Livewire/Project/New/DockerImage.php
View File

@@ -64,11 +64,11 @@ class DockerImage extends Component
'name' => 'docker-image-' . $application->uuid,
'fqdn' => $fqdn
]);
return $this->redirectRoute('project.application.configuration', [
return redirect()->route('project.application.configuration', [
'application_uuid' => $application->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
], navigate: false);
]);
}
public function render()
{

2
app/Livewire/Project/New/EmptyProject.php
View File

@@ -13,6 +13,6 @@ class EmptyProject extends Component
'name' => generate_random_name(),
'team_id' => currentTeam()->id,
]);
return $this->redirectRoute('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production'], navigate: false);
return redirect()->route('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production']);
}
}

4
app/Livewire/Project/New/GithubPrivateRepository.php
View File

@@ -151,11 +151,11 @@ class GithubPrivateRepository extends Component
$application->name = generate_application_name($this->selected_repository_owner . '/' . $this->selected_repository_repo, $this->selected_branch_name, $application->uuid);
$application->save();
return $this->redirectRoute('project.application.configuration', [
return redirect()->route('project.application.configuration', [
'application_uuid' => $application->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
], navigate: false);
]);
} catch (\Throwable $e) {
return handleError($e, $this);
}

4
app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
View File

@@ -132,11 +132,11 @@ class GithubPrivateRepositoryDeployKey extends Component
$application->name = generate_random_name($application->uuid);
$application->save();
return $this->redirectRoute('project.application.configuration', [
return redirect()->route('project.application.configuration', [
'application_uuid' => $application->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
], navigate: false);
]);
} catch (\Throwable $e) {
return handleError($e, $this);
}

4
app/Livewire/Project/New/PublicGitRepository.php
View File

@@ -184,11 +184,11 @@ class PublicGitRepository extends Component
$application->fqdn = $fqdn;
$application->save();
return $this->redirectRoute('project.application.configuration', [
return redirect()->route('project.application.configuration', [
'application_uuid' => $application->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
], navigate: false);
]);
} catch (\Throwable $e) {
return handleError($e, $this);
}

4
app/Livewire/Project/New/Select.php
View File

@@ -55,10 +55,10 @@ class Select extends Component
public function updatedSelectedEnvironment()
{
return $this->redirectRoute('project.resources.new', [
return redirect()->route('project.resources.new', [
'project_uuid' => $this->parameters['project_uuid'],
'environment_name' => $this->selectedEnvironment,
], navigate: true);
]);
}
// public function addExistingPostgresql()

4
app/Livewire/Project/New/SimpleDockerfile.php
View File

@@ -70,10 +70,10 @@ CMD ["nginx", "-g", "daemon off;"]
'fqdn' => $fqdn
]);
return $this->redirectRoute('project.application.configuration', [
return redirect()->route('project.application.configuration', [
'application_uuid' => $application->uuid,
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
], navigate: false);
]);
}
}

2
app/Livewire/Project/Service/Application.php
View File

@@ -41,7 +41,7 @@ class Application extends Component
try {
$this->application->delete();
$this->dispatch('success', 'Application deleted successfully.');
return $this->redirectRoute('project.service.configuration', $this->parameters, navigate: true);
return redirect()->route('project.service.configuration', $this->parameters);
} catch (\Throwable $e) {
return handleError($e, $this);
}

4
app/Livewire/Project/Shared/Danger.php
View File

@@ -25,10 +25,10 @@ class Danger extends Component
{
try {
DeleteResourceJob::dispatchSync($this->resource);
return $this->redirectRoute('project.resources', [
return redirect()->route('project.resources', [
'project_uuid' => $this->projectUuid,
'environment_name' => $this->environmentName
], navigate: true);
]);
} catch (\Throwable $e) {
return handleError($e, $this);
}