@telia-ace/knowledge-widget-bot-provider 0.0.1-alpha.39 → 0.0.1-alpha.41

package/lib-esm/helper/store.helper.js

@@ -1,25 +1,98 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+import { createStorageWriter, readStorage, StorageCategory } from '@telia-ace/widget-services';
 import { MiddlewareHelper } from './middleware.helper';
+var botProviderGlobalStateSessionKey = 'bot-provider-global-state';
 var StoreHelper = /** @class */ (function () {
     function StoreHelper() {
         StoreHelper.globalState = {
             completedInteractionsCount: 0,
             lastBotGuide: 0,
-            site: 'https://localhost:8080/',
+            site: '',
             invincibleParameters: {},
         };
     }
     StoreHelper.insertOrUpdateMessageArrayStore = function (messageArray, entry) {
-        var _this = this;
-        messageArray
-            .filter(function (o) { return !!o; })
-            .forEach(function (t) {
-            if (!_this.messageStore.find(function (o) { return o.id == t.id; }))
-                _this.insertMessageToStore(t);
-            else {
-                _this.updateMessageInStore(t, entry);
-            }
+        return __awaiter(this, void 0, void 0, function () {
+            var _loop_1, this_1, _a, _b, message;
+            var e_1, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _loop_1 = function (message) {
+                            if (!this_1.messageStore.find(function (o) { return o.id == message.id; })) {
+                                this_1.insertMessageToStore(message);
+                            }
+                            else {
+                                this_1.updateMessageInStore(message, entry);
+                            }
+                        };
+                        this_1 = this;
+                        try {
+                            for (_a = __values(messageArray.filter(function (o) { return !!o; })), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                message = _b.value;
+                                _loop_1(message);
+                            }
+                        }
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                            }
+                            finally { if (e_1) throw e_1.error; }
+                        }
+                        return [4 /*yield*/, MiddlewareHelper.setEntrySessionStorage(this.messageStore)];
+                    case 1:
+                        _d.sent();
+                        return [2 /*return*/];
+                }
+            });
         });
-        MiddlewareHelper.setEntrySessionStorage(this.messageStore);
     };
     StoreHelper.insertMessageToStore = function (message) {
         this.messageStore.push(message);
@@ -41,6 +114,9 @@ var StoreHelper = /** @class */ (function () {
     };
     StoreHelper.setGlobalState = function (state) {
         StoreHelper.globalState = state;
+        return createStorageWriter(MiddlewareHelper.getContainer(), botProviderGlobalStateSessionKey, StorageCategory.Necessary).then(function (write) {
+            return write(state);
+        });
     };
     StoreHelper.getAction = function (action) {
         var entry = this.getEntry(action);
@@ -71,6 +147,22 @@ var StoreHelper = /** @class */ (function () {
             return o.entry;
         });
     };
+    StoreHelper.rehydrateState = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var state;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, readStorage(MiddlewareHelper.getContainer(), botProviderGlobalStateSessionKey)];
+                    case 1:
+                        state = _a.sent();
+                        if (state) {
+                            this.setGlobalState(state);
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     StoreHelper.messageStore = [];
     return StoreHelper;
 }());

package/lib-esm/interface/entry.interface.d.ts

