@tiledesk/tiledesk-server 2.4.98 → 2.4.99

package/CHANGELOG.md

@@ -5,6 +5,11 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.4.99
+- Updated whatsapp-connector to 0.1.62
+- Updated messenger-connector to 0.1.16
+- Bug fix: globals are not exported when a chatbot is published
+
 # 2.4.98
 - Updated whatsapp-connector to 0.1.61
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.98",
+  "version": "2.4.99",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/routes/faq_kb.js

@@ -637,19 +637,25 @@ router.post('/fork/:id_faq_kb', async (req, res) => {
   let public = req.query.public;
   winston.debug("public " + public);
 
+  let globals = req.query.globals;
+  winston.debug("export globals " + globals);
+  console.log("export globals? --> globals ", globals);
+
   let token = req.headers.authorization;
 
   let cs = req.app.get('chatbot_service')
 
-  let chatbot = await cs.getBotById(id_faq_kb, public, api_url, chatbot_templates_api_url, token, current_project_id);
+  let chatbot = await cs.getBotById(id_faq_kb, public, api_url, chatbot_templates_api_url, token, current_project_id, globals);
   winston.debug("chatbot: ", chatbot)
-
+  console.log("/fork chatbot after getBotById: ", chatbot);
   if (!chatbot) {
     return res.status(500).send({ success: false, message: "Unable to get chatbot" });
   }
 
-  if (chatbot.attributes) {
-    delete chatbot.attributes.globals
+  if (!globals) {
+    if (chatbot.attributes) {
+      delete chatbot.attributes.globals
+    }
   }
 
   let savedChatbot = await cs.createBot(api_url, token, chatbot, landing_project_id);
@@ -976,6 +982,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, r
 router.get('/exportjson/:id_faq_kb', (req, res) => {
 
   winston.debug("exporting bot...")
+  console.log("exportjson req.query.globals: ", req.query.globals);
 
 
   let id_faq_kb = req.params.id_faq_kb;
@@ -992,8 +999,13 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
         // delete from exclude map intent_id
         const intents = faqs.map(({ _id, id_project, topic, status, id_faq_kb, createdBy, createdAt, updatedAt, __v, ...keepAttrs }) => keepAttrs)
 
-        if (faq_kb.attributes) {
-          delete faq_kb.attributes.globals;
+        if (!req.query.globals) {
+          console.log("Delete globals from attributes!")
+          if (faq_kb.attributes) {
+            delete faq_kb.attributes.globals;
+          }
+        } else {
+          console.log("Keep globals")
         }
 
         let json = {

package/services/chatbotService.js

@@ -12,7 +12,7 @@ class ChatbotService {
     winston.debug("[CHATBOT SERVICE] fork");
 
     return await axios({
-      url: api_url + '/' + project_id + '/faq_kb/fork/'+id_faq_kb+"?projectid="+project_id+"&public=false",
+      url: api_url + '/' + project_id + '/faq_kb/fork/'+id_faq_kb+"?projectid="+project_id+"&public=false&globals=true",
       headers: {
         'Content-Type': 'application/json',
         'Authorization': token
@@ -29,15 +29,16 @@ class ChatbotService {
 
   }
 
-  async getBotById(id_faq_kb, published, api_url, chatbot_templates_api_url, token, project_id) {
+  async getBotById(id_faq_kb, published, api_url, chatbot_templates_api_url, token, project_id, globals) {
 
     winston.debug("[CHATBOT SERVICE] getBotById");
+    console.log("getBotById globals: ", globals);
 
     // private bot
     if (published == "false") {
 
       return await axios({
-        url: api_url + "/" + project_id + "/faq_kb/exportjson/" + id_faq_kb,
+        url: api_url + "/" + project_id + "/faq_kb/exportjson/" + id_faq_kb + "?globals=" + globals,
         headers: {
           'Content-Type': 'application/json',
           'Authorization': token

package/test/chatbot-mock.js

@@ -11,6 +11,12 @@ const existing_chatbot_mock = {
     createdAt: "2022-09-15T15:32:06.491Z",
     updatedAt: "2022-09-15T15:32:06.491Z",
     name: "Bot",
+    attributes: {
+        globals: {
+            "mykey1": "myvalue1",
+            "mykey2": "myvalue2"
+        }
+    },
     intents: [
         {
             "webhook_enabled": false,

package/test/faqkbRoute.js

@@ -947,6 +947,70 @@ describe('FaqKBRoute', () => {
             });
         }).timeout(20000);
 
+        // it('publishChatbot', (done) => {
+
+        //     var email = "test-signup-" + Date.now() + "@email.com";
+        //     var pwd = "pwd";
+
+        //     userService.signup(email, pwd, "Test Firstname", "Test Lastname").then(function (savedUser) {
+        //         projectService.create("current-project", savedUser._id).then(function (currentProject) {
+                    
+        //             console.log("declare chatbot_service functions...")
+
+        //             class chatbot_service {
+        //                 async fork(id, api_url, token, project_id) {
+        //                     console.log("chatbot_service test fork called")
+        //                     return { message: "Chatbot forked successfully", bot_id: savedChatbot._id }
+        //                     //return chatbot_mock.existing_chatbot_mock;
+        //                 }
+
+        //                 async getBotById(id, published, api_url, chatbot_templates_api_url, token, project_id, globals) {
+        //                     return chatbot_mock.existing_chatbot_mock;
+        //                 }
+
+        //                 async createBot(api_url, token, chatbot, project_id) {
+        //                     return chatbot_mock.empty_chatbot_mock
+        //                 }
+
+        //                 async importFaqs(api_url, id_faq_kb, token, chatbot, project_id) {
+        //                     return chatbot_mock.import_faqs_res_mock
+        //                 }
+        //             }
+
+        //             server.set('chatbot_service', new chatbot_service());
+        //             console.log("chatbot_service functions declared")
+
+        //             chai.request(server)
+        //                     .post('/' + currentProject._id + '/faq_kb')
+        //                     .auth(email, pwd)
+        //                     .send({ "name": "privateBot", type: "internal", language: 'en', public: "false", template: "blank" })
+        //                     .end((err, res) => {
+        //                         console.log("res.body: ", res.body);
+        //                         if (log) {
+        //                         }
+        //                         res.should.have.status(200);
+        //                         res.body.should.be.a('object');
+        //                         expect(res.body.name).to.equal("privateBot");
+        //                         expect(res.body.language).to.equal("en");
+        //                         let id_faq_kb = res.body._id;
+
+        //                         chai.request(server)
+        //                         .put('/' + currentProject._id + '/faq_kb/' +  id_faq_kb + '/publish')
+        //                         .auth(email, pwd)
+        //                         .set('Content-Type', 'application/json')
+        //                         .end((err, res) => {
+        //                             console.log("publish bot res.body: ", res.body);
+        //                             res.should.have.status(200);
+
+        //                             done();
+        //                         })
+        //                     })
+
+
+        //         })
+        //     })
+        // })
+
 
     });