Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

ChangeLog

@@ -48,6 +48,7 @@ phpMyAdmin - ChangeLog
 - issue        Fix double encoding on User Groups pages
 - issue        Fix list of users of an user group not showing up
 - issue        Fix duplicate query params in the SQL message card
+- issue #18314 Fix dragged row in index form
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid

js/src/modules/functions.ts

@@ -2868,14 +2868,29 @@ function showIndexEditDialog ($outer) {
     checkIndexType();
     checkIndexName('index_frm');
     var $indexColumns = $('#index_columns');
-    $indexColumns.find('td').each(function () {
-        $(this).css('width', $(this).width() + 'px');
-    });
-
     $indexColumns.find('tbody').sortable({
         axis: 'y',
         containment: $indexColumns.find('tbody'),
-        tolerance: 'pointer'
+        tolerance: 'pointer',
+        forcePlaceholderSize: true,
+        // Add custom dragged row
+        // @ts-ignore
+        helper: function (event, tr: any) {
+            var $originalCells = (tr as JQuery<HTMLElement>).children();
+            var $helper = (tr as JQuery<HTMLElement>).clone();
+            $helper.children().each(function (index) {
+                // Set cell width in dragged row
+                $(this).width($originalCells.eq(index).outerWidth());
+                var $childrenSelect = $originalCells.eq(index).children('select');
+                if ($childrenSelect.length) {
+                    var selectedIndex = $childrenSelect.prop('selectedIndex');
+                    // Set correct select value in dragged row
+                    $(this).children('select').prop('selectedIndex', selectedIndex);
+                }
+            });
+
+            return $helper;
+        }
     });
 
     Functions.showHints($outer);

phpstan-baseline.neon

@@ -2100,6 +2100,11 @@ parameters:
 			count: 2
 			path: libraries/classes/Controllers/Table/FindReplaceController.php
 
+		-
+			message: "#^Cannot cast mixed to string\\.$#"
+			count: 3
+			path: libraries/classes/Controllers/Table/GetFieldController.php
+
 		-
 			message: "#^Parameter \\#1 \\$string of function mb_strlen expects string, string\\|null given\\.$#"
 			count: 1

psalm-baseline.xml

@@ -3445,25 +3445,9 @@
     </RiskyCast>
   </file>
   <file src="libraries/classes/Controllers/Table/GetFieldController.php">
-    <PossiblyInvalidArgument>
-      <code><![CDATA[$_GET['transform_key']]]></code>
-      <code><![CDATA[$_GET['where_clause']]]></code>
-      <code><![CDATA[$_GET['where_clause_sign']]]></code>
-    </PossiblyInvalidArgument>
-    <PossiblyInvalidCast>
-      <code><![CDATA[$_GET['where_clause']]]></code>
-      <code><![CDATA[$_GET['where_clause_sign']]]></code>
-    </PossiblyInvalidCast>
-    <PossiblyInvalidOperand>
-      <code><![CDATA[$_GET['transform_key']]]></code>
-      <code><![CDATA[$_GET['where_clause']]]></code>
-    </PossiblyInvalidOperand>
     <PossiblyNullArgument>
       <code>$result</code>
     </PossiblyNullArgument>
-    <PossiblyUnusedParam>
-      <code>$request</code>
-    </PossiblyUnusedParam>
   </file>
   <file src="libraries/classes/Controllers/Table/GisVisualizationController.php">
     <MixedArrayAccess>

templates/database/central_columns/main.twig

@@ -271,7 +271,7 @@
                                 <a href="#"> {{ get_icon('b_edit', 'Edit' | trans) | raw }}</a>
                             </td>
                             <td class="del_row" data-rownum = "{{ row_num }}">
-                                <a hrf="#">{{ get_icon('b_drop', 'Delete' | trans) }}</a>
+                                <a href="#">{{ get_icon('b_drop', 'Delete' | trans) }}</a>
                                 <input type="submit" data-rownum = "{{ row_num }}" class="btn btn-secondary edit_cancel_form" value="{{ 'Cancel'|trans }}">
                             </td>
                             <td id="{{ 'save_' ~ row_num  }}" class="hide">