@miso.ai/client-sdk-ui 1.9.1-beta.2 → 1.9.1-beta.4

package/dist/cjs/defaults/ask/templates.js

@@ -12,6 +12,7 @@ const _excluded = ["classPrefix", "circledCitationIndex"],
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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; }
+// TODO: rename classPrefix -> rootClass?
 // TODO: placeholder
 
 function root() {

package/dist/cjs/layout/templates.js

@@ -79,7 +79,7 @@ function articleInfoBlock(_ref3, _ref4) {
     updated_at,
     published_at
   } = _ref4;
-  const date = updated_at || published_at || created_at;
+  const date = published_at || created_at || updated_at;
   let content = '';
   if (title) {
     content += `<div class="${className}__item-title">${title}</div>`;
@@ -98,14 +98,22 @@ function articleInfoBlock(_ref3, _ref4) {
 // helpers //
 function renderTagPair(_ref5, _ref6) {
   let {
-    className
+    className,
+    options = {}
   } = _ref5;
   let {
     product_id,
     url
   } = _ref6;
+  const {
+    link = {}
+  } = options;
+  const {
+    target = '_blank',
+    rel = 'noopener'
+  } = link; // TODO: other properties
   const tag = url ? 'a' : 'div';
-  const urlAttrs = url ? `href="${url}" target="_blank" rel="noopener"` : '';
+  const urlAttrs = url ? `href="${url}" target="${target}" rel="${rel}"` : '';
   const productAttrs = product_id ? `${_constants.ATTR_DATA_MISO_PRODUCT_ID}="${product_id}"` : '';
   return [`<${tag} class="${className}__item-body" data-role="item" ${productAttrs} ${urlAttrs}>`, `</${tag}>`];
 }

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.2';
+var _default = exports.default = '1.9.1-beta.4';

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

@@ -21,7 +21,9 @@ const DEFAULT_LAYOUTS = Object.freeze({
   [_constants.ROLE.RELATED_QUESTIONS]: [_index2.ListLayout.type, {
     itemType: 'question'
   }],
-  [_constants.ROLE.QUERY]: [_index2.SearchBoxLayout.type]
+  [_constants.ROLE.QUERY]: [_index2.SearchBoxLayout.type, {
+    placeholder: 'Ask a question'
+  }]
 });
 const DEFAULT_TRACKERS = Object.freeze({
   [_constants.ROLE.RELATED_QUESTIONS]: {}

package/dist/cjs/workflow/options.js

@@ -17,8 +17,8 @@ exports.normalizeTrackers = normalizeTrackers;
 var _commons = require("@miso.ai/commons");
 var _constants = require("../constants.js");
 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; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 // normalize //
 function normalizeApiOptions() {
   let [name, payload] = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -157,7 +157,13 @@ 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, {
+    link: Object.assign({}, base && base.link, overrides && overrides.link),
+    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.2"
+    "@miso.ai/commons": "1.9.1-beta.4"
   },
-  "version": "1.9.1-beta.2"
+  "version": "1.9.1-beta.4"
 }

package/src/defaults/ask/templates.js

@@ -1,6 +1,7 @@
 import { CLASS_PREFIX } from './constants.js';
 import * as DEFAULT_PHRASES from './phrases.js';
 
+// TODO: rename classPrefix -> rootClass?
 // TODO: placeholder
 
 export function root(options = {}) {

package/src/layout/templates.js

@@ -59,7 +59,7 @@ function productInfoBlock({ className }, { title, snippet, description, sale_pri
 }
 
 function articleInfoBlock({ className, templates }, { title, snippet, description, created_at, updated_at, published_at }) {
-  const date = updated_at || published_at || created_at;
+  const date = published_at || created_at || updated_at;
   let content = '';
   if (title) {
     content += `<div class="${className}__item-title">${title}</div>`;
@@ -76,9 +76,11 @@ function articleInfoBlock({ className, templates }, { title, snippet, descriptio
 }
 
 // helpers //
-function renderTagPair({ className }, { product_id, url }) {
+function renderTagPair({ className, options = {} }, { product_id, url }) {
+  const { link = {} } = options;
+  const { target = '_blank', rel = 'noopener' } = link; // TODO: other properties
   const tag = url ? 'a' : 'div';
-  const urlAttrs = url ? `href="${url}" target="_blank" rel="noopener"` : '';
+  const urlAttrs = url ? `href="${url}" target="${target}" rel="${rel}"` : '';
   const productAttrs = product_id ? `${ATTR_DATA_MISO_PRODUCT_ID}="${product_id}"` : '';
   return [`<${tag} class="${className}__item-body" data-role="item" ${productAttrs} ${urlAttrs}>`, `</${tag}>`];
 }

package/src/version.js

@@ -1 +1 @@
-export default '1.9.1-beta.2';
+export default '1.9.1-beta.4';

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

@@ -12,7 +12,7 @@ const DEFAULT_API_OPTIONS = Object.freeze({
 
 const DEFAULT_LAYOUTS = Object.freeze({
   [ROLE.RELATED_QUESTIONS]: [ListLayout.type, { itemType: 'question' }],
-  [ROLE.QUERY]: [SearchBoxLayout.type],
+  [ROLE.QUERY]: [SearchBoxLayout.type, { placeholder: 'Ask a question' }],
 });
 
 const DEFAULT_TRACKERS = Object.freeze({

package/src/workflow/options.js

@@ -130,7 +130,16 @@ 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,
+    link: { ...(base && base.link), ...(overrides && overrides.link) },
+    templates: { ...(base && base.templates), ...(overrides && overrides.templates) },
+  };
 }
 
 export function mergeDataProcessorOptions(...optionsList) {