cozy-search 2.2.26 → 2.2.27

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

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _twakeIcons = require("@linagora/twake-icons");
-
 var _react = _interopRequireDefault(require("react"));
 
+var _twakeIcons = require("@linagora/twake-icons");
+
 var _cozyClient = require("cozy-client");
 
 var _cozyLogger = _interopRequireDefault(require("cozy-logger"));
@@ -45,8 +45,9 @@ var EmailSourceItem = function EmailSourceItem(_ref) {
     subDomainType: client.getInstanceOptions().subdomain,
     hash: "/bridge/dashboard/".concat(emailId)
   });
-  var emailDate = email['datetime'] ? new Date(email['datetime']).toISOString().slice(0, 10) : '';
-  var primary = [emailDate, email['email.subject']].filter(Boolean).join(' - ');
+  var emailDate = email.datetime && new Date(email.datetime).toISOString().slice(0, 10); // ListItemText renders an empty line for '', but nothing for undefined
+
+  var primary = [emailDate, email['email.subject']].filter(Boolean).join(' - ') || undefined;
   return /*#__PURE__*/_react.default.createElement(_ListItem.default, {
     className: styles['sourcesItem'],
     component: "a",
@@ -58,7 +59,7 @@ var EmailSourceItem = function EmailSourceItem(_ref) {
     icon: _twakeIcons.Mail,
     size: 32
   })), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {
-    primary: primary || undefined,
+    primary: primary,
     secondary: email['email.preview'] || undefined
   }));
 };

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

@@ -11,10 +11,12 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _twakeIcons = require("@linagora/twake-icons");
+var _uniqBy = _interopRequireDefault(require("lodash/uniqBy"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _twakeIcons = require("@linagora/twake-icons");
+
 var _cozyClient = require("cozy-client");
 
 var _Box = _interopRequireDefault(require("cozy-ui/transpiled/react/Box"));
@@ -39,7 +41,34 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var WEB_SOURCE_TYPE = 'web';
+var WEB_SOURCE_TYPE = 'web'; // Web sources have no doctype, other sources are identified by theirs
+
+var getSourceType = function getSourceType(source) {
+  if (source.sourceType === WEB_SOURCE_TYPE) return WEB_SOURCE_TYPE;
+  if (source.doctype === _queries.EMAIL_DOCTYPE) return _queries.EMAIL_DOCTYPE;
+  return _queries.FILES_DOCTYPE;
+};
+
+var getSourceKey = function getSourceKey(source) {
+  var type = getSourceType(source);
+  var identity = type === WEB_SOURCE_TYPE ? source.url : source.id;
+  return identity ? "".concat(type, ":").concat(identity) : null;
+};
+/**
+ * A same document can be returned several times by the RAG, typically when
+ * several chunks of the same file or email are relevant. We only want to
+ * display it once. Sources without any identity are all kept, as we can't
+ * tell them apart.
+ */
+
+
+var dedupeSources = function dedupeSources(sources) {
+  return (0, _uniqBy.default)(sources, function (source) {
+    var _getSourceKey;
+
+    return (_getSourceKey = getSourceKey(source)) !== null && _getSourceKey !== void 0 ? _getSourceKey : source;
+  });
+};
 
 var Sources = function Sources(_ref) {
   var messageId = _ref.messageId,
@@ -139,17 +168,18 @@ var SourcesWithFilesQuery = function SourcesWithFilesQuery(_ref2) {
   var fileIds = [];
   var emails = [];
   var urls = [];
-  var files;
-  sources.map(function (source) {
-    if (source.sourceType === WEB_SOURCE_TYPE) {
+  dedupeSources(sources).forEach(function (source) {
+    var type = getSourceType(source);
+
+    if (type === WEB_SOURCE_TYPE) {
       urls.push(source);
-    } else if (source.doctype === _queries.EMAIL_DOCTYPE) {
+    } else if (type === _queries.EMAIL_DOCTYPE) {
       emails.push(source);
     } else {
       fileIds.push(source.id);
     }
   });
-  var enabled = fileIds && fileIds.length > 0;
+  var enabled = fileIds.length > 0;
   var filesByIds = (0, _queries.buildFilesByIds)(fileIds, enabled);
 
   var _useQuery = (0, _cozyClient.useQuery)(filesByIds.definition, filesByIds.options),
@@ -157,7 +187,7 @@ var SourcesWithFilesQuery = function SourcesWithFilesQuery(_ref2) {
       queryResult = (0, _objectWithoutProperties2.default)(_useQuery, _excluded);
 
   var isLoading = (0, _cozyClient.isQueryLoading)(queryResult);
-  files = fetchedFiles || [];
+  var files = fetchedFiles || [];
   if (isLoading && enabled || files.length === 0 && emails.length === 0 && urls.length === 0) return null;
   return /*#__PURE__*/_react.default.createElement(Sources, {
     messageId: messageId,

package/package.json

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