TEMP: SAVE POINT

department-of-veterans-affairs · Sep 15, 2023 · 812720e · 812720e
1 parent b1e100b
commit 812720e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -252,7 +252,6 @@ module:
   va_gov_github: 0
   va_gov_govdelivery: 0
   va_gov_graphql: 0
-  va_gov_header_footer: 0
   va_gov_help_center: 0
   va_gov_links: 0
   va_gov_live_field_migration: 0

diff --git a/docroot/modules/custom/va_gov_header_footer/va_gov_header_footer.services.yml b/docroot/modules/custom/va_gov_header_footer/va_gov_header_footer.services.yml
diff --git a/docroot/modules/custom/va_gov_home/src/EventSubscriber/FormEventSubscriber.php b/docroot/modules/custom/va_gov_home/src/EventSubscriber/FormEventSubscriber.php
@@ -4,7 +4,7 @@
 
 use Drupal\core_event_dispatcher\Event\Form\FormAlterEvent;
 use Drupal\core_event_dispatcher\FormHookEvents;
-use Drupal\va_gov_header_footer\Traits\MenuFormAlter;
+use Drupal\va_gov_menus\Traits\MenuFormAlter;
 use Drupal\va_gov_user\Service\UserPermsService;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 

diff --git a/docroot/modules/custom/va_gov_home/va_gov_home.info.yml b/docroot/modules/custom/va_gov_home/va_gov_home.info.yml
@@ -4,5 +4,5 @@ description: Provides custom logic for the va.gov home page.
 package: Custom
 core_version_requirement: ^9 || ^10
 dependencies:
-  - va_gov_user
   - core_event_dispatcher
+  - va_gov_user
diff --git a/...c/EventSubscriber/FormEventSubscriber.php → ...c/EventSubscriber/FormEventSubscriber.php b/...c/EventSubscriber/FormEventSubscriber.php → ...c/EventSubscriber/FormEventSubscriber.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\va_gov_header_footer\EventSubscriber;
+namespace Drupal\va_gov_menus\EventSubscriber;
 
 use Drupal\core_event_dispatcher\Event\Form\FormAlterEvent;
 use Drupal\core_event_dispatcher\FormHookEvents;
-use Drupal\va_gov_header_footer\Traits\MenuFormAlter;
+use Drupal\va_gov_menus\Traits\MenuFormAlter;
 use Drupal\va_gov_user\Service\UserPermsService;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -60,8 +60,9 @@ public static function getSubscribedEvents(): array {
   public function formAlter(FormAlterEvent $event): void {
     $form = &$event->getForm();
     $formId = $event->getFormId();
-    $admin = $this->permsService->hasAdminRole(TRUE);
-    if (in_array($formId, $this->menus) && $admin) {
+    if (in_array($formId, $this->menus)) {
+//    $admin = $this->permsService->hasAdminRole(TRUE);
+//    if (in_array($formId, $this->menus) && $admin) {
       $this->hideMenuLinkDescriptionField($form);
     }
   }

diff --git a/...eader_footer/src/Traits/MenuFormAlter.php → ...va_gov_menus/src/Traits/MenuFormAlter.php b/...eader_footer/src/Traits/MenuFormAlter.php → ...va_gov_menus/src/Traits/MenuFormAlter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\va_gov_header_footer\Traits;
+namespace Drupal\va_gov_menus\Traits;
 
 /**
  * Provides centralized menu form alter methods.

diff --git a/...ader_footer/va_gov_header_footer.info.yml → ...custom/va_gov_menus/va_gov_menus.info.yml b/...ader_footer/va_gov_header_footer.info.yml → ...custom/va_gov_menus/va_gov_menus.info.yml
diff --git a/docroot/modules/custom/va_gov_menus/va_gov_menus.services.yml b/docroot/modules/custom/va_gov_menus/va_gov_menus.services.yml
@@ -0,0 +1,6 @@
+services:
+  va_gov_menus.event_subscriber:
+    class: Drupal\va_gov_menus\EventSubscriber\FormEventSubscriber
+    arguments: ['@va_gov_user.user_perms']
+    tags:
+      - { name: event_subscriber }