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.

Sign up for GitHub

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

ACMS-4373: Make Acquia CMS Toolbar and Tour work independent. #1909

Merged
merged 14 commits into from
Dec 27, 2024
Merged

ACMS-4373: Make Acquia CMS Toolbar and Tour work independent. #1909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0c2add3
ACMS-4373: Make Acquia CMS Toolbar and Tour work independent.
rajeshreeputra Dec 20, 2024
e095710
ACMS-4373: Acquia Starter Kit Tour fix failing tests.
rajeshreeputra Dec 20, 2024
52583c8
ACMS-4373: Acquia Starter Kit Tour add google maps dev dependency.
rajeshreeputra Dec 23, 2024
fd16a68
ACMS-4373: Acquia Starter Kit Tour and Toolbar refactor install and e…
rajeshreeputra Dec 23, 2024
7ebf199
ACMS-4373: Update Google map tour plugin.
rajeshreeputra Dec 24, 2024
8104560
ACMS-4373: Review feedback changes for Toolbar.
rajeshreeputra Dec 26, 2024
a3d5e11
ACMS-4373: Add test coverage to Toolbar module.
rajeshreeputra Dec 26, 2024
b882573
ACMS-4373: Rename google maps form and test to geocoder google maps.
rajeshreeputra Dec 26, 2024
8a65096
ACMS-4373: Add permission test coverage to Tour module.
rajeshreeputra Dec 26, 2024
033a896
ACMS-4373: Refactore code and add toolbar test in CI.
rajeshreeputra Dec 26, 2024
ac9d754
ACMS-4373: Remove EntityInsertOperationInterface from toolbar.
rajeshreeputra Dec 27, 2024
9443e5d
ACMS-4373: Revert static code analysis as per ORCA.
rajeshreeputra Dec 27, 2024
ac5ab95
ACMS-4373: execute test on INTEGRATED_TEST_ON_PREVIOUS_MINOR will fix…
rajeshreeputra Dec 27, 2024
e2ea37a
ACMS-4373: Fix headless warnings related to D11 compatibility.
rajeshreeputra Dec 27, 2024
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
15 changes: 10 additions & 5 deletions .github/workflows/acquia_cms_ci.workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/acquia_cms_cron.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
29 changes: 15 additions & 14 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 5 additions & 45 deletions modules/acquia_cms_headless/src/Plugin/AcquiaCmsHeadless/HeadlessApiKeys.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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;
}

/**
Expand Down
52 changes: 6 additions & 46 deletions modules/acquia_cms_headless/src/Plugin/AcquiaCmsHeadless/HeadlessApiUsers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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;
}

/**
Expand Down
50 changes: 5 additions & 45 deletions modules/acquia_cms_headless/src/Plugin/AcquiaCmsHeadless/HeadlessNextEntityTypes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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;
}

/**
Expand Down
Loading
Loading