mirror of
https://github.com/coollabsio/coolify.git
synced 2026-09-27 17:55:59 -04:00
feat(global-search): enhance resource creation functionality in search modal
- Introduced a new create mode in the global search component, allowing users to initiate the creation of resources directly from the search input. - Implemented logic to detect specific resource types based on user input, enabling quick access to creation modals for projects, servers, teams, storage, private keys, and GitHub apps. - Updated the UI to display a list of creatable items when in create mode, improving user experience and accessibility for resource management. - Added necessary modals for each resource type to facilitate the creation process seamlessly.
This commit is contained in:
@@ -28,12 +28,21 @@ class GlobalSearch extends Component
|
||||
|
||||
public $allSearchableItems = [];
|
||||
|
||||
public $isCreateMode = false;
|
||||
|
||||
public $creatableItems = [];
|
||||
|
||||
public $autoOpenResource = null;
|
||||
|
||||
public function mount()
|
||||
{
|
||||
$this->searchQuery = '';
|
||||
$this->isModalOpen = false;
|
||||
$this->searchResults = [];
|
||||
$this->allSearchableItems = [];
|
||||
$this->isCreateMode = false;
|
||||
$this->creatableItems = [];
|
||||
$this->autoOpenResource = null;
|
||||
}
|
||||
|
||||
public function openSearchModal()
|
||||
@@ -62,7 +71,63 @@ class GlobalSearch extends Component
|
||||
|
||||
public function updatedSearchQuery()
|
||||
{
|
||||
$this->search();
|
||||
$query = strtolower(trim($this->searchQuery));
|
||||
|
||||
if (str_starts_with($query, 'new')) {
|
||||
$this->isCreateMode = true;
|
||||
$this->loadCreatableItems();
|
||||
$this->searchResults = [];
|
||||
|
||||
// Check for sub-commands like "new project", "new server", etc.
|
||||
// Use original query (not trimmed) to ensure exact match without trailing spaces
|
||||
$this->autoOpenResource = $this->detectSpecificResource(strtolower($this->searchQuery));
|
||||
} else {
|
||||
$this->isCreateMode = false;
|
||||
$this->creatableItems = [];
|
||||
$this->autoOpenResource = null;
|
||||
$this->search();
|
||||
}
|
||||
}
|
||||
|
||||
private function detectSpecificResource(string $query): ?string
|
||||
{
|
||||
// Map of keywords to resource types - order matters for multi-word matches
|
||||
$resourceMap = [
|
||||
'new project' => 'project',
|
||||
'new server' => 'server',
|
||||
'new team' => 'team',
|
||||
'new storage' => 'storage',
|
||||
'new s3' => 'storage',
|
||||
'new private key' => 'private-key',
|
||||
'new privatekey' => 'private-key',
|
||||
'new key' => 'private-key',
|
||||
'new github' => 'source',
|
||||
'new source' => 'source',
|
||||
'new git' => 'source',
|
||||
];
|
||||
|
||||
foreach ($resourceMap as $command => $type) {
|
||||
if ($query === $command) {
|
||||
// Check if user has permission for this resource type
|
||||
if ($this->canCreateResource($type)) {
|
||||
return $type;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private function canCreateResource(string $type): bool
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
return match ($type) {
|
||||
'project', 'source' => $user->can('createAnyResource'),
|
||||
'server', 'storage', 'private-key' => $user->isAdmin() || $user->isOwner(),
|
||||
'team' => true,
|
||||
default => false,
|
||||
};
|
||||
}
|
||||
|
||||
private function loadSearchableItems()
|
||||
@@ -437,6 +502,72 @@ class GlobalSearch extends Component
|
||||
->toArray();
|
||||
}
|
||||
|
||||
private function loadCreatableItems()
|
||||
{
|
||||
$items = collect();
|
||||
$user = auth()->user();
|
||||
|
||||
// Project - can be created if user has createAnyResource permission
|
||||
if ($user->can('createAnyResource')) {
|
||||
$items->push([
|
||||
'name' => 'Project',
|
||||
'description' => 'Create a new project to organize your resources',
|
||||
'type' => 'project',
|
||||
'component' => 'project.add-empty',
|
||||
]);
|
||||
}
|
||||
|
||||
// Server - can be created if user is admin or owner
|
||||
if ($user->isAdmin() || $user->isOwner()) {
|
||||
$items->push([
|
||||
'name' => 'Server',
|
||||
'description' => 'Add a new server to deploy your applications',
|
||||
'type' => 'server',
|
||||
'component' => 'server.create',
|
||||
]);
|
||||
}
|
||||
|
||||
// Team - can be created by anyone (they become owner of new team)
|
||||
$items->push([
|
||||
'name' => 'Team',
|
||||
'description' => 'Create a new team to collaborate with others',
|
||||
'type' => 'team',
|
||||
'component' => 'team.create',
|
||||
]);
|
||||
|
||||
// Storage - can be created if user is admin or owner
|
||||
if ($user->isAdmin() || $user->isOwner()) {
|
||||
$items->push([
|
||||
'name' => 'S3 Storage',
|
||||
'description' => 'Add S3 storage for backups and file uploads',
|
||||
'type' => 'storage',
|
||||
'component' => 'storage.create',
|
||||
]);
|
||||
}
|
||||
|
||||
// Private Key - can be created if user is admin or owner
|
||||
if ($user->isAdmin() || $user->isOwner()) {
|
||||
$items->push([
|
||||
'name' => 'Private Key',
|
||||
'description' => 'Add an SSH private key for server access',
|
||||
'type' => 'private-key',
|
||||
'component' => 'security.private-key.create',
|
||||
]);
|
||||
}
|
||||
|
||||
// GitHub Source - can be created if user has createAnyResource permission
|
||||
if ($user->can('createAnyResource')) {
|
||||
$items->push([
|
||||
'name' => 'GitHub App',
|
||||
'description' => 'Connect a GitHub app for source control',
|
||||
'type' => 'source',
|
||||
'component' => 'source.github.create',
|
||||
]);
|
||||
}
|
||||
|
||||
$this->creatableItems = $items->toArray();
|
||||
}
|
||||
|
||||
public function render()
|
||||
{
|
||||
return view('livewire.global-search');
|
||||
|
||||
Reference in New Issue
Block a user