mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1789052 - [devtools] Fix storage inspector sorting logic r=nchevobbe 

Two issues fixed:
- when sorting on one column, other column content should be re-arranged
- natural order sort was not symmetrical for dates and led to inconsistent sorting

Differential Revision: https://phabricator.services.mozilla.com/D156420
This commit is contained in:
Julian Descottes 2022-09-05 13:00:15 +00:00
Родитель a37ab669ff
Коммит 79b87a7b80
6 изменённых файлов: 121 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
devtools/client/shared/widgets/TableWidget.js
Просмотреть файл

@ -999,9 +999,16 @@ TableWidget.prototype = {
return; return;
} }
// First sort the column to "sort by" explicitly.
const sortedItems = this.columns.get(column).sort([...this.items.values()]); const sortedItems = this.columns.get(column).sort([...this.items.values()]);
// Then, sort all the other columns (id !== column) only based on the
// sortedItems provided by the first sort.
// Each column keeps track of the fact that it is the "sort by" column or
// not, so this will not shuffle the items and will just make sure each
// column displays the correct value.
for (const [id, col] of this.columns) { for (const [id, col] of this.columns) {
if (id === col) { if (id !== column) {
col.sort(sortedItems); col.sort(sortedItems);
} }
} }

2
devtools/client/storage/test/browser.ini
Просмотреть файл

@ -11,6 +11,7 @@ support-files =
storage-complex-values.html storage-complex-values.html
storage-cookies.html storage-cookies.html
storage-cookies-samesite.html storage-cookies-samesite.html
storage-cookies-sort.html
storage-dfpi.html storage-dfpi.html
storage-empty-objectstores.html storage-empty-objectstores.html
storage-file-url.html storage-file-url.html
@ -62,6 +63,7 @@ skip-if =
os == "linux" && debug && fission && socketprocess_networking # high frequency intermittent os == "linux" && debug && fission && socketprocess_networking # high frequency intermittent
[browser_storage_cookies_samesite.js] [browser_storage_cookies_samesite.js]
skip-if = true # Bug 1448484 - sameSite1 is "Unset" - Got undefined, expected Unset skip-if = true # Bug 1448484 - sameSite1 is "Unset" - Got undefined, expected Unset
[browser_storage_cookies_sort.js]
[browser_storage_cookies_tab_navigation.js] [browser_storage_cookies_tab_navigation.js]
[browser_storage_delete.js] [browser_storage_delete.js]
[browser_storage_delete_all.js] [browser_storage_delete_all.js]

64
devtools/client/storage/test/browser_storage_cookies_sort.js Normal file
Просмотреть файл

@ -0,0 +1,64 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// Test column sorting works and sorts dates correctly (including "session"
// cookies).
"use strict";
add_task(async function() {
const TEST_URL = MAIN_DOMAIN + "storage-cookies-sort.html";
await openTabAndSetupStorage(TEST_URL);
showAllColumns(true);
info("Sort on the expires column, ascending order");
clickColumnHeader("expires");
// Note that here we only specify `test_session` for `test_session1` and
// `test_session2`. Since we sort on the "expires" column, there is no point
// in asserting the order between those 2 items.
checkCells([
"test_session",
"test_session",
"test_hour",
"test_day",
"test_year",
]);
info("Sort on the expires column, descending order");
clickColumnHeader("expires");
// Again, only assert `test_session` for `test_session1` and `test_session2`.
checkCells([
"test_year",
"test_day",
"test_hour",
"test_session",
"test_session",
]);
info("Sort on the name column, ascending order");
clickColumnHeader("name");
checkCells([
"test_day",
"test_hour",
"test_session1",
"test_session2",
"test_year",
]);
});
function checkCells(expected) {
const cells = [
...gPanelWindow.document.querySelectorAll("#name .table-widget-cell"),
];
cells.forEach(function(cell, i, arr) {
// We use startsWith in order to avoid asserting the relative order of
// "session" cookies when sorting on the "expires" column.
ok(
cell.value.startsWith(expected[i]),
`Cell value starts with "${expected[i]}".`
);
});
}

26
devtools/client/storage/test/storage-cookies-sort.html Normal file
Просмотреть файл

