Merge #19968 - Fix performance of table/create

williamdes · williamdes · commit 961013971034 · 2025-12-08T13:05:40.000+01:00
Pull-request: #19968 Fixes: #19967 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/resources/templates/columns_definitions/column_attributes.twig b/resources/templates/columns_definitions/column_attributes.twig
@@ -61,19 +61,8 @@
 </td>
 <td class="text-center">
   {# column collation #}
-  <select lang="en" dir="ltr" name="field_collation[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" class="form-select">
-    <option value=""></option>
-    {% for charset in charsets %}
-      <optgroup label="{{ charset.name }}" title="{{ charset.description }}">
-        {% for collation in charset.collations %}
-          <option value="{{ collation.name }}" title="{{ collation.description }}"
-            {{- column_meta['Collation'] is defined and collation.name == column_meta['Collation'] ? ' selected' }}>
-            {{- collation.name -}}
-          </option>
-        {% endfor %}
-      </optgroup>
-    {% endfor %}
-  </select>
+  <select lang="en" dir="ltr" name="field_collation[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" class="form-select collation-select"
+  {{- column_meta['Collation'] is defined ? ('data-selected="' ~ column_meta['Collation'] ~ '"')|raw : '' }}></select>
   {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
diff --git a/resources/templates/columns_definitions/table_fields_definitions.twig b/resources/templates/columns_definitions/table_fields_definitions.twig
@@ -1,4 +1,16 @@
 <div class="responsivetable">
+<template id="collation_select_options">
+  <option value=""></option>
+  {% for charset in charsets %}
+    <optgroup label="{{ charset.name }}" title="{{ charset.description }}">
+      {% for collation in charset.collations %}
+        <option value="{{ collation.name }}" title="{{ collation.description }}">
+          {{- collation.name -}}
+        </option>
+      {% endfor %}
+    </optgroup>
+  {% endfor %}
+</template>
 <table id="table_columns" class="table table-striped caption-top align-middle mb-0 noclick">
     <caption>
         {{ t('Structure') }}
@@ -112,10 +124,24 @@
                 'attribute_types': attribute_types,
                 'privs_available': privs_available,
                 'max_length': max_length,
-                'charsets': charsets,
                 'relation_parameters': relation_parameters
             }) only %}
         </tr>
     {% endfor %}
 </table>
+<script>
+  function populate_collation_select() {
+    const select = this;
+    const selectOptions = document.getElementById('collation_select_options').content.cloneNode(true);
+    select.appendChild(selectOptions);
+    const selectedValue = select.dataset.selected;
+    if (selectedValue) {
+      select.value = selectedValue;
+    }
+    $(select).off('focus', populate_collation_select);
+  }
+
+  $('.collation-select').on('focus', populate_collation_select);
+  $('.collation-select[data-selected]').each(populate_collation_select);
+</script>
 </div>
