Skip to content

[SER-1556] Frontend mix 1. Fix insufficient null checks #5651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 4, 2024
Merged

[SER-1556] Frontend mix 1. Fix insufficient null checks #5651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8de0640
fix deepscan issues
YavuzYilmazz Oct 8, 2024
8d1bf55
fix another deepscan problems
YavuzYilmazz Oct 8, 2024
e994b4b
Merge branch 'next' into SER-1556
ArtursKadikis Oct 21, 2024
85bf387
resolve conv
YavuzYilmazz Oct 21, 2024
c3e2f9e
fix
YavuzYilmazz Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/parts/data/fetch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,7 @@ fetch.fetchEvents = function(params) {
*/
fetch.fetchTimeObj = function(collection, params, isCustomEvent, options) {
fetchTimeObj(collection, params, isCustomEvent, options, function(output) {
if (params?.qstring?.event) {
if (params.qstring?.event) {
output.eventName = params.qstring.event;
}
common.returnOutput(params, output);
Expand Down
2 changes: 1 addition & 1 deletion frontend/express/public/core/events/javascripts/countly.details.models.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@
.then(function(resp) {
if (resp) {
context.commit("setSelectedEventsOverview", countlyAllEvents.helpers.getSelectedEventsOverview(context, resp) || {});
context.commit("setLegendData", countlyAllEvents.helpers.getLegendData(context || {}));
context.commit("setLegendData", countlyAllEvents.helpers.getLegendData(context));
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/express/public/core/events/javascripts/countly.overview.models.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@
return monitorData;
},
getOverviewConfigureList: function(eventsList, groupList) {
var map = eventsList.map || {};
var allEvents = [];
if (eventsList && eventsList.list) {
var map = eventsList.map || {};
eventsList.list.forEach(function(item) {
if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
var label;
Expand Down Expand Up @@ -141,9 +141,9 @@
return allEvents;
},
getEventMapping: function(eventsList, groupList) {
var map = eventsList.map || {};
var mapping = {};
if (eventsList && eventsList.list) {
var map = eventsList.map || {};
eventsList.list.forEach(function(item) {
var obj = {
"eventKey": item,
Expand Down
4 changes: 2 additions & 2 deletions plugins/alerts/frontend/public/javascripts/countly.views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,10 +992,10 @@


if (newState.alertBy === "email") {
if (newState?.allGroups?.length) {
if (newState.allGroups?.length) {
this.selectedRadioButton = "toGroup";
}
if (newState?.alertValues?.length) {
if (newState.alertValues?.length) {
this.selectedRadioButton = "specificAddress";
}
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/compare/frontend/public/javascripts/countly.models.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@
return lineLegend;
},
getAllEventsList: function(eventsList, groupList) {
var map = eventsList.map || {};
var allEvents = [];
if (eventsList) {
var map = eventsList.map || {};
eventsList.list.forEach(function(item) {
if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
var label;
Expand Down Expand Up @@ -245,9 +245,9 @@
return obj;
},
getTableStateMap: function(eventsList, groupList) {
var map = eventsList.map || {};
var allEvents = {};
if (eventsList) {
var map = eventsList.map || {};
eventsList.list.forEach(function(item) {
if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
allEvents[countlyCompareEvents.helpers.decode(item)] = true;
Expand Down
Loading