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

refactor: Load environment variables based on resource type in sortEnvironmentVariables()

Browse Source
This commit is contained in:
Andras Bacsai
2024-08-16 12:23:31 +02:00
parent eaefb3a6fb
commit 2227858f58
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Livewire/Project/Shared/EnvironmentVariable/All.php
View File

@@ -52,11 +52,18 @@ class All extends Component
public function sortEnvironmentVariables() public function sortEnvironmentVariables()
{ {
if ($this->resource->type() === 'application') {
$this->resource->load(['environment_variables', 'environment_variables_preview']); $this->resource->load(['environment_variables', 'environment_variables_preview']);
} else {
$this->resource->load(['environment_variables']);
}
$sortBy = data_get($this->resource, 'settings.is_env_sorting_enabled') ? 'key' : 'order'; $sortBy = data_get($this->resource, 'settings.is_env_sorting_enabled') ? 'key' : 'order';
$sortFunction = function ($variables) use ($sortBy) { $sortFunction = function ($variables) use ($sortBy) {
if (!$variables) {
return $variables;
}
if ($sortBy === 'key') { if ($sortBy === 'key') {
return $variables->sortBy(function ($item) { return $variables->sortBy(function ($item) {
return strtolower($item->key); return strtolower($item->key);