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

refactor: Group and sort fields in StackForm by service name and password status

Browse Source
This commit is contained in:
Andras Bacsai
2024-09-24 21:17:07 +02:00
parent 70dfa101ef
commit 17d55630d5
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Livewire/Project/Service/StackForm.php
View File

@@ -33,7 +33,7 @@ class StackForm extends Component
$key = data_get($field, 'key'); $key = data_get($field, 'key');
$value = data_get($field, 'value'); $value = data_get($field, 'value');
$rules = data_get($field, 'rules', 'nullable'); $rules = data_get($field, 'rules', 'nullable');
$isPassword = data_get($field, 'isPassword'); $isPassword = data_get($field, 'isPassword', false);
$this->fields->put($key, [ $this->fields->put($key, [
'serviceName' => $serviceName, 'serviceName' => $serviceName,
'key' => $key, 'key' => $key,
@@ -47,7 +47,15 @@ class StackForm extends Component
$this->validationAttributes["fields.$key.value"] = $fieldKey; $this->validationAttributes["fields.$key.value"] = $fieldKey;
} }
} }
$this->fields = $this->fields->sortBy('name'); $this->fields = $this->fields->groupBy('serviceName')->map(function ($group) {
return $group->sortBy(function ($field) {
return data_get($field, 'isPassword') ? 1 : 0;
})->mapWithKeys(function ($field) {
return [$field['key'] => $field];
});
})->flatMap(function ($group) {
return $group;
});
} }
public function saveCompose($raw) public function saveCompose($raw)