From c0425c8dfe8e3b85adc959043949b2d5cc27b504 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 22 May 2023 17:45:51 -0700
Subject: [PATCH] Move esm_loader from "Misc" to "Debugging". Add description.

---
 CRM/Admin/Form/Setting/Debugging.php           | 1 +
 CRM/Admin/Form/Setting/Miscellaneous.php       | 1 -
 settings/Developer.setting.php                 | 2 +-
 templates/CRM/Admin/Form/Setting/Debugging.tpl | 5 +++++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CRM/Admin/Form/Setting/Debugging.php b/CRM/Admin/Form/Setting/Debugging.php
index 53cec8c6c6..a328af40ce 100644
--- a/CRM/Admin/Form/Setting/Debugging.php
+++ b/CRM/Admin/Form/Setting/Debugging.php
@@ -25,6 +25,7 @@ class CRM_Admin_Form_Setting_Debugging extends CRM_Admin_Form_Setting {
     'backtrace' => CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME,
     'fatalErrorHandler' => CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME,
     'assetCache' => CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME,
+    'esm_loader' => CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME,
     'environment' => CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME,
   ];
 
diff --git a/CRM/Admin/Form/Setting/Miscellaneous.php b/CRM/Admin/Form/Setting/Miscellaneous.php
index 93cdd5423f..9d4b69921d 100644
--- a/CRM/Admin/Form/Setting/Miscellaneous.php
+++ b/CRM/Admin/Form/Setting/Miscellaneous.php
@@ -41,7 +41,6 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting {
     'dedupe_default_limit' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'remote_profile_submissions' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'allow_alert_autodismissal' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
-    'esm_loader' => CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME,
     'prevNextBackend' => CRM_Core_BAO_Setting::SEARCH_PREFERENCES_NAME,
     'import_batch_size' => CRM_Core_BAO_Setting::SEARCH_PREFERENCES_NAME,
   ];
diff --git a/settings/Developer.setting.php b/settings/Developer.setting.php
index 74258511de..6407be46e7 100644
--- a/settings/Developer.setting.php
+++ b/settings/Developer.setting.php
@@ -118,7 +118,7 @@ return [
     'title' => ts('ECMAScript Module Loader'),
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => NULL,
+    'description' => ts('Specify how to load ESM (JS) files. The "Default" mode is the supported option. Other options may assist with diagnosing or temporarily mitigating compatibility issues.'),
     'help_text' => NULL,
     'options' => ['auto' => ts('Default (Auto-detect)'), 'browser' => ts('Browser'), 'shim-fast' => ts('es-module-shims (fast mode)'), 'shim-slow' => ts('es-module-shims (slow mode)')],
   ],
diff --git a/templates/CRM/Admin/Form/Setting/Debugging.tpl b/templates/CRM/Admin/Form/Setting/Debugging.tpl
index 84559cd597..bf3c829baa 100644
--- a/templates/CRM/Admin/Form/Setting/Debugging.tpl
+++ b/templates/CRM/Admin/Form/Setting/Debugging.tpl
@@ -45,6 +45,11 @@
                 <td>{$form.assetCache.html}<br />
                 <span class="description">{ts}Store computed JS/CSS content in cache files? (Note: In "Auto" mode, the "Debug" setting will determine whether to activate the cache.){/ts}</span></td>
             </tr>
+            <tr class="crm-debugging-form-block-esm_loader">
+                <td class="label">{$form.esm_loader.label}</td>
+                <td>{$form.esm_loader.html}<br />
+                <span class="description">{$settings_fields.esm_loader.description}</span></td>
+            </tr>
     </table>
     <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
     <div class="spacer"></div>
-- 
2.25.1