Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-07-08 12:57:57 +02:00
Code Issues Releases Wiki Activity

Improve rendering of troubleshooting info

Browse Source
This commit is contained in:
Raymond Hill 2023-04-27 19:16:46 -04:00
parent f116392b93
commit 2e465d48c0
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/messaging.js
View File

@ -1527,8 +1527,8 @@ const getSupportData = async function() {
sessionURLFiltering.toArray(),
[]
),
modifiedUserSettings,
modifiedHiddenSettings,
'userSettings': modifiedUserSettings,
'hiddenSettings': modifiedHiddenSettings,
supportStats: µb.supportStats,
};
};

65
src/js/support.js
View File

@ -28,24 +28,24 @@ import { dom, qs$ } from './dom.js';
/******************************************************************************/
const uselessKeys = [
'modifiedHiddenSettings.benchmarkDatasetURL',
'modifiedHiddenSettings.blockingProfiles',
'modifiedHiddenSettings.consoleLogLevel',
'modifiedHiddenSettings.uiPopupConfig',
'modifiedUserSettings.alwaysDetachLogger',
'modifiedUserSettings.firewallPaneMinimized',
'modifiedUserSettings.externalLists',
'modifiedUserSettings.importedLists',
'modifiedUserSettings.popupPanelSections',
'modifiedUserSettings.uiAccentCustom',
'modifiedUserSettings.uiAccentCustom0',
'modifiedUserSettings.uiTheme',
'hiddenSettings.benchmarkDatasetURL',
'hiddenSettings.blockingProfiles',
'hiddenSettings.consoleLogLevel',
'hiddenSettings.uiPopupConfig',
'userSettings.alwaysDetachLogger',
'userSettings.firewallPaneMinimized',
'userSettings.externalLists',
'userSettings.importedLists',
'userSettings.popupPanelSections',
'userSettings.uiAccentCustom',
'userSettings.uiAccentCustom0',
'userSettings.uiTheme',
];
const sensitiveValues = [
'filterset (user)',
'modifiedUserSettings.popupPanelSections',
'modifiedHiddenSettings.userResourcesLocation',
'userSettings.popupPanelSections',
'hiddenSettings.userResourcesLocation',
'trustedset.added',
'hostRuleset.added',
'switchRuleset.added',
@ -136,6 +136,30 @@ function addDetailsToReportURL(id, collapse = false) {
dom.attr(elem, 'data-url', url);
}
function renderData(data, depth = 0) {
const indent = ' '.repeat(depth);
if ( Array.isArray(data) ) {
const out = [];
for ( const value of data ) {
out.push(renderData(value, depth));
}
return out.join('\n');
}
if ( typeof data !== 'object' ) {
return `${indent}${data}`;
}
const out = [];
for ( const [ name, value ] of Object.entries(data) ) {
if ( typeof value === 'object' ) {
out.push(`${indent}${name}:`);
out.push(renderData(value, depth + 1));
continue;
}
out.push(`${indent}${name}: ${value}`);
}
return out.join('\n');
}
async function showSupportData() {
const supportData = await vAPI.messaging.send('dashboard', {
what: 'getSupportData',
@ -153,18 +177,7 @@ async function showSupportData() {
if ( reportedPage !== null ) {
shownData.popupPanel = reportedPage.popupPanel;
}
const text = JSON.stringify(shownData, null, 1)
.split('\n')
.slice(1, -1)
.map(v => {
return v
.replace(/^( *?) "/, '$1')
.replace(/^( *.*[^\\])(?:": "|": \{$|": \[$|": )/, '$1: ')
.replace(/(?:",?|\},?|\],?|,)$/, '');
})
.filter(v => v.trim() !== '')
.join('\n') + '\n';
const text = renderData(shownData);
cmEditor.setValue(text);
cmEditor.clearHistory();