@tiledesk/tiledesk-server 2.3.119 → 2.3.120

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.119",
+  "version": "2.3.120",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -42,7 +42,7 @@
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.4",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
-    "@tiledesk/tiledesk-messenger-connector": "0.1.3",
+    "@tiledesk/tiledesk-messenger-connector": "0.1.4",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-tybot-connector": "^0.1.71",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.42",

package/pubmodules/trigger/rulesTrigger.js

@@ -248,8 +248,12 @@ class RulesTrigger {
               recipient = eventTrigger.event.request_id;
 
               //custom ocf here
-              if (eventTrigger.event.id_project =="6406e34727b57500120b1bd6") {
-                subject = "Apertura richiesta di supporto #" + eventTrigger.event.ticket_id;
+                                                  //prod                                                          //pre
+              if (eventTrigger.event.id_project =="6406e34727b57500120b1bd6" || eventTrigger.event.id_project == "642c609f179910002cc56b3e") {
+                subject = "Richiesta di supporto #" + eventTrigger.event.ticket_id;
+                if (eventTrigger.event.subject) {
+                  subject = subject + " - " + eventTrigger.event.subject;
+                } 
                 // console.log("subject",subject);
               }
 
@@ -754,12 +758,14 @@ class RulesTrigger {
           winston.debug('runAction action preflight: ' + preflight);
 
           if (text && text.indexOf(":tdk_msg_subtype_info")>-1) {
+
             subtype = "info";
             text = text.replace(':tdk_msg_subtype_info', '');
             winston.debug('tdk_msg_subtype_info');
           }
 
           if (text && text.indexOf(":tdk_req_status_hidden")>-1) {
+
             status = 50;
             preflight = true;
             text = text.replace(':tdk_req_status_hidden', '');
@@ -817,6 +823,7 @@ class RulesTrigger {
                     }else {
                       userObj = eventTrigger.event.user;
                     }
+                    //TODO ATTENTION change value by reference userObj.password. This is a problem for trigger. Resolve it
                     delete userObj.password;
 
 

package/services/emailService.js

@@ -1166,7 +1166,18 @@ class EmailService {
       }
     }
 
-
+    var subject = `R: ${message.request ? message.request.subject : '-'}`;  //gmail uses subject
+
+    //ocf 
+        //prod                                                      //pre
+    if (project._id =="6406e34727b57500120b1bd6" || project._id == "642c609f179910002cc56b3e") {
+      subject = "Richiesta di supporto #" + message.request.ticket_id;
+      if (message.request.subject) {
+        subject = subject + " - " + message.request.subject;
+      } 
+      // console.log("subject",subject);
+    }
+    
     // if (message.request && message.request.lead && message.request.lead.email) {
     //   winston.info("message.request.lead.email: " + message.request.lead.email);
     //   replyTo = replyTo + ", "+ message.request.lead.email;
@@ -1182,7 +1193,7 @@ class EmailService {
       inReplyTo: inReplyTo,
       references: references,
       // subject:`${message.request ? message.request.subject : '-'}`, 
-      subject:`R: ${message.request ? message.request.subject : '-'}`,  //gmail uses subject
+      subject: subject,
       text:html, 
       html:html,
       config:configEmail, 
@@ -1803,9 +1814,13 @@ async sendRequestTranscript(to, messages, request, project) {
 
     //custom ocf here
     // console.log("ocf",project._id);
-    let subject = '[Tiledesk] Transcript';
-    if (project._id =="6406e34727b57500120b1bd6") {
-      subject = "Chiusura richiesta di supporto #" + request.ticket_id;
+    let subject = '[Tiledesk] Transcript';        
+         //prod                                               //pre
+    if (project._id =="6406e34727b57500120b1bd6" || project._id == "642c609f179910002cc56b3e") {
+      subject = "Richiesta di supporto #" + request.ticket_id;
+      if (request.subject) {
+        subject = subject + " - " + request.subject;
+      } 
       // console.log("subject",subject);
     }
     // hcustomization.emailTranscript(to, subject, html, configEmail)