@miso.ai/client-sdk-ui 1.11.0-beta.6 → 1.11.0-beta.7

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

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

@@ -57,7 +57,8 @@ const DEFAULT_LAYOUTS = Object.freeze({
 });
 const DEFAULT_TRACKERS = Object.freeze({
   [_constants.ROLE.SOURCES]: {},
-  [_constants.ROLE.AFFILIATION]: {}
+  [_constants.ROLE.AFFILIATION]: {},
+  [_constants.ROLE.PRODUCTS]: {}
 });
 const DEFAULT_OPTIONS = Object.freeze({
   api: DEFAULT_API_OPTIONS,

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

@@ -26,7 +26,6 @@ class HybridSearchAnswer extends _answerBased.default {
       rolesConfig: ROLES_CONFIG,
       superworkflow
     });
-    this.useInteractions(false);
   }
   _initProperties(args) {
     super._initProperties(args);
@@ -38,6 +37,7 @@ class HybridSearchAnswer extends _answerBased.default {
     super.restart();
     // cascade restart to the sibling
     const results = this._superworkflow._results;
+    results._views.filters.reset();
     results.restart();
     this._resultsSession = results.session; // keep track of the session
   }

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

@@ -30,7 +30,6 @@ class HybridSearchResults extends _base.default {
       rolesConfig: ROLES_CONFIG,
       superworkflow
     });
-    this.useInteractions(false);
   }
   _initProperties(args) {
     super._initProperties(args);
@@ -75,7 +74,7 @@ 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, {
+    payload = this._writeFiltersToPayload(Object.assign({}, payload, {
       filters
     }));
     payload = this._writeQuestionIdToPayload(payload);
@@ -83,16 +82,13 @@ class HybridSearchResults extends _base.default {
       answer: false
     });
   }
