cotugno/AdGuardHome
2
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-11-16 02:18:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

client: 2451 Remove empty rules label

Browse Source
This commit is contained in:
Artem Baskal 2020-12-28 16:39:15 +03:00
parent ace7c1c892
commit 67ad07d69a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/components/Logs/Cells/ResponseCell.js
View File

@ -51,18 +51,17 @@ const ResponseCell = ({
})}</div>; })}</div>;
}; };
const rulesList = getRulesToFilterList(rules, filters, whitelistFilters);
const COMMON_CONTENT = { const COMMON_CONTENT = {
encryption_status: boldStatusLabel, encryption_status: boldStatusLabel,
install_settings_dns: upstream, install_settings_dns: upstream,
elapsed: formattedElapsedMs, elapsed: formattedElapsedMs,
response_code: status, response_code: status,
...(service_name ...(service_name
? { service_name: getServiceName(service_name) } && { service_name: getServiceName(service_name) }
: { } ),
...(rules.length > 0
&& { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }
), ),
rule_label: rulesList,
response_table_header: renderResponses(response), response_table_header: renderResponses(response),
original_response: renderResponses(originalResponse), original_response: renderResponses(originalResponse),
}; };

5
client/src/components/Logs/Cells/index.js
View File

@ -169,8 +169,9 @@ const Row = memo(({
response_details: 'title', response_details: 'title',
install_settings_dns: upstream, install_settings_dns: upstream,
elapsed: formattedElapsedMs, elapsed: formattedElapsedMs,
rule_label: rules.length > 0 ...(rules.length > 0
&& getRulesToFilterList(rules, filters, whitelistFilters), && { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }
),
response_table_header: response?.join('\n'), response_table_header: response?.join('\n'),
response_code: status, response_code: status,
client_details: 'title', client_details: 'title',