Merge pull request #6490 from Countly/anna/master

[core] handle switching to report manager for table

Author: Cookiezaurs

CHANGELOG.md

@@ -9,10 +9,12 @@ Fixes:
 - [crashes] Fix free session for home widget
 - [crashes] Use na for free session and free user when there's no data
 - [crashes] Fix trend and change calculation for crash stats
+- [push] Show segmentation, geo and cohorts related components in push drawer on editing draft. 
 
 Enterprise Fixes:
 - [ldap] Error handling in ldap plugin on search error
 - [license] Display notification for non global admin user
+- [users] Load table data from report if user table calculation goes to report manager
 
 Dependencies:
 - Bump puppeteer from 24.14.0 to 24.15.0

frontend/express/public/javascripts/countly/vue/data/vuex.js

@@ -274,14 +274,23 @@
                         options.onOverrideResponse(context, res);
                     }
                     var convertedResponse = _dataTableAdapters.toStandardResponse(res, requestOptions);
-                    if (!Object.prototype.hasOwnProperty.call(convertedResponse, "echo") ||
-                        convertedResponse.echo >= context.state[echoField]) {
-                        if (typeof options.onReady === 'function') {
-                            convertedResponse.rows = options.onReady(context, convertedResponse.rows);
+                    if (res.task_id) {
+                        if (typeof options.onTask === 'function') {
+                            options.onTask(context, res.task_id);
                         }
                         context.commit(_capitalized("set", resourceName), convertedResponse);
                         context.commit(_capitalized("set", lastSuccessfulRequestKey), requestOptions);
                     }
+                    else {
+                        if (!Object.prototype.hasOwnProperty.call(convertedResponse, "echo") ||
+                            convertedResponse.echo >= context.state[echoField]) {
+                            if (typeof options.onReady === 'function') {
+                                convertedResponse.rows = options.onReady(context, convertedResponse.rows);
+                            }
+                            context.commit(_capitalized("set", resourceName), convertedResponse);
+                            context.commit(_capitalized("set", lastSuccessfulRequestKey), requestOptions);
+                        }
+                    }
                 })
                 .catch(function(err) {
                     if (typeof options.onError === 'function') {