Skip to content

Commit b7a3e14

Browse files
committed
4120: Removed use of select2 and cleaned up templates
1 parent 128a124 commit b7a3e14

11 files changed

Lines changed: 20 additions & 321 deletions

File tree

assets/app.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,3 @@
55
* which should already be in your base.html.twig.
66
*/
77
import './styles/app.css';
8-
9-
import jquery from 'jquery';
10-
const $ = jquery;
11-
window.$ = $;
12-
13-
import once from 'jquery-once';
14-
15-
import "select2/dist/css/select2.min.css";
16-
import select2 from 'select2';
17-
select2($);

assets/styles/app.css

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -217,17 +217,3 @@ body.list table tbody td.dashboard--table-answer {
217217
}
218218
}
219219
}
220-
221-
.select2 {
222-
.select2-container--default,
223-
.select2-selection--multiple {
224-
min-height: 38px !important;
225-
border-color: var(--bs-border-color) !important;
226-
font-size: 1rem;
227-
line-height: 1.25;
228-
229-
textarea {
230-
color: var(--bs-body-color) !important;
231-
}
232-
}
233-
}

importmap.php

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -16,50 +16,4 @@
1616
'path' => './assets/app.js',
1717
'entrypoint' => true,
1818
],
19-
'jquery' => [
20-
'version' => '3.7.1',
21-
],
22-
'select2' => [
23-
'version' => '4.1.0-rc.0',
24-
],
25-
'select2/dist/css/select2.min.css' => [
26-
'version' => '4.1.0-rc.0',
27-
'type' => 'css',
28-
],
29-
'region-align' => [
30-
'version' => '2.1.3',
31-
],
32-
'object-assign' => [
33-
'version' => '3.0.0',
34-
],
35-
'escape-html' => [
36-
'version' => '1.0.3',
37-
],
38-
'to-style' => [
39-
'version' => '1.3.3',
40-
],
41-
'react-style-normalizer' => [
42-
'version' => '1.2.8',
43-
],
44-
'clone' => [
45-
'version' => '1.0.4',
46-
],
47-
'matches-selector' => [
48-
'version' => '1.2.0',
49-
],
50-
'contains' => [
51-
'version' => '0.1.1',
52-
],
53-
'region' => [
54-
'version' => '2.1.2',
55-
],
56-
'hasown' => [
57-
'version' => '1.0.1',
58-
],
59-
'newify' => [
60-
'version' => '1.1.9',
61-
],
62-
'jquery-once' => [
63-
'version' => '2.3.0',
64-
],
6519
];

package.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/Controller/Admin/CustomDashboardCrudController.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,9 @@ private function getFilterFormBuilder(
413413
'multiple' => true,
414414
'attr' => [
415415
'class' => 'form-control',
416+
// @todo Find documentation reference for why setting data-ea-widget actually works
417+
// (https://github.com/search?q=repo%3AEasyCorp%2FEasyAdminBundle%20data-ea-widget&type=code)
418+
'data-ea-widget' => 'ea-autocomplete',
416419
'data-placeholder' => $this->translator->trans(
417420
'filter.placeholder.groups'
418421
),
@@ -426,6 +429,7 @@ private function getFilterFormBuilder(
426429
'choices' => $subownerOptions,
427430
'attr' => [
428431
'class' => 'form-control',
432+
'data-ea-widget' => 'ea-autocomplete',
429433
],
430434
'required' => false,
431435
'disabled' => 0 == count($subownerOptions),
@@ -440,6 +444,7 @@ private function getFilterFormBuilder(
440444
),
441445
'attr' => [
442446
'class' => 'form-control',
447+
'data-ea-widget' => 'ea-autocomplete',
443448
],
444449
'required' => false,
445450
'data' => $formParameters['theme'] ?? null,
@@ -454,6 +459,7 @@ private function getFilterFormBuilder(
454459
),
455460
'attr' => [
456461
'class' => 'form-control',
462+
'data-ea-widget' => 'ea-autocomplete',
457463
],
458464
'required' => false,
459465
'data' => $formParameters['category'] ?? null,
@@ -466,6 +472,7 @@ private function getFilterFormBuilder(
466472
'choices' => $filterSelfServiceOptions,
467473
'attr' => [
468474
'class' => 'form-control',
475+
'data-ea-widget' => 'ea-autocomplete',
469476
],
470477
'required' => false,
471478
'data' => $formParameters['self_service'] ?? null,

templates/dashboard.html.twig

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -113,23 +113,20 @@
113113
{% endblock main %}
114114

115115
{% block body_javascript %}
116-
{# // Called more than once, so we need to check if it's already been called ?! #}
117116
{{ parent() }}
118117

119-
<script type="text/javascript">
120-
document.addEventListener("DOMContentLoaded", function() {
121-
$('#form_groups').once('select-processed').each(function () {
122-
let groups = $('#form_groups');
123-
groups.select2();
124-
groups.on('select2:opening select2:closing', function (event) {
125-
let searchField = $(this).parent().find('.select2-search__field');
126-
searchField.prop('disabled', true);
127-
});
128-
});
129-
130-
$('.dashboard-filters select').bind('change', function () {
131-
$('.dashboard-filters form').submit();
132-
});
133-
}, { once: true });
118+
<script>
119+
{# Subowner options depend on selected groups, so we submit the form when groups are changed to reflect the new subowners. #}
120+
addEventListener('load', () => {
121+
const el = document.getElementById('form_groups')
122+
if (el) {
123+
el.addEventListener('change', (event) => {
124+
const form = event.target.form
125+
if (form) {
126+
form.submit()
127+
}
128+
})
129+
}
130+
})
134131
</script>
135132
{% endblock %}

templates/list.html.twig

Lines changed: 0 additions & 100 deletions
This file was deleted.

templates/theme/_delete_form.html.twig

Lines changed: 0 additions & 6 deletions
This file was deleted.

templates/theme/_form.html.twig

Lines changed: 0 additions & 65 deletions
This file was deleted.

templates/theme/edit.html.twig

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)