Merge pull request #1909 from acquia/ACMS-4373

ACMS-4373: Make Acquia CMS Toolbar and Tour work independent.
acquia · Dec 27, 2024 · dc1ac52 · dc1ac52
2 parents 8cee154 + e2ea37a
commit dc1ac52
Show file tree

Hide file tree

Showing 28 changed files with 439 additions and 405 deletions.
diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml
@@ -128,7 +128,8 @@ jobs:
       matrix:
         orca-job:
           - INTEGRATED_TEST_ON_LATEST_LTS
-          - ISOLATED_TEST_ON_CURRENT
+          - INTEGRATED_TEST_ON_PREVIOUS_MINOR
+#          - ISOLATED_TEST_ON_CURRENT
         acms_job:
           - integrated_php_unit_tests
           - integrated_existing_site_tests
@@ -225,7 +226,8 @@ jobs:
       matrix:
         orca-job:
           - INTEGRATED_TEST_ON_LATEST_LTS
-          - ISOLATED_TEST_ON_CURRENT
+          - INTEGRATED_TEST_ON_PREVIOUS_MINOR
+#          - ISOLATED_TEST_ON_CURRENT
         #php-version: [ "8.1" ]
         modules:
           - acquia_cms_article
@@ -240,6 +242,7 @@ jobs:
           - acquia_cms_place
           - acquia_cms_search
           - acquia_cms_site_studio
+          - acquia_cms_toolbar
           - acquia_cms_tour
           - acquia_cms_video
     steps:
@@ -322,14 +325,16 @@ jobs:
       matrix:
         orca-job:
           - INTEGRATED_TEST_ON_LATEST_LTS
-          # - INTEGRATED_TEST_ON_PREVIOUS_MINOR
-          - ISOLATED_TEST_ON_CURRENT
+          - INTEGRATED_TEST_ON_PREVIOUS_MINOR
+#          - ISOLATED_TEST_ON_CURRENT
         php-version:
           - 8.1
           - 8.3
         exclude:
           - php-version: 8.1
-            orca-job: ISOLATED_TEST_ON_CURRENT
+            orca-job: INTEGRATED_TEST_ON_PREVIOUS_MINOR
+#          - php-version: 8.1
+#            orca-job: ISOLATED_TEST_ON_CURRENT
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js 20.x

diff --git a/.github/workflows/acquia_cms_cron.yml b/.github/workflows/acquia_cms_cron.yml
@@ -383,6 +383,7 @@ jobs:
          - acquia_cms_place
          - acquia_cms_search
          - acquia_cms_site_studio
+         - acquia_cms_toolbar
          - acquia_cms_tour
          - acquia_cms_video
     steps:

