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

package/lib/contract/custom-component/contact-method-item.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 interface PropsType {
     contactMethod: any;
     type: any;
+    expanded?: boolean;
     className?: any;
 }
 declare const ContactMethodItem: React.FC<PropsType>;

package/lib/contract/custom-component/contact-method-item.js

@@ -9,46 +9,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 import { ContactMethod as GenericContactMethod } from '@telia-ace/knowledge-widget-adapters';
-import { useContainer, useDispatch } from '@telia-ace/knowledge-widget-ui';
-import React, { useEffect, useState } from 'react';
-var ContactMethodItem = function (props) {
+import { useDispatch } from '@telia-ace/knowledge-widget-ui';
+import React from 'react';
+var ContactMethodItem = function (_a) {
+    var contactMethod = _a.contactMethod, className = _a.className;
     var dispatch = useDispatch();
-    var container = useContainer();
-    var _a = __read(useState(props.contactMethod.body), 2), body = _a[0], setBody = _a[1];
-    useEffect(function () {
-        if (!container || !container.get('$widget')) {
-            return;
-        }
-        var events = container.get('$widget').events;
-        events.subscribe('form:validated', function (_event, _data) {
-            // TODO: this is a due to props not being updated when props.contactMethod.body changes
-            // perhaps there is a cleaner way of doing this
-            setBody(props.contactMethod.body);
-        });
-    }, [container]);
-    return (React.createElement(GenericContactMethod, __assign({ className: props.className, onClick: function () {
-            dispatch('action', "".concat(props.contactMethod.id, "/").concat(props.type.toString(), "/").concat(props.contactMethod.title));
-            // dispatch(
-            //   "expand",
-            //   `${props.contactMethod.id}/${props.type.toString()}`
-            // );
-        }, dispatch: dispatch }, props.contactMethod, { body: body, expanded: props.contactMethod.expanded })));
+    return (React.createElement(GenericContactMethod, __assign({ className: className, onClick: function () {
+            dispatch('action', "".concat(contactMethod.id, "/contact-methods/").concat(contactMethod.title));
+        }, dispatch: dispatch }, contactMethod)));
 };
 export default ContactMethodItem;

package/lib/contract/custom-component/contact-method-list.js

@@ -6,7 +6,7 @@ import React, { Fragment } from 'react';
 import styled from 'styled-components';
 import ContactMethodItem from './contact-method-item';
 var ContactMethodList = function (props) {
-    return (React.createElement(Fragment, null, props.contactMethodList.map(function (contactMethod) { return (React.createElement(StyledContactMethod, { key: contactMethod.id, type: props.type, contactMethod: contactMethod })); })));
+    return (React.createElement(Fragment, null, props.contactMethodList.map(function (contactMethod) { return (React.createElement(StyledContactMethod, { key: contactMethod.id, type: props.type, contactMethod: contactMethod, expanded: !!contactMethod.executeImmediately || undefined })); })));
 };
 var StyledContactMethod = styled(ContactMethodItem)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n    border-bottom: 1px solid rgb(239, 239, 239);\n    padding: ", ";\n"], ["\n    border-bottom: 1px solid rgb(239, 239, 239);\n    padding: ", ";\n"])), function (p) { var _a; return (_a = p.theme.sizes) === null || _a === void 0 ? void 0 : _a.medium; });
 export default ContactMethodList;

package/lib/interface/entry.interface.js

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 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) {
@@ -50,6 +61,7 @@ import { ConversationMessageListItemType, } from '@telia-ace/widget-conversation
 import { ContactMethodClient } from '../client/contact-method.client';
 import { ServerEntryTypeEnum } from '../contract/enum/server-entry-type.enum';
 import { StoreHelper } from '../helper/store.helper';
+import { contactMethodFromLegacy } from '../utils';
 var EntryInterface = /** @class */ (function () {
     function EntryInterface(container) {
         this.container = container;
@@ -199,7 +211,14 @@ var EntryInterface = /** @class */ (function () {
         var _this = this;
         var list = [];
         var mainListContent = {};
-        var mainList = [this.getListType(state), { actions: mainListContent }];
+        var mainListType = this.getListType(state);
+        var mainList = [mainListType, { actions: mainListContent }];
+        if (mainListType === 'ace-knowledge-contact-method') {
+            mainList[1] = __assign(__assign({}, mainList[1]), { contactMethods: items.map(function (item) {
+                    var formatted = contactMethodFromLegacy(item.data);
+                    return formatted;
+                }) });
+        }
         if (text && text.title) {
             list.push([ConversationMessageListItemType.Header, text.title]);
         }
@@ -230,11 +249,17 @@ var EntryInterface = /** @class */ (function () {
         return list;
     };
     EntryInterface.prototype.getListType = function (state) {
-        if ((state === null || state === void 0 ? void 0 : state.$type) === 'Humany.Matching.Bots.Conversations.GuideListState, Humany.Matching')
+        if ((state === null || state === void 0 ? void 0 : state.$type) === 'Humany.Matching.Bots.Conversations.GuideListState, Humany.Matching') {
             return ConversationMessageListItemType.LinkList;
+        }
         else if ((state === null || state === void 0 ? void 0 : state.$type) ===
-            'Humany.Matching.Bots.Conversations.States.GuideFeedbackState, Humany.Matching')
+            'Humany.Matching.Bots.Conversations.States.GuideFeedbackState, Humany.Matching') {
             return ConversationMessageListItemType.FeedbackList;
+        }
+        else if ((state === null || state === void 0 ? void 0 : state.$type) ===
+            'Humany.Matching.Bots.Conversations.States.ContactState, Humany.Matching') {
+            return 'ace-knowledge-contact-method';
+        }
         else
             return ConversationMessageListItemType.ButtonList;
     };

package/lib/utils.d.ts

@@ -1 +1,2 @@
 export declare const getContactMethodEntry: (contactMethodId: string) => import("./contract/model/http/server-entry.model").ServerEntry | undefined;
+export declare const contactMethodFromLegacy: ({ id, title, defaultIcon, exits: [exit], exitType, confirmationText, expandFormAutomatically, form, description, }: any, validation?: any) => any;

package/lib/utils.js

@@ -1,5 +1,79 @@
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+import { FormBuilder } from '@telia-ace/widget-forms';
 import { StoreHelper } from './helper/store.helper';
 export var getContactMethodEntry = function (contactMethodId) {
     var entries = StoreHelper.getEntryStore();
     return entries.find(function (e) { return e.content.id === +contactMethodId; });
 };
+var convertLegacySymbol = function (symbol) {
+    if (symbol) {
+        var type = symbol.type, content = symbol.content;
+        if (type && content) {
+            return { type: type, content: content };
+        }
+    }
+};
+export var contactMethodFromLegacy = function (_a, validation) {
+    var id = _a.id, title = _a.title, defaultIcon = _a.defaultIcon, _b = __read(_a.exits, 1), exit = _b[0], exitType = _a.exitType, confirmationText = _a.confirmationText, expandFormAutomatically = _a.expandFormAutomatically, form = _a.form, description = _a.description;
+    var adapter = (exit || { Adapter: {} }).adapter;
+    var _c = adapter.clientName, clientName = _c === void 0 ? '' : _c, _d = adapter.settings, adapterSettings = _d === void 0 ? {} : _d, _e = adapter.customClientName, customClientName = _e === void 0 ? '' : _e;
+    var settings = {
+        id: id.toString(),
+        title: title,
+        description: description,
+        symbol: convertLegacySymbol(defaultIcon),
+        clientName: clientName === 'custom.adapter' ? customClientName : clientName,
+        expanded: true,
+        inline: true,
+        body: {},
+    };
+    if (clientName.indexOf('phone') > -1 || clientName.indexOf('freetext') > -1) {
+        var displayTextBeforeClick = adapterSettings.displayTextBeforeClick, textBeforeClick = adapterSettings.textBeforeClick;
+        if (displayTextBeforeClick === 'true') {
+            settings.expanded = false;
+            settings.title = textBeforeClick;
+        }
+        if (clientName.indexOf('phone.text') > -1) {
+            settings.body.phoneNumber = adapterSettings.phoneNumber;
+        }
+        else {
+            settings.body.freetext = adapterSettings.freetext;
+        }
+    }
+    if (clientName.indexOf('chat.popup') > -1 ||
+        clientName.indexOf('link') > -1 ||
+        (clientName === 'custom.adapter' && exitType === 'custom')) {
+        settings.body = adapterSettings;
+        settings.body.confirmationFallback = confirmationText;
+    }
+    if (clientName.indexOf('ace') > -1) {
+        settings.body = adapterSettings;
+    }
+    if (form && form.hasValueComponents) {
+        if (validation) {
+            settings.body.form = FormBuilder.fromLegacyForm(id.toString(), form, validation).get();
+        }
+        else {
+            settings.body.form = FormBuilder.fromLegacyForm(id.toString(), form).get();
+        }
+        if (!expandFormAutomatically) {
+            settings.expanded = settings.inline = false;
+        }
+    }
+    return settings;
+};

package/lib-esm/contract/custom-component/contact-method-item.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 interface PropsType {
     contactMethod: any;
     type: any;
+    expanded?: boolean;
     className?: any;
 }
 declare const ContactMethodItem: React.FC<PropsType>;

package/lib-esm/contract/custom-component/contact-method-item.js

@@ -9,46 +9,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 import { ContactMethod as GenericContactMethod } from '@telia-ace/knowledge-widget-adapters';
-import { useContainer, useDispatch } from '@telia-ace/knowledge-widget-ui';
-import React, { useEffect, useState } from 'react';
-var ContactMethodItem = function (props) {
+import { useDispatch } from '@telia-ace/knowledge-widget-ui';
+import React from 'react';
+var ContactMethodItem = function (_a) {
+    var contactMethod = _a.contactMethod, className = _a.className;
     var dispatch = useDispatch();
-    var container = useContainer();
-    var _a = __read(useState(props.contactMethod.body), 2), body = _a[0], setBody = _a[1];
-    useEffect(function () {
-        if (!container || !container.get('$widget')) {
-            return;
-        }
-        var events = container.get('$widget').events;
-        events.subscribe('form:validated', function (_event, _data) {
-            // TODO: this is a due to props not being updated when props.contactMethod.body changes
-            // perhaps there is a cleaner way of doing this
-            setBody(props.contactMethod.body);
-        });
-    }, [container]);
-    return (React.createElement(GenericContactMethod, __assign({ className: props.className, onClick: function () {
-            dispatch('action', "".concat(props.contactMethod.id, "/").concat(props.type.toString(), "/").concat(props.contactMethod.title));
-            // dispatch(
-            //   "expand",
-            //   `${props.contactMethod.id}/${props.type.toString()}`
-            // );
-        }, dispatch: dispatch }, props.contactMethod, { body: body, expanded: props.contactMethod.expanded })));
+    return (React.createElement(GenericContactMethod, __assign({ className: className, onClick: function () {
+            dispatch('action', "".concat(contactMethod.id, "/contact-methods/").concat(contactMethod.title));
+        }, dispatch: dispatch }, contactMethod)));
 };
 export default ContactMethodItem;

package/lib-esm/contract/custom-component/contact-method-list.js

@@ -6,7 +6,7 @@ import React, { Fragment } from 'react';
 import styled from 'styled-components';
 import ContactMethodItem from './contact-method-item';
 var ContactMethodList = function (props) {
-    return (React.createElement(Fragment, null, props.contactMethodList.map(function (contactMethod) { return (React.createElement(StyledContactMethod, { key: contactMethod.id, type: props.type, contactMethod: contactMethod })); })));
+    return (React.createElement(Fragment, null, props.contactMethodList.map(function (contactMethod) { return (React.createElement(StyledContactMethod, { key: contactMethod.id, type: props.type, contactMethod: contactMethod, expanded: !!contactMethod.executeImmediately || undefined })); })));
 };
 var StyledContactMethod = styled(ContactMethodItem)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n    border-bottom: 1px solid rgb(239, 239, 239);\n    padding: ", ";\n"], ["\n    border-bottom: 1px solid rgb(239, 239, 239);\n    padding: ", ";\n"])), function (p) { var _a; return (_a = p.theme.sizes) === null || _a === void 0 ? void 0 : _a.medium; });
 export default ContactMethodList;

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

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 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) {
@@ -50,6 +61,7 @@ import { ConversationMessageListItemType, } from '@telia-ace/widget-conversation
 import { ContactMethodClient } from '../client/contact-method.client';
 import { ServerEntryTypeEnum } from '../contract/enum/server-entry-type.enum';
 import { StoreHelper } from '../helper/store.helper';
+import { contactMethodFromLegacy } from '../utils';
 var EntryInterface = /** @class */ (function () {
     function EntryInterface(container) {
         this.container = container;
@@ -199,7 +211,14 @@ var EntryInterface = /** @class */ (function () {
         var _this = this;
         var list = [];
         var mainListContent = {};
-        var mainList = [this.getListType(state), { actions: mainListContent }];
+        var mainListType = this.getListType(state);
+        var mainList = [mainListType, { actions: mainListContent }];
+        if (mainListType === 'ace-knowledge-contact-method') {
+            mainList[1] = __assign(__assign({}, mainList[1]), { contactMethods: items.map(function (item) {
+                    var formatted = contactMethodFromLegacy(item.data);
+                    return formatted;
+                }) });
+        }
         if (text && text.title) {
             list.push([ConversationMessageListItemType.Header, text.title]);
         }
@@ -230,11 +249,17 @@ var EntryInterface = /** @class */ (function () {
         return list;
     };
     EntryInterface.prototype.getListType = function (state) {
-        if ((state === null || state === void 0 ? void 0 : state.$type) === 'Humany.Matching.Bots.Conversations.GuideListState, Humany.Matching')
+        if ((state === null || state === void 0 ? void 0 : state.$type) === 'Humany.Matching.Bots.Conversations.GuideListState, Humany.Matching') {
             return ConversationMessageListItemType.LinkList;
+        }
         else if ((state === null || state === void 0 ? void 0 : state.$type) ===
-            'Humany.Matching.Bots.Conversations.States.GuideFeedbackState, Humany.Matching')
+            'Humany.Matching.Bots.Conversations.States.GuideFeedbackState, Humany.Matching') {
             return ConversationMessageListItemType.FeedbackList;
+        }
+        else if ((state === null || state === void 0 ? void 0 : state.$type) ===
+            'Humany.Matching.Bots.Conversations.States.ContactState, Humany.Matching') {
+            return 'ace-knowledge-contact-method';
+        }
         else
             return ConversationMessageListItemType.ButtonList;
     };

package/lib-esm/utils.d.ts

@@ -1 +1,2 @@
 export declare const getContactMethodEntry: (contactMethodId: string) => import("./contract/model/http/server-entry.model").ServerEntry | undefined;
+export declare const contactMethodFromLegacy: ({ id, title, defaultIcon, exits: [exit], exitType, confirmationText, expandFormAutomatically, form, description, }: any, validation?: any) => any;

package/lib-esm/utils.js

@@ -1,5 +1,79 @@
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+import { FormBuilder } from '@telia-ace/widget-forms';
 import { StoreHelper } from './helper/store.helper';
 export var getContactMethodEntry = function (contactMethodId) {
     var entries = StoreHelper.getEntryStore();
     return entries.find(function (e) { return e.content.id === +contactMethodId; });
 };
+var convertLegacySymbol = function (symbol) {
+    if (symbol) {
+        var type = symbol.type, content = symbol.content;
+        if (type && content) {
+            return { type: type, content: content };
+        }
+    }
+};
+export var contactMethodFromLegacy = function (_a, validation) {
+    var id = _a.id, title = _a.title, defaultIcon = _a.defaultIcon, _b = __read(_a.exits, 1), exit = _b[0], exitType = _a.exitType, confirmationText = _a.confirmationText, expandFormAutomatically = _a.expandFormAutomatically, form = _a.form, description = _a.description;
+    var adapter = (exit || { Adapter: {} }).adapter;
+    var _c = adapter.clientName, clientName = _c === void 0 ? '' : _c, _d = adapter.settings, adapterSettings = _d === void 0 ? {} : _d, _e = adapter.customClientName, customClientName = _e === void 0 ? '' : _e;
+    var settings = {
+        id: id.toString(),
+        title: title,
+        description: description,
+        symbol: convertLegacySymbol(defaultIcon),
+        clientName: clientName === 'custom.adapter' ? customClientName : clientName,
+        expanded: true,
+        inline: true,
+        body: {},
+    };
+    if (clientName.indexOf('phone') > -1 || clientName.indexOf('freetext') > -1) {
+        var displayTextBeforeClick = adapterSettings.displayTextBeforeClick, textBeforeClick = adapterSettings.textBeforeClick;
+        if (displayTextBeforeClick === 'true') {
+            settings.expanded = false;
+            settings.title = textBeforeClick;
+        }
+        if (clientName.indexOf('phone.text') > -1) {
+            settings.body.phoneNumber = adapterSettings.phoneNumber;
+        }
+        else {
+            settings.body.freetext = adapterSettings.freetext;
+        }
+    }
+    if (clientName.indexOf('chat.popup') > -1 ||
+        clientName.indexOf('link') > -1 ||
+        (clientName === 'custom.adapter' && exitType === 'custom')) {
+        settings.body = adapterSettings;
+        settings.body.confirmationFallback = confirmationText;
+    }
+    if (clientName.indexOf('ace') > -1) {
+        settings.body = adapterSettings;
+    }
+    if (form && form.hasValueComponents) {
+        if (validation) {
+            settings.body.form = FormBuilder.fromLegacyForm(id.toString(), form, validation).get();
+        }
+        else {
+            settings.body.form = FormBuilder.fromLegacyForm(id.toString(), form).get();
+        }
+        if (!expandFormAutomatically) {
+            settings.expanded = settings.inline = false;
+        }
+    }
+    return settings;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@telia-ace/knowledge-widget-bot-provider",
-    "version": "0.0.1-alpha.41",
+    "version": "0.0.1-alpha.42",
     "description": "Bot Provider Plugin ACE Knowledge Widgets.",
     "license": "SEE LICENSE IN LICENSE.txt",
     "author": "Telia Company AB",
@@ -41,5 +41,5 @@
     "devDependencies": {
         "@types/uuid": "^8.3.4"
     },
-    "gitHead": "733b97495cbc823d594ae31e687aeb05a660f195"
+    "gitHead": "7cffe3a572ab9968a9d9f4d9e2035accdf79e608"
 }