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

package/dist/cjs/layout/input/facets.js

@@ -161,10 +161,10 @@ class FacetsLayout extends _template.default {
   }
   _render(element, data, controls) {
     super._render(element, data, controls);
-    this._syncSelections();
   }
   _afterRender(element, state) {
     this._syncBindings(element, state);
+    this._syncSelections();
   }
   _unrender() {
     this._clearBindings();
@@ -270,6 +270,10 @@ class FacetsLayout extends _template.default {
     return Array.from(element.querySelectorAll(`[data-role="option"]`));
   }
   _handleClick(event) {
+    // only left click
+    if (event.button !== 0) {
+      return;
+    }
     const element = event.target.closest(`[data-role="option"]`);
     if (!element) {
       return;

package/dist/cjs/version.js

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

package/dist/cjs/workflow/hybrid-search-results.js

@@ -10,7 +10,8 @@ var _index = require("../actor/index.js");
 var _constants = require("../constants.js");
 var _options = require("./options.js");
 var _processors = require("./processors.js");
-const _excluded = ["filters"];
+const _excluded = ["filters"],
+  _excluded2 = ["filters"];
 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 (e.includes(n)) continue; t[n] = r[n]; } return t; }
 const ROLES_CONFIG = Object.freeze({
@@ -49,8 +50,7 @@ class HybridSearchResults extends _base.default {
     // get stored query from sibling
     const query = this._superworkflow._answer._hub.states[_index.fields.query()];
     const payload = this._buildPayload(Object.assign({}, query, {
-      filters,
-      answer: false
+      filters
     }));
     const {
       session
@@ -69,11 +69,32 @@ class HybridSearchResults extends _base.default {
       payload = _objectWithoutPropertiesLoose(_ref, _excluded);
     // borrow the work from the sibling
     payload = this._superworkflow._answer._buildPayload(payload);
+    payload = this._writeFqToPayload(Object.assign({}, payload, {
+      filters
+    }));
+    payload = this._writeQuestionIdToPayload(payload);
+    return Object.assign({}, payload, {
+      answer: false
+    });
+  }
+  _writeFqToPayload() {
+    let _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    let {
+        filters
+      } = _ref2,
+      payload = _objectWithoutPropertiesLoose(_ref2, _excluded2);
     const fq = (0, _processors.composeFq)(filters); // TODO: combine with fq in payload?
     return (0, _commons.trimObj)(Object.assign({}, payload, {
       fq
     }));
   }
+  _writeQuestionIdToPayload(payload) {
+    return Object.assign({}, payload, {
+      _meta: (0, _commons.trimObj)(Object.assign({}, payload._meta, {
+        question_id: this._superworkflow._answer.questionId
+      }))
+    });
+  }
   _request(event) {
     this._hub.update(_index.fields.request(), event);
   }

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

@@ -10,6 +10,7 @@ var _base = _interopRequireDefault(require("./base.js"));
 var _answerBased = _interopRequireDefault(require("./answer-based.js"));
 var _constants = require("../constants.js");
 var _index2 = require("../layout/index.js");
+var _hybridSearchAnswer = _interopRequireDefault(require("./hybrid-search-answer.js"));
 var _hybridSearchResults = _interopRequireDefault(require("./hybrid-search-results.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const DEFAULT_API_OPTIONS = Object.freeze(Object.assign({}, _answerBased.default.DEFAULT_API_OPTIONS, {
@@ -74,7 +75,7 @@ class HybridSearch extends _base.default {
   }
   _initProperties(args) {
     super._initProperties(args);
-    this._subworkflows = [this._answer = new HybridSearchAnswer(this), this._results = new _hybridSearchResults.default(this)];
+    this._subworkflows = [this._answer = new _hybridSearchAnswer.default(this), this._results = new _hybridSearchResults.default(this)];
   }
   _getSubworkflow(name) {
     switch (name) {

package/dist/cjs/workflow/processors.js

@@ -106,7 +106,8 @@ function composeFq(filters) {
     if (!values || !values.length) {
       continue; // just in case
     }
-    clauses.push(`${field}:(${values.map(v => `"${v}"`).join(' OR ')})`);
+    const vstr = values.length === 1 ? `"${values[0]}"` : `(${values.map(v => `"${v}"`).join(' OR ')})`;
+    clauses.push(`${field}:${vstr}`);
   }
-  return clauses.map(c => `(${c})`).join(' AND ');
+  return clauses.map(c => `(${c})`).join(' AND ') || undefined;
 }

package/package.json

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

package/src/layout/input/facets.js

@@ -125,11 +125,11 @@ export default class FacetsLayout extends TemplateBasedLayout {
 
   _render(element, data, controls) {
     super._render(element, data, controls);
-    this._syncSelections();
   }
 
   _afterRender(element, state) {
     this._syncBindings(element, state);
+    this._syncSelections();
   }
 
   _unrender() {
@@ -220,6 +220,10 @@ export default class FacetsLayout extends TemplateBasedLayout {
   }
 
   _handleClick(event) {
+    // only left click
+    if (event.button !== 0) {
+      return;
+    }
     const element = event.target.closest(`[data-role="option"]`);
     if (!element) {
       return;

package/src/version.js

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

package/src/workflow/hybrid-search-results.js

@@ -48,7 +48,7 @@ export default class HybridSearchResults extends Workflow {
 
     // get stored query from sibling
     const query = this._superworkflow._answer._hub.states[fields.query()];
-    const payload = this._buildPayload({ ...query, filters, answer: false });
+    const payload = this._buildPayload({ ...query, filters });
     const { session } = this;
     const event = mergeApiOptions(this._options.resolved.api, { payload, session });
 
@@ -58,6 +58,12 @@ export default class HybridSearchResults extends Workflow {
   _buildPayload({ filters, ...payload } = {}) {
     // borrow the work from the sibling
     payload = this._superworkflow._answer._buildPayload(payload);
+    payload = this._writeFqToPayload({ ...payload, filters });
+    payload = this._writeQuestionIdToPayload(payload);
+    return { ...payload, answer: false };
+  }
+
+  _writeFqToPayload({ filters, ...payload } = {}) {
     const fq = composeFq(filters); // TODO: combine with fq in payload?
     return trimObj({
       ...payload,
@@ -65,6 +71,16 @@ export default class HybridSearchResults extends Workflow {
     });
   }
 
+  _writeQuestionIdToPayload(payload) {
+    return {
+      ...payload,
+      _meta: trimObj({
+        ...payload._meta,
+        question_id: this._superworkflow._answer.questionId,
+      }),
+    };
+  }
+
   _request(event) {
     this._hub.update(fields.request(), event);
   }

package/src/workflow/hybrid-search.js

@@ -4,6 +4,7 @@ import Workflow from './base.js';
 import AnswerBasedWorkflow from './answer-based.js';
 import { ROLE } from '../constants.js';
 import { ListLayout, TextLayout, FacetsLayout } from '../layout/index.js';
+import HybridSearchAnswer from './hybrid-search-answer.js';
 import HybridSearchResults from './hybrid-search-results.js';
 
 const DEFAULT_API_OPTIONS = Object.freeze({

package/src/workflow/processors.js

@@ -84,7 +84,8 @@ export function composeFq(filters) {
     if (!values || !values.length) {
       continue; // just in case
     }
-    clauses.push(`${field}:(${values.map(v => `"${v}"`).join(' OR ')})`);
+    const vstr = values.length === 1 ? `"${values[0]}"` : `(${values.map(v => `"${v}"`).join(' OR ')})`;
+    clauses.push(`${field}:${vstr}`);
   }
-  return clauses.map(c => `(${c})`).join(' AND ');
+  return clauses.map(c => `(${c})`).join(' AND ') || undefined;
 }