-  _writeFqToPayload() {
+  _writeFiltersToPayload() {
     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
-    }));
+    return (0, _commons.trimObj)(Object.assign({}, payload, (0, _processors.composeFiltersPayload)(filters)));
   }
   _writeQuestionIdToPayload(payload) {
     return Object.assign({}, payload, {

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

@@ -16,7 +16,8 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const DEFAULT_API_OPTIONS = Object.freeze(Object.assign({}, _answerBased.default.DEFAULT_API_OPTIONS, {
   name: _commons.API.NAME.SEARCH,
   payload: Object.assign({}, _answerBased.default.DEFAULT_API_OPTIONS.payload, {
-    fl: ['cover_image', 'url', 'created_at', 'updated_at', 'published_at']
+    source_fl: ['cover_image', 'url', 'created_at', 'updated_at', 'published_at', 'title'],
+    fl: ['cover_image', 'url', 'created_at', 'updated_at', 'published_at', 'title']
   })
 }));
 const DEFAULT_LAYOUTS = Object.freeze(Object.assign({}, _answerBased.default.DEFAULT_LAYOUTS, {

package/dist/cjs/workflow/processors.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.composeFq = composeFq;
+exports.composeFiltersPayload = composeFiltersPayload;
 exports.writeAnswerStageToMeta = writeAnswerStageToMeta;
 exports.writeDataStatus = writeDataStatus;
 exports.writeKeywordsToData = writeKeywordsToData;
@@ -94,21 +94,30 @@ function writeAnswerStageToMeta(data) {
     })
   });
 }
-function composeFq(filters) {
+function composeFiltersPayload(filters) {
   if (!filters) {
     return undefined;
   }
-  const clauses = [];
   const {
     facets
   } = filters;
+  return (0, _commons.trimObj)({
+    facet_filters: composeFacetFilters(facets)
+  });
+}
+function composeFacetFilters(facets) {
+  if (!facets) {
+    return undefined;
+  }
+  const filters = {};
   for (const field in facets) {
     const values = facets[field];
     if (!values || !values.length) {
       continue; // just in case
     }
-    const vstr = values.length === 1 ? `"${values[0]}"` : `(${values.map(v => `"${v}"`).join(' OR ')})`;
-    clauses.push(`${field}:${vstr}`);
+    filters[field] = {
+      terms: values
+    };
   }
-  return clauses.map(c => `(${c})`).join(' AND ') || undefined;
+  return Object.keys(filters).length ? filters : 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.6"
+    "@miso.ai/commons": "1.11.0-beta.7"
   },
-  "version": "1.11.0-beta.6"
+  "version": "1.11.0-beta.7"
 }

package/src/version.js

@@ -1 +1 @@
-export default '1.11.0-beta.6';
+export default '1.11.0-beta.7';

package/src/workflow/answer-based.js

@@ -38,6 +38,7 @@ const DEFAULT_LAYOUTS = Object.freeze({
 const DEFAULT_TRACKERS = Object.freeze({
   [ROLE.SOURCES]: {},
   [ROLE.AFFILIATION]: {},
+  [ROLE.PRODUCTS]: {},
 });
 
 const DEFAULT_OPTIONS = Object.freeze({

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

@@ -20,7 +20,6 @@ export default class HybridSearchAnswer extends AnswerBasedWorkflow {
       rolesConfig: ROLES_CONFIG,
       superworkflow,
     });
-    this.useInteractions(false);
   }
 
   _initProperties(args) {
@@ -34,6 +33,7 @@ export default class HybridSearchAnswer extends AnswerBasedWorkflow {
     super.restart();
     // cascade restart to the sibling
     const results = this._superworkflow._results;
+    results._views.filters.reset();
     results.restart();
     this._resultsSession = results.session; // keep track of the session
   }

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

@@ -3,7 +3,7 @@ import Workflow from './base.js';
 import { fields } from '../actor/index.js';
 import { ROLE, STATUS } from '../constants.js';
 import { mergeApiOptions } from './options.js';
-import { writeKeywordsToData, composeFq } from './processors.js';
+import { writeKeywordsToData, composeFiltersPayload } from './processors.js';
 
 const ROLES_CONFIG = Object.freeze({
   [ROLE.FACETS]: {
@@ -23,7 +23,6 @@ export default class HybridSearchResults extends Workflow {
       rolesConfig: ROLES_CONFIG,
       superworkflow,
     });
-    this.useInteractions(false);
   }
 
   _initProperties(args) {
@@ -62,16 +61,15 @@ 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._writeFiltersToPayload({ ...payload, filters });
     payload = this._writeQuestionIdToPayload(payload);
     return { ...payload, answer: false };
   }
 
-  _writeFqToPayload({ filters, ...payload } = {}) {
-    const fq = composeFq(filters); // TODO: combine with fq in payload?
+  _writeFiltersToPayload({ filters, ...payload } = {}) {
     return trimObj({
       ...payload,
-      fq,
+      ...composeFiltersPayload(filters),
     });
   }
 

package/src/workflow/hybrid-search.js

@@ -12,7 +12,8 @@ const DEFAULT_API_OPTIONS = Object.freeze({
   name: API.NAME.SEARCH,
   payload: {
     ...AnswerBasedWorkflow.DEFAULT_API_OPTIONS.payload,
-    fl: ['cover_image', 'url', 'created_at', 'updated_at', 'published_at'],
+    source_fl: ['cover_image', 'url', 'created_at', 'updated_at', 'published_at', 'title'],
+    fl: ['cover_image', 'url', 'created_at', 'updated_at', 'published_at', 'title'],
   },
 });
 

package/src/workflow/processors.js

@@ -74,19 +74,29 @@ export function writeAnswerStageToMeta(data) {
   };
 }
 
-export function composeFq(filters) {
+export function composeFiltersPayload(filters) {
   if (!filters) {
     return undefined;
   }
-  const clauses = [];
   const { facets } = filters;
+  return trimObj({
+    facet_filters: composeFacetFilters(facets),
+  });
+}
+
+function composeFacetFilters(facets) {
+  if (!facets) {
+    return undefined;
+  }
+  const filters = {};
   for (const field in facets) {
     const values = facets[field];
     if (!values || !values.length) {
       continue; // just in case
     }
-    const vstr = values.length === 1 ? `"${values[0]}"` : `(${values.map(v => `"${v}"`).join(' OR ')})`;
-    clauses.push(`${field}:${vstr}`);
+    filters[field] = {
+      terms: values,
+    };
   }
-  return clauses.map(c => `(${c})`).join(' AND ') || undefined;
+  return Object.keys(filters).length ? filters : undefined;
 }