Skip to content
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

Display proper number of results on pagination #23

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Controller/Action/SearchAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Setono\Doctrine\ORMTrait;
use Setono\SyliusMeilisearchPlugin\Engine\SearchEngineInterface;
use Setono\SyliusMeilisearchPlugin\Form\Builder\SearchFormBuilderInterface;
use Setono\SyliusMeilisearchPlugin\Meilisearch\Provider\SearchResultDataProvider;
use Setono\SyliusMeilisearchPlugin\Model\IndexableInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
Expand Down Expand Up @@ -54,6 +55,8 @@ public function __invoke(Request $request): Response

return new Response($this->twig->render('@SetonoSyliusMeilisearchPlugin/search/index.html.twig', [
'searchResult' => $searchResult,
'pageStartHit' => SearchResultDataProvider::getPageStartHit($searchResult),
'pageEndHit' => SearchResultDataProvider::getPageEndHit($searchResult),
'searchForm' => $searchForm->createView(),
'items' => $items,
]));
Expand Down
24 changes: 24 additions & 0 deletions src/Meilisearch/Provider/SearchResultDataProvider.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

declare(strict_types=1);

namespace Setono\SyliusMeilisearchPlugin\Meilisearch\Provider;

use Meilisearch\Search\SearchResult;

final class SearchResultDataProvider
{
public static function getPageStartHit(SearchResult $searchResult): int
{
return (int) $searchResult->getPage() * (int) $searchResult->getHitsPerPage() - (int) $searchResult->getHitsPerPage();
}

public static function getPageEndHit(SearchResult $searchResult): int
{
$totalHits = (int) $searchResult->getTotalHits();
$page = (int) $searchResult->getPage();
$hitsPerPage = (int) $searchResult->getHitsPerPage();

return ($totalHits < $page * $hitsPerPage) ? $totalHits : $page * $hitsPerPage;
}
}
2 changes: 1 addition & 1 deletion src/Resources/views/search/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div class="twelve wide column">
<div class="ui grid">
<div class="eight wide column">
Displaying {{ (searchResult.page * searchResult.hitsPerPage) - searchResult.hitsPerPage }} - {{ searchResult.page * searchResult.hitsPerPage }} of {{ searchResult.hitsCount }}
Displaying {{ pageStartHit }} - {{ pageEndHit }} of {{ searchResult.hitsCount }}
</div>
<div class="eight wide right aligned column">
{{ form_widget(searchForm.sort) }}
Expand Down
Loading