diff --git a/composer.lock b/composer.lock
diff --git a/modules/acquia_cms_headless/src/Plugin/AcquiaCmsHeadless/HeadlessApiKeys.php b/modules/acquia_cms_headless/src/Plugin/AcquiaCmsHeadless/HeadlessApiKeys.php
@@ -25,34 +25,6 @@
  * )
  */
 class HeadlessApiKeys extends AcquiaCmsDashboardBase {
-  /**
-   * The state interface.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The link generator.
-   *
-   * @var \Drupal\Core\Utility\LinkGeneratorInterface
-   */
-  protected $linkGenerator;
-
-  /**
-   * The info file parser.
-   *
-   * @var \Drupal\Core\Extension\InfoParserInterface
-   */
-  protected $infoParser;
 
   /**
    * The EntityTypeManager service.
@@ -75,27 +47,15 @@ class HeadlessApiKeys extends AcquiaCmsDashboardBase {
    */
   protected $module = 'consumers';
 
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(StateInterface $state, ModuleHandlerInterface $module_handler, LinkGeneratorInterface $link_generator, InfoParserInterface $info_parser, EntityTypeManagerInterface $entity_type_manager, StarterkitNextjsService $starterkit_nextjs_service) {
-    parent::__construct($state, $module_handler, $link_generator, $info_parser);
-    $this->entityTypeManager = $entity_type_manager;
-    $this->starterKitNextjsService = $starterkit_nextjs_service;
-  }
-
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('state'),
-      $container->get('module_handler'),
-      $container->get('link_generator'),
-      $container->get('info_parser'),
-      $container->get('entity_type.manager'),
-      $container->get('acquia_cms_headless.starterkit_nextjs')
-    );
+    $instance = parent::create($container);
+    $instance->entityTypeManager = $container->get('entity_type.manager');
+    $instance->starterKitNextjsService = $container->get('acquia_cms_headless.starterkit_nextjs');
+
+    return $instance;
   }
 
   /**

diff --git a/modules/acquia_cms_headless/src/Plugin/AcquiaCmsHeadless/HeadlessApiUsers.php b/modules/acquia_cms_headless/src/Plugin/AcquiaCmsHeadless/HeadlessApiUsers.php
@@ -24,34 +24,6 @@
  * )
  */
 class HeadlessApiUsers extends AcquiaCmsDashboardBase {
-  /**
-   * The state interface.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The link generator.
-   *
-   * @var \Drupal\Core\Utility\LinkGeneratorInterface
-   */
-  protected $linkGenerator;
-
-  /**
-   * The info file parser.
-   *
-   * @var \Drupal\Core\Extension\InfoParserInterface
-   */
-  protected $infoParser;
 
   /**
    * The EntityTypeManager service.
@@ -81,28 +53,16 @@ class HeadlessApiUsers extends AcquiaCmsDashboardBase {
    */
   protected $headlessRoleLabel;
 
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(StateInterface $state, ModuleHandlerInterface $module_handler, LinkGeneratorInterface $link_generator, InfoParserInterface $info_parser, EntityTypeManagerInterface $entity_type_manager, StarterkitNextjsService $starterkit_nextjs_service) {
-    parent::__construct($state, $module_handler, $link_generator, $info_parser);
-    $this->entityTypeManager = $entity_type_manager;
-    $this->headlessRoleLabel = $entity_type_manager->getStorage('user_role')->load('headless')->label();
-    $this->starterKitNextjsService = $starterkit_nextjs_service;
-  }
-
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('state'),
-      $container->get('module_handler'),
-      $container->get('link_generator'),
-      $container->get('info_parser'),
-      $container->get('entity_type.manager'),
-      $container->get('acquia_cms_headless.starterkit_nextjs')
-    );
+    $instance = parent::create($container);
+    $instance->entityTypeManager = $container->get('entity_type.manager');
+    $instance->starterKitNextjsService = $container->get('acquia_cms_headless.starterkit_nextjs');
+    $instance->headlessRoleLabel = $instance->entityTypeManager->getStorage('user_role')->load('headless')->label();
+
+    return $instance;
   }
 
   /**

diff --git a/modules/acquia_cms_headless/src/Plugin/AcquiaCmsHeadless/HeadlessNextEntityTypes.php b/modules/acquia_cms_headless/src/Plugin/AcquiaCmsHeadless/HeadlessNextEntityTypes.php
@@ -24,34 +24,6 @@
  * )
  */
 class HeadlessNextEntityTypes extends AcquiaCmsDashboardBase {
-  /**
-   * The state interface.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The link generator.
-   *
-   * @var \Drupal\Core\Utility\LinkGeneratorInterface
-   */
-  protected $linkGenerator;
-
-  /**
-   * The info file parser.
-   *
-   * @var \Drupal\Core\Extension\InfoParserInterface
-   */
-  protected $infoParser;
 
   /**
    * The EntityTypeManager service.
@@ -74,27 +46,15 @@ class HeadlessNextEntityTypes extends AcquiaCmsDashboardBase {
    */
   protected $module = 'next';
 
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(StateInterface $state, ModuleHandlerInterface $module_handler, LinkGeneratorInterface $link_generator, InfoParserInterface $info_parser, EntityTypeManagerInterface $entity_type_manager, StarterkitNextjsService $starterKitNextjsService) {
-    parent::__construct($state, $module_handler, $link_generator, $info_parser);
-    $this->entityTypeManager = $entity_type_manager;
-    $this->starterKitNextjsService = $starterKitNextjsService;
-  }
-
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('state'),
-      $container->get('module_handler'),
-      $container->get('link_generator'),
-      $container->get('info_parser'),
-      $container->get('entity_type.manager'),
-      $container->get('acquia_cms_headless.starterkit_nextjs')
-    );
+    $instance = parent::create($container);
+    $instance->entityTypeManager = $container->get('entity_type.manager');
+    $instance->starterKitNextjsService = $container->get('acquia_cms_headless.starterkit_nextjs');
+
+    return $instance;
   }
 
   /**