[5.0] Joomla Dialog for Aricles, Categories batch and Finder Index with Statistic (#40359)

Fedik · web-flow · commit b0064dc54039 · 2023-09-05T08:48:51.000+02:00
* Articles Batch use Joomla Dialog

* Articles Batch use Joomla Dialog

* Finder Index and Statistic use Joomla Dialog

* Articles batch popup style

* Articles batch popup style

* Finder reload on Indexing is completed

* Categories Batch use Joomla Dialog

* One more statistic

* fix asset name

* fix asset name

* Versions toolbar button

* phpcs
diff --git a/administrator/components/com_categories/src/View/Categories/HtmlView.php b/administrator/components/com_categories/src/View/Categories/HtmlView.php
@@ -241,7 +241,11 @@ protected function addToolbar()
                 && $canDo->get('core.edit.state')
             ) {
                 $childBar->popupButton('batch', 'JTOOLBAR_BATCH')
-                    ->selector('collapseModal')
+                    ->popupType('inline')
+                    ->textHeader(Text::_('COM_CATEGORIES_BATCH_OPTIONS'))
+                    ->url('#joomla-dialog-batch')
+                    ->modalWidth('800px')
+                    ->modalHeight('fit-content')
                     ->listCheck(true);
             }
         }
diff --git a/administrator/components/com_categories/tmpl/categories/default.php b/administrator/components/com_categories/tmpl/categories/default.php
@@ -284,15 +284,7 @@
                         && $user->authorise('core.edit', $extension)
                         && $user->authorise('core.edit.state', $extension)
                     ) : ?>
-                        <?php echo HTMLHelper::_(
-                            'bootstrap.renderModal',
-                            'collapseModal',
-                            [
-                                'title'  => Text::_('COM_CATEGORIES_BATCH_OPTIONS'),
-                                'footer' => $this->loadTemplate('batch_footer'),
-                            ],
-                            $this->loadTemplate('batch_body')
-                        ); ?>
+                        <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
                     <?php endif; ?>
                 <?php endif; ?>
 
diff --git a/administrator/components/com_categories/tmpl/categories/default_batch_body.php b/administrator/components/com_categories/tmpl/categories/default_batch_body.php
@@ -64,3 +64,8 @@
     </div>
     <?php endif; ?>
 </div>
+<div class="btn-toolbar p-3">
+    <joomla-toolbar-button task="category.batch" class="ms-auto">
+        <button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
+    </joomla-toolbar-button>
+</div>
diff --git a/administrator/components/com_categories/tmpl/categories/default_batch_footer.php b/administrator/components/com_categories/tmpl/categories/default_batch_footer.php
diff --git a/administrator/components/com_content/src/View/Articles/HtmlView.php b/administrator/components/com_content/src/View/Articles/HtmlView.php
@@ -237,7 +237,11 @@ protected function addToolbar()
                 && $user->authorise('core.execute.transition', 'com_content')
             ) {
                 $childBar->popupButton('batch', 'JTOOLBAR_BATCH')
-                    ->selector('collapseModal')
+                    ->popupType('inline')
+                    ->textHeader(Text::_('COM_CONTENT_BATCH_OPTIONS'))
+                    ->url('#joomla-dialog-batch')
+                    ->modalWidth('800px')
+                    ->modalHeight('fit-content')
                     ->listCheck(true);
             }
         }
diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php
@@ -375,15 +375,7 @@
                         && $user->authorise('core.edit', 'com_content')
                         && $user->authorise('core.edit.state', 'com_content')
                     ) : ?>
-                        <?php echo HTMLHelper::_(
-                            'bootstrap.renderModal',
-                            'collapseModal',
-                            [
-                                'title'  => Text::_('COM_CONTENT_BATCH_OPTIONS'),
-                                'footer' => $this->loadTemplate('batch_footer'),
-                            ],
-                            $this->loadTemplate('batch_body')
-                        ); ?>
+                        <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
                     <?php endif; ?>
                 <?php endif; ?>
 
diff --git a/administrator/components/com_content/tmpl/articles/default_batch_body.php b/administrator/components/com_content/tmpl/articles/default_batch_body.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Language\Multilanguage;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $params = ComponentHelper::getParams('com_content');
@@ -58,3 +59,8 @@
         <?php endif; ?>
     </div>
 </div>
+<div class="btn-toolbar p-3">
+    <joomla-toolbar-button task="article.batch" class="ms-auto">
+        <button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
+    </joomla-toolbar-button>
+</div>
diff --git a/administrator/components/com_content/tmpl/articles/default_batch_footer.php b/administrator/components/com_content/tmpl/articles/default_batch_footer.php
diff --git a/administrator/components/com_finder/src/View/Index/HtmlView.php b/administrator/components/com_finder/src/View/Index/HtmlView.php
@@ -183,27 +183,30 @@ protected function addToolbar()
 
             $childBar = $dropdown->getChildToolbar();
 
