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

fix: link in task failed job notifications

Browse Source
This commit is contained in:
Andras Bacsai
2024-07-25 13:30:38 +02:00
parent 192bc0f13b
commit debd2a3433
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Models/Application.php
View File

@@ -232,12 +232,24 @@ class Application extends BaseModel
public function failedTaskLink($task_uuid) public function failedTaskLink($task_uuid)
{ {
if (data_get($this, 'environment.project.uuid')) { if (data_get($this, 'environment.project.uuid')) {
return route('project.application.scheduled-tasks', [ $route = route('project.application.scheduled-tasks', [
'project_uuid' => data_get($this, 'environment.project.uuid'), 'project_uuid' => data_get($this, 'environment.project.uuid'),
'environment_name' => data_get($this, 'environment.name'), 'environment_name' => data_get($this, 'environment.name'),
'application_uuid' => data_get($this, 'uuid'), 'application_uuid' => data_get($this, 'uuid'),
'task_uuid' => $task_uuid, 'task_uuid' => $task_uuid,
]); ]);
$settings = InstanceSettings::get();
if (data_get($settings, 'fqdn')) {
$url = Url::fromString($route);
$url = $url->withPort(null);
$fqdn = data_get($settings, 'fqdn');
$fqdn = str_replace(['http://', 'https://'], '', $fqdn);
$url = $url->withHost($fqdn);
return $url->__toString();
}
return $route;
} }
return null; return null;
@@ -1270,7 +1282,7 @@ class Application extends BaseModel
$template = $this->preview_url_template; $template = $this->preview_url_template;
$host = $url->getHost(); $host = $url->getHost();
$schema = $url->getScheme(); $schema = $url->getScheme();
$random = new Cuid2(7); $random = new Cuid2();
$preview_fqdn = str_replace('{{random}}', $random, $template); $preview_fqdn = str_replace('{{random}}', $random, $template);
$preview_fqdn = str_replace('{{domain}}', $host, $preview_fqdn); $preview_fqdn = str_replace('{{domain}}', $host, $preview_fqdn);
$preview_fqdn = str_replace('{{pr_id}}', $pull_request_id, $preview_fqdn); $preview_fqdn = str_replace('{{pr_id}}', $pull_request_id, $preview_fqdn);

15
app/Models/Service.php
View File

@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use OpenApi\Attributes as OA; use OpenApi\Attributes as OA;
use Spatie\Url\Url;
use Symfony\Component\Yaml\Yaml; use Symfony\Component\Yaml\Yaml;
#[OA\Schema( #[OA\Schema(
@@ -764,12 +765,24 @@ class Service extends BaseModel
public function failedTaskLink($task_uuid) public function failedTaskLink($task_uuid)
{ {
if (data_get($this, 'environment.project.uuid')) { if (data_get($this, 'environment.project.uuid')) {
return route('project.service.scheduled-tasks', [ $route = route('project.service.scheduled-tasks', [
'project_uuid' => data_get($this, 'environment.project.uuid'), 'project_uuid' => data_get($this, 'environment.project.uuid'),
'environment_name' => data_get($this, 'environment.name'), 'environment_name' => data_get($this, 'environment.name'),
'service_uuid' => data_get($this, 'uuid'), 'service_uuid' => data_get($this, 'uuid'),
'task_uuid' => $task_uuid, 'task_uuid' => $task_uuid,
]); ]);
$settings = InstanceSettings::get();
if (data_get($settings, 'fqdn')) {
$url = Url::fromString($route);
$url = $url->withPort(null);
$fqdn = data_get($settings, 'fqdn');
$fqdn = str_replace(['http://', 'https://'], '', $fqdn);
$url = $url->withHost($fqdn);
return $url->__toString();
}
return $route;
} }
return null; return null;