Use the global search modal for search help

escopecz · Oct 8, 2024 · 61717ba · 61717ba
1 parent 18f6738
commit 61717ba
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 6 deletions.
diff --git a/app/bundles/CoreBundle/Assets/js/1a.content.js b/app/bundles/CoreBundle/Assets/js/1a.content.js
@@ -317,6 +317,7 @@ Mautic.processPageContent = function (response) {
  */
 Mautic.onPageLoad = function (container, response, inModal) {
     Mautic.initDateRangePicker(container + ' #daterange_date_from', container + ' #daterange_date_to');
+    Mautic.initSearchHelpButton();
 
     //initiate links
     Mautic.makeLinksAlive(mQuery(container + " a[data-toggle='ajax']"));

diff --git a/app/bundles/CoreBundle/Assets/js/9.modals.js b/app/bundles/CoreBundle/Assets/js/9.modals.js
@@ -450,4 +450,30 @@ Mautic.showModal = function(target) {
     mQuery(target).modal('show');
 };
 
+Mautic.initSearchHelpButton = function (accordionId) {
+    const $searchHelpButton = mQuery('[data-toggle="searchhelp"]');
+    const $searchHelpModal = mQuery('#searchCommandsModal');
+    const searchId = $searchHelpButton.data('target');
+
+    // Scroll to the accordion item
+    $searchHelpModal.on('shown.bs.modal', function () {
+        const $modalBody = mQuery(this).find('.modal-content');
+        const $accordion = $modalBody.find('#specificCommandsAccordion');
+        $accordion.find('.collapse').collapse('hide');
+
+        if (searchId.length <= 1) {
+            return;
+        }
+
+        const $accordionItem = $accordion.find(searchId);
+        $accordionItem.collapse('show');
+        const elementTop = $accordionItem.offset().top;
+        $modalBody.scrollTop($modalBody.scrollTop() + elementTop - $modalBody.offset().top);
+    });
+
+    $searchHelpButton.on('click', function (e) {
+        $searchHelpModal.modal('toggle');
+    });
+}
+
 
diff --git a/app/bundles/CoreBundle/Resources/views/Helper/search.html.twig b/app/bundles/CoreBundle/Resources/views/Helper/search.html.twig
@@ -2,19 +2,18 @@
 {% set target = target|default('.page-list') %}
 {% set overlayTarget = overlayTarget|default(target) %}
 {% set overlayEnabled = overlayDisabled is defined and overlayDisabled is not empty ? 'false' : 'true' %}
-{% set id = searchId|default('list-search') %}
 {% set tmpl = tmpl|default('list') %}
 
 <div class="input-group">
     {% if searchHelp is defined and searchHelp is not empty %}
     <div class="input-group-btn">
-        <button class="input-group-addon btn-nospin" data-toggle="modal" data-target="#{{ searchId }}-search-help">
+        <button class="input-group-addon btn-nospin" data-toggle="searchhelp" data-target="#{{ searchId }}">
             <i class="ri-question-line"></i>
         </button>
     </div>
     {% endif %}
 
-    <input type="search" class="form-control search" id="{{ id }}" name="search" placeholder="{% trans %}mautic.core.search.placeholder{% endtrans %}" value="{{ searchValue|escape }}" autocomplete="false" data-toggle="livesearch" data-target="{{ target }}" data-tmpl="{{ tmpl }}" data-action="{{ action }}" data-overlay="{{ overlayEnabled }}" data-overlay-text="{% trans %}mautic.core.search.livesearch{% endtrans %}" data-overlay-target="{{ overlayTarget }}" />
+    <input type="search" class="form-control search" id="list-search" name="search" placeholder="{% trans %}mautic.core.search.placeholder{% endtrans %}" value="{{ searchValue|escape }}" autocomplete="false" data-toggle="livesearch" data-target="{{ target }}" data-tmpl="{{ tmpl }}" data-action="{{ action }}" data-overlay="{{ overlayEnabled }}" data-overlay-text="{% trans %}mautic.core.search.livesearch{% endtrans %}" data-overlay-target="{{ overlayTarget }}" />
     <div class="input-group-btn">
         <button type="button" class="input-group-addon btn-search btn-nospin" id="btn-filter" data-livesearch-parent="{{ id }}">
             <i class="ri-search-line ri-fw"></i>

diff --git a/app/bundles/LeadBundle/Resources/views/Lead/_filter.html.twig b/app/bundles/LeadBundle/Resources/views/Lead/_filter.html.twig
@@ -28,6 +28,7 @@
     {% endif %}
     <div id="page-list-wrapper">
         {{ include('@MauticCore/Helper/list_toolbar.html.twig', {
+            'searchId': 'collapseMautic_lead_leads',
             'searchValue': searchValue|default(''),
             'searchHelp': 'mautic.lead.lead.help.searchcommands',
             'action': currentRoute,

diff --git a/app/bundles/NotificationBundle/Resources/views/MobileNotification/list.html.twig b/app/bundles/NotificationBundle/Resources/views/MobileNotification/list.html.twig
@@ -33,7 +33,6 @@
         {{ include('@MauticCore/Helper/list_toolbar.html.twig', {
                 'searchValue': searchValue,
                 'searchHelp': 'mautic.notification.help.searchcommands',
-                'searchId': 'mobile-notification-search',
                 'action': currentRoute,
         }) }}
         <div class="page-list">

diff --git a/app/bundles/NotificationBundle/Resources/views/Notification/list.html.twig b/app/bundles/NotificationBundle/Resources/views/Notification/list.html.twig
@@ -33,7 +33,6 @@
         {{ include('@MauticCore/Helper/list_toolbar.html.twig', {
                 'searchValue': searchValue,
                 'searchHelp': 'mautic.notification.help.searchcommands',
-                'searchId': 'notification-search',
                 'action': currentRoute,
         }) }}
         <div class="page-list">

diff --git a/app/bundles/ReportBundle/Resources/views/Report/list.html.twig b/app/bundles/ReportBundle/Resources/views/Report/list.html.twig
@@ -21,6 +21,7 @@
   {% if isIndex %}
   <div id="page-list-wrapper">
       {{ include('@MauticCore/Helper/list_toolbar.html.twig', {
+              'searchId': 'collapseMautic_report_reports',
               'searchValue': searchValue,
               'searchHelp': 'mautic.report.report.help.searchcommands',
               'action': currentRoute,

diff --git a/app/bundles/SmsBundle/Resources/views/Sms/list.html.twig b/app/bundles/SmsBundle/Resources/views/Sms/list.html.twig
@@ -19,7 +19,6 @@
         {{- include('@MauticCore/Helper/list_toolbar.html.twig', {
             'searchValue' : searchValue,
             'searchHelp'  : 'mautic.sms.help.searchcommands',
-            'searchId'    : 'sms-search',
             'action'      : currentRoute,
         }) -}}