Skip to content

Commit 8335efd

Browse files
Merge pull request #5651 from Countly/SER-1556
[SER-1556] Frontend mix 1. Fix insufficient null checks
2 parents b6a1f90 + c3e2f9e commit 8335efd

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

api/parts/data/fetch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1323,7 +1323,7 @@ fetch.fetchEvents = function(params) {
13231323
*/
13241324
fetch.fetchTimeObj = function(collection, params, isCustomEvent, options) {
13251325
fetchTimeObj(collection, params, isCustomEvent, options, function(output) {
1326-
if (params?.qstring?.event) {
1326+
if (params.qstring?.event) {
13271327
output.eventName = params.qstring.event;
13281328
}
13291329
common.returnOutput(params, output);

frontend/express/public/core/events/javascripts/countly.details.models.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@
10811081
.then(function(resp) {
10821082
if (resp) {
10831083
context.commit("setSelectedEventsOverview", countlyAllEvents.helpers.getSelectedEventsOverview(context, resp) || {});
1084-
context.commit("setLegendData", countlyAllEvents.helpers.getLegendData(context || {}));
1084+
context.commit("setLegendData", countlyAllEvents.helpers.getLegendData(context));
10851085
}
10861086
});
10871087
}

frontend/express/public/core/events/javascripts/countly.overview.models.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@
107107
return monitorData;
108108
},
109109
getOverviewConfigureList: function(eventsList, groupList) {
110-
var map = eventsList.map || {};
111110
var allEvents = [];
112111
if (eventsList && eventsList.list) {
112+
var map = eventsList.map || {};
113113
eventsList.list.forEach(function(item) {
114114
if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
115115
var label;
@@ -141,9 +141,9 @@
141141
return allEvents;
142142
},
143143
getEventMapping: function(eventsList, groupList) {
144-
var map = eventsList.map || {};
145144
var mapping = {};
146145
if (eventsList && eventsList.list) {
146+
var map = eventsList.map || {};
147147
eventsList.list.forEach(function(item) {
148148
var obj = {
149149
"eventKey": item,

plugins/alerts/frontend/public/javascripts/countly.views.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -992,10 +992,10 @@
992992

993993

994994
if (newState.alertBy === "email") {
995-
if (newState?.allGroups?.length) {
995+
if (newState.allGroups?.length) {
996996
this.selectedRadioButton = "toGroup";
997997
}
998-
if (newState?.alertValues?.length) {
998+
if (newState.alertValues?.length) {
999999
this.selectedRadioButton = "specificAddress";
10001000
}
10011001
}

plugins/compare/frontend/public/javascripts/countly.models.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@
201201
return lineLegend;
202202
},
203203
getAllEventsList: function(eventsList, groupList) {
204-
var map = eventsList.map || {};
205204
var allEvents = [];
206205
if (eventsList) {
206+
var map = eventsList.map || {};
207207
eventsList.list.forEach(function(item) {
208208
if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
209209
var label;
@@ -245,9 +245,9 @@
245245
return obj;
246246
},
247247
getTableStateMap: function(eventsList, groupList) {
248-
var map = eventsList.map || {};
249248
var allEvents = {};
250249
if (eventsList) {
250+
var map = eventsList.map || {};
251251
eventsList.list.forEach(function(item) {
252252
if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
253253
allEvents[countlyCompareEvents.helpers.decode(item)] = true;

0 commit comments

Comments
 (0)