bibot 1.0.22 → 1.0.24

package/dist/hooks/useBiBotChatBot.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { predefinedQuestionsType } from '../services/plugin-api';
 interface UseBiBotChatBotProps {
     clientId: string;
 }
@@ -23,7 +24,7 @@ declare const useBiBotChatBot: ({ clientId }: UseBiBotChatBotProps) => {
     sendInputInquiry: () => Promise<void>;
     chatBubbleConfig: ChatBubbleConfigProps | undefined;
     showPredefinedQuestions: boolean;
-    predefinedQuestions: string[];
-    handlePredefinedQuestionSelect: (question: any) => void;
+    predefinedQuestions: predefinedQuestionsType[];
+    handlePredefinedQuestionSelect: (question: predefinedQuestionsType) => void;
 };
 export { useBiBotChatBot };

package/dist/index.js

@@ -3488,16 +3488,33 @@ var AppProvider = function AppProvider(_ref) {
 };
 
 var getRemoteClientChatPredefinedQuestions = function getRemoteClientChatPredefinedQuestions(params) {
-  return Promise.resolve(_catch(function () {
-    var path = "" + domain.inference + resources.predefinedQ;
-    return Promise.resolve(pluginAxiosInstance.get(path, {
-      params: params
-    })).then(function (response) {
-      return response.data.predefined_messages;
-    });
-  }, function () {
-    return ['These are placeholders', 'They will be removed in production', 'This will be empty if there are no predefined questions', 'So hide if there are no predefined questions'];
-  }));
+  try {
+    return Promise.resolve(_catch(function () {
+      var path = "" + domain.inference + resources.predefinedQ;
+      return Promise.resolve(pluginAxiosInstance.get(path, {
+        params: params
+      })).then(function (response) {
+        console.log(response.data.predefined_questions);
+        return response.data.predefined_questions;
+      });
+    }, function () {
+      return [{
+        question: 'These are placeholders',
+        answer: ''
+      }, {
+        question: 'They will be removed in production',
+        answer: ''
+      }, {
+        question: 'This will be empty if there are no predefined questions',
+        answer: ''
+      }, {
+        question: 'So hide if there are no predefined questions',
+        answer: ''
+      }];
+    }));
+  } catch (e) {
+    return Promise.reject(e);
+  }
 };
 var getRemoteClientChatBubbleConfig = function getRemoteClientChatBubbleConfig(params) {
   try {
@@ -3520,64 +3537,49 @@ var getRemoteClientChatBubbleConfig = function getRemoteClientChatBubbleConfig(p
     return Promise.reject(e);
   }
 };
+var handleRetries = function handleRetries(data, attempt) {
+  try {
+    var maxAttempts = 30;
+    var delay = 10000;
+    if (attempt >= maxAttempts) {
+      return Promise.resolve("Sorry this is taking longer than usual. Please try again later");
+    }
+    return Promise.resolve(new Promise(function (resolve) {
+      return setTimeout(resolve, delay);
+    })).then(function () {
+      return _catch(function () {
+        return Promise.resolve(askTimedOutBiBot(_extends({}, data, {
+          tries: attempt + 1
+        }))).then(function (message) {
+          if (message === defaultSlacker) {
+            return Promise.resolve(handleRetries(data, attempt + 1));
+          } else {
+            return message;
+          }
+        });
+      }, function (error) {
+        return error.message;
+      });
+    });
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
 var askBiBot = function askBiBot(data) {
   try {
     return Promise.resolve(_catch(function () {
       var path = "" + domain.inference + resources.q;
       return Promise.resolve(pluginAxiosInstance.post(path, data)).then(function (response) {
         if (response.data.message === defaultSlacker) {
-          return _catch(function () {
-            return Promise.resolve(new Promise(function (resolve) {
-              return setTimeout(resolve, 6000);
-            })).then(function () {
-              return Promise.resolve(askTimedOutBiBot(_extends({}, data, {
-                tries: 2
-              })));
-            });
-          }, function (error2) {
-            if (error2.code === 'ECONNABORTED' || error2.message.includes('Endpoint request timed out')) {
-              return _catch(function () {
-                return Promise.resolve(new Promise(function (resolve) {
-                  return setTimeout(resolve, 6000);
-                })).then(function () {
-                  return Promise.resolve(askTimedOutBiBot(_extends({}, data, {
-                    tries: 3
-                  })));
-                });
-              }, function (error3) {
-                return error3.message;
-              });
-            } else {
-              return error2.message;
-            }
-          });
+          return Promise.resolve(handleRetries(data, 1));
         } else {
           return response.data.message;
         }
       });
     }, function (error1) {
+      console.log('This is the error1 from the endpoint on the 1st try:', error1);
       console.log(error1.message);
-      if (error1.code === 'ECONNABORTED' || error1.message.includes('Endpoint request timed out')) {
-        return _catch(function () {
-          return Promise.resolve(askTimedOutBiBot(_extends({}, data, {
-            tries: 2
-          })));
-        }, function (error2) {
-          if (error2.code === 'ECONNABORTED' || error2.message.includes('Endpoint request timed out')) {
-            return _catch(function () {
-              return Promise.resolve(askTimedOutBiBot(_extends({}, data, {
-                tries: 3
-              })));
-            }, function (error3) {
-              return error3.message;
-            });
-          } else {
-            return error2.message;
-          }
-        });
-      } else {
-        return error1.message;
-      }
+      return error1.message;
     }));
   } catch (e) {
     return Promise.reject(e);
@@ -3599,27 +3601,28 @@ var askTimedOutBiBot = function askTimedOutBiBot(data) {
     return Promise.reject(e);
   }
 };
-var defaultSlacker = "Unfortunately I could not find any information that reasonably answers that question. I just forwarded your inquiry to support, they will respond ASAP.";
+var defaultSlacker = "BiBot_Retry_Later";
 var pluginAxiosInstance = createPluginAxiosInstance();
 
 var useBiBotChatBot = function useBiBotChatBot(_ref) {
   var sendInputInquiry = function sendInputInquiry() {
     try {
       setIsLoading(true);
+      var input = userInput.trim();
       setUserInput('');
       return Promise.resolve(_finallyRethrows(function () {
         return _catch(function () {
           var _temp2 = function () {
-            if (userInput.trim()) {
+            if (input) {
               setMessages(function (messages) {
                 return [].concat(messages, [{
                   sender: 'user',
-                  text: userInput
+                  text: input
                 }]);
               });
               return Promise.resolve(askBiBot({
                 client_id: clientId,
-                q: userInput.trim(),
+                q: input,
                 session_id: state.sessionId,
                 chat_id: v4()
               })).then(function (response) {
@@ -3635,7 +3638,7 @@ var useBiBotChatBot = function useBiBotChatBot(_ref) {
           if (_temp2 && _temp2.then) return _temp2.then(function () {});
         }, function (error) {
           var _error$message;
-          void error((_error$message = error === null || error === void 0 ? void 0 : error.message) != null ? _error$message : 'Failed to get response from server');
+          console.error((_error$message = error === null || error === void 0 ? void 0 : error.message) != null ? _error$message : 'Failed to get response from server');
         });
       }, function (_wasThrown, _result) {
         setIsLoading(false);
@@ -3646,6 +3649,33 @@ var useBiBotChatBot = function useBiBotChatBot(_ref) {
       return Promise.reject(e);
     }
   };
+  var askPredefinedQuestion = function askPredefinedQuestion(question) {
+    try {
+      setIsLoading(true);
+      var input = question.question.trim();
+      setUserInput('');
+      if (input === question.question) {
+        setMessages(function (messages) {
+          return [].concat(messages, [{
+            sender: 'user',
+            text: input
+          }]);
+        });
+        setTimeout(function () {
+          setMessages(function (messages) {
+            return [].concat(messages, [{
+              sender: 'bot',
+              text: question.answer
+            }]);
+          });
+          setIsLoading(false);
+        }, 1000);
+      }
+      return Promise.resolve();
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   var clientId = _ref.clientId;
   var _useState = React.useState([]),
     predefinedQuestions = _useState[0],
@@ -3672,9 +3702,10 @@ var useBiBotChatBot = function useBiBotChatBot(_ref) {
     chatBubbleConfig = _useState7[0],
     setChatBubbleConfig = _useState7[1];
   var handlePredefinedQuestionSelect = function handlePredefinedQuestionSelect(question) {
-    setUserInput(question);
     sendInputInquiry();
-    setShowPredefinedQuestions(false);
+    askPredefinedQuestion(question);
+    setUserInput('');
+    setShowPredefinedQuestions(true);
   };
   var getChatBubbleConfig = React.useCallback(function () {
     try {
@@ -3910,38 +3941,61 @@ var useOnlineStatus = function useOnlineStatus() {
 
 var PredefinedQuestions = function PredefinedQuestions(_ref) {
   var questions = _ref.questions,
-    onSelect = _ref.onSelect;
+    onSelect = _ref.onSelect,
+    clientId = _ref.clientId;
+  var _useBiBotChatBot = useBiBotChatBot({
+      clientId: clientId
+    }),
+    chatBubbleConfig = _useBiBotChatBot.chatBubbleConfig;
   return React.createElement("div", {
-    className: styles['predefined-questions']
+    className: styles['predefined-questions'],
+    style: {
+      height: '50%',
+      color: '#000'
+    }
   }, questions.map(function (question, index) {
+    var _chatBubbleConfig$col;
     return React.createElement("div", {
       key: index,
       className: styles['predefined-questions'],
+      style: {
+        backgroundColor: '#fff',
+        border: "0.5px solid " + (chatBubbleConfig ? (_chatBubbleConfig$col = chatBubbleConfig === null || chatBubbleConfig === void 0 ? void 0 : chatBubbleConfig.color) != null ? _chatBubbleConfig$col : '#dedede' : '#000'),
+        fontSize: 16,
+        margin: 5,
+        textAlign: 'start',
+        height: 20,
+        padding: 10,
+        display: 'flex',
+        alignItems: 'center',
+        borderRadius: 6,
+        cursor: 'pointer'
+      },
       onClick: function onClick() {
-        return onSelect(question);
+        onSelect(question);
       }
-    }, question);
+    }, question.question);
   }));
 };
 var ChatBubbleBiBot = function ChatBubbleBiBot(_ref2) {
-  var _chatBubbleConfig$col, _chatBubbleConfig$col2;
+  var _chatBubbleConfig$col2, _chatBubbleConfig$col3;
   var clientId = _ref2.clientId;
-  var _useBiBotChatBot = useBiBotChatBot({
+  var _useBiBotChatBot2 = useBiBotChatBot({
       clientId: clientId
     }),
-    chatIsOpen = _useBiBotChatBot.chatIsOpen,
-    messages = _useBiBotChatBot.messages,
-    isLoading = _useBiBotChatBot.isLoading,
-    messageEndRef = _useBiBotChatBot.messageEndRef,
-    userInput = _useBiBotChatBot.userInput,
-    handleUserInput = _useBiBotChatBot.handleUserInput,
-    handleKeyPress = _useBiBotChatBot.handleKeyPress,
-    sendInputInquiry = _useBiBotChatBot.sendInputInquiry,
-    toggleChat = _useBiBotChatBot.toggleChat,
-    chatBubbleConfig = _useBiBotChatBot.chatBubbleConfig,
-    showPredefinedQuestions = _useBiBotChatBot.showPredefinedQuestions,
-    predefinedQuestions = _useBiBotChatBot.predefinedQuestions,
-    handlePredefinedQuestionSelect = _useBiBotChatBot.handlePredefinedQuestionSelect;
+    chatIsOpen = _useBiBotChatBot2.chatIsOpen,
+    messages = _useBiBotChatBot2.messages,
+    isLoading = _useBiBotChatBot2.isLoading,
+    messageEndRef = _useBiBotChatBot2.messageEndRef,
+    userInput = _useBiBotChatBot2.userInput,
+    handleUserInput = _useBiBotChatBot2.handleUserInput,
+    handleKeyPress = _useBiBotChatBot2.handleKeyPress,
+    sendInputInquiry = _useBiBotChatBot2.sendInputInquiry,
+    toggleChat = _useBiBotChatBot2.toggleChat,
+    chatBubbleConfig = _useBiBotChatBot2.chatBubbleConfig,
+    showPredefinedQuestions = _useBiBotChatBot2.showPredefinedQuestions,
+    predefinedQuestions = _useBiBotChatBot2.predefinedQuestions,
+    handlePredefinedQuestionSelect = _useBiBotChatBot2.handlePredefinedQuestionSelect;
   var isOnline = useOnlineStatus();
   return React.createElement("div", {
     className: "chat-bubble " + (chatIsOpen ? 'open' : ''),
@@ -3968,7 +4022,7 @@ var ChatBubbleBiBot = function ChatBubbleBiBot(_ref2) {
   }, React.createElement("div", {
     className: styles['chat-header'],
     style: {
-      backgroundColor: (_chatBubbleConfig$col = chatBubbleConfig === null || chatBubbleConfig === void 0 ? void 0 : chatBubbleConfig.color) != null ? _chatBubbleConfig$col : '#dedede',
+      backgroundColor: (_chatBubbleConfig$col2 = chatBubbleConfig === null || chatBubbleConfig === void 0 ? void 0 : chatBubbleConfig.color) != null ? _chatBubbleConfig$col2 : '#dedede',
       height: 50,
       borderTopLeftRadius: 8,
       borderTopRightRadius: 8,
@@ -4065,8 +4119,9 @@ var ChatBubbleBiBot = function ChatBubbleBiBot(_ref2) {
       }
     }, message.text));
   }), showPredefinedQuestions && predefinedQuestions && predefinedQuestions.length > 0 && React.createElement(PredefinedQuestions, {
-    questions: predefinedQuestions,
-    onSelect: handlePredefinedQuestionSelect
+    questions: predefinedQuestions.slice(0, 5),
+    onSelect: handlePredefinedQuestionSelect,
+    clientId: clientId
   }), isLoading && React.createElement("div", {
     style: {
       marginLeft: '20px'
@@ -4111,14 +4166,16 @@ var ChatBubbleBiBot = function ChatBubbleBiBot(_ref2) {
       border: 'none',
       cursor: 'pointer'
     },
-    onClick: sendInputInquiry
+    onClick: function onClick() {
+      return sendInputInquiry();
+    }
   }, React.createElement(SendMessageIcon, {
     color: isLoading ? '#fff' : chatBubbleConfig === null || chatBubbleConfig === void 0 ? void 0 : chatBubbleConfig.color
   })))), React.createElement("button", {
     onClick: toggleChat,
     className: styles['chat-toggle'],
     style: {
-      backgroundColor: (_chatBubbleConfig$col2 = chatBubbleConfig === null || chatBubbleConfig === void 0 ? void 0 : chatBubbleConfig.color) != null ? _chatBubbleConfig$col2 : '#dedede',
+      backgroundColor: (_chatBubbleConfig$col3 = chatBubbleConfig === null || chatBubbleConfig === void 0 ? void 0 : chatBubbleConfig.color) != null ? _chatBubbleConfig$col3 : '#dedede',
       color: '#fff',
       borderRadius: '50%',
       cursor: 'pointer',