Merge branch 'QA_5_2'

williamdes · williamdes · commit 74b7253f6b81 · 2023-06-29T12:47:18.000+02:00
Signed-off-by: William Desportes &lt;williamdes@wdes.fr&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -54,8 +54,9 @@ phpMyAdmin - ChangeLog
 - issue #18471 Fix SQL statement not being displayed correctly on RTL languages
 - issue        Fix state times not getting summed in the profiling table
 - issue        Fix a case where a fatal error message was not displayed
-- issue        Fix profiling chart not loading when profiling is activated
+- issue #17420 Fix profiling chart not loading when profiling is activated
 - issue #18159 Fix error when changing the number of chart columns in the monitor page
+- issue #18403 Fix Uncaught SyntaxError: JSON.parse on makegrid conditions
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/js/src/makegrid.ts b/js/src/makegrid.ts
@@ -1278,7 +1278,11 @@ const makeGrid = function (t, enableResize = undefined, enableReorder = undefine
                 }
 
                 fullWhereClause.push(whereClause);
-                var conditionArray = JSON.parse(($tr.find('.condition_array').val() as string));
+                var conditionArrayContent: string | undefined = $tr.find('.condition_array').val() as string;
+                if (typeof conditionArrayContent === 'undefined') {
+                    conditionArrayContent = '{}';
+                }
+                var conditionArray = JSON.parse(conditionArrayContent);
 
                 /**
                  * multi edit variables, for current row
