outage message fix/constant file changes

Author: aehmt

sample/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "antd": "^3.21.4",
     "gh-pages": "^2.1.1",
-    "hypertrack-views-react": "^1.1.20",
+    "hypertrack-views-react": "^1.1.21",
     "react": "^16.8.2",
     "react-dom": "^16.8.2",
     "react-scripts": "3.0.1",

src/constants/app_constants.json

@@ -32,12 +32,12 @@
     "completed": "completed"
   },
   "inactiveReason": {
-    "locationPermissionsDenied": "locationPermissionsDenied",
-    "motionActivityPermissionsDenied": "motionActivityPermissionsDenied",
-    "locationServicesDisabled": "locationServicesDisabled",
-    "motionActivityServicesDisabled": "motionActivityServicesDisabled",
-    "motionActivityServicesUnavailable": "motionActivityServicesUnavailable",
-    "stoppedProgrammatically": "stoppedProgrammatically",
+    "locationPermissionsDenied": "location_permissions_denied",
+    "motionActivityPermissionsDenied": "motion_activity_permissions_denied",
+    "locationServicesDisabled": "location_services_disabled",
+    "motionActivityServicesDisabled": "motion_activity_services_disabled",
+    "motionActivityServicesUnavailable": "motion_activity_services_unavailable",
+    "stoppedProgrammatically": "stopped_programmatically",
     "unknown": "unknown"
   },
   "htEvent": {

src/constants/index.js

@@ -67,17 +67,19 @@ const statusMessageMap = {
 }
 
 const newMovementStatusMessage = {
-  [APP_CONSTANTS.movementStatus.disconnected]: 'Device disconncted',
+  [APP_CONSTANTS.movementStatus.disconnected]: 'Device disconnected',
   [APP_CONSTANTS.inactiveReason.locationPermissionsDenied]:
     'Location permission denied',
-  [APP_CONSTANTS.inactiveReason.locationServicesDisabled]: 'Location disabled',
+  [APP_CONSTANTS.inactiveReason.locationServicesDisabled]:
+    'Location service disabled',
   [APP_CONSTANTS.inactiveReason.motionActivityPermissionsDenied]:
     'Activity permission denied',
   [APP_CONSTANTS.inactiveReason.motionActivityServicesDisabled]:
-    'Activity disabled',
+    'Activity service disabled',
   [APP_CONSTANTS.inactiveReason.motionActivityServicesUnavailable]:
-    'Activity not supported',
-  [APP_CONSTANTS.inactiveReason.stoppedProgrammatically]: 'Tracking stopped',
+    'Activity service unavailable',
+  [APP_CONSTANTS.inactiveReason.stoppedProgrammatically]:
+    'Stopped programmatically',
   [APP_CONSTANTS.inactiveReason.unknown]: 'Unknown'
 }
 

src/pages/AccountLiveLocation/components/CustomPopup.js

@@ -2,9 +2,11 @@ import React from 'react'
 import { dateUtils, utils } from './../../../common'
 import CONSTANTS from '../../../constants'
 
-const getOutageMessage = (device_status, { reason }) =>
+const getOutageMessage = (device_status, inactiveReason) =>
   CONSTANTS.newMovementStatusMessage[device_status] ||
-  CONSTANTS.newMovementStatusMessage[reason]
+  CONSTANTS.newMovementStatusMessage[
+    inactiveReason.reason ? inactiveReason.reason : 'unknown'
+  ]
 
 const fixCoordinates = val => (val ? val.toFixed(3) : 'Unknown')
 
@@ -34,7 +36,7 @@ export const customPopup = (
               <td className="popupTableRowHeader">Outage</td>
               <td className="emptyCell" />
               <td className="popupTableRowContent error">
-                {() => getOutageMessage(device_status, notActivePayload)}
+                {getOutageMessage(device_status, notActivePayload)}
               </td>
             </tr>
           ) : null}