@tiledesk/tiledesk-server 2.10.39 → 2.10.41

package/CHANGELOG.md

@@ -5,7 +5,13 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
-# 2.10.39 (next release)
+# 2.10.41
+- added agents_available field in faq_kb and faq models
+
+# 2.10.40
+- bug fix: empty string for slug and index issue
+
+# 2.10.39
 - updated whatsapp-connector to 0.1.76
 - updated tybot-connector to 0.2.139
 - added chatbot slug in faq_kb model

package/models/faq.js

@@ -101,12 +101,20 @@ var FaqSchema = new Schema({
   attributes: {
     type: Object,
   },
+  agents_available: {
+    type: Boolean,
+    required: false,
+    default: function () {
+      return this.isNew ? false : undefined;
+    },
+  }
 }, {
   timestamps: true,
   toJSON: { virtuals: true } //used to polulate messages in toJSON// https://mongoosejs.com/docs/populate.html
 }
 );
 
+
 FaqSchema.virtual('faq_kb', {
   ref: 'faq_kb', // The model to use
   localField: 'id_faq_kb', // Find people where `localField`

package/models/faq_kb.js

@@ -11,13 +11,13 @@ var Faq_kbSchema = new Schema({
   name: {
     type: String,
     required: true,
-    index:true
+    index: true
   },
   description: {
     type: String,
     // index:true
   },
-  url: { 
+  url: {
     type: String,
     // required: true
   },
@@ -25,7 +25,7 @@ var Faq_kbSchema = new Schema({
     type: String,
     // required: true
   },
-  webhook_enabled: { 
+  webhook_enabled: {
     type: Boolean,
     required: false,
     default: false,
@@ -74,13 +74,13 @@ var Faq_kbSchema = new Schema({
     type: Boolean,
     required: false,
     default: false,
-    index:true
+    index: true
   },
   certified: {
     type: Boolean,
     required: false,
     default: false,
-    index:true
+    index: true
   },
   mainCategory: {
     type: String,
@@ -92,18 +92,18 @@ var Faq_kbSchema = new Schema({
     default: 'none'
   },
   tags: [{
-      type: String
-    }],
+    type: String
+  }],
   score: {
-      type: Number,
-      required: false,
-      index: true,
-      default: 0
-    },
+    type: Number,
+    required: false,
+    index: true,
+    default: 0
+  },
   publishedBy: {
     type: String,
   },
-  publishedAt: { 
+  publishedAt: {
     type: Date
   },
   trained: {
@@ -122,16 +122,22 @@ var Faq_kbSchema = new Schema({
     type: Array,
     required: false
   },
+  agents_available: {
+    type: Boolean,
+    required: false,
+    default: function () {
+      return this.isNew ? false : undefined;
+    },
+  },
   slug: {
     type: String,
     required: false,
-    default: "",
     index: true
-  },
+  }
 },{
   timestamps: true
-}
-);
+});
+
 
 Faq_kbSchema.pre("save", async function (next) {
   // Check if the document is new and if the slug has not been set manually

package/package.json

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

package/routes/faq.js

@@ -15,6 +15,7 @@ csv = require('csv-express');
 csv.separator = ';';
 const axios = require("axios").default;
 var configGlobal = require('../config/global');
+const roleConstants = require('../models/roleConstants');
 
 const apiUrl = process.env.API_URL || configGlobal.apiUrl;
 
@@ -424,6 +425,9 @@ router.put('/:faqid', function (req, res) {
   if (req.body.attributes != undefined) {
     update.attributes = req.body.attributes;
   }
+  if (req.body.agents_available != undefined) {
+    update.agents_available = req.body.agents_available;
+  }
 
   if (faqid.startsWith("intentId")) {
     let intent_id = faqid.substring(8);
@@ -606,6 +610,13 @@ router.get('/', function (req, res, next) {
     query.intent_display_name = req.query.intent_display_name
   }
 
+  let project_user = req.projectuser;
+  if (project_user && project_user.role === roleConstants.AGENT) {
+    query.agents_available = {
+      $in: [ null, true ]
+    }
+  }
+
 
   winston.debug("GET FAQ query", query);
 

package/routes/faq_kb.js

@@ -245,7 +245,7 @@ router.put('/:faq_kbid/publish', roleChecker.hasRole('admin'), async (req, res)
     let forkedChatBotId = forked.bot_id;
     winston.debug("forkedChatBotId: "+forkedChatBotId);
 
-    let updatedForkedChabot = await Faq_kb.findByIdAndUpdate(forkedChatBotId, {trashed: true, publishedBy: req.user.id, publishedAt: new Date().getTime()}, { new: true, upsert: true }).exec();
+    let updatedForkedChabot = await Faq_kb.findByIdAndUpdate(forkedChatBotId, { $unset: { slug: 1 }, trashed: true, publishedBy: req.user.id, publishedAt: new Date().getTime()}, { new: true, upsert: true }).exec();
     winston.debug("updatedForkedChabot: ",updatedForkedChabot);
     botEvent.emit('faqbot.update', updatedForkedChabot);
 
@@ -325,8 +325,8 @@ router.put('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot','subscriptio
     update.certifiedTags = req.body.certifiedTags
   }
 
-  if (req.body.agents_visible != undefined) {
-    update.agents_visible = req.body.agents_visible
+  if (req.body.agents_available != undefined) {
+    update.agents_available = req.body.agents_available
   }
 
   if (req.body.slug != undefined) {
@@ -542,13 +542,19 @@ router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot','subscription']), fun
    * if filter only for 'trashed = false', 
    * the bots created before the implementation of the 'trashed' property are not returned 
    */
-  var query = { "id_project": req.projectid, "trashed": { $in: [null, false] } };
+  let query = { "id_project": req.projectid, "trashed": { $in: [null, false] } };
+  
+  if (restricted_mode === true) {
+    query.agents_available = {
+      $in: [ null, true ]
+    }
+  }
 
   if (req.query.all != "true") {
     query.type = { $ne: "identity" }
   }
 
-  var search_obj = {"$search": req.query.text};
+  let search_obj = {"$search": req.query.text};
 
   if (req.query.text) {    
     if (req.query.language) {