@@ -6,7 +6,7 @@ export default class EntryInterface {
     private helpActionKey;
     private nextActionKey;
     constructor(container: Container);
-    transform(entry: ServerEntry): Promise<Message | undefined>;
+    transform(entry: ServerEntry, feedbackEntry?: ServerEntry): Promise<Message | undefined>;
     transformContactMethod(entry: ServerEntry): Promise<any>;
     transformArray(entryArray: ServerEntry[]): Promise<Message[]>;
     getUserMessage(action: string): string | undefined;

package/lib-esm/interface/entry.interface.js

@@ -57,7 +57,7 @@ var EntryInterface = /** @class */ (function () {
         this.nextActionKey = 'next';
     }
     // transform the entry based on its type
-    EntryInterface.prototype.transform = function (entry) {
+    EntryInterface.prototype.transform = function (entry, feedbackEntry) {
         return __awaiter(this, void 0, void 0, function () {
             var entryType, _a;
             var _b;
@@ -69,38 +69,31 @@ var EntryInterface = /** @class */ (function () {
                         switch (_a) {
                             case ServerEntryTypeEnum.List: return [3 /*break*/, 1];
                             case ServerEntryTypeEnum.Text: return [3 /*break*/, 2];
-                            case ServerEntryTypeEnum.Text: return [3 /*break*/, 3];
-                            case ServerEntryTypeEnum.Contact: return [3 /*break*/, 4];
+                            case ServerEntryTypeEnum.Contact: return [3 /*break*/, 3];
                         }
-                        return [3 /*break*/, 6];
+                        return [3 /*break*/, 5];
                     case 1: return [2 /*return*/, {
                             id: entry.id,
-                            message: this.listTransform(entry),
+                            message: this.listTransform(entry, feedbackEntry),
                             entry: entry,
                             isUser: false,
                         }];
                     case 2: return [2 /*return*/, {
                             id: entry.id,
-                            message: this.textTransform(entry),
+                            message: this.textTransform(entry, feedbackEntry),
                             entry: entry,
                             isUser: false,
                         }];
-                    case 3: return [2 /*return*/, {
-                            id: entry.id,
-                            message: this.listTransform(entry),
-                            entry: entry,
-                            isUser: false,
-                        }];
-                    case 4:
+                    case 3:
                         _b = {
                             id: entry.id
                         };
                         return [4 /*yield*/, this.transformContactMethod(entry)];
-                    case 5: return [2 /*return*/, (_b.message = _c.sent(),
+                    case 4: return [2 /*return*/, (_b.message = _c.sent(),
                             _b.entry = entry,
                             _b.isUser = false,
                             _b)];
-                    case 6: return [2 /*return*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -128,37 +121,40 @@ var EntryInterface = /** @class */ (function () {
     // transform an array of entries
     EntryInterface.prototype.transformArray = function (entryArray) {
         return __awaiter(this, void 0, void 0, function () {
-            var returnArray, entryArray_1, entryArray_1_1, o, x, e_1_1;
-            var e_1, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var feedbackEntry, returnArray, _a, _b, o, x, e_1_1;
+            var e_1, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
+                        feedbackEntry = entryArray.find(function (o) {
+                            return o.tags.find(function (t) { return t == 'gentle' || t == 'feedback'; });
+                        });
                         returnArray = [];
-                        _b.label = 1;
+                        _d.label = 1;
                     case 1:
-                        _b.trys.push([1, 6, 7, 8]);
-                        entryArray_1 = __values(entryArray), entryArray_1_1 = entryArray_1.next();
-                        _b.label = 2;
+                        _d.trys.push([1, 6, 7, 8]);
+                        _a = __values(entryArray.filter(function (t) { return t !== feedbackEntry; })), _b = _a.next();
+                        _d.label = 2;
                     case 2:
-                        if (!!entryArray_1_1.done) return [3 /*break*/, 5];
-                        o = entryArray_1_1.value;
-                        return [4 /*yield*/, this.transform(o)];
+                        if (!!_b.done) return [3 /*break*/, 5];
+                        o = _b.value;
+                        return [4 /*yield*/, this.transform(o, feedbackEntry)];
                     case 3:
-                        x = _b.sent();
+                        x = _d.sent();
                         if (!!x)
                             returnArray.push(x);
-                        _b.label = 4;
+                        _d.label = 4;
                     case 4:
-                        entryArray_1_1 = entryArray_1.next();
+                        _b = _a.next();
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_1_1 = _b.sent();
+                        e_1_1 = _d.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
-                            if (entryArray_1_1 && !entryArray_1_1.done && (_a = entryArray_1.return)) _a.call(entryArray_1);
+                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
@@ -172,14 +168,17 @@ var EntryInterface = /** @class */ (function () {
         var entry = StoreHelper.getEntry(action);
         return this.getTitleFromEntry(entry, action);
     };
-    EntryInterface.prototype.listTransform = function (entry) {
+    EntryInterface.prototype.listTransform = function (entry, feedbackEntry) {
         if (entry.type === 'Contact') {
-            // TODO: is this needed
-            return undefined;
+            return;
         }
         if (!entry.content)
-            return undefined;
+            return;
         var object = this.getListActions(entry.content.items, this.getContentText(entry), entry.actions, entry.localState);
+        if (!!feedbackEntry) {
+            var feedbackObject = this.getListActions(feedbackEntry.content.items, this.getContentText(feedbackEntry), feedbackEntry.actions, feedbackEntry.localState);
+            return object.concat(feedbackObject);
+        }
         return object;
     };
     EntryInterface.prototype.getContentText = function (entry) {
@@ -188,9 +187,9 @@ var EntryInterface = /** @class */ (function () {
         if (entry.content.header)
             return { title: entry.content.header };
     };
-    EntryInterface.prototype.textTransform = function (entry) {
+    EntryInterface.prototype.textTransform = function (entry, feedbackEntry) {
         if (!!entry.content.items)
-            return this.listTransform(entry);
+            return this.listTransform(entry, feedbackEntry);
         return [
             ConversationMessageListItemType.HTML,
             { body: entry.content.html.replace('\n', '') },

package/lib-esm/interface/middleware/processor.interface.js

@@ -85,7 +85,7 @@ var ProcessorInterface = /** @class */ (function () {
             return target.localState;
         };
         entries.forEach(function (entry) {
-            if (entry.relation) {
+            if (entry.relation && !entry.tags.find(function (o) { return o == 'gentle' || o == 'feedback'; })) {
                 var existingEntry = entries.find(function (o) { return o.id == entry.relation; });
                 if (existingEntry) {
                     var existingIndex = output.indexOf(existingEntry);

package/lib-esm/plugin.js

@@ -84,7 +84,8 @@ var KnowledgeBotProviderPlugin = function (container) { return __awaiter(void 0,
                     MiddlewareClient.initialize(container, container.get('$widget'));
                     // executes to decide on what to do on first load
                     var httpClient = new HttpClient(endpoint, clientId, container);
-                    httpClient.firstHit();
+                    var firstLoader = conversation.loading();
+                    httpClient.firstHit().then(firstLoader);
                     component.actions.create('evaluate', function (input) {
                         var cmClient = new ContactMethodClient(container);
                         cmClient.handleNewForm(input.form, input.form.id);
@@ -108,7 +109,8 @@ var KnowledgeBotProviderPlugin = function (container) { return __awaiter(void 0,
                     });
                     component.actions.watch('conversation.user-submit', function (input, next) {
                         var httpClient = new HttpClient(endpoint, clientId, container);
-                        httpClient.handlePhrase(input.text);
+                        var loader = conversation.loading();
+                        httpClient.handlePhrase(input.text).then(loader);
                         return next(input);
                     });
                     component.actions.watch('conversation.form', function (input, next) {
@@ -121,24 +123,25 @@ var KnowledgeBotProviderPlugin = function (container) { return __awaiter(void 0,
                         //     cmClient.handleContactMethod(input);
                         //     return next(input);
                         // }
+                        var loader = conversation.loading();
                         if (input.split('/').length > 1) {
-                            cmClient.handleContactMethod(input);
+                            cmClient.handleContactMethod(input).then(loader);
                             return next(input);
                         }
                         var httpClient = new HttpClient(endpoint, clientId, container);
                         if (input == 'burger-clicked') {
-                            httpClient.handleCategories();
+                            httpClient.handleCategories().then(loader);
                             return next(input);
                         }
                         var middlewareClient = new MiddlewareClient(container);
                         // this is an update check, as it requires
                         // a lot different logic and no user message
                         if (middlewareClient.checkForUpdate(input)) {
-                            httpClient.handleUpdate(input);
+                            httpClient.handleUpdate(input).then(loader);
                             return next(input);
                         }
                         chatClient.printUserMessageAndStoreIt(input);
-                        httpClient.handleInput(input);
+                        httpClient.handleInput(input).then(loader);
                         return next(input);
                     });
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@telia-ace/knowledge-widget-bot-provider",
-    "version": "0.0.1-alpha.39",
+    "version": "0.0.1-alpha.41",
     "description": "Bot Provider Plugin ACE Knowledge Widgets.",
     "license": "SEE LICENSE IN LICENSE.txt",
     "author": "Telia Company AB",
@@ -25,10 +25,10 @@
     "sideEffects": false,
     "typings": "lib/index.d.ts",
     "dependencies": {
-        "@telia-ace/knowledge-widget-adapters": "^1.0.8",
-        "@telia-ace/knowledge-widget-types-grid": "^1.0.8",
+        "@telia-ace/knowledge-widget-adapters": "^1.0.10",
+        "@telia-ace/knowledge-widget-types-grid": "^1.0.10",
         "@telia-ace/knowledge-widget-ui": "^1.0.7",
-        "@telia-ace/widget-conversation": "^1.0.7",
+        "@telia-ace/widget-conversation": "^1.0.9",
         "@telia-ace/widget-forms": "^1.0.6",
         "@telia-ace/widget-services": "^1.0.4",
         "@webprovisions/bootstrapping": "^1.0.12",
@@ -41,5 +41,5 @@
     "devDependencies": {
         "@types/uuid": "^8.3.4"
     },
-    "gitHead": "7cc9d6b80523ae90df0ef4ef67cb4e20689b10cb"
+    "gitHead": "733b97495cbc823d594ae31e687aeb05a660f195"
 }