@tiledesk/tiledesk-server 2.19.13 → 2.19.14

package/routes/kb.js

@@ -894,7 +894,13 @@ router.delete('/deleteall', async (req, res) => {
 
   aiService.deleteNamespace(data).then((resp) => {
     winston.debug("delete namespace resp: ", resp.data);
-    kbEvent.emit('kb.contents.delete', { req, namespace_id, project_id });
+    kbEvent.emit('kb.contents.delete', {
+      req,
+      namespace_id,
+      project_id,
+      namespace_name: namespace.name,
+      deleteMode: 'contents_only'
+    });
     res.status(200).send(resp.data);
   }).catch((err) => {
     winston.error("delete namespace err: ", err);
@@ -1443,7 +1449,14 @@ router.delete('/namespace/:id', async (req, res) => {
       })
       winston.debug("delete all contents response: ", deleteResponse);
 
-      kbEvent.emit('kb.contents.delete', { req, namespace_id, project_id, deletedCount: deleteResponse?.deletedCount });
+      kbEvent.emit('kb.contents.delete', {
+        req,
+        namespace_id,
+        project_id,
+        namespace_name: namespace.name,
+        deletedCount: deleteResponse?.deletedCount,
+        deleteMode: 'contents_only'
+      });
 
       return res.status(200).send({ success: true, message: "All contents deleted successfully" })
 
@@ -1485,6 +1498,14 @@ router.delete('/namespace/:id', async (req, res) => {
       })
       winston.debug("delete namespace response: ", deleteNamespaceResponse);
 
+      kbEvent.emit('kb.namespace.delete', {
+        req,
+        namespace_id,
+        project_id,
+        namespace_name: namespace.name,
+        deletedCount: deleteResponse?.deletedCount
+      });
+
       return res.status(200).send({ success: true, message: "Namespace deleted succesfully" })
 
     }).catch((err) => {
@@ -1757,6 +1778,18 @@ router.post('/', async (req, res) => {
       }
 
       aiManager.scheduleScrape([json], namespace.hybrid);
+
+      kbEvent.emit('kb.contents.add', {
+        req,
+        project_id: id_project,
+        namespace_id: namespace_id,
+        namespace_name: namespace.name,
+        contentAddType: 'content',
+        count: 1,
+        type: saved_kb.type,
+        source: saved_kb.source || saved_kb.name
+      });
+
       return res.status(200).send(raw_content);
 
     }
@@ -1825,6 +1858,14 @@ router.post('/multi', upload.single('uploadFile'), async (req, res) => {
 
   try {
     const result = await aiManager.addMultipleUrls(namespace, list, options);
+    kbEvent.emit('kb.contents.add', {
+      req,
+      project_id: id_project,
+      namespace_id: namespace_id,
+      namespace_name: namespace.name,
+      contentAddType: 'url_list',
+      count: list.length
+    });
     return res.status(200).send(result);
   } catch (err) {
     winston.error("addMultipleUrls error: ", err)
@@ -1931,6 +1972,16 @@ router.post('/csv', upload.single('uploadFile'), async (req, res) => {
         }
 
         aiManager.scheduleScrape(resources, hybrid);
+
+        kbEvent.emit('kb.contents.add', {
+          req,
+          project_id: project_id,
+          namespace_id: namespace_id,
+          namespace_name: namespace.name,
+          contentAddType: 'csv',
+          count: kbs.length
+        });
+
         return res.status(200).send(result);
 
       }).catch((err) => {
@@ -2068,6 +2119,18 @@ router.post('/sitemap/import', async (req, res) => {
       return res.status(200).send(result);
     }
     result.push(saved_content);
+
+    kbEvent.emit('kb.contents.add', {
+      req,
+      project_id: id_project,
+      namespace_id: namespace_id,
+      namespace_name: namespace.name,
+      contentAddType: 'sitemap',
+      count: urls.length,
+      type: 'sitemap',
+      source: source
+    });
+
     return res.status(200).send(result);
   } catch (err) {
     return res.status(500).send({ success: false, error: "Unable to add multiple urls from sitemap due to an error." });
@@ -2279,6 +2342,29 @@ router.delete('/:kb_id', async (req, res) => {
   data.engine = namespace.engine || default_engine;
   winston.verbose("/:delete_id data: ", data);
 
+  const emitKbContentDelete = (deletedKb) => {
+    const content = deletedKb || kb;
+    const contentSnapshot = content.toObject ? content.toObject() : content;
+    kbEvent.emit('kb.content.delete', {
+      req,
+      kb_id,
+      project_id,
+      namespace_id,
+      namespace_name: namespace.name,
+      kb: {
+        _id: contentSnapshot._id,
+        name: contentSnapshot.name,
+        source: contentSnapshot.source,
+        type: contentSnapshot.type
+      }
+    });
+  };
+
+  if (process.env.NODE_ENV === 'test') {
+    emitKbContentDelete(kb);
+    return res.status(200).send({ success: true, message: "Content deleted successfully" });
+  }
+
   aiService.deleteIndex(data).then((resp) => {
     winston.debug("delete resp: ", resp.data);
     if (resp.data.success === true) {
@@ -2288,6 +2374,7 @@ router.delete('/:kb_id', async (req, res) => {
           winston.error("Delete kb error: ", err);
           return res.status(500).send({ success: false, error: err });
         }
+        emitKbContentDelete(deletedKb);
         res.status(200).send(deletedKb);
       })
 
@@ -2303,6 +2390,7 @@ router.delete('/:kb_id', async (req, res) => {
           winston.verbose("Unable to delete the content in indexing status")
           return res.status(500).send({ success: false, error: "Unable to delete the content in indexing status" })
         } else {
+          emitKbContentDelete(deletedKb);
           res.status(200).send(deletedKb);
         }
       })

package/routes/project_user.js

@@ -18,6 +18,25 @@ var validtoken = require('../middleware/valid-token')
 var roleChecker = require('../middleware/has-role');
 const puEvent = require('../event/projectUserEvent');
 const { track } = require('../lib/analyticsClient');
+const projectUserUpdateContextUtil = require('../utils/projectUserUpdateContextUtil');
+
+function emitProjectUserDeleteActivity(req, project_user, deleteType) {
+  if (!project_user) {
+    return;
+  }
+  project_user.populate({ path: 'id_user', select: { firstname: 1, lastname: 1, email: 1 } }, function (populateErr, project_userPopulated) {
+    if (populateErr) {
+      winston.error('Error populating project_user for delete activity', populateErr);
+    }
+    const pu = project_userPopulated || project_user;
+    const payload = pu.toJSON ? pu.toJSON() : pu;
+    authEvent.emit('project_user.delete', {
+      req: req,
+      project_userPopulated: payload,
+      deleteType: deleteType
+    });
+  });
+}
 
 
 router.post('/invite', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], function (req, res) {
@@ -111,15 +130,19 @@ router.post('/invite', [passport.authenticate(['basic', 'jwt'], { session: false
 
             emailService.sendYouHaveBeenInvited(email, req.user.firstname, req.user.lastname, req.project.name, id_project, user.firstname, user.lastname, req.body.role)
 
-            updatedPuser.populate({path:'id_user', select:{'firstname':1, 'lastname':1, 'email': 1}},function (err, updatedPuserPopulated){
-              var pu = updatedPuserPopulated.toJSON();
+            savedProject_user.populate({path:'id_user', select:{'firstname':1, 'lastname':1, 'email': 1}},function (err, savedProject_userPopulated){
+              if (err) {
+                winston.error("Error populating project user after re-invite", err);
+                return;
+              }
+              var pu = savedProject_userPopulated.toJSON();
               pu.isBusy = ProjectUserUtil.isBusy(savedProject_userPopulated, req.project.settings && req.project.settings.max_agent_assigned_chat);
-              var eventData = {req:req, updatedPuserPopulated: pu};
+              var eventData = {req:req, savedProject_userPopulated: pu};
               winston.debug("eventData",eventData);
               authEvent.emit('project_user.invite', eventData);
             });
 
-            return res.status(200).send(updatedPuser);
+            return res.status(200).send(savedProject_user);
           })
 
         } else {
@@ -220,6 +243,13 @@ router.put('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
   }
 
   const previousUserAvailable = req.projectuser.user_available;
+  const previousProfileStatus = req.projectuser.profileStatus;
+  const updateContext = projectUserUpdateContextUtil.buildProjectUserUpdateContext(
+    req,
+    previousUserAvailable,
+    previousProfileStatus,
+    projectUserUpdateContextUtil.resolveUserId(req.projectuser.id_user)
+  );
 
   Project_user.findByIdAndUpdate(req.projectuser.id, update,  { new: true, upsert: true }, function (err, updatedProject_user) {
     if (err) {
@@ -230,7 +260,13 @@ router.put('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
     updatedProject_user.populate({ path:'id_user', select: { 'firstname': 1, 'lastname': 1 }}, function (err, updatedProject_userPopulated) {    
       var pu = updatedProject_userPopulated.toJSON();
       pu.isBusy = ProjectUserUtil.isBusy(updatedProject_userPopulated, req.project.settings && req.project.settings.max_agent_assigned_chat);
-      authEvent.emit('project_user.update', {updatedProject_userPopulated:pu, req: req, previousUserAvailable: previousUserAvailable});
+      authEvent.emit('project_user.update', {
+        updatedProject_userPopulated: pu,
+        req: req,
+        previousUserAvailable: previousUserAvailable,
+        previousProfileStatus: previousProfileStatus,
+        updateContext: updateContext
+      });
     });
     
     res.json(updatedProject_user);
@@ -286,7 +322,14 @@ router.put('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
 
   winston.debug("project_userid update", update);
 
-  function _doUpdateProjectUser(previousUserAvailable) {
+  function _doUpdateProjectUser(previousUserAvailable, previousProfileStatus, targetUserId) {
+    const updateContext = projectUserUpdateContextUtil.buildProjectUserUpdateContext(
+      req,
+      previousUserAvailable,
+      previousProfileStatus,
+      targetUserId
+    );
+
     Project_user.findByIdAndUpdate(req.params.project_userid, update, { new: true, upsert: true }, function (err, updatedProject_user) {
       if (err) {
         winston.error("Error gettting project_user for update", err);
@@ -299,7 +342,13 @@ router.put('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
           var pu = updatedProject_userPopulated.toJSON();
           pu.isBusy = ProjectUserUtil.isBusy(updatedProject_user, req.project.settings && req.project.settings.max_agent_assigned_chat);
           
-            authEvent.emit('project_user.update', {updatedProject_userPopulated:pu, req: req, previousUserAvailable: previousUserAvailable});
+            authEvent.emit('project_user.update', {
+              updatedProject_userPopulated: pu,
+              req: req,
+              previousUserAvailable: previousUserAvailable,
+              previousProfileStatus: previousProfileStatus,
+              updateContext: updateContext
+            });
         });
       
 
@@ -307,12 +356,16 @@ router.put('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
     });
   }
 
-  if (update.user_available !== undefined && process.env.ANALYTICS_INGEST_URL) {
-    Project_user.findById(req.params.project_userid, 'user_available').lean().exec(function(err, currentPu) {
-      _doUpdateProjectUser(currentPu ? currentPu.user_available : null);
+  if (update.user_available !== undefined || update.profileStatus !== undefined) {
+    Project_user.findById(req.params.project_userid, 'user_available profileStatus id_user').lean().exec(function(err, currentPu) {
+      _doUpdateProjectUser(
+        currentPu ? currentPu.user_available : null,
+        currentPu ? currentPu.profileStatus : null,
+        currentPu ? currentPu.id_user : null
+      );
     });
   } else {
-    _doUpdateProjectUser(null);
+    _doUpdateProjectUser(null, null, null);
   }
 });
 
@@ -340,7 +393,7 @@ router.delete('/:project_userid', [passport.authenticate(['basic', 'jwt'], { ses
       }
 
       puEvent.emit('project_user.deleted', project_user);
-      // Event 'project_user.delete' not working - Check it and improve it to manage soft/hard delete
+      emitProjectUserDeleteActivity(req, project_user, 'soft');
       return res.status(200).send(project_user);
 
     })
@@ -360,11 +413,7 @@ router.delete('/:project_userid', [passport.authenticate(['basic', 'jwt'], { ses
 
       winston.debug("Hard deleted project_user", project_user);
 
-      if (project_user) {
-        project_user.populate({ path: 'id_user', select: { 'firstname': 1, 'lastname': 1 } }, function (err, project_userPopulated) {
-          authEvent.emit('project_user.delete', { req: req, project_userPopulated: project_userPopulated });
-        });
-      }
+      emitProjectUserDeleteActivity(req, project_user, 'hard');
 
       puEvent.emit('project_user.deleted', project_user);
       return res.status(200).send(project_user);

package/routes/request.js

@@ -20,6 +20,7 @@ var Message = require("../models/message");
 var cacheUtil = require('../utils/cacheUtil');
 var RequestConstants = require("../models/requestConstants");
 var cacheEnabler = require("../services/cacheEnabler");
+var assignmentContextUtil = require('../utils/assignmentContextUtil');
 var Project_user = require("../models/project_user");
 var Lead = require("../models/lead");
 var UIDGenerator = require("../utils/UIDGenerator");
@@ -408,7 +409,8 @@ router.post('/:requestid/participants',
     }
 
     //addParticipantByRequestId(request_id, id_project, member)
-    return requestService.addParticipantByRequestId(req.params.requestid, req.projectid, req.body.member).then(function (updatedRequest) {
+    const assignmentOptions = assignmentContextUtil.buildAddParticipantOptions(req, req.body.member);
+    return requestService.addParticipantByRequestId(req.params.requestid, req.projectid, req.body.member, assignmentOptions).then(function (updatedRequest) {
 
       winston.verbose("participant added", updatedRequest);
 
@@ -439,7 +441,8 @@ router.put('/:requestid/participants', async (req, res) => {
   winston.debug("var participants", participants);
 
   //setParticipantsByRequestId(request_id, id_project, participants)
-  return requestService.setParticipantsByRequestId(req.params.requestid, req.projectid, participants).then(function (updatedRequest) {
+  const assignmentOptions = assignmentContextUtil.buildSetParticipantsOptions(req, participants);
+  return requestService.setParticipantsByRequestId(req.params.requestid, req.projectid, participants, assignmentOptions).then(function (updatedRequest) {
 
     winston.debug("participant set", updatedRequest);
 
@@ -516,7 +519,8 @@ router.put('/:requestid/replace', async (req, res) => {
   participants.push(id);
   winston.verbose("participants to be set: ", participants);
 
-  requestService.setParticipantsByRequestId(req.params.requestid, req.projectid, participants).then((updatedRequest) => {
+  const assignmentOptions = assignmentContextUtil.buildSetParticipantsOptions(req, participants);
+  requestService.setParticipantsByRequestId(req.params.requestid, req.projectid, participants, assignmentOptions).then((updatedRequest) => {
     winston.debug("SetParticipant response: ", updatedRequest);
     // Additive: include the resolved canonical (root) bot id for analytics
     // attribution. Existing consumers ignore the extra field.
@@ -531,8 +535,13 @@ router.put('/:requestid/replace', async (req, res) => {
 // TODO make a synchronous chat21 version (with query parameter?) with request.support_group.created
 router.delete('/:requestid/participants/:participantid', async (req, res) => {
   winston.debug(req.body);
-  //removeParticipantByRequestId(request_id, id_project, member)
-  return requestService.removeParticipantByRequestId(req.params.requestid, req.projectid, req.params.participantid).then(function (updatedRequest) {
+  const leaveOptions = assignmentContextUtil.buildRemoveParticipantOptions(req, req.params.participantid);
+  return requestService.removeParticipantByRequestId(
+    req.params.requestid,
+    req.projectid,
+    req.params.participantid,
+    leaveOptions
+  ).then(function (updatedRequest) {
 
     winston.verbose("participant removed", updatedRequest);
 
@@ -593,7 +602,8 @@ router.put('/:requestid/assign', function (req, res) {
         return res.json(request);
       }
       //route(request_id, departmentid, id_project) {      
-      requestService.route(req.params.requestid, req.body.departmentid, req.projectid, req.body.nobot, req.body.no_populate).then(function (updatedRequest) {
+      const assignmentOptions = assignmentContextUtil.buildAutoRouteOptions(req, 'api');
+      requestService.route(req.params.requestid, req.body.departmentid, req.projectid, req.body.nobot, req.body.no_populate, assignmentOptions).then(function (updatedRequest) {
 
         winston.debug("department changed", updatedRequest);
 
@@ -615,7 +625,8 @@ router.put('/:requestid/assign', function (req, res) {
 router.put('/:requestid/departments', function (req, res) {
   winston.debug(req.body);
   //route(request_id, departmentid, id_project) {      
-  requestService.route(req.params.requestid, req.body.departmentid, req.projectid, req.body.nobot, req.body.no_populate).then(function (updatedRequest) {
+  const assignmentOptions = assignmentContextUtil.buildDepartmentRouteOptions(req, 'api');
+  requestService.route(req.params.requestid, req.body.departmentid, req.projectid, req.body.nobot, req.body.no_populate, assignmentOptions).then(function (updatedRequest) {
 
     winston.debug("department changed", updatedRequest);
 
@@ -651,7 +662,8 @@ router.put('/:requestid/agent', async (req, res) => {
   }
   winston.debug("departmentid after: " + departmentid);
 
-  requestService.route(req.params.requestid, departmentid, req.projectid, true, undefined).then(function (updatedRequest) {
+  const assignmentOptions = assignmentContextUtil.buildAutoRouteOptions(req, 'chatbot');
+  requestService.route(req.params.requestid, departmentid, req.projectid, true, undefined, assignmentOptions).then(function (updatedRequest) {
 
     winston.debug("department changed", updatedRequest);
 

package/services/chatbotService.js

@@ -6,11 +6,14 @@ class ChatbotService {
 
   constructor() {}
 
-  async fork(id_faq_kb, api_url, token, project_id) {
+  async fork(id_faq_kb, api_url, token, project_id, options) {
     winston.debug("(ChatbotService) fork");
 
+    const forPublish = options && options.forPublish === true;
+    const forPublishQuery = forPublish ? '&for_publish=true' : '';
+
     return await axios({
-      url: api_url + '/' + project_id + '/faq_kb/fork/'+id_faq_kb+"?projectid="+project_id+"&public=false&globals=true",
+      url: api_url + '/' + project_id + '/faq_kb/fork/' + id_faq_kb + '?projectid=' + project_id + '&public=false&globals=true' + forPublishQuery,
       headers: {
         'Content-Type': 'application/json',
         'Authorization': token
@@ -76,7 +79,7 @@ class ChatbotService {
     winston.debug("(ChatbotService) createBot");
 
     return await axios({
-      url: api_url + '/' + project_id + '/faq_kb/',
+      url: api_url + '/' + project_id + '/faq_kb/?skip_activity=true',
       headers: {
         'Content-Type': 'application/json',
         'Authorization': token