-            $childBar->popupButton('index', 'COM_FINDER_INDEX')
+            $childBar->popupButton('archive', 'COM_FINDER_INDEX')
+                ->popupType('iframe')
+                ->textHeader(Text::_('COM_FINDER_HEADING_INDEXER'))
                 ->url('index.php?option=com_finder&view=indexer&tmpl=component')
+                ->modalWidth('800px')
+                ->modalHeight('400px')
                 ->icon('icon-archive')
-                ->iframeWidth(500)
-                ->iframeHeight(210)
-                ->onclose('window.parent.location.reload()')
                 ->title(Text::_('COM_FINDER_HEADING_INDEXER'));
 
             $childBar->linkButton('indexdebug', 'COM_FINDER_INDEX_TOOLBAR_INDEX_DEBUGGING')
                 ->url('index.php?option=com_finder&view=indexer&layout=debug')
                 ->icon('icon-tools');
         } else {
-            $toolbar->popupButton('index', 'COM_FINDER_INDEX')
+            $toolbar->popupButton('archive', 'COM_FINDER_INDEX')
+                ->popupType('iframe')
+                ->textHeader(Text::_('COM_FINDER_HEADING_INDEXER'))
                 ->url('index.php?option=com_finder&view=indexer&tmpl=component')
+                ->modalWidth('800px')
+                ->modalHeight('400px')
                 ->icon('icon-archive')
-                ->iframeWidth(500)
-                ->iframeHeight(210)
-                ->onclose('window.parent.location.reload()')
                 ->title(Text::_('COM_FINDER_HEADING_INDEXER'));
         }
 
+
         if (!$this->isEmptyState) {
             if ($canDo->get('core.edit.state')) {
                 $dropdown = $toolbar->dropdownButton('status-group')
@@ -243,9 +246,11 @@ protected function addToolbar()
             }
 
             $toolbar->popupButton('bars', 'COM_FINDER_STATISTICS')
+                ->popupType('iframe')
+                ->textHeader(Text::_('COM_FINDER_STATISTICS_TITLE'))
                 ->url('index.php?option=com_finder&view=statistics&tmpl=component')
-                ->iframeWidth(550)
-                ->iframeHeight(350)
+                ->modalWidth('800px')
+                ->modalHeight('500px')
                 ->title(Text::_('COM_FINDER_STATISTICS_TITLE'))
                 ->icon('icon-bars');
         }
diff --git a/administrator/components/com_finder/src/View/Maps/HtmlView.php b/administrator/components/com_finder/src/View/Maps/HtmlView.php
@@ -165,9 +165,11 @@ protected function addToolbar()
 
             $toolbar->divider();
             $toolbar->popupButton('bars', 'COM_FINDER_STATISTICS')
+                ->popupType('iframe')
+                ->textHeader(Text::_('COM_FINDER_STATISTICS_TITLE'))
                 ->url('index.php?option=com_finder&view=statistics&tmpl=component')
-                ->iframeWidth(550)
-                ->iframeHeight(350)
+                ->modalWidth('800px')
+                ->modalHeight('500px')
                 ->title(Text::_('COM_FINDER_STATISTICS_TITLE'))
                 ->icon('icon-bars');
             $toolbar->divider();
diff --git a/build/media_source/com_contenthistory/joomla.asset.json b/build/media_source/com_contenthistory/joomla.asset.json
@@ -30,7 +30,8 @@
     {
       "name": "com_contenthistory.admin-history-versions",
       "type": "script",
-      "uri": "com_contenthistory/admin-history-versions.min.js",
+      "uri": "",
+      "deprecated": true,
       "dependencies": [
         "core"
       ],
diff --git a/build/media_source/com_contenthistory/js/admin-history-versions.es6.js b/build/media_source/com_contenthistory/js/admin-history-versions.es6.js
diff --git a/build/media_source/com_finder/js/indexer.es6.js b/build/media_source/com_finder/js/indexer.es6.js
@@ -58,7 +58,7 @@
         // Auto close the window
         if (message === Joomla.Text._('COM_FINDER_INDEXER_MESSAGE_COMPLETE')) {
           removeElement('progress');
-          window.parent.Joomla.Modal.getCurrent().close();
+          window.parent.location.reload();
         }
       }
     };
diff --git a/layouts/joomla/toolbar/popup.php b/layouts/joomla/toolbar/popup.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\Utilities\ArrayHelper;
 
-extract($displayData, EXTR_OVERWRITE);
+extract($displayData);
 
 /**
  * Layout variables
@@ -27,16 +27,38 @@
  * @var   string  $tagName
  * @var   bool    $listCheck
  * @var   string  $htmlAttributes
+ * @var   string  $modalWidth
+ * @var   string  $modalHeight
+ * @var   string  $popupType
+ * @var   string  $url
+ * @var   string  $textHeader
  */
 
-Factory::getDocument()->getWebAssetManager()
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+Factory::getApplication()->getDocument()->getWebAssetManager()
     ->useScript('core')
+    ->useScript('joomla.dialog-autocreate')
     ->useScript('webcomponent.toolbar-button');
 
