Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Tor measurements table #305

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Tor measurements table #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions data/lang-en.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,7 @@ TestResults.Details.Circumvention.Tor.DirectoryAuthorities.Label.OK,{dirAuthAcce
TestResults.Details.Circumvention.Tor.Table.Header.Name,Name,,,
TestResults.Details.Circumvention.Tor.Table.Header.Address,Address,,,
TestResults.Details.Circumvention.Tor.Table.Header.Type,Type,,,
TestResults.Details.Circumvention.Tor.Table.Header.Connect,Connect,,,
TestResults.Details.Circumvention.Tor.Table.Header.Handshake,Handshake,,,
TestResults.Details.Circumvention.Tor.Table.Header.Accessible,Accessible,,,
TestResults.Details.Circumvention.RiseupVPN.Blocked.Hero.Title,Likely blocked,,,
TestResults.Details.Circumvention.RiseupVPN.Reachable.Hero.Title,Working,,,
TestResults.Details.Circumvention.RiseupVPN.Blocked.Content.Paragraph,[RiseupVPN](https://riseup.net/vpn) appears to be blocked.,,,
Expand Down
3 changes: 1 addition & 2 deletions lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,7 @@
"TestResults.Details.Circumvention.Tor.Table.Header.Name": "Name",
"TestResults.Details.Circumvention.Tor.Table.Header.Address": "Address",
"TestResults.Details.Circumvention.Tor.Table.Header.Type": "Type",
"TestResults.Details.Circumvention.Tor.Table.Header.Connect": "Connect",
"TestResults.Details.Circumvention.Tor.Table.Header.Handshake": "Handshake",
"TestResults.Details.Circumvention.Tor.Table.Header.Accessible": "Accessible",
"TestResults.Details.Circumvention.RiseupVPN.Blocked.Hero.Title": "Likely blocked",
"TestResults.Details.Circumvention.RiseupVPN.Reachable.Hero.Title": "Working",
"TestResults.Details.Circumvention.RiseupVPN.Blocked.Content.Paragraph": "[RiseupVPN](https://riseup.net/vpn) appears to be blocked.",
Expand Down
28 changes: 3 additions & 25 deletions renderer/components/nettests/circumvention/Tor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,20 +221,12 @@ const Tor = ({measurement, isAnomaly, render}) => {
accessor: 'type'
},
{
Header: <FormattedMessage id='TestResults.Details.Circumvention.Tor.Table.Header.Connect' />,
accessor: 'connect',
Header: <FormattedMessage id='TestResults.Details.Circumvention.Tor.Table.Header.Accessible' />,
accessor: 'failure',
collapse: true,
Cell: ConnectionStatusCell,
sortType: statusColumnSort
},
{
Header: <FormattedMessage id='TestResults.Details.Circumvention.Tor.Table.Header.Handshake' />,
accessor: 'handshake',
collapse: true,
Cell: ConnectionStatusCell,
sortType: statusColumnSort

},
{
accessor: 'connectFailure',
}
Expand All @@ -247,25 +239,11 @@ const Tor = ({measurement, isAnomaly, render}) => {
const targets = rawData ? rawData.test_keys.targets : {}
return (
Object.keys(targets).map(target => {
// Connection Status values
// false: Didn't run (N/A)
// null: No failure a.k.a success
// string: Failure with error string
let connectStatus = false, handshakeStatus = false
if (targets[target].summary.connect) {
connectStatus = targets[target].summary.connect.failure
}

if (targets[target].summary.handshake) {
handshakeStatus = targets[target].summary.handshake.failure
}

return {
name: targets[target].target_name || target,
address: targets[target].target_address,
type: targets[target].target_protocol,
connect: connectStatus,
handshake: handshakeStatus
failure: targets[target].failure,
}
})
)
Expand Down
2 changes: 1 addition & 1 deletion renderer/public/static/translations.js
View file
Open in desktop

Large diffs are not rendered by default.