@miso.ai/client-sdk-ui 1.12.3-beta.0 → 1.12.3-beta.2

package/dist/cjs/actor/data.js

@@ -42,12 +42,6 @@ class DataActor {
       this._ac = new AbortController();
     }
     this._session = session;
-
-    // TODO: move this to workflow
-    // reflect session update
-    this._emitResponse({
-      session
-    });
   }
   async _handleRequest(event) {
     // protocol: inactive -> no reaction
@@ -55,15 +49,9 @@ class DataActor {
       return;
     }
     const {
-      session
-    } = this._hub.states;
-    const request = _objectWithoutPropertiesLoose(event, _excluded);
-
-    // emit response to update request
-    this._emitResponse({
-      session,
-      request
-    });
+        session
+      } = event,
+      request = _objectWithoutPropertiesLoose(event, _excluded);
     try {
       const {
         signal
@@ -73,7 +61,7 @@ class DataActor {
       });
       const response = await this._source(Object.assign({
         session
-      }, event, {
+      }, request, {
         options
       }));
       // takes an iterable, either sync or async

package/dist/cjs/version.js

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

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

@@ -213,8 +213,8 @@ class AnswerBasedWorkflow extends _base.default {
     this._updateUrlIfNecessary(data);
   }
   _handleHeadResponse(data) {}
-  _defaultProcessData(data) {
-    data = super._defaultProcessData(data);
+  _defaultProcessData(data, oldData) {
+    data = super._defaultProcessData(data, oldData);
     data = (0, _index3.processData)(data);
     data = (0, _processors.writeAnswerStageToMeta)(data);
     return data;

package/dist/cjs/workflow/base.js

@@ -90,7 +90,7 @@ class Workflow extends _commons.Component {
   _initSubscriptions({
     roles
   }) {
-    this._unsubscribes = [this._hub.on(_index.fields.response(), data => this.updateData(data)), this._hub.on(_index.fields.tracker(), args => this._onTracker(args))];
+    this._unsubscribes = [this._hub.on(_index.fields.session(), session => this._onSession(session)), this._hub.on(_index.fields.response(), data => this.updateData(data)), this._hub.on(_index.fields.tracker(), args => this._onTracker(args))];
     if (roles.main) {
       this._unsubscribes.push(this._hub.on(_index.fields.view(roles.main), state => this._onMainViewUpdate(state)));
     }
@@ -166,6 +166,11 @@ class Workflow extends _commons.Component {
       this._emitLifecycleEvent('finally', state);
     }
   }
+  _onSession(session) {
+    this.updateData({
+      session
+    });
+  }
   _onMainViewUpdate(state) {
     const {
       status
@@ -202,10 +207,14 @@ class Workflow extends _commons.Component {
     const {
       session
     } = this;
-    const event = (0, _index3.mergeApiOptions)(this._options.resolved.api, Object.assign({}, options, {
+    const request = (0, _index3.mergeApiOptions)(this._options.resolved.api, options);
+    this.updateData({
+      session,
+      request
+    });
+    this._hub.update(_index.fields.request(), Object.assign({}, request, {
       session
     }));
-    this._hub.update(_index.fields.request(), event);
   }
 
   // data //
@@ -238,13 +247,15 @@ class Workflow extends _commons.Component {
     return this;
   }
   _updateData(data) {
-    data = this._defaultProcessData(data);
+    const oldData = this._hub.states[_index.fields.data()];
+    data = this._defaultProcessData(data, oldData);
     for (const process of this._options.resolved.dataProcessor) {
-      data = process(data);
+      data = process(data, oldData);
     }
-    this._updateDataInHub(data);
+    this._updateDataInHub(data, oldData);
   }
-  _defaultProcessData(data) {
+  _defaultProcessData(data, oldData) {
+    data = (0, _processors.writeRequestFromPreviousData)(data, oldData);
     data = (0, _processors.writeDataStatus)(data);
     data = (0, _processors.writeMisoIdToMeta)(data);
     return data;

package/dist/cjs/workflow/explore.js

@@ -129,8 +129,8 @@ class Explore extends _unit.default {
     super.notifyViewUpdate(role, ...args);
     return this;
   }
-  _defaultProcessData(data) {
-    data = super._defaultProcessData(data);
+  _defaultProcessData(data, oldData) {
+    data = super._defaultProcessData(data, oldData);
     data = this._addUrlToRelatedQuestions(data);
     return data;
   }

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

@@ -67,8 +67,8 @@ class HybridSearchAnswer extends _answerBased.default {
   }
 
   // data //
-  _defaultProcessData(data) {
-    data = super._defaultProcessData(data);
+  _defaultProcessData(data, oldData) {
+    data = super._defaultProcessData(data, oldData);
     data = (0, _processors.writeKeywordsToData)(data);
     data = (0, _processors.writeMisoIdFromSession)(data);
     data = (0, _processors.writeUnanswerableToMeta)(data);

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

@@ -69,8 +69,8 @@ class HybridSearchResults extends _searchBased.default {
   }
 
   // data //
-  _defaultProcessData(data) {
-    data = super._defaultProcessData(data);
+  _defaultProcessData(data, oldData) {
+    data = super._defaultProcessData(data, oldData);
     (0, _processors.writeMisoIdToSession)(data);
     return data;
   }

package/dist/cjs/workflow/processors.js

@@ -23,6 +23,7 @@ exports.writeMisoIdAsRootMisoId = writeMisoIdAsRootMisoId;
 exports.writeMisoIdFromSession = writeMisoIdFromSession;
 exports.writeMisoIdToMeta = writeMisoIdToMeta;
 exports.writeMisoIdToSession = writeMisoIdToSession;
+exports.writeRequestFromPreviousData = writeRequestFromPreviousData;
 exports.writeUnanswerableToMeta = writeUnanswerableToMeta;
 var _commons = require("@miso.ai/commons");
 var _constants = require("../constants.js");
@@ -114,6 +115,18 @@ function mappingFollowUpQuestionsData(data) {
 function getRevision(data) {
   return data && data.value && data.value.revision;
 }
+function writeRequestFromPreviousData(data, oldData) {
+  // patch request in case user call updateData() without request object in custom data scenario
+  if (!data || !data.value || data.request || !oldData || !oldData.request) {
+    return data;
+  }
+  const {
+    request
+  } = oldData;
+  return Object.assign({}, data, {
+    request
+  });
+}
 function writeDataStatus(data) {
   const status = getStatus(data);
   const ongoing = status === _constants.STATUS.READY ? data.ongoing : undefined;

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

@@ -215,8 +215,8 @@ class SearchBasedWorkflow extends _base.default {
   }
 
   // data //
-  _defaultProcessData(data) {
-    data = super._defaultProcessData(data);
+  _defaultProcessData(data, oldData) {
+    data = super._defaultProcessData(data, oldData);
     data = (0, _processors.writeKeywordsToData)(data);
     data = (0, _processors.retainFacetCountsInData)(data, this._currentFacetCounts);
     data = (0, _processors.writeExhaustionToData)(data, {

package/package.json

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

package/src/actor/data.js

@@ -38,10 +38,6 @@ export default class DataActor {
       this._ac = new AbortController();
     }
     this._session = session;
-
-    // TODO: move this to workflow
-    // reflect session update
-    this._emitResponse({ session });
   }
 
   async _handleRequest(event) {
@@ -49,16 +45,12 @@ export default class DataActor {
     if (!this.active) {
       return;
     }
-    const { session } = this._hub.states;
-    const { session: _, ...request } = event;
-
-    // emit response to update request
-    this._emitResponse({ session, request });
+    const { session, ...request } = event;
 
     try {
       const { signal } = this._ac || {};
       const options = { ...event.options, signal };
-      const response = await this._source({ session, ...event, options });
+      const response = await this._source({ session, ...request, options });
       // takes an iterable, either sync or async
       if (response && response[Symbol.asyncIterator]) {
         // also emit reponse of the head request, if available

package/src/version.js

@@ -1 +1 @@
-export default '1.12.3-beta.0';
+export default '1.12.3-beta.2';

package/src/workflow/answer-based.js

@@ -209,8 +209,8 @@ export default class AnswerBasedWorkflow extends Workflow {
 
   _handleHeadResponse(data) {}
 
-  _defaultProcessData(data) {
-    data = super._defaultProcessData(data);
+  _defaultProcessData(data, oldData) {
+    data = super._defaultProcessData(data, oldData);
     data = processAffiliationData(data);
     data = writeAnswerStageToMeta(data);
     return data;

package/src/workflow/base.js

@@ -4,7 +4,7 @@ import * as sources from '../source.js';
 import { STATUS, ROLE } from '../constants.js';
 import { ContainerLayout, ErrorLayout } from '../layout/index.js';
 import { WorkflowOptions, mergeApiOptions, makeConfigurable } from './options/index.js';
-import { getRevision, writeDataStatus, writeMisoIdToMeta, buildBaseInteraction, writeAffiliationInfoToInteraction, mergeInteraction } from './processors.js';
+import { getRevision, writeRequestFromPreviousData, writeDataStatus, writeMisoIdToMeta, buildBaseInteraction, writeAffiliationInfoToInteraction, mergeInteraction } from './processors.js';
 
 const DEFAULT_API_OPTIONS = Object.freeze({});
 
@@ -75,6 +75,7 @@ export default class Workflow extends Component {
 
   _initSubscriptions({ roles }) {
     this._unsubscribes = [
+      this._hub.on(fields.session(), session => this._onSession(session)),
       this._hub.on(fields.response(), data => this.updateData(data)),
       this._hub.on(fields.tracker(), args => this._onTracker(args)),
     ];
@@ -154,6 +155,10 @@ export default class Workflow extends Component {
     }
   }
 
+  _onSession(session) {
+    this.updateData({ session });
+  }
+
   _onMainViewUpdate(state) {
     const { status } = state;
     const done = status === STATUS.READY;
@@ -186,8 +191,9 @@ export default class Workflow extends Component {
   // request //
   _request(options = {}) {
     const { session } = this;
-    const event = mergeApiOptions(this._options.resolved.api, { ...options, session });
-    this._hub.update(fields.request(), event);
+    const request = mergeApiOptions(this._options.resolved.api, options);
+    this.updateData({ session, request });
+    this._hub.update(fields.request(), { ...request, session });
   }
 
   // data //
@@ -221,15 +227,17 @@ export default class Workflow extends Component {
   }
 
   _updateData(data) {
-    data = this._defaultProcessData(data);
+    const oldData = this._hub.states[fields.data()];
+    data = this._defaultProcessData(data, oldData);
     for (const process of this._options.resolved.dataProcessor) {
-      data = process(data);
+      data = process(data, oldData);
     }
 
-    this._updateDataInHub(data);
+    this._updateDataInHub(data, oldData);
   }
 
-  _defaultProcessData(data) {
+  _defaultProcessData(data, oldData) {
+    data = writeRequestFromPreviousData(data, oldData);
     data = writeDataStatus(data);
     data = writeMisoIdToMeta(data);
     return data;

package/src/workflow/explore.js

@@ -121,8 +121,8 @@ export default class Explore extends UnitWorkflow {
     return this;
   }
 
-  _defaultProcessData(data) {
-    data = super._defaultProcessData(data);
+  _defaultProcessData(data, oldData) {
+    data = super._defaultProcessData(data, oldData);
     data = this._addUrlToRelatedQuestions(data);
     return data;
   }

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

@@ -60,8 +60,8 @@ export default class HybridSearchAnswer extends AnswerBasedWorkflow {
   }
 
   // data //
-  _defaultProcessData(data) {
-    data = super._defaultProcessData(data);
+  _defaultProcessData(data, oldData) {
+    data = super._defaultProcessData(data, oldData);
     data = writeKeywordsToData(data);
     data = writeMisoIdFromSession(data);
     data = writeUnanswerableToMeta(data);

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

@@ -71,8 +71,8 @@ export default class HybridSearchResults extends SearchBasedWorkflow {
   }
 
   // data //
-  _defaultProcessData(data) {
-    data = super._defaultProcessData(data);
+  _defaultProcessData(data, oldData) {
+    data = super._defaultProcessData(data, oldData);
     writeMisoIdToSession(data);
     return data;
   }

package/src/workflow/processors.js

@@ -66,6 +66,18 @@ export function getRevision(data) {
   return data && data.value && data.value.revision;
 }
 
+export function writeRequestFromPreviousData(data, oldData) {
+  // patch request in case user call updateData() without request object in custom data scenario
+  if (!data || !data.value || data.request || !oldData || !oldData.request) {
+    return data;
+  }
+  const { request } = oldData;
+  return {
+    ...data,
+    request,
+  };
+}
+
 export function writeDataStatus(data) {
   const status = getStatus(data);
   const ongoing = status === STATUS.READY ? data.ongoing : undefined;

package/src/workflow/search-based.js

@@ -225,8 +225,8 @@ export default class SearchBasedWorkflow extends Workflow {
   }
 
   // data //
-  _defaultProcessData(data) {
-    data = super._defaultProcessData(data);
+  _defaultProcessData(data, oldData) {
+    data = super._defaultProcessData(data, oldData);
     data = writeKeywordsToData(data);
     data = retainFacetCountsInData(data, this._currentFacetCounts);
     data = writeExhaustionToData(data, { role: this._roles.main });