@miso.ai/client-sdk-ui 1.9.1-beta.1 → 1.9.1-beta.3

package/dist/cjs/layout/list/collection.js

@@ -214,7 +214,8 @@ class CollectionLayout extends _template.default {
     this._view._events.emit('click', {
       session,
       value,
-      element
+      element,
+      domEvent: event
     });
   }
   destroy() {

package/dist/cjs/version.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = exports.default = '1.9.1-beta.1';
+var _default = exports.default = '1.9.1-beta.3';

package/dist/cjs/workflow/ask.js

@@ -10,8 +10,7 @@ var _options = require("./options.js");
 var _index = require("../actor/index.js");
 var _constants = require("../constants.js");
 var _index2 = require("../layout/index.js");
-const _excluded = ["layouts"],
-  _excluded2 = ["q"];
+const _excluded = ["q"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 const DEFAULT_API_OPTIONS = Object.freeze({
@@ -26,7 +25,9 @@ const DEFAULT_API_OPTIONS = Object.freeze({
   }
 });
 const DEFAULT_LAYOUTS = Object.freeze({
-  [_constants.ROLE.QUERY]: [_index2.SearchBoxLayout.type],
+  [_constants.ROLE.QUERY]: [_index2.SearchBoxLayout.type, {
+    placeholder: 'Ask a question'
+  }],
   [_constants.ROLE.QUESTION]: [_index2.TextLayout.type, {
     tag: 'h2'
   }],
@@ -61,26 +62,13 @@ const DEFAULT_OPTIONS = Object.freeze({
   layouts: DEFAULT_LAYOUTS,
   trackers: DEFAULT_TRACKERS
 });
-function mergeDefaults(_ref, parentQuestionId) {
-  let {
-      layouts
-    } = _ref,
-    defaults = _objectWithoutPropertiesLoose(_ref, _excluded);
-  return Object.assign({}, defaults, {
-    layouts: (0, _options.mergeLayoutsOptions)(layouts, {
-      [_constants.ROLE.QUERY]: [_index2.SearchBoxLayout.type, {
-        placeholder: parentQuestionId ? 'Ask a follow-up question' : 'Ask anything'
-      }]
-    })
-  });
-}
 class Ask extends _base.default {
   constructor(context, parentQuestionId) {
     super({
       name: 'ask',
       context,
       roles: Object.keys(DEFAULT_LAYOUTS),
-      defaults: mergeDefaults(DEFAULT_OPTIONS, parentQuestionId)
+      defaults: DEFAULT_OPTIONS
     });
     this._context = context;
     (0, _commons.defineValues)(this, {
@@ -145,11 +133,11 @@ class Ask extends _base.default {
     }
   }
   query() {
-    let _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    let _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     let {
         q: question
-      } = _ref2,
-      payload = _objectWithoutPropertiesLoose(_ref2, _excluded2);
+      } = _ref,
+      payload = _objectWithoutPropertiesLoose(_ref, _excluded);
     payload = Object.assign({}, payload, {
       question
     });
@@ -220,12 +208,12 @@ class Ask extends _base.default {
       this._context._byQid.set(questionId, this);
     }
   }
-  _onAnswerViewUpdate(_ref3) {
+  _onAnswerViewUpdate(_ref2) {
     let {
       session,
       status,
       ongoing
-    } = _ref3;
+    } = _ref2;
     if (status === _constants.STATUS.INITIAL) {
       return;
     }
@@ -257,10 +245,10 @@ class Ask extends _base.default {
       }))
     });
   }
-  _onCitationClick(_ref4) {
+  _onCitationClick(_ref3) {
     let {
       index
-    } = _ref4;
+    } = _ref3;
     const {
       value
     } = this.states[_index.fields.data()] || {};

package/dist/cjs/workflow/explore.js

@@ -20,6 +20,9 @@ const DEFAULT_API_OPTIONS = Object.freeze({
 const DEFAULT_LAYOUTS = Object.freeze({
   [_constants.ROLE.RELATED_QUESTIONS]: [_index2.ListLayout.type, {
     itemType: 'question'
+  }],
+  [_constants.ROLE.QUERY]: [_index2.SearchBoxLayout.type, {
+    placeholder: 'Ask a question'
   }]
 });
 const DEFAULT_TRACKERS = Object.freeze({
@@ -41,7 +44,7 @@ class Explore extends _base.default {
     });
     this._productId = undefined;
     this._linkFn = undefined;
-    this._unsubscribes.push(this._views.get(_constants.ROLE.RELATED_QUESTIONS).on('click', event => this._handleQuestionClick(event)));
+    this._unsubscribes = [...this._unsubscribes, this._views.get(_constants.ROLE.RELATED_QUESTIONS).on('click', event => this._handleRelatedQuestionClick(event)), this._hub.on(_index.fields.query(), payload => this.query(payload))];
   }
   set productId(value) {
     console.warning('DEPRECATED: use useApi() instead');
@@ -102,7 +105,7 @@ class Explore extends _base.default {
       })
     });
   }
-  _handleQuestionClick(_ref) {
+  _handleRelatedQuestionClick(_ref) {
     let {
         value: question
       } = _ref,
@@ -111,5 +114,15 @@ class Explore extends _base.default {
       question
     })));
   }
+  query() {
+    let {
+      q
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    if (!this._linkFn) {
+      return;
+    }
+    const url = this._linkFn(q);
+    window.open(url, '_blank');
+  }
 }
 exports.default = Explore;

package/dist/cjs/workflow/options.js

@@ -157,7 +157,12 @@ function mergeLayoutOptions(base, overrides) {
   if (overrides[0] === false) {
     return overrides;
   }
-  return base && overrides ? [overrides[0] || base[0], Object.assign({}, base[1], overrides[1])] : overrides || base;
+  return base && overrides ? [overrides[0] || base[0], mergeLayoutParameters(base[1], overrides[1])] : overrides || base;
+}
+function mergeLayoutParameters(base, overrides) {
+  return Object.assign({}, base, overrides, {
+    templates: Object.assign({}, base && base.templates, overrides && overrides.templates)
+  });
 }
 function mergeDataProcessorOptions() {
   for (var _len3 = arguments.length, optionsList = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {

package/package.json

@@ -26,7 +26,7 @@
     "url": "https://github.com/MisoAI/miso-client-js-sdk/issues"
   },
   "dependencies": {
-    "@miso.ai/commons": "1.9.1-beta.1"
+    "@miso.ai/commons": "1.9.1-beta.3"
   },
-  "version": "1.9.1-beta.1"
+  "version": "1.9.1-beta.3"
 }

package/src/layout/list/collection.js

@@ -176,7 +176,7 @@ export default class CollectionLayout extends TemplateBasedLayout {
     }
     const value = element[VALUE];
     const { session } = this._view._state;
-    this._view._events.emit('click', { session, value, element });
+    this._view._events.emit('click', { session, value, element, domEvent: event });
   }
 
   destroy() {

package/src/version.js

@@ -1 +1 @@
-export default '1.9.1-beta.1';
+export default '1.9.1-beta.3';

package/src/workflow/ask.js

@@ -1,6 +1,6 @@
 import { defineValues, trimObj, API } from '@miso.ai/commons';
 import Workflow from './base.js';
-import { mergeApiOptions, mergeLayoutsOptions } from './options.js';
+import { mergeApiOptions } from './options.js';
 import { fields, FeedbackActor } from '../actor/index.js';
 import { ROLE, STATUS } from '../constants.js';
 import { SearchBoxLayout, OptionListLayout, ListLayout, TextLayout, TypewriterLayout, FeedbackLayout } from '../layout/index.js';
@@ -18,7 +18,7 @@ const DEFAULT_API_OPTIONS = Object.freeze({
 });
 
 const DEFAULT_LAYOUTS = Object.freeze({
-  [ROLE.QUERY]: [SearchBoxLayout.type],
+  [ROLE.QUERY]: [SearchBoxLayout.type, { placeholder: 'Ask a question' }],
   [ROLE.QUESTION]: [TextLayout.type, { tag: 'h2' }],
   [ROLE.ANSWER]: TypewriterLayout.type,
   [ROLE.FEEDBACK]: FeedbackLayout.type,
@@ -44,17 +44,6 @@ const DEFAULT_OPTIONS = Object.freeze({
   trackers: DEFAULT_TRACKERS,
 });
 
-function mergeDefaults({ layouts, ...defaults }, parentQuestionId) {
-  return {
-    ...defaults,
-    layouts: mergeLayoutsOptions(layouts, {
-      [ROLE.QUERY]: [SearchBoxLayout.type, {
-        placeholder: parentQuestionId ? 'Ask a follow-up question' : 'Ask anything',
-      }],
-    }),
-  };
-}
-
 export default class Ask extends Workflow {
 
   constructor(context, parentQuestionId) {
@@ -62,7 +51,7 @@ export default class Ask extends Workflow {
       name: 'ask',
       context,
       roles: Object.keys(DEFAULT_LAYOUTS),
-      defaults: mergeDefaults(DEFAULT_OPTIONS, parentQuestionId),
+      defaults: DEFAULT_OPTIONS,
     });
     this._context = context;
     defineValues(this, { parentQuestionId });

package/src/workflow/explore.js

@@ -3,7 +3,7 @@ import Workflow from './base.js';
 import { mergeApiOptions } from './options.js';
 import { fields } from '../actor/index.js';
 import { ROLE } from '../constants.js';
-import { ListLayout } from '../layout/index.js';
+import { ListLayout, SearchBoxLayout } from '../layout/index.js';
 
 const DEFAULT_API_OPTIONS = Object.freeze({
   group: API.GROUP.ASK,
@@ -12,6 +12,7 @@ const DEFAULT_API_OPTIONS = Object.freeze({
 
 const DEFAULT_LAYOUTS = Object.freeze({
   [ROLE.RELATED_QUESTIONS]: [ListLayout.type, { itemType: 'question' }],
+  [ROLE.QUERY]: [SearchBoxLayout.type, { placeholder: 'Ask a question' }],
 });
 
 const DEFAULT_TRACKERS = Object.freeze({
@@ -36,7 +37,12 @@ export default class Explore extends Workflow {
     });
     this._productId = undefined;
     this._linkFn = undefined;
-    this._unsubscribes.push(this._views.get(ROLE.RELATED_QUESTIONS).on('click', event => this._handleQuestionClick(event)));
+
+    this._unsubscribes = [
+      ...this._unsubscribes,
+      this._views.get(ROLE.RELATED_QUESTIONS).on('click', event => this._handleRelatedQuestionClick(event)),
+      this._hub.on(fields.query(), payload => this.query(payload)),
+    ];
   }
 
   set productId(value) {
@@ -89,8 +95,16 @@ export default class Explore extends Workflow {
     };
   }
 
-  _handleQuestionClick({ value: question, ...event }) {
+  _handleRelatedQuestionClick({ value: question, ...event }) {
     this._events.emit('select', Object.freeze({ ...event, question }));
   }
 
+  query({ q } = {}) {
+    if (!this._linkFn) {
+      return;
+    }
+    const url = this._linkFn(q);
+    window.open(url, '_blank');
+  }
+
 }

package/src/workflow/options.js

@@ -130,7 +130,15 @@ function mergeLayoutOptions(base, overrides) {
   if (overrides[0] === false) {
     return overrides;
   }
-  return base && overrides ? [overrides[0] || base[0], { ...base[1], ...overrides[1] }] : (overrides || base);
+  return base && overrides ? [overrides[0] || base[0], mergeLayoutParameters(base[1], overrides[1])] : (overrides || base);
+}
+
+function mergeLayoutParameters(base, overrides) {
+  return {
+    ...base,
+    ...overrides,
+    templates: { ...(base && base.templates), ...(overrides && overrides.templates) },
+  };
 }
 
 export function mergeDataProcessorOptions(...optionsList) {