Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Apr 28, 2022 · 6dc859c · 6dc859c
2 parents b008cca + 49e2b08
commit 6dc859c
Show file tree

Hide file tree

Showing 32 changed files with 52 additions and 117 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -30,6 +30,7 @@ phpMyAdmin - ChangeLog
 - issue #16197 Replace the master/slave terminology
 - issue #17257 Replace libraries/vendor_config.php constants with an array
 - issue        Add the Bootstrap theme
+- issue #17499 Remove stickyfilljs JavaScript dependency
 
 5.1.4 (not yet released)
 - issue #17287 Fixed sorting the database list with "statistics" enabled on "Data" column creates a PHP type error

diff --git a/doc/faq.rst b/doc/faq.rst
@@ -1905,7 +1905,7 @@ to plot' field. Once you have decided over your criteria, click 'Go'
 to display the plot.
 
 After the plot is generated, you can use the
-mousewheel to zoom in and out of the plot. In addition, panning
+mouse wheel to zoom in and out of the plot. In addition, panning
 feature is enabled to navigate through the plot. You can zoom-in to a
 certain level of detail and use panning to locate your area of
 interest. Clicking on a point opens a dialogue box, displaying field

diff --git a/js/src/gis_data_editor.js b/js/src/gis_data_editor.js
@@ -96,15 +96,10 @@ function loadJSAndGISEditor (value, field, type, inputName) {
     var head = document.getElementsByTagName('head')[0];
     var script;
 
-    // Loads a set of small JS file needed for the GIS editor
-    var smallScripts = ['js/vendor/jquery/jquery.mousewheel.js', 'js/dist/table/gis_visualization.js'];
-
-    for (var i = 0; i < smallScripts.length; i++) {
-        script = document.createElement('script');
-        script.type = 'text/javascript';
-        script.src = smallScripts[i];
-        head.appendChild(script);
-    }
+    script = document.createElement('script');
+    script.type = 'text/javascript';
+    script.src = 'js/dist/table/gis_visualization.js';
+    head.appendChild(script);
 
     // OpenLayers.js is BIG and takes time. So asynchronous loading would not work.
     // Load the JS and do a callback to load the content for the GIS Editor.

diff --git a/js/src/sql.js b/js/src/sql.js
@@ -7,7 +7,6 @@
  * @test-module Sql
  */
 
-/* global Stickyfill */
 /* global isStorageSupported */ // js/config.js
 /* global codeMirrorEditor */ // js/functions.js
 /* global makeGrid */ // js/makegrid.js
@@ -1089,9 +1088,3 @@ AJAX.registerOnload('sql.js', function () {
     Sql.makeProfilingChart();
     Sql.initProfilingTables();
 });
-
-/**
- * Polyfill to make table headers sticky.
- */
-var elements = $('.sticky');
-Stickyfill.add(elements);
diff --git a/js/src/table/gis_visualization.js b/js/src/table/gis_visualization.js
@@ -2,7 +2,6 @@
  * @fileoverview    functions used for visualizing GIS data
  *
  * @requires    jquery
- * @requires    vendor/jquery/jquery.mousewheel.js
  */
 
 /* global drawOpenLayers */ // templates/table/gis_visualization/gis_visualization.twig
@@ -148,6 +147,9 @@ function getRelativeCoords (e) {
     };
 }
 
