Merge branch '5.x' into fix/double-french-stop

EMS/core-bundle/assets/js/EmsListeners.js

@@ -756,12 +756,13 @@ export default class EmsListeners {
     addA2LixLibSfCollection()
     {
         jquery(this.target).find('.a2lix_lib_sf_collection').each(function () {
+            const langRemove = $(this).data('lang-remove')
             a2lix_lib.sfCollection.init({
                 collectionsSelector: '#' + $(this).attr('id'),
-                manageRemoveEntry: true,
+                manageRemoveEntry: undefined !== langRemove,
                 lang: {
                     add: $(this).data('lang-add'),
-                    remove: $(this).data('lang-remove'),
+                    remove: langRemove ?? '',
                 }
             });
         });

EMS/core-bundle/src/Form/Field/FilterOptionsType.php

@@ -184,11 +184,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'attr' => [
                 'class' => 'a2lix_lib_sf_collection filter_option fields-to-display-for fields-to-display-for-synonym',
                 'data-lang-add' => 'Add synonyms',
-                'data-lang-remove' => 'X',
                 'data-entry-remove-class' => 'btn btn-danger',
             ],
             'entry_options' => [
                 'label' => false,
+                'row_attr' => [
+                    'class' => 'input-group filter-container',
+                ],
             ],
             'allow_add' => true,
             'allow_delete' => true,

EMS/core-bundle/src/Resources/public/manifest.json

@@ -24,25 +24,25 @@
   "yellow-light.css": "bundles/emscore/css/yellow-light.d49e5306580cfb1f6833.css",
   "yellow-light.js": "bundles/emscore/js/yellow-light.31d6cfe0d16ae931b73c.js",
   "app.css": "bundles/emscore/css/app.67e944301dce775833e1.css",
-  "app.js": "bundles/emscore/js/app.ab99ac44d017ddbea13d.js",
+  "app.js": "bundles/emscore/js/app.1976fbfb7302ec783bfc.js",
   "edit-revision.css": "bundles/emscore/css/edit-revision.67e944301dce775833e1.css",
-  "edit-revision.js": "bundles/emscore/js/edit-revision.5ccda4b17084e023c207.js",
+  "edit-revision.js": "bundles/emscore/js/edit-revision.4b0ba322dae662a4b4ea.js",
   "managed-alias.css": "bundles/emscore/css/managed-alias.7bc3d10b7f3e1814e81e.css",
-  "managed-alias.js": "bundles/emscore/js/managed-alias.974987636d9e848dc631.js",
+  "managed-alias.js": "bundles/emscore/js/managed-alias.b1f0e4f1872ecebe22cd.js",
   "user-profile.css": "bundles/emscore/css/user-profile.7bc3d10b7f3e1814e81e.css",
-  "user-profile.js": "bundles/emscore/js/user-profile.2c5173bce299c3bbdca0.js",
+  "user-profile.js": "bundles/emscore/js/user-profile.1312835b05dd81812d97.js",
   "template.css": "bundles/emscore/css/template.7bc3d10b7f3e1814e81e.css",
-  "template.js": "bundles/emscore/js/template.ba6b739bf07cdc4d8ff0.js",
+  "template.js": "bundles/emscore/js/template.63edd994b0b361aa2b95.js",
   "hierarchical.css": "bundles/emscore/css/hierarchical.7bc3d10b7f3e1814e81e.css",
-  "hierarchical.js": "bundles/emscore/js/hierarchical.331ba5d954f1d61a0b14.js",
+  "hierarchical.js": "bundles/emscore/js/hierarchical.e17a99b559590a2340bd.js",
   "calendar.css": "bundles/emscore/css/calendar.7bc3d10b7f3e1814e81e.css",
-  "calendar.js": "bundles/emscore/js/calendar.33f2617bee514999d2e4.js",
+  "calendar.js": "bundles/emscore/js/calendar.56a87d0e5db9d7b347be.js",
   "criteria-view.css": "bundles/emscore/css/criteria-view.7bc3d10b7f3e1814e81e.css",
-  "criteria-view.js": "bundles/emscore/js/criteria-view.9fc87fc7a923f64ba6e7.js",
+  "criteria-view.js": "bundles/emscore/js/criteria-view.e2995a159602082c2f69.js",
   "criteria-table.css": "bundles/emscore/css/criteria-table.7bc3d10b7f3e1814e81e.css",
-  "criteria-table.js": "bundles/emscore/js/criteria-table.5ab460dbfa6883e9196c.js",
+  "criteria-table.js": "bundles/emscore/js/criteria-table.c26c7eab524cd3774a37.js",
   "i18n.css": "bundles/emscore/css/i18n.7bc3d10b7f3e1814e81e.css",
-  "i18n.js": "bundles/emscore/js/i18n.b137f005c64ab18a18f3.js",
+  "i18n.js": "bundles/emscore/js/i18n.09c5b6ee0bd0b8c2f278.js",
   "dashboard-browser.css": "bundles/emscore/css/dashboard-browser.0ca4a46888d56dc2418f.css",
   "dashboard-browser.js": "bundles/emscore/js/dashboard-browser.b827d809f0a027d92b63.js",
   "js/ace/worker-xquery.js": "bundles/emscore/js/ace/worker-xquery.js",

EMS/core-bundle/src/Resources/views/form/fields.html.twig

@@ -1471,3 +1471,14 @@
     {{ parent() }}
     <span class="pull-right text-counter" data-counter-label="{{ 'field_type.textarea.counter'|trans|e('html_attr') }}"></span>
 {% endblock textarea_widget %}
+
+{% block collection_entry_with_grouped_remove %}
+    {{ block('form_widget') }}
+    <span class="input-group-btn">
+        <button type="button" class="btn btn-danger remove-filter">X</button>
+    </span>
+{% endblock collection_entry_with_grouped_remove %}
+
+{% block _filter_options_synonyms_entry_widget %}
+    {{ block('collection_entry_with_grouped_remove') }}
+{% endblock _filter_options_synonyms_entry_widget %}