From 1ab4ddb07ca46d1e69cb58d2d601ff0bbc742745 Mon Sep 17 00:00:00 2001 From: MartinOscar <40749467+rmartinoscar@users.noreply.github.com> Date: Thu, 11 Dec 2025 12:48:34 +0000 Subject: [PATCH] Fix File global search path & rename to nested search (#1985) --- .../Server/Resources/Files/Pages/ListFiles.php | 10 +++++----- .../Server/Resources/Files/Pages/SearchFiles.php | 8 ++++---- lang/en/server/file.php | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/Filament/Server/Resources/Files/Pages/ListFiles.php b/app/Filament/Server/Resources/Files/Pages/ListFiles.php index 634d0afdb..3576bba57 100644 --- a/app/Filament/Server/Resources/Files/Pages/ListFiles.php +++ b/app/Filament/Server/Resources/Files/Pages/ListFiles.php @@ -557,15 +557,15 @@ class ListFiles extends ListRecords Action::make('search') ->authorize(fn () => user()?->can(Permission::ACTION_FILE_READ, $server)) ->hiddenLabel()->iconButton()->iconSize(IconSize::ExtraLarge) - ->tooltip(trans('server/file.actions.global_search.title')) + ->tooltip(trans('server/file.actions.nested_search.title')) ->color('primary') ->icon('tabler-world-search') - ->modalHeading(trans('server/file.actions.global_search.title')) - ->modalSubmitActionLabel(trans('server/file.actions.global_search.search')) + ->modalHeading(trans('server/file.actions.nested_search.title')) + ->modalSubmitActionLabel(trans('server/file.actions.nested_search.search')) ->schema([ TextInput::make('searchTerm') - ->label(trans('server/file.actions.global_search.search_term')) - ->placeholder(trans('server/file.actions.global_search.search_term_placeholder')) + ->label(trans('server/file.actions.nested_search.search_term')) + ->placeholder(trans('server/file.actions.nested_search.search_term_placeholder')) ->required() ->regex('/^[^*]*\*?[^*]*$/') ->minValue(3), diff --git a/app/Filament/Server/Resources/Files/Pages/SearchFiles.php b/app/Filament/Server/Resources/Files/Pages/SearchFiles.php index f91969a44..713d3cc9f 100644 --- a/app/Filament/Server/Resources/Files/Pages/SearchFiles.php +++ b/app/Filament/Server/Resources/Files/Pages/SearchFiles.php @@ -36,7 +36,7 @@ class SearchFiles extends ListRecords return [ $resource::getUrl() => $resource::getBreadcrumb(), - self::getUrl(['searchTerm' => $this->searchTerm]) => trans('server/file.actions.global_search.search_for_term', ['term' => ' "' . $this->searchTerm . '"']), + self::getUrl(['searchTerm' => $this->searchTerm]) => trans('server/file.actions.nested_search.search_for_term', ['term' => ' "' . $this->searchTerm . '"']), ]; } @@ -67,15 +67,15 @@ class SearchFiles extends ListRecords ]) ->recordUrl(function (File $file) { if ($file->is_directory) { - return ListFiles::getUrl(['path' => join_paths($this->path, $file->name)]); + return ListFiles::getUrl(['path' => $file->name]); } - return $file->canEdit() ? EditFiles::getUrl(['path' => join_paths($this->path, $file->name)]) : null; + return $file->canEdit() ? EditFiles::getUrl(['path' => $file->name]) : null; }); } public function getTitle(): string|Htmlable { - return trans('server/file.actions.global_search.title'); + return trans('server/file.actions.nested_search.title'); } } diff --git a/lang/en/server/file.php b/lang/en/server/file.php index 63ac2c1dc..c349195ac 100644 --- a/lang/en/server/file.php +++ b/lang/en/server/file.php @@ -67,8 +67,8 @@ return [ 'title' => 'New folder', 'folder_name' => 'New folder name', ], - 'global_search' => [ - 'title' => 'Global Search', + 'nested_search' => [ + 'title' => 'Nested Search', 'search_term' => 'Search term', 'search_term_placeholder' => 'Enter a search term, ex. *.txt', 'search' => 'Search',