Fallback to testKeys based status information when fastback data unav…

…ilable
ooni · Feb 22, 2020 · 4411578 · 4411578
1 parent ed2bffb
commit 4411578
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/components/measurement/AccessPointStatus.js b/components/measurement/AccessPointStatus.js
@@ -39,7 +39,7 @@ const AccessPointStatus = ({ icon, label, ok , content, color, ...props}) => {
 AccessPointStatus.propTypes = {
   icon: PropTypes.element.isRequired,
   label: PropTypes.string.isRequired,
-  ok: PropTypes.bool.isRequired,
+  ok: PropTypes.oneOf([true, false, undefined]),
   content: PropTypes.element
 }
 

diff --git a/components/measurement/nettests/WhatsApp.js b/components/measurement/nettests/WhatsApp.js
@@ -16,9 +16,16 @@ import AccessPointStatus from '../AccessPointStatus'
 const WhatsAppDetails = ({ isAnomaly, scores, measurement, render }) => {
   const testKeys = measurement.test_keys
   const tcp_connect = testKeys.tcp_connect
-  const registrationServerAccessible = scores.analysis.registration_server_accessible
-  const webAccessible = scores.analysis.whatsapp_web_accessible
-  const endpointsAccessible = scores.analysis.whatsapp_endpoints_accessible
+  let registrationServerAccessible, webAccessible, endpointsAccessible
+  try {
+    registrationServerAccessible = scores.analysis.registration_server_accessible
+    endpointsAccessible = scores.analysis.whatsapp_endpoints_accessible
+    webAccessible = scores.analysis.whatsapp_web_accessible
+  } catch (e) {
+    registrationServerAccessible = testKeys.registration_server_status === 'ok'
+    endpointsAccessible = testKeys.whatsapp_endpoints_status === 'ok'
+    webAccessible = testKeys.whatsapp_web_status === 'ok'
+  }
 
   let status = 'reachable'
   let info = <FormattedMessage id='Measurement.Details.Hint.WhatsApp.Reachable' />