@ -0,0 +1,26 @@
<!DOCTYPE HTML>
<html>
<!--
Bug 970517 - Storage inspector front end - tests
-->
<head>
<meta charset="utf-8">
<title>Storage inspector cookie test</title>
</head>
<body>
<script type="application/javascript">
"use strict";
const ONE_HOUR = 60 * 60 * 1000;
const ONE_DAY = 24 * ONE_HOUR;
const expiresOneHour = new Date(Date.now() + 1 * ONE_HOUR).toUTCString();
const expiresOneDay = new Date(Date.now() + 1 * ONE_DAY).toUTCString();
const expiresOneYear = new Date(Date.now() + 365 * ONE_DAY).toUTCString();
document.cookie = "test_hour=hour;expires=" + expiresOneHour;
document.cookie = "test_session1=session1";
document.cookie = "test_day=day;expires=" + expiresOneDay;
document.cookie = "test_session2=session2";
document.cookie = "test_year=year;expires=" + expiresOneYear;
</script>
</body>
</html>

8
devtools/shared/natural-sort.js
Просмотреть файл

@ -15,7 +15,6 @@
"use strict"; "use strict";
const tokenizeNumbersRx = /(^([+\-]?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?(?=\D|\s|$))|^0x[\da-fA-F]+$|\d+)/g; const tokenizeNumbersRx = /(^([+\-]?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?(?=\D|\s|$))|^0x[\da-fA-F]+$|\d+)/g;
const dateRx = /(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[\/\-]\d{1,4}[\/\-]\d{1,4}|^\w+, \w+ \d+, \d{4})/;
const hexRx = /^0x[0-9a-f]+$/i; const hexRx = /^0x[0-9a-f]+$/i;
const startsWithNullRx = /^\0/; const startsWithNullRx = /^\0/;
const endsWithNullRx = /\0$/; const endsWithNullRx = /\0$/;
@ -74,9 +73,7 @@ function naturalSort(a = "", b = "", insensitive = false) {
const aHexOrDate = const aHexOrDate =
parseInt(a.match(hexRx), 16) || (aChunks.length !== 1 && Date.parse(a)); parseInt(a.match(hexRx), 16) || (aChunks.length !== 1 && Date.parse(a));
const bHexOrDate = const bHexOrDate =
parseInt(b.match(hexRx), 16) || parseInt(b.match(hexRx), 16) || (bChunks.length !== 1 && Date.parse(b));
(aHexOrDate && b.match(dateRx) && Date.parse(b)) ||
null;
if ( if (
(aHexOrDate || bHexOrDate) && (aHexOrDate || bHexOrDate) &&
@ -92,12 +89,13 @@ function naturalSort(a = "", b = "", insensitive = false) {
} }
// Try and sort Hex codes or Dates. // Try and sort Hex codes or Dates.
if (bHexOrDate) { if (aHexOrDate && bHexOrDate) {
if (aHexOrDate < bHexOrDate) { if (aHexOrDate < bHexOrDate) {
return -1; return -1;
} else if (aHexOrDate > bHexOrDate) { } else if (aHexOrDate > bHexOrDate) {
return 1; return 1;
} }
return 0;
} }
// Natural sorting through split numeric strings and default strings // Natural sorting through split numeric strings and default strings

18
devtools/shared/tests/xpcshell/test_natural-sort.js
Просмотреть файл

@ -178,6 +178,24 @@ function run_test() {
], ],
`"${sessionString}" amongst date strings` `"${sessionString}" amongst date strings`
); );
runTest(
[
"Wed, 04 Sep 2024 09:11:44 GMT",
sessionString,
"Tue, 06 Sep 2022 09:11:44 GMT",
sessionString,
"Mon, 05 Sep 2022 09:12:41 GMT",
],
[
sessionString,
sessionString,
"Mon, 05 Sep 2022 09:12:41 GMT",
"Tue, 06 Sep 2022 09:11:44 GMT",
"Wed, 04 Sep 2024 09:11:44 GMT",
],
`"${sessionString}" amongst date strings (complex)`
);
runTest( runTest(
[ [
"Madras", "Madras",