Fix Tor measurements table

ooni · Aug 17, 2022 · ddec0da · ddec0da
1 parent 540b21e
commit ddec0da
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 30 deletions.
diff --git a/data/lang-en.csv b/data/lang-en.csv
@@ -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.,,,

diff --git a/lang/en.json b/lang/en.json
@@ -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.",

diff --git a/renderer/components/nettests/circumvention/Tor.js b/renderer/components/nettests/circumvention/Tor.js
@@ -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',
  }
@@ -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,
  }
  })
  )

diff --git a/renderer/public/static/translations.js b/renderer/public/static/translations.js