From 37928b81f44674f6b766dc57c0c5b7caad5475b4 Mon Sep 17 00:00:00 2001
From: Nathan Douglas <github@darkdell.net>
Date: Wed, 4 Oct 2023 15:04:39 -0400
Subject: [PATCH] Fix status block.

---
 .../va_gov_build_trigger.libraries.yml             | 14 --------------
 .../va_gov_build_trigger.routing.yml               |  7 -------
 .../src/Controller/StatusBlockController.php}      |  6 +++---
 .../Block/ContentReleaseStatusBlock.php            |  8 +++++---
 .../va_gov_content_release.routing.yml             |  7 +++++++
 5 files changed, 15 insertions(+), 27 deletions(-)
 delete mode 100644 docroot/modules/custom/va_gov_build_trigger/va_gov_build_trigger.libraries.yml
 rename docroot/modules/custom/{va_gov_build_trigger/src/Controller/ContentReleaseStatusBlockController.php => va_gov_content_release/src/Controller/StatusBlockController.php} (90%)
 rename docroot/modules/custom/va_gov_content_release/src/{ => Plugin}/Block/ContentReleaseStatusBlock.php (95%)

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
deleted file mode 100644
index faf84191d1..0000000000
--- a/docroot/modules/custom/va_gov_build_trigger/va_gov_build_trigger.libraries.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-build_trigger_form:
-  version: 1.x
-  css:
-    theme:
-      css/build_trigger_form.css: {}
-
-content_release_status_block:
-  version: 1.x
-  js:
-    js/content_release_status_block.js: {}
-  dependencies:
-    - core/jquery
-    - core/once
-    - core/drupalSettings
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
index 9f2740ef3c..d3344d0c84 100644
--- 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/docroot/modules/custom/va_gov_build_trigger/src/Controller/ContentReleaseStatusBlockController.php b/docroot/modules/custom/va_gov_content_release/src/Controller/StatusBlockController.php
similarity index 90%
rename from docroot/modules/custom/va_gov_build_trigger/src/Controller/ContentReleaseStatusBlockController.php
rename to docroot/modules/custom/va_gov_content_release/src/Controller/StatusBlockController.php
index c3858b590f..bd36781c43 100644
--- a/docroot/modules/custom/va_gov_build_trigger/src/Controller/ContentReleaseStatusBlockController.php
+++ b/docroot/modules/custom/va_gov_content_release/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/docroot/modules/custom/va_gov_content_release/src/Block/ContentReleaseStatusBlock.php b/docroot/modules/custom/va_gov_content_release/src/Plugin/Block/ContentReleaseStatusBlock.php
similarity index 95%
rename from docroot/modules/custom/va_gov_content_release/src/Block/ContentReleaseStatusBlock.php
rename to docroot/modules/custom/va_gov_content_release/src/Plugin/Block/ContentReleaseStatusBlock.php
index c46e8f42c8..c483efb460 100644
--- a/docroot/modules/custom/va_gov_content_release/src/Block/ContentReleaseStatusBlock.php
+++ b/docroot/modules/custom/va_gov_content_release/src/Plugin/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
index 481d2a7446..5aa5572ed1 100644
--- 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: