-
-
Notifications
You must be signed in to change notification settings - Fork 40
Add documentation search feature #154
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
735bc48
Initial plan
Copilot cc01465
Add search feature implementation with API, indexing, and tests
Copilot 07b03ae
Address code review feedback: optimize search performance and improve…
Copilot 1a1decc
Fix error handling in preg_replace and cache retrieval
Copilot 0e1a628
Address code review feedback: add config values, validation, metadata…
Copilot 09445cb
Update tests for new index structure and validation behavior
Copilot 54b1f48
Integrate Sprunje for pagination and response formatting
Copilot 6869f42
Fix Sprunje integration issues: pagination, validation, and error han…
Copilot c984e86
Improve code comments for clarity and accuracy
Copilot 4e8b2e0
Major refactor: fix config structure, Sprunje integration, and addres…
Copilot 56f2180
Update tests for NotFoundException error handling
Copilot 6059737
Improve SearchSprunje: use named DummySearchModel class and fix comments
Copilot f0b6e57
Remove slop, apply better sprunje
lcharette 2e7bc01
Add size & page to output, complete tests, fix default options
lcharette 2def405
Replace options magic keys with proper getters and setters
lcharette 47bd291
Refactor StaticSprunje: Remove getArray, getModels -> getResultSet a…
lcharette baa146c
Replace magic array with objects
lcharette 3bd361e
Index should be fetched if cache is empty
lcharette 6af0323
Simplify SearchIndex & SearchService
lcharette 99d41fc
Review tests
lcharette 7349745
Replace matches with score + add score multiplier to constant
lcharette 539956e
Add Search UI
lcharette 213c558
Highlight query in snippet
lcharette 6466fb1
Change default size, skip pages
lcharette a130442
Merge branch 'main' into copilot/add-documentation-search-feature
lcharette f586eca
Fix style
lcharette c591ee6
Fix test
lcharette a3e3177
Add search to mobile
lcharette File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| <script setup lang="ts"> | ||
| import { ref, watch } from 'vue' | ||
| import axios from 'axios' | ||
|
|
||
| /** | ||
| * Configuration Constants | ||
| */ | ||
| const minLength: number = 3 | ||
| const dataUrl: string = '/api/search' | ||
|
|
||
| /** | ||
| * Reactive Variables | ||
| */ | ||
| const searchQuery = ref<string>('') | ||
| const loading = ref<boolean>(false) | ||
| const error = ref<any>(null) | ||
| const data = ref<ResultData>({ | ||
| count: 0, | ||
| size: 0, | ||
| page: 0, | ||
| rows: [] | ||
| }) | ||
|
|
||
| /** | ||
| * Api fetch function | ||
| */ | ||
| async function fetch() { | ||
| if (searchQuery.value.length < minLength) { | ||
| return | ||
| } | ||
|
|
||
| loading.value = true | ||
| axios | ||
| .get<ResultData>(dataUrl, { | ||
| params: { | ||
| q: searchQuery.value | ||
| } | ||
| }) | ||
| .then((response) => { | ||
| data.value = response.data | ||
| }) | ||
| .catch((err) => { | ||
| error.value = err.response.data | ||
| }) | ||
| .finally(() => { | ||
| loading.value = false | ||
| }) | ||
| } | ||
|
|
||
| /** | ||
| * Watchers | ||
| */ | ||
| watch(searchQuery, async () => { | ||
| fetch() | ||
| }) | ||
|
|
||
| /** | ||
| * Computed Properties | ||
| */ | ||
| const placeholder = ref<string>(`Type at least ${minLength} characters to search`) | ||
|
|
||
| /** | ||
| * Interfaces | ||
| */ | ||
| interface ResultData { | ||
| count: number | ||
| size: number | ||
| page: number | ||
| rows: Result[] | ||
| } | ||
|
|
||
| interface Result { | ||
| title: string | ||
| slug: string | ||
| route: string | ||
| snippet: string | ||
| score: number | ||
| version: string | ||
| } | ||
| </script> | ||
|
|
||
| <template> | ||
| <div class="uk-margin-small uk-inline uk-width-expand"> | ||
| <span class="uk-form-icon" uk-icon="icon: search"></span> | ||
| <input | ||
| class="uk-input" | ||
| type="text" | ||
| placeholder="Search Documentation" | ||
| aria-label="Search Documentation" | ||
| uk-toggle="target: #search-modal" /> | ||
| </div> | ||
|
|
||
| <!-- This is the modal --> | ||
| <div id="search-modal" uk-modal> | ||
| <div class="uk-modal-dialog"> | ||
| <button class="uk-modal-close-default" type="button" uk-close></button> | ||
| <div class="uk-modal-header"> | ||
| <h2 class="uk-modal-title">Search Documentation</h2> | ||
| </div> | ||
|
|
||
| <div class="uk-modal-body"> | ||
| <div class="uk-margin-small uk-inline uk-width-expand"> | ||
| <span class="uk-form-icon" uk-icon="icon: search"></span> | ||
| <input | ||
| class="uk-input" | ||
| v-model="searchQuery" | ||
| type="text" | ||
| :placeholder="placeholder" | ||
| aria-label="Search Documentation" | ||
| autofocus | ||
| tabindex="1" /> | ||
| </div> | ||
|
|
||
| <div class="uk-margin" uk-overflow-auto> | ||
| <div v-if="loading" class="uk-text-center"> | ||
| <div uk-spinner></div> | ||
| </div> | ||
| <div v-else-if="error" class="uk-alert-danger" uk-alert> | ||
| <p>{{ error }}</p> | ||
| </div> | ||
| <div | ||
| v-else-if="data.rows.length === 0 && searchQuery.length >= minLength" | ||
| class="uk-text-center uk-text-muted"> | ||
| <p>No results found</p> | ||
| </div> | ||
| <ul v-else-if="data.rows.length > 0" class="uk-list uk-list-divider"> | ||
| <li v-for="row in data.rows" :key="row.route"> | ||
| <a :href="row.route" class="uk-link-reset"> | ||
| <h4 class="uk-margin-remove">{{ row.title }}</h4> | ||
| <p class="uk-text-small" v-html="row.snippet"></p> | ||
| </a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="uk-modal-footer uk-text-right"> | ||
| <button class="uk-button uk-button-primary uk-modal-close" type="button"> | ||
| Close | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </template> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| import { createApp } from 'vue' | ||
| import SearchComponent from './SearchComponent.vue' | ||
| createApp(SearchComponent).mount('#search-box') | ||
| createApp(SearchComponent).mount('#search-box-mobile') |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /* | ||
| * UserFrosting Learn (http://www.userfrosting.com) | ||
| * | ||
| * @link https://github.com/userfrosting/Learn | ||
| * @copyright Copyright (c) 2025 Alexander Weissman & Louis Charette | ||
| * @license https://github.com/userfrosting/Learn/blob/main/LICENSE.md (MIT License) | ||
| */ | ||
|
|
||
| namespace UserFrosting\Learn\Bakery; | ||
|
|
||
| use Symfony\Component\Console\Command\Command; | ||
| use Symfony\Component\Console\Input\InputInterface; | ||
| use Symfony\Component\Console\Input\InputOption; | ||
| use Symfony\Component\Console\Output\OutputInterface; | ||
| use UserFrosting\Bakery\WithSymfonyStyle; | ||
| use UserFrosting\Learn\Search\SearchIndex; | ||
|
|
||
| /** | ||
| * Bakery command to rebuild the search index for documentation. | ||
| */ | ||
| class SearchIndexCommand extends Command | ||
| { | ||
| use WithSymfonyStyle; | ||
|
|
||
| /** | ||
| * @param SearchIndex $searchIndex | ||
| */ | ||
| public function __construct( | ||
| protected SearchIndex $searchIndex, | ||
| ) { | ||
| parent::__construct(); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| protected function configure(): void | ||
| { | ||
| $this->setName('search:index') | ||
| ->setDescription('Build or rebuild the search index for documentation') | ||
| ->addOption( | ||
| 'doc-version', | ||
| null, | ||
| InputOption::VALUE_OPTIONAL, | ||
| 'Documentation version to index (omit to index all versions)' | ||
| ) | ||
| ->addOption( | ||
| 'clear', | ||
| null, | ||
| InputOption::VALUE_NONE, | ||
| 'Clear the search index before rebuilding' | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| protected function execute(InputInterface $input, OutputInterface $output): int | ||
| { | ||
| $this->io->title('Documentation Search Index'); | ||
|
|
||
| /** @var string|null $version */ | ||
| $version = $input->getOption('doc-version'); | ||
| $clear = $input->getOption('clear'); | ||
|
|
||
| // Clear index if requested | ||
| if ($clear === true) { | ||
| $this->io->writeln('Clearing search index...'); | ||
| $this->searchIndex->clearIndex($version); | ||
| $this->io->success('Search index cleared.'); | ||
| } | ||
|
|
||
| // Build index | ||
| $versionText = $version !== null ? "version {$version}" : 'all versions'; | ||
| $this->io->writeln("Building search index for {$versionText}..."); | ||
|
|
||
| try { | ||
| $count = $this->searchIndex->buildIndex($version); | ||
| $this->io->success("Search index built successfully. Indexed {$count} pages."); | ||
| } catch (\Exception $e) { | ||
| $this->io->error("Failed to build search index: {$e->getMessage()}"); | ||
|
|
||
| return Command::FAILURE; | ||
| } | ||
|
|
||
| return Command::SUCCESS; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /* | ||
| * UserFrosting Learn (http://www.userfrosting.com) | ||
| * | ||
| * @link https://github.com/userfrosting/Learn | ||
| * @copyright Copyright (c) 2025 Alexander Weissman & Louis Charette | ||
| * @license https://github.com/userfrosting/Learn/blob/main/LICENSE.md (MIT License) | ||
| */ | ||
|
|
||
| namespace UserFrosting\Learn\Controller; | ||
|
|
||
| use Psr\Http\Message\ResponseInterface as Response; | ||
| use Psr\Http\Message\ServerRequestInterface as Request; | ||
| use UserFrosting\Learn\Search\SearchSprunje; | ||
|
|
||
| /** | ||
| * Controller for the documentation search API. | ||
| */ | ||
| class SearchController | ||
| { | ||
| public function __construct( | ||
| protected SearchSprunje $sprunje, | ||
| ) { | ||
| } | ||
|
|
||
| /** | ||
| * Search documentation pages. | ||
| * Request type: GET. | ||
| * | ||
| * Query parameters: | ||
| * - q: Search query (required, min length from config) | ||
| * - page: Page number for pagination (optional, default 1) | ||
| * - size: Number of results per page (optional, default from config, null means all results) | ||
| * - version: Documentation version (optional, defaults to latest) | ||
| * | ||
| * @param Request $request | ||
| * @param Response $response | ||
| */ | ||
| public function search(Request $request, Response $response): Response | ||
| { | ||
| $params = $request->getQueryParams(); | ||
|
|
||
| $this->sprunje | ||
| ->setQuery($params['q'] ?? '') | ||
| ->setVersion($params['version'] ?? null) | ||
| ->setPage((int) ($params['page'] ?? 1)); | ||
|
|
||
| // Only set size if explicitly provided | ||
| if (isset($params['size'])) { | ||
| $this->sprunje->setSize((int) $params['size']); | ||
| } | ||
|
|
||
| return $this->sprunje->toResponse($response); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.