@miso.ai/client-sdk-ui 1.12.7 → 1.13.0-beta.1

package/src/workflow/answer-based.js

@@ -90,8 +90,8 @@ export default class AnswerBasedWorkflow extends Workflow {
     this._unsubscribes = [
       ...this._unsubscribes,
       this._hub.on(fields.query(), args => this._query(args)),
-      this._views.get(ROLE.ANSWER).on('citation-click', event => this._onCitationClick(event)),
-      this._views.get(ROLE.ANSWER).on('link-click', event => this._onAnswerLinkClick(event)),
+      this._views.on(ROLE.ANSWER, 'citation-click', event => this._onCitationClick(event)),
+      this._views.on(ROLE.ANSWER, 'link-click', event => this._onAnswerLinkClick(event)),
     ];
   }
 
@@ -123,6 +123,7 @@ export default class AnswerBasedWorkflow extends Workflow {
     const done = status === STATUS.READY && !state.ongoing;
     const erroneous = status === STATUS.ERRONEOUS;
     const eventName = done ? 'done' : erroneous ? 'error' : status;
+
     // answer-stage
     const context = this._getSessionContext(session);
     const oldAnswerStage = context.answerStage;
@@ -131,6 +132,17 @@ export default class AnswerBasedWorkflow extends Workflow {
       this._emitLifecycleEvent('answer-stage', Object.freeze({ ...state, answer_stage: newAnswerStage }));
       context.answerStage = newAnswerStage;
     }
+
+    // blocked reason
+    const data = this._hub.states[fields.data()] || {};
+    const { value } = data;
+    if (value) {
+      const { blocked_reason } = value;
+      if (blocked_reason) {
+        this._emitLifecycleEvent('blocked', { ...state, blockedReason: blocked_reason });
+      }
+    }
+
     // ready, done, or error
     this._emitLifecycleEvent(eventName, state);
     if (done || erroneous) {

package/src/workflow/ask.js

@@ -80,9 +80,9 @@ export default class Ask extends AnswerBasedWorkflow {
     this._unsubscribes = [
       ...this._unsubscribes,
       this._hub.on(fields.view(ROLE.REASONING), state => this._onReasoningViewUpdate(state)),
-      this._views.get(ROLE.ANSWER).on('follow-up-click', event => this._onFollowUpClick(event)),
-      this._views.get(ROLE.FOLLOW_UP_QUESTIONS).on('select', event => this._onFollowUpQuestionSelect(event)),
-      this._views.get(ROLE.QUERY_SUGGESTIONS).on('select', event => this._onQuerySuggestionSelect(event)),
+      this._views.on(ROLE.ANSWER, 'follow-up-click', event => this._onFollowUpClick(event)),
+      this._views.on(ROLE.FOLLOW_UP_QUESTIONS, 'select', event => this._onFollowUpQuestionSelect(event)),
+      this._views.on(ROLE.QUERY_SUGGESTIONS, 'select', event => this._onQuerySuggestionSelect(event)),
     ];
   }
 
@@ -154,8 +154,9 @@ export default class Ask extends AnswerBasedWorkflow {
     if (!next) {
       return;
     }
-    const view = next._views.get(ROLE.QUERY_SUGGESTIONS);
-    view && view.refresh();
+    for (const view of next._views.getAll(ROLE.QUERY_SUGGESTIONS)) {
+      view.refresh();
+    }
   }
 
   // view //
@@ -163,8 +164,10 @@ export default class Ask extends AnswerBasedWorkflow {
     if (status !== STATUS.READY || ongoing) {
       return;
     }
-    const element = this._getReasoningBoxElement();
-    element && element.classList.add('done');
+    for (const view of this._views.getAll(ROLE.REASONING)) {
+      const element = view.element && view.element.closest('[data-role="reasoning-box"]');
+      element && element.classList.add('done');
+    }
   }
 
   // interactions //
@@ -251,12 +254,6 @@ export default class Ask extends AnswerBasedWorkflow {
     }
   }
 
-  _getReasoningBoxElement() {
-    const view = this._views.get(ROLE.REASONING);
-    const element = view && view.element;
-    return element && element.closest('[data-role="reasoning-box"]');
-  }
-
   // destroy //
   _destroy(options) {
     const { next, parentQuestionId, questionId } = this;

package/src/workflow/base.js

@@ -1,5 +1,5 @@
 import { Component, isNullLike, mergeInteractions } from '@miso.ai/commons';
-import { Hub, SessionMaker, DataActor, ViewsActor, InteractionsActor, TrackersActor, fields } from '../actor/index.js';
+import { Hub, SessionMaker, DataActor, ViewsActor, InteractionsActor, TrackersActor, proxyTrackers, fields } from '../actor/index.js';
 import * as sources from '../source.js';
 import { STATUS, ROLE } from '../constants.js';
 import { ContainerLayout, ErrorLayout } from '../layout/index.js';
@@ -78,9 +78,10 @@ export default class Workflow extends Component {
     const layouts = this._plugin.layouts;
 
     this._sessions = new SessionMaker(hub);
+    this._trackers = new TrackersActor(hub, { roles, options });
+    this._proxyTrackers = proxyTrackers(this._trackers);
     this._data = new DataActor(hub, { source: sources.api(client), options, ...this._extraOptions.api });
     this._views = new ViewsActor(hub, { extensions, layouts, roles, options, workflow: this });
-    //this._trackers = new TrackersActor(hub, { options });
     this._interactions = new InteractionsActor(hub, { client, options });
   }
 
@@ -272,7 +273,7 @@ export default class Workflow extends Component {
 
   // trackers //
   get trackers() {
-    return this._views.trackers;
+    return this._proxyTrackers;
   }
 
   _onTracker(args) {
@@ -355,7 +356,7 @@ export default class Workflow extends Component {
     for (const callback of callbacks) {
       try {
         callback({ workflow: this, ...event });
-      } catch(e) {
+      } catch (e) {
         this._error(e);
       }
     }

package/src/workflow/explore.js

@@ -66,7 +66,7 @@ export default class Explore extends UnitWorkflow {
     super._initSubscriptions(args);
     this._unsubscribes = [
       ...this._unsubscribes,
-      this._views.get(ROLE.RELATED_QUESTIONS).on('click', event => this._handleRelatedQuestionClick(event)),
+      this._views.on(ROLE.RELATED_QUESTIONS, 'click', event => this._handleRelatedQuestionClick(event)),
       this._hub.on(fields.query(), args => this._query(args)),
     ];
   }

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

@@ -18,10 +18,18 @@ export default class HybridSearchViewsActor {
     return this._subviews.results.filters;
   }
 
+  on(role, event, callback) {
+    return this._getSubviews(role).on(role, event, callback);
+  }
+
   get(role) {
     return this._getSubviews(role).get(role);
   }
 
+  getAll(role) {
+    return this._getSubviews(role).getAll(role);
+  }
+
   addContainer(element) {
     if (this._containers.has(element)) {
       return;
@@ -42,12 +50,12 @@ export default class HybridSearchViewsActor {
   }
 
   addComponent(element) {
-    this._getViewByElement(element).element = element;
+    this._getSubviews(element.role).addComponent(element);
     this._addContainerToSubviews(element._container, element);
   }
 
   removeComponent(element) {
-    this._getViewByElement(element).element = undefined;
+    this._getSubviews(element.role).removeComponent(element);
     this._removeContainerFromSubviewsIfNecessary(element._container);
   }
 
@@ -56,8 +64,7 @@ export default class HybridSearchViewsActor {
   }
 
   refreshElement(element) {
-    const view = element.isContainer ? this._containers.get(element) : this._getViewByElement(element);
-    view && view.refresh({ force: true });
+    this._getSubviews(element.role).refreshElement(element);
   }
 
   // helpers //
@@ -69,14 +76,6 @@ export default class HybridSearchViewsActor {
     return this._subviews[getSubworkflowByRole(role)];
   }
 
-  _getViewByElement(element) {
-    let { role } = element;
-    if (!role) {
-      throw new Error('Component must have a role');
-    }
-    return this.get(role);
-  }
-
   _addContainerToSubviews(container, child) {
     if (!container) {
       return;

package/src/workflow/options/auto-query.js

@@ -21,15 +21,20 @@ export function autoQuery(options = {}) {
   const searchParams = new URLSearchParams(window.location.search);
   const q = searchParams.get(param);
   const qs = searchParams.get(sourceParam) || undefined;
-  const { layout } = this._views.get(ROLE.QUERY);
-  if (layout) {
-    if (q && setValue) {
-      layout.value = q;
-    }
-    if (!q && focus) {
-      layout.focus();
+
+  // because it's probably not there yet, but this is an ad-hoc solution
+  setTimeout(() => {
+    for (const view of this._views.getAll(ROLE.QUERY)) {
+      const { layout } = view;
+      if (q && setValue) {
+        layout.value = q;
+      }
+      if (!q && focus) {
+        layout.focus();
+      }
     }
-  }
+  });
+
   if (q) {
     this.query(trimObj({ q, qs }));
   }

package/src/workflow/search-based.js

@@ -68,7 +68,7 @@ export default class SearchBasedWorkflow extends Workflow {
       this._hub.on(fields.query(), args => this._query(args)),
       this._hub.on(fields.filters(), () => this._refine()),
       this._hub.on(fields.more(), () => this._more()),
-      this._views.get(ROLE.SORT).on('select', event => this._handleSortSelect(event)),
+      this._views.on(ROLE.SORT, 'select', event => this._handleSortSelect(event)),
     ];
   }