From ee17a78916b876ed03b6b3a1aafd657d030f27b8 Mon Sep 17 00:00:00 2001 From: Herman Liang Date: Fri, 24 Jun 2016 20:40:14 +0800 Subject: [PATCH 1/3] fix error if alert field is not exist in payload --- src/dashboard/Push/PushIndex.react.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/dashboard/Push/PushIndex.react.js b/src/dashboard/Push/PushIndex.react.js index 0cf46fe3e9..9e181043be 100644 --- a/src/dashboard/Push/PushIndex.react.js +++ b/src/dashboard/Push/PushIndex.react.js @@ -141,15 +141,11 @@ let getPushName = (pushData) => { ); } else { let payload = pushData[PushConstants.PAYLOAD_FIELD]; - try { - payload = JSON.parse(payload); - } catch(e) { } - if (payload) { - if (typeof payload.alert === 'string') { - return payload.alert; - } - return payload.alert ? JSON.stringify(payload.alert) : payload; + if(payload) { + let payloadJSON = JSON.parse(payload); + return payloadJSON.alert ? payloadJSON.alert : payload; } + return ''; } } From d12fdad730ac107a948f43333cadd29769984c73 Mon Sep 17 00:00:00 2001 From: Herman Liang Date: Sat, 25 Jun 2016 06:41:19 +0800 Subject: [PATCH 2/3] fix error if alert field is not exist in payload (rev.) --- src/dashboard/Push/PushIndex.react.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/dashboard/Push/PushIndex.react.js b/src/dashboard/Push/PushIndex.react.js index 9e181043be..36a6848838 100644 --- a/src/dashboard/Push/PushIndex.react.js +++ b/src/dashboard/Push/PushIndex.react.js @@ -140,12 +140,16 @@ let getPushName = (pushData) => { {title} ); } else { - let payload = pushData[PushConstants.PAYLOAD_FIELD]; - if(payload) { - let payloadJSON = JSON.parse(payload); - return payloadJSON.alert ? payloadJSON.alert : payload; + let payload = pushData[PushConstants.PAYLOAD_FIELD] || ''; + try { + payload = JSON.parse(payload); + } catch(e) { } + if (payload) { + if (typeof payload.alert === 'string') { + return payload.alert; + } + return payload.alert ? JSON.stringify(payload.alert) : JSON.stringify(payload); } - return ''; } } From 6fe2fce43afcf196b63a4d4fe78eb5a0321ac8d6 Mon Sep 17 00:00:00 2001 From: Herman Liang Date: Sat, 25 Jun 2016 08:41:02 +0800 Subject: [PATCH 3/3] check type of payload --- src/dashboard/Push/PushIndex.react.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dashboard/Push/PushIndex.react.js b/src/dashboard/Push/PushIndex.react.js index 36a6848838..661e19707f 100644 --- a/src/dashboard/Push/PushIndex.react.js +++ b/src/dashboard/Push/PushIndex.react.js @@ -144,11 +144,13 @@ let getPushName = (pushData) => { try { payload = JSON.parse(payload); } catch(e) { } - if (payload) { + if (typeof payload === 'object') { if (typeof payload.alert === 'string') { return payload.alert; } return payload.alert ? JSON.stringify(payload.alert) : JSON.stringify(payload); + } else { + return ''; } } }