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

package/dist/cjs/actor/data.js

@@ -58,13 +58,12 @@ class DataActor {
       session
     } = this._hub.states;
     const request = _objectWithoutPropertiesLoose(event, _excluded);
-    if (!event._skipLoading) {
-      // emit response to update request
-      this._emitResponse({
-        session,
-        request
-      });
-    }
+
+    // emit response to update request
+    this._emitResponse({
+      session,
+      request
+    });
     try {
       const {
         signal

package/dist/cjs/actor/hub.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _commons = require("@miso.ai/commons");
-var _processors = require("../workflow/processors.js");
 class Hub {
   constructor() {
     (this._events = new _commons.EventEmitter())._injectSubscribeInterface(this);
@@ -20,7 +19,7 @@ class Hub {
     let {
       silent = false
     } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    this._states[name] = Object.freeze((0, _processors.removeDataInstructions)(state));
+    this._states[name] = Object.freeze(state);
     if (!silent) {
       this._events.emit(name, state);
     }

package/dist/cjs/actor/sessions.js

@@ -15,16 +15,15 @@ class SessionMaker {
     (0, _commons.delegateGetters)(hub, this, ['active']);
   }
   get active() {
-    const {
-      session
-    } = this._hub.states;
+    // TODO: may eliminate active flag?
+    const session = this._hub.states[fields.session()];
     return !!(session && session.active);
   }
   new() {
     let {
       force = false
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const currentSession = this._hub.states.session;
+    const currentSession = this._hub.states[fields.session()];
     if (currentSession && !currentSession.active && !force) {
       return;
     }
@@ -32,7 +31,7 @@ class SessionMaker {
     this._hub.update(fields.session(), session);
   }
   start() {
-    const session = this._hub.states.session || this._create();
+    const session = this._hub.states[fields.session()] || this._create();
     if (session.active) {
       return;
     }

package/dist/cjs/actor/views.js

@@ -95,6 +95,9 @@ class ViewsActor {
   updateComponentRole(element, oldRole, newRole) {
     // TODO
   }
+  containsElement(element) {
+    return this._containers.has(element) || this._views[element.role];
+  }
   refreshElement(element) {
     const view = element.isContainer ? this._containers.get(element) : this._getViewByElement(element);
     view && view.refresh({

package/dist/cjs/defaults/hybrid-search/answer-box.js

@@ -38,7 +38,7 @@ class AnswerBox {
     // sync state
     this._syncWofkflowStatus();
     this._syncButtonText();
-    this._unsubscribes = [() => element.removeEventListener('click', callback), workflow.on('loading', () => this.hide()), workflow.on('error', () => this.show()), workflow.on('ready', () => this.show())];
+    this._unsubscribes = [() => element.removeEventListener('click', callback), workflow._answer.on('loading', () => this.hide()), workflow._answer.on('error', () => this.show()), workflow._answer.on('ready', () => this.show())];
   }
   _handleClick(_ref) {
     let {
@@ -56,7 +56,7 @@ class AnswerBox {
   _syncWofkflowStatus() {
     const {
       status
-    } = this._workflow;
+    } = this._workflow._answer;
     switch (status) {
       case _constants2.STATUS.ERRONEOUS:
       case _constants2.STATUS.READY:

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

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

@@ -159,13 +159,14 @@ class AnswerBasedWorkflow extends _base.default {
     // start a new session
     this.restart();
 
-    // keep track of question source on this session
+    // TODO: move to ask workflow
+    // keep track of question source on this session, for suggested questions interactions
+    this._writeQuestionSourceToSession(args);
+
+    // build payload and trigger request
     const {
       session
     } = this;
-    session.meta.question_source = args.questionSource || _constants.ORGANIC_QUESTION_SOURCE; // might be null, not undefined
-
-    // build payload and trigger request
     const payload = this._buildPayload(args);
     const event = (0, _options.mergeApiOptions)(this._options.resolved.api, {
       payload,
@@ -173,6 +174,9 @@ class AnswerBasedWorkflow extends _base.default {
     });
     this._request(event);
   }
+  _writeQuestionSourceToSession(args) {
+    this.session.meta.question_source = args.questionSource || _constants.ORGANIC_QUESTION_SOURCE; // might be null, not undefined
+  }
   _request(event) {
     this._hub.update(_index.fields.request(), event);
   }
@@ -193,11 +197,20 @@ class AnswerBasedWorkflow extends _base.default {
   */
 
   // data //
-  _defaultProcessData(data) {
-    data = super._defaultProcessData(data);
-
+  _updateData(data) {
+    // if it's the head response, write question id and return
+    if (data.value && !data.value.answer_stage) {
+      this._handleHeadResponse(data);
+      return;
+    }
+    super._updateData(data);
+  }
+  _handleHeadResponse(data) {
     // capture question ID and register at context
     this._writeQuestionIdFromData(data);
+  }
+  _defaultProcessData(data) {
+    data = super._defaultProcessData(data);
 
     // update URL if autoQuery.updateUrl is not false
     this._updateUrlIfNecessary(data);

package/dist/cjs/workflow/ask.js

@@ -69,6 +69,7 @@ class Ask extends _answerBased.default {
     if (!previous) {
       return;
     }
+    // TODO: write question_source from payload._meta, so we don't need to write it to session.meta
     const values = previous.states[_index.fields.data()].value;
     const value = values.suggested_followup_questions || values.followup_questions || [];
     this._hub.update(_index.fields.suggestions(), {

package/dist/cjs/workflow/base.js

@@ -53,7 +53,8 @@ class Workflow extends _commons.Component {
     let {
       context,
       plugin,
-      client
+      client,
+      options
     } = args;
     this._context = context;
     this._plugin = plugin = plugin || context._plugin;
@@ -66,7 +67,7 @@ class Workflow extends _commons.Component {
     this._roles = args.roles;
     this._rolesConfig = Object.assign({}, ROLES_CONFIG, args.rolesConfig);
     this._extensions = plugin._getExtensions(client);
-    this._options = new _options.WorkflowOptions(context && context._options, mergeDefaults(this, args.defaults));
+    this._options = options || new _options.WorkflowOptions(context && context._options, mergeDefaults(this, args.defaults));
     this._hub = (0, _utils.injectLogger)(new _index.Hub(), function () {
       return _this._log(...arguments);
     });
@@ -112,7 +113,7 @@ class Workflow extends _commons.Component {
     return this.session && this.session.uuid;
   }
   get session() {
-    return this._hub.states.session;
+    return this._hub.states[_index.fields.session()];
   }
   get active() {
     const {
@@ -147,9 +148,6 @@ class Workflow extends _commons.Component {
 
   // states //
   updateData(data) {
-    let {
-      instructions
-    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     if (!data) {
       throw new Error(`Data is required.`);
     }
@@ -174,6 +172,10 @@ class Workflow extends _commons.Component {
         return;
       }
     }
+    this._updateData(data);
+    return this;
+  }
+  _updateData(data) {
     this._sessions.start(); // in case session not started yet
 
     data = (0, _processors.writeDataStatus)(data);
@@ -181,23 +183,24 @@ class Workflow extends _commons.Component {
     for (const process of this._options.resolved.dataProcessor) {
       data = process(data);
     }
-
-    // write data instructions from function args
-    data = (0, _processors.addDataInstructions)(data, instructions);
-    data = this._mergeDataIfNecessary(data);
     this._hub.update(_index.fields.data(), data);
-    return this;
   }
   _defaultProcessData(data) {
     return (0, _processors.writeMisoIdToMeta)(data);
   }
+
+  /*
   _mergeDataIfNecessary(data) {
     if (!data._inst || !data._inst.merge) {
       return data;
     }
-    return Object.assign({}, this._hub.states[_index.fields.data()], data);
+    return {
+      ...this._hub.states[fields.data()],
+      ...data,
+    };
   }
-  _handleResponseObject() {}
+   _handleResponseObject() {}
+  */
 
   // TODO: notifyViewUpdateAll()
 

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

@@ -0,0 +1,86 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _answerBased = _interopRequireDefault(require("./answer-based.js"));
+var _constants = require("../constants.js");
+var _processors = require("./processors.js");
+const _excluded = ["q", "qs"];
+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({
+  [_constants.ROLE.QUESTION]: {
+    mapping: _constants.ROLE.KEYWORDS
+  }
+});
+class HybridSearchAnswer extends _answerBased.default {
+  constructor(superworkflow) {
+    super({
+      name: 'hybrid-search/answer',
+      plugin: superworkflow._plugin,
+      client: superworkflow._client,
+      options: superworkflow._options,
+      roles: Object.keys(_answerBased.default.DEFAULT_LAYOUTS),
+      rolesConfig: ROLES_CONFIG,
+      superworkflow
+    });
+    this.useInteractions(false);
+  }
+  _initProperties(args) {
+    super._initProperties(args);
+    this._superworkflow = args.superworkflow;
+  }
+  _initReset() {} // no reset here, will manually reset later
+
+  restart() {
+    super.restart();
+    // cascade restart to the sibling
+    const results = this._superworkflow._results;
+    results.restart();
+    this._resultsSession = results.session; // keep track of the session
+  }
+
+  // query //
+  _buildPayload() {
+    let _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    let {
+        q,
+        qs
+      } = _ref,
+      payload = _objectWithoutPropertiesLoose(_ref, _excluded);
+    return Object.assign({}, payload, {
+      q,
+      // q, not question
+      _meta: Object.assign({}, payload._meta, {
+        question_source: qs || _constants.ORGANIC_QUESTION_SOURCE // might be null, not undefined
+      })
+    });
+  }
+
+  // data //
+  _updateData(data) {
+    // we want this to be available everywhere
+    data = (0, _processors.writeKeywordsToData)(data);
+    switch (data.status) {
+      case _constants.STATUS.INITIAL:
+      case _constants.STATUS.LOADING:
+        // share the initial/loading status with its sibling
+        this._dispatchDataToSibling(data);
+        break;
+    }
+    super._updateData(data);
+  }
+  _handleHeadResponse(data) {
+    super._handleHeadResponse(data);
+    // share the search results with its sibling
+    this._dispatchDataToSibling(data);
+  }
+  _dispatchDataToSibling(data) {
+    this._superworkflow._results.updateData(Object.assign({}, data, {
+      session: this._resultsSession
+    }));
+  }
+}
+exports.default = HybridSearchAnswer;

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

@@ -0,0 +1,88 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _commons = require("@miso.ai/commons");
+var _base = _interopRequireDefault(require("./base.js"));
+var _index = require("../actor/index.js");
+var _constants = require("../constants.js");
+var _options = require("./options.js");
+var _processors = require("./processors.js");
+const _excluded = ["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({
+  [_constants.ROLE.FACETS]: {
+    mapping: 'facet_counts'
+  }
+});
+class HybridSearchResults extends _base.default {
+  constructor(superworkflow) {
+    super({
+      name: 'hybrid-search/results',
+      plugin: superworkflow._plugin,
+      client: superworkflow._client,
+      options: superworkflow._options,
+      roles: [_constants.ROLE.PRODUCTS, _constants.ROLE.KEYWORDS, _constants.ROLE.HITS, _constants.ROLE.FACETS],
+      rolesConfig: ROLES_CONFIG,
+      superworkflow
+    });
+    this.useInteractions(false);
+  }
+  _initProperties(args) {
+    super._initProperties(args);
+    this._superworkflow = args.superworkflow;
+  }
+  _initSubscriptions(args) {
+    super._initSubscriptions(args);
+    this._unsubscribes = [...this._unsubscribes, this._hub.on(_index.fields.filters(), filters => this._refine(filters))];
+  }
+  _initReset() {} // no reset here, will manually reset later
+
+  // query //
+  _refine(filters) {
+    // start a new session
+    this.restart();
+
+    // 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
+    }));
+    const {
+      session
+    } = this;
+    const event = (0, _options.mergeApiOptions)(this._options.resolved.api, {
+      payload,
+      session
+    });
+    this._request(event);
+  }
+  _buildPayload() {
+    let _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    let {
+        filters
+      } = _ref,
+      payload = _objectWithoutPropertiesLoose(_ref, _excluded);
+    // borrow the work from the sibling
+    payload = this._superworkflow._answer._buildPayload(payload);
+    const fq = (0, _processors.composeFq)(filters); // TODO: combine with fq in payload?
+    return (0, _commons.trimObj)(Object.assign({}, payload, {
+      fq
+    }));
+  }
+  _request(event) {
+    this._hub.update(_index.fields.request(), event);
+  }
+
+  // data //
+  _defaultProcessData(data) {
+    data = super._defaultProcessData(data);
+    data = (0, _processors.writeKeywordsToData)(data);
+    return data;
+  }
+}
+exports.default = HybridSearchResults;