a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge: - client: show all available information in the response tooltip 

Closes #1916

* commit '1ab650bb86f4b3103b8c650c6af862c6f1881694':
  - client: show all available information in the response tooltip
This commit is contained in:
Ildar Kamalov 2020-07-24 16:27:58 +03:00
parent 4a8dcbeeed 1ab650bb86
commit 22935c5fed
1 changed files with 22 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
client/src/components/Logs/Cells/getResponseCell.js
View File

@ -38,59 +38,31 @@ const getResponseCell = (row, filtering, t, isDetailed, getFilterName) => {
})}</div>; })}</div>;
}; };
const FILTERED_STATUS_TO_FIELDS_MAP = { const COMMON_CONTENT = {
[FILTERED_STATUS.NOT_FILTERED_NOT_FOUND]: {
encryption_status: boldStatusLabel, encryption_status: boldStatusLabel,
install_settings_dns: upstream, install_settings_dns: upstream,
elapsed: formattedElapsedMs, elapsed: formattedElapsedMs,
response_code: status, response_code: status,
filter,
rule_label: rule,
response_table_header: renderResponses(response), response_table_header: renderResponses(response),
},
[FILTERED_STATUS.FILTERED_BLOCKED_SERVICE]: {
encryption_status: boldStatusLabel,
install_settings_dns: upstream,
elapsed: formattedElapsedMs,
filter,
rule_label: rule,
response_code: status,
original_response: renderResponses(originalResponse), original_response: renderResponses(originalResponse),
},
[FILTERED_STATUS.NOT_FILTERED_WHITE_LIST]: {
encryption_status: boldStatusLabel,
install_settings_dns: upstream,
elapsed: formattedElapsedMs,
filter,
rule_label: rule,
response_code: status,
},
[FILTERED_STATUS.NOT_FILTERED_WHITE_LIST]: {
encryption_status: boldStatusLabel,
filter,
rule_label: rule,
response_code: status,
},
[FILTERED_STATUS.FILTERED_SAFE_SEARCH]: {
encryption_status: boldStatusLabel,
install_settings_dns: upstream,
elapsed: formattedElapsedMs,
response_code: status,
response_table_header: renderResponses(response),
},
[FILTERED_STATUS.FILTERED_BLACK_LIST]: {
encryption_status: boldStatusLabel,
filter,
rule_label: rule,
install_settings_dns: upstream,
elapsed: formattedElapsedMs,
response_code: status,
original_response: renderResponses(originalResponse),
},
}; };
const content = FILTERED_STATUS_TO_FIELDS_MAP[reason] const getTooltipContent = (reason) => {
? Object.entries(FILTERED_STATUS_TO_FIELDS_MAP[reason]) switch (reason) {
: Object.entries(FILTERED_STATUS_TO_FIELDS_MAP.NotFilteredNotFound); case FILTERED_STATUS.FILTERED_BLOCKED_SERVICE:
case FILTERED_STATUS.NOT_FILTERED_WHITE_LIST:
case FILTERED_STATUS.FILTERED_BLACK_LIST: {
return Object.entries(COMMON_CONTENT);
}
default: {
return Object.entries({ ...COMMON_CONTENT, filter: '' });
}
}
};
const content = getTooltipContent(reason);
const detailedInfo = isBlocked ? filter : formattedElapsedMs; const detailedInfo = isBlocked ? filter : formattedElapsedMs;
return ( return (