Fix status block.

department-of-veterans-affairs · Oct 4, 2023 · 37928b8 · 37928b8
1 parent 0caf65c
commit 37928b8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 27 deletions.
diff --git a/docroot/modules/custom/va_gov_build_trigger/va_gov_build_trigger.libraries.yml b/docroot/modules/custom/va_gov_build_trigger/va_gov_build_trigger.libraries.yml
diff --git a/docroot/modules/custom/va_gov_build_trigger/va_gov_build_trigger.routing.yml b/docroot/modules/custom/va_gov_build_trigger/va_gov_build_trigger.routing.yml
@@ -1,10 +1,3 @@
-va_gov_build_trigger.content_release_status_block_controller_get_block:
-  path: '/admin/content_release_status_block/ajax'
-  defaults:
-    _controller: '\Drupal\va_gov_build_trigger\Controller\ContentReleaseStatusBlockController::getBlock'
-  requirements:
-    _permission: "va gov deploy content build"
-
 route_callbacks:
   - '\Drupal\va_gov_build_trigger\RouteProvider::buildRequestRoutes'
   - '\Drupal\va_gov_build_trigger\RouteProvider::notificationRoutes'
diff --git a/...r/ContentReleaseStatusBlockController.php → .../src/Controller/StatusBlockController.php b/...r/ContentReleaseStatusBlockController.php → .../src/Controller/StatusBlockController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\va_gov_build_trigger\Controller;
+namespace Drupal\va_gov_content_release\Controller;
 
 use Drupal\Core\Block\BlockManagerInterface;
 use Drupal\Core\Controller\ControllerBase;
@@ -9,9 +9,9 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Retrieves the content release status block.
+ * Retrieves the status block.
  */
-class ContentReleaseStatusBlockController extends ControllerBase {
+class StatusBlockController extends ControllerBase {
 
   /**
    * Drupal\Core\Block\BlockManagerInterface definition.

diff --git a/...e/src/Block/ContentReleaseStatusBlock.php → ...lugin/Block/ContentReleaseStatusBlock.php b/...e/src/Block/ContentReleaseStatusBlock.php → ...lugin/Block/ContentReleaseStatusBlock.php
@@ -8,6 +8,8 @@
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\Core\Url;
+use Drupal\va_gov_build_trigger\Environment\EnvironmentDiscovery;
+use Drupal\va_gov_build_trigger\Service\BuildRequester;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -159,10 +161,10 @@ public function build() {
       ],
     ];
 
-    $build['#attached']['library'][] = 'va_gov_build_trigger/content_release_status_block';
-    $build['#attached']['drupalSettings']['contentReleaseStatusBlock'] = [
+    $build['#attached']['library'][] = 'va_gov_content_release/status_block';
+    $build['#attached']['drupalSettings']['contentRelease']['statusBlock'] = [
       'blockRefreshPath' => Url::fromRoute(
-        'va_gov_build_trigger.content_release_status_block_controller_get_block'
+        'va_gov_content_release.status_block_controller_get_block'
       )->toString(),
     ];
 

diff --git a/docroot/modules/custom/va_gov_content_release/va_gov_content_release.routing.yml b/docroot/modules/custom/va_gov_content_release/va_gov_content_release.routing.yml
@@ -24,6 +24,13 @@ va_gov_content_release.form.simple:
   requirements:
     _permission: "va gov deploy content build"
 
+va_gov_content_release.status_block_controller_get_block:
+  path: '/admin/content_release_status_block/ajax'
+  defaults:
+    _controller: '\Drupal\va_gov_content_release\Controller\StatusBlockController::getBlock'
+  requirements:
+    _permission: "va gov deploy content build"
+
 va_gov_content_release.frontend_version_autocomplete:
   path: '/admin/content/deploy/frontend_version_autocomplete/{frontend}/{count}'
   defaults: