Merge pull request #6858 from Countly/ar2rsawseen/master2

Fixes

Author: ar2rsawseen

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## Version 25.03.25
+Fixes:
+- [crashes] Fixed resolving audit log recording
+- [location] Fixed updating none gps coordinate location after gps location was used
+- 
 Enterprise Fixes:
 - [ab-testing] Add script for fixing variant cohort
 - [groups] Fix user permission update after updating user group permission

api/parts/data/usage.js

@@ -1030,7 +1030,7 @@ plugins.register("/sdk/user_properties", async function(ob) {
 
                 if (plugins.getConfig('api', params.app && params.app.plugins, true).city_data === true && !userProps.loc && typeof data.lat !== "undefined" && typeof data.lon !== "undefined") {
                     // only override lat/lon if no recent gps location exists in user document
-                    if (!params.app_user.loc || (params.app_user.loc.gps && params.time.mstimestamp - params.app_user.loc.date > 7 * 24 * 3600)) {
+                    if (!params.app_user.loc || !params.app_user.loc.gps || params.time.mstimestamp - params.app_user.loc.date > 7 * 24 * 3600) {
                         userProps.loc = {
                             gps: false,
                             geo: {
@@ -1061,7 +1061,7 @@ plugins.register("/sdk/user_properties", async function(ob) {
 
                     if (plugins.getConfig('api', params.app && params.app.plugins, true).city_data === true && !userProps.loc && data.ll && typeof data.ll[0] !== "undefined" && typeof data.ll[1] !== "undefined") {
                         // only override lat/lon if no recent gps location exists in user document
-                        if (!params.app_user.loc || (params.app_user.loc.gps && params.time.mstimestamp - params.app_user.loc.date > 7 * 24 * 3600)) {
+                        if (!params.app_user.loc || !params.app_user.loc.gps || params.time.mstimestamp - params.app_user.loc.date > 7 * 24 * 3600) {
                             userProps.loc = {
                                 gps: false,
                                 geo: {

plugins/crashes/api/api.js

@@ -1487,7 +1487,7 @@ plugins.setConfigs("crashes", {
                 var crashes = params.qstring.args.crashes || [params.qstring.args.crash_id];
                 common.db.collection('app_crashgroups' + params.qstring.app_id).update({'_id': {$in: crashes} }, {"$set": {is_resolving: true}}, {multi: true}, function() {
                     for (var i = 0; i < crashes.length; i++) {
-                        plugins.dispatch("/systemlogs", {params: params, action: "crash_shown", data: {app_id: params.qstring.app_id, crash_id: params.qstring.args.crash_id}});
+                        plugins.dispatch("/systemlogs", {params: params, action: "crash_resolving", data: {app_id: params.qstring.app_id, crash_id: params.qstring.args.crash_id}});
                     }
                     common.returnMessage(params, 200, 'Success');
                     return true;

plugins/crashes/frontend/public/localization/crashes.properties

@@ -219,6 +219,7 @@ crashes.home.unique = Number of crashes (fatal or non-fatal) that occurred uniqu
 crashes.home.per-session=Number of crashes for the applied filter occurring per session, expressed as a percentage, in the selected time period.
 systemlogs.action.crash_resolved = Crash Resolved
 systemlogs.action.crash_unresolved = Crash Unresolved
+systemlogs.action.crash_resolving = Crash Resolving
 systemlogs.action.crash_shared = Crash Shared
 systemlogs.action.crash_unshared = Crash Unshared
 systemlogs.action.crash_modify_share = Crash Modified Share