Skip to content

Commit 0e600bb

Browse files
kamil-tekielakamil-tekiela
authored
Remove Tracking Twig extension (#18250)
* Remove get_tracker_version extension Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Remove test seam and fix test Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> --------- Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
1 parent 6264b7c commit 0e600bb

6 files changed

Lines changed: 29 additions & 61 deletions

File tree

‎libraries/classes/Template.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use PhpMyAdmin\Twig\MessageExtension;
1313
use PhpMyAdmin\Twig\SanitizeExtension;
1414
use PhpMyAdmin\Twig\TableExtension;
15-
use PhpMyAdmin\Twig\TrackerExtension;
1615
use PhpMyAdmin\Twig\TransformationsExtension;
1716
use PhpMyAdmin\Twig\UrlExtension;
1817
use PhpMyAdmin\Twig\UtilExtension;
@@ -90,7 +89,6 @@ public static function getTwigEnvironment(string|null $cacheDir): Environment
9089
$twig->addExtension(new MessageExtension());
9190
$twig->addExtension(new SanitizeExtension());
9291
$twig->addExtension(new TableExtension());
93-
$twig->addExtension(new TrackerExtension());
9492
$twig->addExtension(new TransformationsExtension());
9593
$twig->addExtension(new UrlExtension());
9694
$twig->addExtension(new UtilExtension());

‎libraries/classes/Tracking.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@ public function getHtmlForDbTrackingTables(
11001100
return $this->template->render('database/tracking/tables', [
11011101
'db' => $db,
11021102
'head_version_exists' => $versions !== [],
1103-
'untracked_tables_exists' => count($untrackedTables) > 0,
1103+
'untracked_tables_exists' => $untrackedTables !== [],
11041104
'versions' => $versions,
11051105
'url_params' => $urlParams,
11061106
'text_dir' => $textDir,
@@ -1113,20 +1113,19 @@ public function getHtmlForDbTrackingTables(
11131113
*
11141114
* @param array $table_list Table list
11151115
* @param string $db Current database
1116-
* @param bool $testing Testing
11171116
*
11181117
* @return array
11191118
*/
1120-
public function extractTableNames(array $table_list, $db, $testing = false): array
1119+
public function extractTableNames(array $table_list, $db): array
11211120
{
11221121
$untracked_tables = [];
11231122
$sep = $GLOBALS['cfg']['NavigationTreeTableSeparator'];
11241123

11251124
foreach ($table_list as $value) {
11261125
if (is_array($value) && array_key_exists('is' . $sep . 'group', $value) && $value['is' . $sep . 'group']) {
11271126
// Recursion step
1128-
$untracked_tables = array_merge($this->extractTableNames($value, $db, $testing), $untracked_tables);
1129-
} elseif (is_array($value) && ($testing || Tracker::getVersion($db, $value['Name']) == -1)) {
1127+
$untracked_tables = array_merge($this->extractTableNames($value, $db), $untracked_tables);
1128+
} elseif (is_array($value) && (Tracker::getVersion($db, $value['Name']) == -1)) {
11301129
$untracked_tables[] = $value['Name'];
11311130
}
11321131
}

‎libraries/classes/Twig/TrackerExtension.php‎

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

‎templates/database/tracking/tables.twig‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -155,29 +155,27 @@
155155
</tr>
156156
</thead>
157157
<tbody>
158-
{% for table_name in untracked_tables %}
159-
{% if get_tracker_version(db, table_name) == -1 %}
160-
<tr>
161-
<td class="text-center">
162-
<input type="checkbox" name="selected_tbl[]"
163-
class="checkall" id="selected_tbl_{{ table_name }}"
164-
value="{{ table_name }}">
165-
</td>
166-
<th>
167-
<label for="selected_tbl_{{ table_name }}">
168-
{{ table_name }}
169-
</label>
170-
</th>
171-
<td>
172-
<a href="{{ url('/table/tracking', url_params|merge({
173-
'db': db,
174-
'table': table_name
175-
})) }}">
176-
{{ get_icon('eye', 'Track table'|trans) }}
177-
</a>
178-
</td>
179-
</tr>
180-
{% endif %}
158+
{% for table_name in untracked_tables %}
159+
<tr>
160+
<td class="text-center">
161+
<input type="checkbox" name="selected_tbl[]"
162+
class="checkall" id="selected_tbl_{{ table_name }}"
163+
value="{{ table_name }}">
164+
</td>
165+
<th>
166+
<label for="selected_tbl_{{ table_name }}">
167+
{{ table_name }}
168+
</label>
169+
</th>
170+
<td>
171+
<a href="{{ url('/table/tracking', url_params|merge({
172+
'db': db,
173+
'table': table_name
174+
})) }}">
175+
{{ get_icon('eye', 'Track table'|trans) }}
176+
</a>
177+
</td>
178+
</tr>
181179
{% endfor %}
182180
</tbody>
183181
</table>

‎test/classes/Stubs/DbiDummy.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2325,13 +2325,13 @@ private function init(): void
23252325
'query' => 'SELECT MAX(version) FROM `pmadb`.`tracking` WHERE `db_name` = \'db\''
23262326
. ' AND `table_name` = \'hello_world\'',
23272327
'columns' => ['version'],
2328-
'result' => [['10']],
2328+
'result' => [],
23292329
],
23302330
[
23312331
'query' => 'SELECT MAX(version) FROM `pmadb`.`tracking` WHERE `db_name` = \'db\''
23322332
. ' AND `table_name` = \'hello_lovely_world\'',
23332333
'columns' => ['version'],
2334-
'result' => [['10']],
2334+
'result' => [],
23352335
],
23362336
[
23372337
'query' => 'SELECT MAX(version) FROM `pmadb`.`tracking` WHERE `db_name` = \'db\''

‎test/classes/TrackingTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ public function testExtractTableNames(): void
110110
'hello_world' => ['Name' => 'hello_world'],
111111
],
112112
];
113-
$untracked_tables = $this->tracking->extractTableNames($table_list, 'db', true);
113+
$untracked_tables = $this->tracking->extractTableNames($table_list, 'db');
114114
$this->assertContains('hello_world', $untracked_tables);
115115
$this->assertContains('hello_lovely_world', $untracked_tables);
116-
$this->assertContains('hello_lovely_world2', $untracked_tables);
116+
$this->assertNotContains('hello_lovely_world2', $untracked_tables);
117117
}
118118

119119
public function testGetHtmlForMain(): void

0 commit comments

Comments
 (0)