-$tagName = $tagName ?? 'button';
+$tagName    = $tagName ?? 'button';
+$modalAttrs = [];
 
-$modalAttrs['data-bs-toggle'] = 'modal';
-$modalAttrs['data-bs-target'] = '#' . $selector;
+// Check for use of Joomla Dialog, otherwise fallback to BS Modal
+if (!empty($popupType)) {
+    $popupOptions = [
+        'popupType'  => $popupType,
+        'src'        => $url,
+        'textHeader' => $textHeader ?? '',
+        'width'      => $modalWidth ?? null,
+        'height'     => $modalHeight ?? null,
+    ];
+
+    $modalAttrs['data-joomla-dialog'] = $this->escape(json_encode($popupOptions));
+} else {
+    // @TODO: Remove this fallback in Joomla 6. Deprecation already triggered in PopupButton class.
+    $modalAttrs['data-bs-toggle'] = 'modal';
+    $modalAttrs['data-bs-target'] = '#' . $selector;
+}
 
 $idAttr   = !empty($id)        ? ' id="' . $id . '"' : '';
 $listAttr = !empty($listCheck) ? ' list-selection' : '';
diff --git a/layouts/joomla/toolbar/versions.php b/layouts/joomla/toolbar/versions.php
@@ -11,11 +11,9 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Session\Session;
 
-extract($displayData, EXTR_OVERWRITE);
+extract($displayData);
 
 /**
  * Layout variables
@@ -28,43 +26,34 @@
  */
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = Factory::getDocument()->getWebAssetManager();
-$wa->getRegistry()->addExtensionRegistryFile('com_contenthistory');
+$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
 
 $wa->useScript('core')
-    ->useScript('webcomponent.toolbar-button')
-    ->useScript('com_contenthistory.admin-history-versions');
+    ->useScript('joomla.dialog-autocreate')
+    ->useScript('webcomponent.toolbar-button');
+
+$url = 'index.php?' . http_build_query([
+    'option'                => 'com_contenthistory',
+    'view'                  => 'history',
+    'layout'                => 'modal',
+    'tmpl'                  => 'component',
+    'item_id'               => $itemId,
+    Session::getFormToken() => 1,
+]);
+
+
+$dialogOptions = [
+    'popupType'  => 'iframe',
+    'src'        => $url,
+    'textHeader' => $title ?? '',
+];
 
-echo HTMLHelper::_(
-    'bootstrap.renderModal',
-    'versionsModal',
-    [
-        'url'    => 'index.php?' . http_build_query(
-            [
-                'option' => 'com_contenthistory',
-                'view' => 'history',
-                'layout' => 'modal',
-                'tmpl' => 'component',
-                'item_id' => $itemId,
-                Session::getFormToken() => 1
-            ]
-        ),
-        'title'  => $title,
-        'height' => '100%',
-        'width'  => '100%',
-        'modalWidth'  => '80',
-        'bodyHeight'  => '60',
-        'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-            . Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
-    ]
-);
 ?>
 <joomla-toolbar-button id="toolbar-versions">
     <button
         class="btn btn-primary"
-        type="button"
-        data-bs-target="#versionsModal"
-        data-bs-toggle="modal">
+        data-joomla-dialog="<?php echo $this->escape(json_encode($dialogOptions)); ?>"
+        type="button">
         <span class="icon-code-branch" aria-hidden="true"></span>
         <?php echo $title; ?>
     </button>
diff --git a/libraries/src/Toolbar/Button/PopupButton.php b/libraries/src/Toolbar/Button/PopupButton.php

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,11 @@ protected function addToolbar()`
`241`	`241`	`&& $canDo->get('core.edit.state')`
`242`	`242`	`) {`
`243`	`243`	`$childBar->popupButton('batch', 'JTOOLBAR_BATCH')`
`244`		`- ->selector('collapseModal')`
	`244`	`+ ->popupType('inline')`
	`245`	`+ ->textHeader(Text::_('COM_CATEGORIES_BATCH_OPTIONS'))`
	`246`	`+ ->url('#joomla-dialog-batch')`
	`247`	`+ ->modalWidth('800px')`
	`248`	`+ ->modalHeight('fit-content')`
`245`	`249`	`->listCheck(true);`
`246`	`250`	`}`
`247`	`251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,11 @@ protected function addToolbar()`
`237`	`237`	`&& $user->authorise('core.execute.transition', 'com_content')`
`238`	`238`	`) {`
`239`	`239`	`$childBar->popupButton('batch', 'JTOOLBAR_BATCH')`
`240`		`- ->selector('collapseModal')`
	`240`	`+ ->popupType('inline')`
	`241`	`+ ->textHeader(Text::_('COM_CONTENT_BATCH_OPTIONS'))`
	`242`	`+ ->url('#joomla-dialog-batch')`
	`243`	`+ ->modalWidth('800px')`
	`244`	`+ ->modalHeight('fit-content')`
`241`	`245`	`->listCheck(true);`
`242`	`246`	`}`
`243`	`247`	`}`