Merge pull request #5788 from Countly/SER-1991-ss-taskmanager-uses-comment-field-for-identifying-operation

[core] taskmanager: removed the ability to stop a mongo operation

Author: ArtursKadikis

api/utils/requestProcessor.js

@@ -828,17 +828,6 @@ const processRequest = (params) => {
                         });
                     });
                     break;
-                case 'stop':
-                    validateUserForWrite(params, () => {
-                        taskmanager.stopTask({
-                            db: common.db,
-                            id: params.qstring.task_id,
-                            op_id: params.qstring.op_id
-                        }, (err, res) => {
-                            common.returnMessage(params, 200, res);
-                        });
-                    });
-                    break;
                 case 'delete':
                     validateUserForWrite(params, () => {
                         taskmanager.deleteResult({

api/utils/taskmanager.js

@@ -58,7 +58,7 @@ const log = require('./log.js')('core:taskmanager');
 *   }, outputData:function(err, data){
 *       common.returnOutput(params, data);
 *   }
-* })); 
+* }));
 */
 taskmanager.longtask = function(options) {
     options.db = options.db || common.db;
@@ -224,9 +224,6 @@ taskmanager.createTask = function(options, callback) {
     update.subtask_key = options.subtask_key || "";
     update.taskgroup = options.taskgroup || false;
     update.linked_to = options.linked_to;
-    if (options.comment_id) {
-        update.comment_id = options.comment_id;
-    }
     if (options.subtask && options.subtask !== "") {
         update.subtask = options.subtask;
         var updateSub = {$set: {}};
@@ -1043,10 +1040,6 @@ taskmanager.rerunTask = function(options, callback) {
     });
 };
 
-taskmanager.stopTask = function(options, callback) {
-    callback(null, "Operation could not be stopped");
-};
-
 /**
  *  Create a callback for getting result, including checking gridfs
  *  @param {function} callback - callback for the result

frontend/express/public/core/report-manager/javascripts/countly.views.js

@@ -127,9 +127,6 @@
             canDeleteReport: function() {
                 return countlyGlobal.member.global_admin || countlyGlobal.admin_apps[countlyCommon.ACTIVE_APP_ID];
             },
-            canStopReport: function() {
-                return countlyGlobal.member.global_admin || countlyGlobal.admin_apps[countlyCommon.ACTIVE_APP_ID];
-            },
             query: function() {
                 var q = {};
                 if (this.fixedOrigin) {
@@ -316,14 +313,6 @@
             isDownloadable: function(row) {
                 return ["views", "dbviewer", "tableExport"].includes(row.type);
             },
-            isStopable: function(row) {
-                if (row.status === "running" && row.op_id && row.comment_id) {
-                    return true;
-                }
-                else {
-                    return false;
-                }
-            },
             isReadyForView: function(row) {
                 if (row.linked_to) {
                     if (row.have_dashboard_widget) {
@@ -342,7 +331,6 @@
             },
             handleCommand: function(command, row) {
                 var id = row._id,
-                    op_id = row.op_id,
                     self = this;
 
                 if (id) {
@@ -378,23 +366,6 @@
                             });
                         }, [CV.i18n("common.no-dont-do-that"), CV.i18n("taskmanager.yes-rerun-task")], {title: CV.i18n("taskmanager.confirm-rerun-title"), image: "rerunning-task"});
                     }
-                    else if (command === "stop-task") {
-                        CountlyHelpers.confirm(CV.i18n("taskmanager.confirm-stop"), "popStyleGreen", function(result) {
-                            if (!result) {
-                                return true;
-                            }
-                            self.refresh();
-                            countlyTaskManager.stop(id, op_id, function(res, error) {
-                                if (res.result === "Success") {
-                                    countlyTaskManager.monitor(id, true);
-                                    self.refresh();
-                                }
-                                else {
-                                    CountlyHelpers.alert(error, "red");
-                                }
-                            });
-                        }, [CV.i18n("common.no-dont-do-that"), CV.i18n("taskmanager.yes-stop-task")], {title: CV.i18n("taskmanager.confirm-stop-title"), image: "rerunning-task"});
-                    }
                     else if (command === "view-task") {
                         self.$emit("view-task", row);
                         if (!this.disableAutoNavigationToTask) {