Skip to content
Snippets Groups Projects
Verified Commit 9048b09b authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3384725 by acbramley, smustgrave: Add pagination to VersionHistoryController

parent 48b85189
No related branches found
No related tags found
41 merge requests!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!3878Removed unused condition head title for views,!38582585169-10.1.x,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3668Resolve #3347842 "Deprecate the trusted",!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3546refactored dialog.pcss file,!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3502Issue #3335308: Confusing behavior with FormState::setFormState and FormState::setMethod,!3452Issue #3332701: Refactor Claro's tablesort-indicator stylesheet,!3451Issue #2410579: Allows setting the current language programmatically.,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3147Issue #3328457: Replace most substr($a, $i) where $i is negative with str_ends_with(),!3146Issue #3328456: Replace substr($a, 0, $i) with str_starts_with(),!3133core/modules/system/css/components/hidden.module.css,!31312878513-10.1.x,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2614Issue #2981326: Replace non-test usages of \Drupal::logger() with IoC injection,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!844Resolve #3036010 "Updaters",!673Issue #3214208: FinishResponseSubscriber could create duplicate headers,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
Pipeline #21279 failed
Pipeline: drupal

#21291

    Pipeline: drupal

    #21290

      Pipeline: drupal

      #21289

        +2
        ......@@ -25,6 +25,8 @@
        */
        class VersionHistoryController extends ControllerBase {
        const REVISIONS_PER_PAGE = 50;
        /**
        * Constructs a new VersionHistoryController.
        *
        ......@@ -213,6 +215,7 @@ protected function loadRevisions(RevisionableInterface $entity) {
        ->allRevisions()
        ->condition($entityType->getKey('id'), $entity->id())
        ->sort($entityType->getKey('revision'), 'DESC')
        ->pager(self::REVISIONS_PER_PAGE)
        ->execute();
        $currentLangcode = $this->languageManager
        ......@@ -249,6 +252,8 @@ protected function revisionOverview(RevisionableInterface $entity): array {
        $build['entity_revisions_table']['#rows'][$revision->getRevisionId()] = $this->buildRow($revision);
        }
        $build['pager'] = ['#type' => 'pager'];
        (new CacheableMetadata())
        // Only dealing with this entity and no external dependencies.
        ->addCacheableDependency($entity)
        ......
        ......@@ -2,6 +2,7 @@
        namespace Drupal\FunctionalTests\Entity;
        use Drupal\Core\Entity\Controller\VersionHistoryController;
        use Drupal\entity_test\Entity\EntityTestRev;
        use Drupal\entity_test_revlog\Entity\EntityTestWithRevisionLog;
        use Drupal\Tests\BrowserTestBase;
        ......@@ -305,4 +306,44 @@ public function testOperationDeleteRevision(): void {
        $this->assertSession()->elementsCount('css', 'table tbody tr', 3);
        }
        /**
        * Test revisions are paginated.
        */
        public function testRevisionsPagination(): void {
        /** @var \Drupal\entity_test\Entity\EntityTestRev $entity */
        $entity = EntityTestRev::create([
        'type' => 'entity_test_rev',
        'name' => 'view all revisions,view revision',
        ]);
        $entity->save();
        $firstRevisionId = $entity->getRevisionId();
        for ($i = 0; $i < VersionHistoryController::REVISIONS_PER_PAGE; $i++) {
        $entity->setNewRevision(TRUE);
        // We need to change something on the entity for it to be considered a new
        // revision to display. We need "view all revisions" and "view revision"
        // in a comma separated string to grant access.
        $entity->setName('view all revisions,view revision,' . $i)->save();
        }
        $this->drupalGet($entity->toUrl('version-history'));
        $this->assertSession()->elementsCount('css', 'table tbody tr', VersionHistoryController::REVISIONS_PER_PAGE);
        $this->assertSession()->elementExists('css', '.pager');
        /** @var \Drupal\Core\Entity\RevisionableStorageInterface $storage */
        $storage = $this->container->get('entity_type.manager')->getStorage($entity->getEntityTypeId());
        $firstRevision = $storage->loadRevision($firstRevisionId);
        $secondRevision = $storage->loadRevision($firstRevisionId + 1);
        // We should see everything up to the second revision, but not the first.
        $this->assertSession()->linkByHrefExists($secondRevision->toUrl('revision')->toString());
        $this->assertSession()->linkByHrefNotExists($firstRevision->toUrl('revision')->toString());
        // The next page should show just the first revision.
        $this->clickLink('Go to next page');
        $this->assertSession()->elementsCount('css', 'table tbody tr', 1);
        $this->assertSession()->elementExists('css', '.pager');
        $this->assertSession()->linkByHrefNotExists($secondRevision->toUrl('revision')->toString());
        $this->assertSession()->linkByHrefExists($firstRevision->toUrl('revision')->toString());
        }
        }
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment