From 640531af93bf6096b79edd2a938a77b1969ccc1d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 11 May 2023 17:26:52 -0700
Subject: [PATCH] (REF) ImportMap::setRequired() ==> ImportMap::useModule()

---
 CRM/Core/Resources/CollectionTrait.php |  2 +-
 Civi/Esm/ImportMap.php                 | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index 121f06fffe..63927faf51 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -102,7 +102,7 @@ trait CRM_Core_Resources_CollectionTrait {
       }
     }
     if (!empty($snippet['esm'])) {
-      Civi::service('esm.import_map')->setRequired(TRUE);
+      Civi::service('esm.import_map')->useModule($snippet);
     }
 
     if ($snippet['type'] === 'scriptFile' && !isset($snippet['scriptFileUrls'])) {
diff --git a/Civi/Esm/ImportMap.php b/Civi/Esm/ImportMap.php
index 638ae52432..118efff700 100644
--- a/Civi/Esm/ImportMap.php
+++ b/Civi/Esm/ImportMap.php
@@ -102,7 +102,7 @@ class ImportMap extends \Civi\Core\Service\AutoService implements HookInterface
    * @param \Civi\Core\Event\GenericHookEvent $e
    */
   public function on_civi_region_render(GenericHookEvent $e): void {
-    if ($e->region->_name !== 'html-header' || !$this->isAutoInject() || !$this->isRequired()) {
+    if ($e->region->_name !== 'html-header' || !$this->isAutoInject() || !$this->required) {
       return;
     }
 
@@ -127,20 +127,11 @@ class ImportMap extends \Civi\Core\Service\AutoService implements HookInterface
   }
 
   /**
-   * Does the current page-load define any "module" files?
-   *
-   * @return bool
-   */
-  public function isRequired(): bool {
-    return $this->required;
-  }
-
-  /**
-   * @param bool $required
+   * @param array $snippet
    * @return ImportMap
    */
-  public function setRequired(bool $required): ImportMap {
-    $this->required = $required;
+  public function useModule(array $snippet): ImportMap {
+    $this->required = TRUE;
     return $this;
   }
 
-- 
2.25.1