@miso.ai/client-sdk-ui 1.13.0-beta.3 → 1.13.0-beta.5

package/dist/cjs/defaults/hybrid-search/phrases.js

@@ -22,6 +22,6 @@ const keywords = exports.keywords = 'You searched for “${value}”';
 /**
  * The phrase to display <miso-total>
  */
-const total = exports.total = '${value} Results';
+const total = exports.total = '${value}';
 const showMore = exports.showMore = 'Show more';
 const showLess = exports.showLess = 'Show less';

package/dist/cjs/layout/text/text.js

@@ -11,9 +11,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const TYPE = 'text';
 const DEFAULT_CLASSNAME = 'miso-text';
-function root(layout, {
-  value
-}) {
+function root(layout, state) {
   const {
     className,
     role,
@@ -23,8 +21,13 @@ function root(layout, {
     }
   } = layout;
   const roleAttr = role ? `data-role="${role}"` : '';
-  const content = value !== undefined ? (0, _commons.escapeHtml)(getFormatFunction(layout)(value)) : '';
-  return raw ? content : `<${tag} class="${className}" ${roleAttr}>${content}</${tag}>`;
+  const text = layout.templates.content(layout, state);
+  return raw ? text : `<${tag} class="${className}" ${roleAttr}>${text}</${tag}>`;
+}
+function content(layout, {
+  value
+}) {
+  return value !== undefined ? (0, _commons.escapeHtml)(getFormatFunction(layout)(value)) : '';
 }
 function getFormatFunction(layout) {
   let {
@@ -55,7 +58,8 @@ function getFormatFunction(layout) {
   }
 }
 const DEFAULT_TEMPLATES = Object.freeze({
-  root
+  root,
+  content
 });
 class TextLayout extends _template.default {
   static get type() {

package/dist/cjs/version.js

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

package/dist/cjs/workflow/explore.js

@@ -141,15 +141,14 @@ class Explore extends _unit.default {
     if (!value || !value.related_questions) {
       return data;
     }
-    const linkFn = this._linkFn && this._linkFn[0];
-    const related_questions = value.related_questions.map(linkFn ? text => ({
+    const [linkFn, linkOptions = {}] = this._linkFn || [];
+    const getDisplayedUrl = text => linkFn && linkOptions.showUrl ? this._getSubmitUrl({
+      q: text,
+      generated: true
+    }) : '#';
+    const related_questions = value.related_questions.map(text => ({
       text,
-      url: this._getSubmitUrl({
-        q: text,
-        generated: true
-      })
-    }) : text => ({
-      text
+      url: getDisplayedUrl(text)
     }));
     return Object.assign({}, data, {
       value: Object.assign({}, value, {
@@ -165,6 +164,16 @@ class Explore extends _unit.default {
     this._events.emit('select', Object.freeze(Object.assign({}, event, {
       question
     })));
+    const [linkFn, linkOptions = {}] = this._linkFn || [];
+    if (!linkFn || !linkOptions.showUrl) {
+      event.domEvent && event.domEvent.preventDefault();
+    }
+    if (linkFn && !linkOptions.showUrl) {
+      this._submitToPage({
+        q: question.text,
+        generated: true
+      });
+    }
   }
   query(args) {
     if (!args.q) {
@@ -178,6 +187,7 @@ class Explore extends _unit.default {
     }));
   }
   _getSubmitUrl(args) {
+    // TODO: if trending_questions -> qs = '_trending'
     let url = _useLink.UseLinkMixin.prototype._getSubmitUrl.call(this, args);
     if (!args.generated || !this._productId) {
       return url;

package/dist/cjs/workflow/search-based.js

@@ -22,6 +22,19 @@ const DEFAULT_API_OPTIONS = Object.freeze(Object.assign({}, _base.default.DEFAUL
     rows: DEFAULT_ROWS
   })
 }));
+function totalContent(layout, {
+  value
+}) {
+  if (value === undefined) {
+    return '';
+  }
+  const {
+    formatNumber
+  } = layout.templates.helpers;
+  const formatted = formatNumber(value);
+  const label = value === 1 ? 'result' : 'results';
+  return `${formatted} ${label}`;
+}
 const DEFAULT_LAYOUTS = Object.freeze(Object.assign({}, _base.default.DEFAULT_LAYOUTS, {
   [_constants.ROLE.QUERY]: [_index2.SearchBoxLayout.type],
   [_constants.ROLE.PRODUCTS]: [_index2.ListLayout.type, {
@@ -33,7 +46,9 @@ const DEFAULT_LAYOUTS = Object.freeze(Object.assign({}, _base.default.DEFAULT_LA
   }],
   [_constants.ROLE.TOTAL]: [_index2.TextLayout.type, {
     raw: true,
-    format: 'number'
+    templates: {
+      content: totalContent
+    }
   }],
   [_constants.ROLE.FACETS]: [_index2.FacetsLayout.type],
   [_constants.ROLE.SORT]: [_index2.SelectLayout.type],

package/dist/cjs/workflow/use-link.js

@@ -23,7 +23,6 @@ class UseLinkMixin {
     if (!this._linkFn) {
       return;
     }
-    // TODO: we want a submit event
     const url = this._getSubmitUrl(args);
     const [_, options = {}] = this._linkFn;
     if (options.open === false) {

package/package.json

@@ -16,7 +16,11 @@
     "build:cjs": "BABEL_ENV=cjs npx babel src --root-mode upward --out-dir dist/cjs",
     "build": "npm run build:clean && npm run build:cjs"
   },
-  "repository": "MisoAI/miso-client-js-sdk",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MisoAI/miso-client-js-sdk.git",
+    "directory": "packages/client-sdk-ui"
+  },
   "homepage": "https://misoai.github.io/miso-client-js-sdk/sdk",
   "license": "MIT",
   "contributors": [
@@ -26,7 +30,7 @@
     "url": "https://github.com/MisoAI/miso-client-js-sdk/issues"
   },
   "dependencies": {
-    "@miso.ai/commons": "1.13.0-beta.3"
+    "@miso.ai/commons": "1.13.0-beta.5"
   },
-  "version": "1.13.0-beta.3"
+  "version": "1.13.0-beta.5"
 }

package/src/defaults/hybrid-search/phrases.js

@@ -16,7 +16,7 @@ export const keywords = 'You searched for “${value}”';
 /**
  * The phrase to display <miso-total>
  */
-export const total = '${value} Results';
+export const total = '${value}';
 
 export const showMore = 'Show more';
 export const showLess = 'Show less';

package/src/layout/text/text.js

@@ -4,11 +4,15 @@ import TemplateBasedLayout from '../template.js';
 const TYPE = 'text';
 const DEFAULT_CLASSNAME = 'miso-text';
 
-function root(layout, { value }) {
+function root(layout, state) {
   const { className, role, options: { raw = false, tag } } = layout;
   const roleAttr = role ? `data-role="${role}"` : '';
-  const content = value !== undefined ? escapeHtml(getFormatFunction(layout)(value)) : '';
-  return raw ? content : `<${tag} class="${className}" ${roleAttr}>${content}</${tag}>`;
+  const text = layout.templates.content(layout, state);
+  return raw ? text : `<${tag} class="${className}" ${roleAttr}>${text}</${tag}>`;
+}
+
+function content(layout, { value }) {
+  return value !== undefined ? escapeHtml(getFormatFunction(layout)(value)) : '';
 }
 
 function getFormatFunction(layout) {
@@ -37,6 +41,7 @@ function getFormatFunction(layout) {
 
 const DEFAULT_TEMPLATES = Object.freeze({
   root,
+  content,
 });
 
 export default class TextLayout extends TemplateBasedLayout {

package/src/version.js

@@ -1 +1 @@
-export default '1.13.0-beta.3';
+export default '1.13.0-beta.5';

package/src/workflow/explore.js

@@ -132,8 +132,12 @@ export default class Explore extends UnitWorkflow {
     if (!value || !value.related_questions) {
       return data;
     }
-    const linkFn = this._linkFn && this._linkFn[0];
-    const related_questions = value.related_questions.map(linkFn ? (text => ({ text, url: this._getSubmitUrl({ q: text, generated: true }) })) : (text => ({ text })));
+    const [linkFn, linkOptions = {}] = this._linkFn || [];
+    const getDisplayedUrl = text => linkFn && linkOptions.showUrl ? this._getSubmitUrl({ q: text, generated: true }) : '#';
+    const related_questions = value.related_questions.map(text => ({
+      text,
+      url: getDisplayedUrl(text),
+    }));
     return {
       ...data,
       value: {
@@ -145,6 +149,13 @@ export default class Explore extends UnitWorkflow {
 
   _handleRelatedQuestionClick({ value: question, ...event }) {
     this._events.emit('select', Object.freeze({ ...event, question }));
+    const [linkFn, linkOptions = {}] = this._linkFn || [];
+    if (!linkFn || !linkOptions.showUrl) {
+      event.domEvent && event.domEvent.preventDefault();
+    }
+    if (linkFn && !linkOptions.showUrl) {
+      this._submitToPage({ q: question.text, generated: true });
+    }
   }
 
   query(args) {
@@ -159,6 +170,7 @@ export default class Explore extends UnitWorkflow {
   }
 
   _getSubmitUrl(args) {
+    // TODO: if trending_questions -> qs = '_trending'
     let url = UseLinkMixin.prototype._getSubmitUrl.call(this, args);
     if (!args.generated || !this._productId) {
       return url;

package/src/workflow/search-based.js

@@ -20,12 +20,22 @@ const DEFAULT_API_OPTIONS = Object.freeze({
   },
 });
 
+function totalContent(layout, { value }) {
+  if (value === undefined) {
+    return '';
+  }
+  const { formatNumber } = layout.templates.helpers;
+  const formatted = formatNumber(value);
+  const label = value === 1 ? 'result' : 'results';
+  return `${formatted} ${label}`;
+}
+
 const DEFAULT_LAYOUTS = Object.freeze({
   ...Workflow.DEFAULT_LAYOUTS,
   [ROLE.QUERY]: [SearchBoxLayout.type],
   [ROLE.PRODUCTS]: [ListLayout.type, { incremental: true, infiniteScroll: true }],
   [ROLE.KEYWORDS]: [TextLayout.type, { raw: true }],
-  [ROLE.TOTAL]: [TextLayout.type, { raw: true, format: 'number' }],
+  [ROLE.TOTAL]: [TextLayout.type, { raw: true, templates: { content: totalContent } }],
   [ROLE.FACETS]: [FacetsLayout.type],
   [ROLE.SORT]: [SelectLayout.type],
   [ROLE.MORE]: [MoreButtonLayout.type],

package/src/workflow/use-link.js

@@ -18,7 +18,6 @@ export class UseLinkMixin {
     if (!this._linkFn) {
       return;
     }
-    // TODO: we want a submit event
     const url = this._getSubmitUrl(args);
     const [_, options = {}] = this._linkFn;
     if (options.open === false) {