Commit 2d9bc63c authored by catch's avatar catch
Browse files

task: #3618746 Move Toolbar uses in Announcement, User, Contextual to Toolbar

By: gábor hojtsy
By: virag.jain
By: quietone
By: longwave
By: catch
By: larowlan
By: godotislate
parent e8208641
Loading
Loading
Loading
Loading
+0 −6
Changes for core/modules/announcements_feed/announcements_feed.libraries.yml: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -4,12 +4,6 @@ drupal.announcements_feed.dialog:
    component:
      css/announcements_feed.dialog.css: {}

drupal.announcements_feed.toolbar:
  version: VERSION
  css:
    component:
      css/announcements_feed.toolbar.css: {}

drupal.announcements_feed.page:
  version: VERSION
  css:
+0 −3
Changes for core/modules/announcements_feed/announcements_feed.services.yml: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ services:
    parent: logger.channel_base
    arguments: ['announcements_feed']
    public: false
  announcements_feed.lazy_builders:
    class: Drupal\announcements_feed\LazyBuilders
  Drupal\announcements_feed\LazyBuilders: '@announcements_feed.lazy_builders'
  announcements_feed.renderer:
    class: Drupal\announcements_feed\AnnounceRenderer
    arguments: ['@announcements_feed.fetcher', '%announcements_feed.feed_link%']
+2 −1
Changes for core/modules/announcements_feed/templates/announcements-feed.html.twig: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@
 * @file
 * Template file for the theming of announcement_feed off-canvas dialog.
 *
 * This template will get rendered when the user clicks the announcement button in the toolbar.
 * This template is used for the off-canvas announcements dialog and for the
 * announcements block.
 *
 * Available variables:
 * - count: Contains the total number of announcements.
+1 −1
Changes for core/modules/announcements_feed/tests/src/Functional/AlertsJsonFeedTest.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class AlertsJsonFeedTest extends BrowserTestBase {
  protected $defaultTheme = 'stark';

  /**
   * A user with permission to access toolbar and access announcements.
   * A user with permission to access announcements.
   */
  protected UserInterface $user;

+21 −1
Changes for core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php: 21 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@
 */
class BigPipeTestController implements TrustedCallbackInterface {

  /**
   * The fixed name returned by ::displayName().
   *
   * @see \Drupal\Tests\big_pipe\FunctionalJavascript\BigPipePreviewTest
   */
  const DISPLAY_NAME = 'James Bond';

  /**
   * Returns all BigPipe placeholder test case render arrays.
   *
@@ -109,7 +116,7 @@ public function placeholderPreview() {
        '#type' => 'container',
        '#attributes' => ['id' => 'placeholder-preview-twig-container'],
        'user' => [
          '#lazy_builder' => ['user.toolbar_link_builder:renderDisplayName', []],
          '#lazy_builder' => [static::class . '::displayName', []],
          '#create_placeholder' => TRUE,
        ],
      ],
@@ -129,6 +136,18 @@ public function placeholderPreview() {
    ];
  }

  /**
   * Render API callback: Builds a fixed display name.
   *
   * This function is assigned as a #lazy_builder callback.
   *
   * @return array
   *   A render array with a fixed name as plain text.
   */
  public static function displayName(): array {
    return ['#plain_text' => self::DISPLAY_NAME];
  }

  /**
   * Render API callback: Builds <time> markup with current time.
   *
@@ -293,6 +312,7 @@ public static function redirectUntrusted(): void {
   */
  public static function trustedCallbacks() {
    return [
      'displayName',
      'currentTime',
      'piggy',
      'helloOrHi',
Loading