cozy-search 0.23.0 → 0.23.2

package/dist/components/Assistant/AssistantContainer.js

@@ -59,7 +59,7 @@ var AssistantContainer = function AssistantContainer() {
     className: "u-w-5 u-pb-0-t u-pb-1"
   }), /*#__PURE__*/_react.default.createElement(_PrettyScrollbar.default, {
     className: "u-flex-auto u-flex u-flex-column u-pb-0-t u-pb-1 u-ov-hidden"
-  }, isOpenSearchConversation && (0, _cozyFlags.default)('cozy.search-conversation.enabled') ? /*#__PURE__*/_react.default.createElement(_SearchConversation.default, null) : /*#__PURE__*/_react.default.createElement(_CozyAssistantRuntimeProvider.default, null, /*#__PURE__*/_react.default.createElement(_Conversation.default, null))), openedKnowledgePanel && (0, _cozyFlags.default)('cozy.source-knowledge.enabled') && /*#__PURE__*/_react.default.createElement("div", {
+  }, isOpenSearchConversation && (0, _cozyFlags.default)('cozy.assistant.search-conversation.enabled') ? /*#__PURE__*/_react.default.createElement(_SearchConversation.default, null) : /*#__PURE__*/_react.default.createElement(_CozyAssistantRuntimeProvider.default, null, /*#__PURE__*/_react.default.createElement(_Conversation.default, null))), openedKnowledgePanel && (0, _cozyFlags.default)('cozy.assistant.source-knowledge.enabled') && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('u-h-100 u-maw-7 u-pl-half', styles["knowledge-panel--".concat(theme)])
   }, /*#__PURE__*/_react.default.createElement(_TwakeKnowledgePanel.default, {
     onClose: function onClose() {

package/dist/components/Conversations/ConversationActions.js

@@ -182,7 +182,7 @@ var ConversationActions = function ConversationActions(_ref) {
     };
   }();
 
-  var actions = (0, _Actions.makeActions)([_rename.rename, (0, _cozyFlags.default)('cozy.conversation-sharing.enabled') && _share.share, _delete.remove].filter(Boolean), {
+  var actions = (0, _Actions.makeActions)([_rename.rename, (0, _cozyFlags.default)('cozy.assistant.conversation-sharing.enabled') && _share.share, _delete.remove].filter(Boolean), {
     t: t,
     onRename: handleOpenRename,
     onDelete: function onDelete() {

package/dist/components/Conversations/ConversationComposer.js

@@ -83,9 +83,9 @@ var ConversationComposer = function ConversationComposer() {
     onSend: handleSend
   }), /*#__PURE__*/_react2.default.createElement("div", {
     className: "u-flex u-flex-items-center u-flex-justify-between u-mt-1"
-  }, (0, _cozyFlags.default)('cozy.create-assistant.enabled') && /*#__PURE__*/_react2.default.createElement(_AssistantSelection.default, {
+  }, (0, _cozyFlags.default)('cozy.assistant.create-assistant.enabled') && /*#__PURE__*/_react2.default.createElement(_AssistantSelection.default, {
     disabled: !isThreadEmpty
-  }), (0, _cozyFlags.default)('cozy.source-knowledge.enabled') && /*#__PURE__*/_react2.default.createElement(_TwakeKnowledgeSelector.default, {
+  }), (0, _cozyFlags.default)('cozy.assistant.source-knowledge.enabled') && /*#__PURE__*/_react2.default.createElement(_TwakeKnowledgeSelector.default, {
     onSelectTwakeKnowledge: setOpenedKnowledgePanel
   })));
 };

package/dist/components/Conversations/Sources/Sources.js

@@ -70,8 +70,18 @@ var Sources = function Sources(_ref) {
   }, []);
   (0, _react.useEffect)(function () {
     if (showSources) {
+      var _ref$current2;
+
+      var innerContainer = (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.closest('.cozyDialogContent');
+
+      if (!innerContainer) {
+        var _ref$current3;
+
+        (_ref$current3 = ref.current) === null || _ref$current3 === void 0 ? void 0 : _ref$current3.scrollIntoView(false);
+        return;
+      }
+
       var sourcesBottom = ref.current.getBoundingClientRect().bottom;
-      var innerContainer = document.getElementsByClassName('cozyDialogContent')[0];
       var innerContainerBottom = innerContainer.getBoundingClientRect().bottom;
 
       if (sourcesBottom > innerContainerBottom) {

package/dist/components/CozyAssistantRuntimeProvider.js

@@ -205,6 +205,10 @@ var CozyAssistantRuntimeProviderInner = function CozyAssistantRuntimeProviderInn
           streamBridgeRef.current.onDelta(conversationId, res.content, res.position);
         }
 
+        if (res.object === 'sources') {
+          streamBridgeRef.current.onSources(conversationId, res.content);
+        }
+
         if (res.object === 'done') {
           streamBridgeRef.current.onDone(conversationId);
           currentStreamingMessageIdRef.current = null;

package/dist/components/Sidebar/index.js

@@ -128,7 +128,7 @@ var Sidebar = function Sidebar(_ref) {
       icon: _Burger.default,
       "aria-hidden": "true"
     })
-  })), /*#__PURE__*/_react.default.createElement("div", null, sidebarOpen && (0, _cozyFlags.default)('cozy.search-conversation.enabled') && /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+  })), /*#__PURE__*/_react.default.createElement("div", null, sidebarOpen && (0, _cozyFlags.default)('cozy.assistant.search-conversation.enabled') && /*#__PURE__*/_react.default.createElement(_IconButton.default, {
     size: "medium",
     className: "u-bdrs-6",
     onClick: onToggleSearch,

package/dist/components/adapters/CozyRealtimeChatAdapter.js

@@ -9,6 +9,8 @@ exports.createCozyRealtimeChatAdapter = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _awaitAsyncGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/awaitAsyncGenerator"));
 
 var _wrapAsyncGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapAsyncGenerator"));
@@ -17,6 +19,10 @@ var _cozyMinilog = _interopRequireDefault(require("cozy-minilog"));
 
 var _helpers = require("../helpers");
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _asyncIterator(iterable) { var method, async, sync, retry = 2; for ("undefined" != typeof Symbol && (async = Symbol.asyncIterator, sync = Symbol.iterator); retry--;) { if (async && null != (method = iterable[async])) return method.call(iterable); if (sync && null != (method = iterable[sync])) return new AsyncFromSyncIterator(method.call(iterable)); async = "@@asyncIterator", sync = "@@iterator"; } throw new TypeError("Object is not async iterable"); }
 
 function AsyncFromSyncIterator(s) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var done = r.done; return Promise.resolve(r.value).then(function (value) { return { value: value, done: done }; }); } return AsyncFromSyncIterator = function AsyncFromSyncIterator(s) { this.s = s, this.n = s.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function next() { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, return: function _return(value) { var ret = this.s.return; return void 0 === ret ? Promise.resolve({ value: value, done: !0 }) : AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments)); }, throw: function _throw(value) { var thr = this.s.return; return void 0 === thr ? Promise.reject(value) : AsyncFromSyncIteratorContinuation(thr.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(s); }
@@ -58,7 +64,7 @@ var createCozyRealtimeChatAdapter = function createCozyRealtimeChatAdapter(optio
       var messages = _ref.messages,
           abortSignal = _ref.abortSignal;
       return (0, _wrapAsyncGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var client, conversationId, streamBridge, assistantId, userQuery, stream, fullText, wasAborted, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, chunk, sanitizedText, finalText;
+        var client, conversationId, streamBridge, assistantId, userQuery, stream, fullText, wasAborted, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, chunk, sanitizedText, finalText, sources;
 
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
@@ -185,13 +191,14 @@ var createCozyRealtimeChatAdapter = function createCozyRealtimeChatAdapter(optio
 
               case 48:
                 if (wasAborted) {
-                  _context.next = 53;
+                  _context.next = 54;
                   break;
                 }
 
                 finalText = (0, _helpers.sanitizeChatContent)(fullText);
-                _context.next = 52;
-                return {
+                sources = streamBridge.getSources(conversationId);
+                _context.next = 53;
+                return _objectSpread({
                   content: [{
                     type: 'text',
                     text: finalText
@@ -200,21 +207,27 @@ var createCozyRealtimeChatAdapter = function createCozyRealtimeChatAdapter(optio
                     type: 'complete',
                     reason: 'stop'
                   }
-                };
+                }, sources ? {
+                  metadata: {
+                    custom: {
+                      sources: sources
+                    }
+                  }
+                } : {});
 
-              case 52:
+              case 53:
                 streamBridge.cleanup(conversationId);
 
-              case 53:
-                _context.next = 61;
+              case 54:
+                _context.next = 62;
                 break;
 
-              case 55:
-                _context.prev = 55;
+              case 56:
+                _context.prev = 56;
                 _context.t1 = _context["catch"](6);
                 log.error('Error:', _context.t1);
                 streamBridge.cleanup(conversationId);
-                _context.next = 61;
+                _context.next = 62;
                 return {
                   content: [{
                     type: 'text',
@@ -226,12 +239,12 @@ var createCozyRealtimeChatAdapter = function createCozyRealtimeChatAdapter(optio
                   }
                 };
 
-              case 61:
+              case 62:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, null, [[6, 55], [15, 34, 38, 48], [39,, 43, 47]]);
+        }, _callee, null, [[6, 56], [15, 34, 38, 48], [39,, 43, 47]]);
       }))();
     }
   };

package/dist/components/adapters/StreamBridge.d.ts

@@ -10,6 +10,7 @@ export declare class StreamBridge {
     private cleanupCallback;
     private positionBuffers;
     private nextPositions;
+    private sourcesMap;
     /**
      * Sets a callback to be invoked when cleanup is called.
      * This allows the provider to mark the current message as cancelled.
@@ -31,6 +32,21 @@ export declare class StreamBridge {
      * Completes the stream for the conversation.
      */
     onDone(conversationId: string): void;
+    /**
+     * Called when a 'sources' event is received from WebSocket.
+     * Stores sources for the conversation to be retrieved by the adapter.
+     */
+    onSources(conversationId: string, sources: Array<{
+        id: string;
+        doctype?: string;
+    }>): void;
+    /**
+     * Returns stored sources for a conversation.
+     */
+    getSources(conversationId: string): Array<{
+        id: string;
+        doctype?: string;
+    }> | undefined;
     /**
      * Called when an error occurs.
      * Errors the stream for the conversation.

package/dist/components/adapters/StreamBridge.js

@@ -27,6 +27,7 @@ var StreamBridge = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "cleanupCallback", null);
     (0, _defineProperty2.default)(this, "positionBuffers", new Map());
     (0, _defineProperty2.default)(this, "nextPositions", new Map());
+    (0, _defineProperty2.default)(this, "sourcesMap", new Map());
   }
 
   (0, _createClass2.default)(StreamBridge, [{
@@ -200,6 +201,26 @@ var StreamBridge = /*#__PURE__*/function () {
         this.nextPositions.delete(conversationId);
       }
     }
+    /**
+     * Called when a 'sources' event is received from WebSocket.
+     * Stores sources for the conversation to be retrieved by the adapter.
+     */
+
+  }, {
+    key: "onSources",
+    value: function onSources(conversationId, sources) {
+      if (!this.streams.has(conversationId)) return;
+      this.sourcesMap.set(conversationId, sources);
+    }
+    /**
+     * Returns stored sources for a conversation.
+     */
+
+  }, {
+    key: "getSources",
+    value: function getSources(conversationId) {
+      return this.sourcesMap.get(conversationId);
+    }
     /**
      * Called when an error occurs.
      * Errors the stream for the conversation.
@@ -212,9 +233,11 @@ var StreamBridge = /*#__PURE__*/function () {
 
       if (stream) {
         stream.error(error);
-        this.positionBuffers.delete(conversationId);
-        this.nextPositions.delete(conversationId);
       }
+
+      this.positionBuffers.delete(conversationId);
+      this.nextPositions.delete(conversationId);
+      this.sourcesMap.delete(conversationId);
     }
     /**
      * Cleans up the stream for a conversation.
@@ -233,9 +256,11 @@ var StreamBridge = /*#__PURE__*/function () {
 
         stream.complete();
         this.streams.delete(conversationId);
-        this.positionBuffers.delete(conversationId);
-        this.nextPositions.delete(conversationId);
       }
+
+      this.positionBuffers.delete(conversationId);
+      this.nextPositions.delete(conversationId);
+      this.sourcesMap.delete(conversationId);
     }
     /**
      * Checks if there's an active stream for a conversation.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cozy-search",
   "description": "UI components about search bar and IA assistant",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "author": {
     "name": "Cozy Cloud",
     "url": "https://github.com/cozy"
@@ -94,5 +94,5 @@
     "lint": "cd .. && yarn eslint --ext js,jsx,ts packages/cozy-search"
   },
   "types": "dist/index.d.ts",
-  "gitHead": "7d0b0b566aae3b7601b60eb3f2910d6920f049ba"
+  "gitHead": "447d3d18c58cda9265ae8f73733993ea05be9fbb"
 }