+/**
+ * @param {WheelEvent} event
+ */
 function onGisMouseWheel (event) {
     if (event.deltaY === 0) {
         return;
@@ -169,7 +171,7 @@ function onGisMouseWheel (event) {
  *
  * Actions Ajaxified here:
  *
- * Zooming in and zooming out on mousewheel movement.
+ * Zooming in and zooming out on mouse wheel movement.
  * Panning the visualization on dragging.
  * Zooming in on double clicking.
  * Zooming out on clicking the zoom out button.

diff --git a/libraries/classes/Controllers/Database/SearchController.php b/libraries/classes/Controllers/Database/SearchController.php
@@ -38,12 +38,7 @@ public function __invoke(): void
         $GLOBALS['tooltip_aliasname'] = $GLOBALS['tooltip_aliasname'] ?? null;
         $GLOBALS['pos'] = $GLOBALS['pos'] ?? null;
 
-        $this->addScriptFiles([
-            'database/search.js',
-            'vendor/stickyfill.min.js',
-            'sql.js',
-            'makegrid.js',
-        ]);
+        $this->addScriptFiles(['database/search.js', 'sql.js', 'makegrid.js']);
 
         $this->checkParameters(['db']);
 

diff --git a/libraries/classes/Controllers/Database/SqlController.php b/libraries/classes/Controllers/Database/SqlController.php
@@ -34,12 +34,7 @@ public function __invoke(): void
         $GLOBALS['back'] = $GLOBALS['back'] ?? null;
         $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null;
 
-        $this->addScriptFiles([
-            'makegrid.js',
-            'vendor/jquery/jquery.uitablefilter.js',
-            'vendor/stickyfill.min.js',
-            'sql.js',
-        ]);
+        $this->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']);
 
         $pageSettings = new PageSettings('Sql');
         $this->response->addHTML($pageSettings->getErrorHTML());

diff --git a/libraries/classes/Controllers/Server/SqlController.php b/libraries/classes/Controllers/Server/SqlController.php
@@ -38,12 +38,7 @@ public function __invoke(): void
     {
         $GLOBALS['errorUrl'] = $GLOBALS['errorUrl'] ?? null;
 
-        $this->addScriptFiles([
-            'makegrid.js',
-            'vendor/jquery/jquery.uitablefilter.js',
-            'vendor/stickyfill.min.js',
-            'sql.js',
-        ]);
+        $this->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']);
 
         $pageSettings = new PageSettings('Sql');
         $this->response->addHTML($pageSettings->getErrorHTML());

diff --git a/libraries/classes/Controllers/Sql/SqlController.php b/libraries/classes/Controllers/Sql/SqlController.php
@@ -77,7 +77,6 @@ public function __invoke(): void
             'vendor/jquery/jquery.uitablefilter.js',
             'table/change.js',
             'indexes.js',
-            'vendor/stickyfill.min.js',
             'gis_data_editor.js',
             'multi_column_sort.js',
         ]);

diff --git a/libraries/classes/Controllers/Table/ChangeController.php b/libraries/classes/Controllers/Table/ChangeController.php
@@ -139,7 +139,6 @@ public function __invoke(): void
 
         $this->addScriptFiles([
             'makegrid.js',
-            'vendor/stickyfill.min.js',
             'sql.js',
             'table/change.js',
             'vendor/jquery/additional-methods.js',

diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php
@@ -108,13 +108,7 @@ public function __invoke(): void
          */
         $GLOBALS['goto_include'] = false;
 
-        $this->addScriptFiles([
-            'makegrid.js',
-            'vendor/stickyfill.min.js',
-            'sql.js',
-            'indexes.js',
-            'gis_data_editor.js',
-        ]);
+        $this->addScriptFiles(['makegrid.js', 'sql.js', 'indexes.js', 'gis_data_editor.js']);
 
         $insertRows = $_POST['insert_rows'] ?? null;
         if (is_numeric($insertRows) && $insertRows != $GLOBALS['cfg']['InsertRows']) {

diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php
@@ -181,7 +181,6 @@ public function __invoke(): void
 
         $this->addScriptFiles([
             'makegrid.js',
-            'vendor/stickyfill.min.js',
             'sql.js',
             'table/select.js',
             'table/change.js',

diff --git a/libraries/classes/Controllers/Table/SqlController.php b/libraries/classes/Controllers/Table/SqlController.php
@@ -38,12 +38,7 @@ public function __invoke(): void
         $GLOBALS['goto'] = $GLOBALS['goto'] ?? null;
         $GLOBALS['back'] = $GLOBALS['back'] ?? null;
 
-        $this->addScriptFiles([
-            'makegrid.js',
-            'vendor/jquery/jquery.uitablefilter.js',
-            'vendor/stickyfill.min.js',
-            'sql.js',
-        ]);
+        $this->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']);
 
         $pageSettings = new PageSettings('Sql');
         $this->response->addHTML($pageSettings->getErrorHTML());

diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php
@@ -106,7 +106,6 @@ public function __invoke(): void
         DbTableExists::check($GLOBALS['db'], $GLOBALS['table']);
 
         $this->addScriptFiles([
-            'vendor/stickyfill.min.js',
             'makegrid.js',
             'sql.js',
             'vendor/jqplot/jquery.jqplot.js',

diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
@@ -1111,7 +1111,7 @@ private function getFieldVisibilityParams(
 
             $displayParams['emptypre'] = $emptyPreCondition ? 4 : 0;
 
-            $buttonHtml .= '<th class="column_action sticky d-print-none"' . $colspan
+            $buttonHtml .= '<th class="column_action position-sticky d-print-none"' . $colspan
                 . '>' . $fullOrPartialTextLink . '</th>';
         } elseif (
             $leftOrBoth
@@ -1125,7 +1125,7 @@ private function getFieldVisibilityParams(
         } elseif ($GLOBALS['cfg']['RowActionLinks'] === self::POSITION_NONE) {
             // ... elseif display an empty column if the actions links are
             //  disabled to match the rest of the table
-            $buttonHtml .= '<th class="column_action sticky"></th>';
+            $buttonHtml .= '<th class="column_action position-sticky"></th>';
         }
 
         $this->properties['display_params'] = $displayParams;

diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
@@ -137,7 +137,6 @@ private function addDefaultScripts(): void
         $this->scripts->addFile('name-conflict-fixes.js');
         $this->scripts->addFile('vendor/bootstrap/bootstrap.bundle.min.js');
         $this->scripts->addFile('vendor/js.cookie.js');
-        $this->scripts->addFile('vendor/jquery/jquery.mousewheel.js');
         $this->scripts->addFile('vendor/jquery/jquery.validate.js');
         $this->scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js');
         $this->scripts->addFile('vendor/jquery/jquery.debounce-1.0.6.js');

diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
@@ -1086,7 +1086,6 @@ private function getQueryResponseForNoResultsReturned(
         if ($profilingResults !== null) {
             $header = $response->getHeader();
             $scripts = $header->getScripts();
-            $scripts->addFile('vendor/stickyfill.min.js');
             $scripts->addFile('sql.js');
 
             $profiling = $this->getDetailedProfilingStats($profilingResults);
@@ -1495,7 +1494,6 @@ private function getQueryResponseForResultsReturned(
 
         if (! isset($_POST['printview']) || $_POST['printview'] != '1') {
             $scripts->addFile('makegrid.js');
-            $scripts->addFile('vendor/stickyfill.min.js');
             $scripts->addFile('sql.js');
             unset($GLOBALS['message']);
             //we don't need to buffer the output in getMessage here.

diff --git a/package.json b/package.json
@@ -24,7 +24,6 @@
     "jquery": "3.6.0",
     "jquery-debounce-throttle": "^1.0.6-rc.0",
     "jquery-migrate": "3.3.2",
-    "jquery-mousewheel": "3.1.13",
     "jquery-ui-dist": "1.12.1",
     "jquery-ui-timepicker-addon": "1.6.3",
     "jquery-uitablefilter": "^1.0.0",
@@ -39,7 +38,6 @@
     "rtlcss": "^3.3.0",
     "sass": "^1.42.1",
     "sass-loader": "^12.4.0",
-    "stickyfilljs": "2.1.0",
     "tablesorter": "^2.31.3",
     "tracekit": "0.4.6",
     "u2f-api-polyfill": "0.4.4",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -8825,6 +8825,11 @@ parameters:
 			count: 1
 			path: test/classes/CommonTest.php
 
+		-
+			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with null will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/Config/FormDisplayTest.php
+
 		-
 			message: "#^Cannot access offset 'pma_testform' on mixed\\.$#"
 			count: 1
@@ -10220,6 +10225,11 @@ parameters:
 			count: 1
 			path: test/classes/Partitioning/TablePartitionDefinitionTest.php
 
+		-
+			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with 32 and 0 will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/Plugins/Auth/AuthenticationCookieTest.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\Tests\\\\Plugins\\\\Auth\\\\AuthenticationCookieTest\\:\\:checkRulesProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/templates/display/results/table_headers_for_columns.twig b/templates/display/results/table_headers_for_columns.twig
@@ -1,5 +1,5 @@
 {% for column in columns %}
-  <th class="draggable sticky{{ column.is_column_numeric ? ' text-end' }}{{ column.is_column_hidden ? ' hide' -}}
+  <th class="draggable position-sticky{{ column.is_column_numeric ? ' text-end' }}{{ column.is_column_hidden ? ' hide' -}}
     {{- is_sortable ? ' column_heading' }}{{ is_sortable and column.is_browse_marker_enabled ? ' marker' }}{{ is_sortable and column.is_browse_pointer_enabled ? ' pointer' -}}
     {{- not is_sortable and column.has_condition ? ' condition' }}" data-column="{{ column.column_name }}">
     {% if is_sortable %}

diff --git a/test/jest/test-env.js b/test/jest/test-env.js
@@ -6,4 +6,3 @@ global.jQuery = $;
 global.CommonParams = require('phpmyadmin/common');
 global.AJAX = require('phpmyadmin/ajax');
 global.Functions = require('phpmyadmin/functions');
-global.Stickyfill = require('@vendor/stickyfill.min');
diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss
@@ -1497,12 +1497,6 @@ input#auto_increment_opt {
   }
 }
 
-.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  top: 60px;
-}
-
 .pma_table {
   td {
     position: static;
@@ -2632,10 +2626,6 @@ body .ui-dialog {
     overflow-x: auto;
   }
 
-  .sticky {
-    top: 0;
-  }
-
   body#loginform div.container {
     width: 100%;
   }

diff --git a/themes/bootstrap/scss/_tables.scss b/themes/bootstrap/scss/_tables.scss
@@ -0,0 +1,5 @@
+@media only screen and (min-width: 768px) {
+  .table th.position-sticky {
+    top: 96px;
+  }
+}
diff --git a/themes/bootstrap/scss/theme.scss b/themes/bootstrap/scss/theme.scss
@@ -9,6 +9,7 @@
 @import "jqplot";
 @import "icons";
 @import "reboot";
+@import "tables";
 @import "forms";
 @import "breadcrumb";
 @import "print";

diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss
@@ -1710,12 +1710,6 @@ form.append_fields_form .tblFooters {
   }
 }
 
-.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  top: 60px;
-}
-
 .pma_table {
   td {
     position: static;
@@ -2856,12 +2850,6 @@ body {
   }
 }
 
-@media only screen and (max-width: 768px) {
-  .sticky {
-    top: 0;
-  }
-}
-
 .resize-vertical {
   resize: vertical;
 }
diff --git a/themes/metro/scss/_tables.scss b/themes/metro/scss/_tables.scss
@@ -16,3 +16,9 @@
     }
   }
 }
+
+@media only screen and (min-width: 768px) {
+  .table th.position-sticky {
+    top: 87px;
+  }
+}
diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss
@@ -1508,12 +1508,6 @@ input#auto_increment_opt {
   }
 }
 
-.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  top: 60px;
-}
-
 .pma_table {
   td {
     position: static;
@@ -2616,10 +2610,6 @@ body {
     overflow-x: auto;
   }
 
-  .sticky {
-    top: 0;
-  }
-
   body#loginform div.container {
     width: 100%;
   }

diff --git a/themes/original/scss/_tables.scss b/themes/original/scss/_tables.scss
@@ -32,3 +32,9 @@
   --#{$variable-prefix}table-hover-color: #{$table-hover-color};
   --#{$variable-prefix}table-hover-bg: #{$table-hover-bg};
 }
+
+@media only screen and (min-width: 768px) {
+  .table th.position-sticky {
+    top: 49px;
+  }
+}