Merge remote-tracking branch 'trigger/AC-99' into AC-1963

Author: xmav

app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

@@ -40,7 +40,7 @@ if ($isField) {
         data-role="<?=  $block->escapeHtmlAttr($id) ?>-wrapper">
         <div class="fieldset-wrapper-title admin__fieldset-wrapper-title">
             <strong <?= /* @noEscape */ $isCollapsable ?
-                'class="admin__collapsible-title" data-toggle="collapse" data-target="#' . $id . '-content"' :
+                'class="admin__collapsible-title" data-bs-toggle="collapse" data-bs-target="#' . $id . '-content"' :
                 'class="title"'; ?>>
                 <span><?= $block->escapeHtml($element->getLegend()) ?></span>
             </strong>

app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml

@@ -13,8 +13,8 @@
         <div class="fieldset-wrapper admin__collapsible-block-wrapper opened"
              id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-wrapper">
             <div class="fieldset-wrapper-title">
-                <strong class="admin__collapsible-title" data-toggle="collapse"
-                        data-target="#<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
+                <strong class="admin__collapsible-title" data-bs-toggle="collapse"
+                        data-bs-target="#<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
                     <span><%- data.default_title %></span>
                 </strong>
                 <div class="actions">

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml

@@ -9,7 +9,7 @@
 
 <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="manage-titles-wrapper">
     <div class="fieldset-wrapper-title">
-        <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#manage-titles-content">
+        <strong class="admin__collapsible-title" data-bs-toggle="collapse" data-bs-target="#manage-titles-content">
             <span><?= $block->escapeHtml(__('Manage Titles (Size, Color, etc.)')) ?></span>
         </strong>
     </div>

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml

@@ -16,8 +16,8 @@
         <div class="fieldset-wrapper-title">
             <strong
                 class="admin__collapsible-title"
-                data-toggle="collapse"
-                data-target="#<%- data.id %>-content">
+                data-bs-toggle="collapse"
+                data-bs-target="#<%- data.id %>-content">
                 <span id="option_<%- data.id %>_header_title"><%- data.title %></span>
             </strong>
             <div class="actions">

app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/variations/steps/summary-grid.html

@@ -7,7 +7,7 @@
 
 <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" data-bind="mageInit: {'collapsible':{'active':true,'openedState':'opened'}}">
     <div class="fieldset-wrapper-title toggle" data-role="title">
-        <strong class="admin__collapsible-title" data-toggle="collapse" data-bind="attr:{'data-target': '#'+id}">
+        <strong class="admin__collapsible-title" data-bs-toggle="collapse" data-bind="attr:{'data-bs-target': '#'+id}">
             <span data-bind="text: title"></span>
         </strong>
     </div>

app/design/adminhtml/Magento/backend/web/js/theme.js

@@ -594,13 +594,13 @@ define('collapsable', [
             var self = this;
 
             this.element
-                .on('show', function (e) {
+                .on('show.bs.collapse', function (e) {
                     var fieldsetWrapper = $(this).closest(self.options.wrapper);
 
                     fieldsetWrapper.addClass(self.options.openedClass);
                     e.stopPropagation();
                 })
-                .on('hide', function (e) {
+                .on('hide.bs.collapse', function (e) {
                     var fieldsetWrapper = $(this).closest(self.options.wrapper);
 
                     fieldsetWrapper.removeClass(self.options.openedClass);