linagora · romanesko · Jun 10, 2022 · Jun 10, 2022
diff --git a/twake/backend/node/src/services/messages/web/controllers/views/search-files.ts b/twake/backend/node/src/services/messages/web/controllers/views/search-files.ts
@@ -1,7 +1,5 @@
 import { FastifyRequest } from "fastify";
-import { PublicFile } from "../../../../../services/files/entities/file";
-import { ListResult } from "../../../../../core/platform/framework/api/crud-service";
-import { Pagination } from "../../../../../core/platform/framework/api/crud-service";
+import { ListResult, Pagination } from "../../../../../core/platform/framework/api/crud-service";
 import { MessageFile } from "../../../../../services/messages/entities/message-files";
 import { Message } from "../../../../../services/messages/entities/messages";
 import { ChannelViewExecutionContext } from "../../../../../services/messages/types";
@@ -11,6 +9,7 @@ import { formatUser } from "../../../../../utils/users";
 import gr from "../../../../global-resolver";
 import { MessageFileRef } from "../../../../../services/messages/entities/message-file-refs";
 import recentFiles from "./recent-files";
+import { isEmpty } from "lodash";
 
 interface MessageViewSearchFilesQueryParameters extends PaginationQueryParameters {
   q: string;
@@ -41,7 +40,7 @@ export default async (
   }>,
   context: ChannelViewExecutionContext,
 ): Promise<ResourceListResponse<MessageFile>> => {
-  if (request.query.q.length < 1) {
+  if (isEmpty(request)) {
     return recentFiles(request);
   }
 

diff --git a/twake/frontend/src/app/components/channel-avatar/channel-avatar.tsx b/twake/frontend/src/app/components/channel-avatar/channel-avatar.tsx
@@ -12,9 +12,10 @@ const emoji = require('emoji-name-map');
 type PropsType = {
   channel: ChannelType;
   showLabel: boolean;
+  collapseToOne?: boolean;
 };
 
-export default ({ channel, showLabel }: PropsType): JSX.Element => {
+export default ({ channel, showLabel, collapseToOne }: PropsType): JSX.Element => {
   if (channel.visibility === 'direct') {
     let channelMembers = (channel.members || []).filter(e => e !== UsersService.getCurrentUserId());
     channelMembers = channelMembers.filter((e, i) => channelMembers.indexOf(e) === i);
@@ -29,12 +30,14 @@ export default ({ channel, showLabel }: PropsType): JSX.Element => {
 
     users.forEach(member => {
       channelName.push(UserService.getFullName(member));
-      icons.push(getThumbnail(member));
+      if (!(collapseToOne && icons.length > 0)) {
+        icons.push(getThumbnail(member));
+      }
     });
 
     let width = 64;
 
-    if (channelMembers.length > 1) {
+    if (!collapseToOne && channelMembers.length > 1) {
       const shift = 64 - (64 * 2) / 5;
       width = 64 + (channelMembers.length - 1) * shift;
     }

diff --git a/twake/frontend/src/app/components/search-popup/parts/channels-result.tsx b/twake/frontend/src/app/components/search-popup/parts/channels-result.tsx
@@ -38,7 +38,7 @@ export default ({ channel, highlight, onClick }: PropsType): JSX.Element => {
 
   return (
     <div className="result-item" onClick={onItemClick}>
-      <ChannelAvatar channel={channel} showLabel={false} />
+      <ChannelAvatar channel={channel} showLabel={false} collapseToOne={true} />
       <div className="result-item-content">
         <div
           className="channel-title"

diff --git a/twake/frontend/src/app/components/search-popup/parts/messages-result.tsx b/twake/frontend/src/app/components/search-popup/parts/messages-result.tsx
@@ -84,7 +84,11 @@ export default ({ message, highlight, onClick }: PropsType): JSX.Element => {
 
   return (
     <div className="result-item" onClick={onItemClick}>
-      {channel ? <ChannelAvatar channel={channel} showLabel={false} /> : <div />}
+      {channel ? (
+        <ChannelAvatar channel={channel} showLabel={false} collapseToOne={true} />
+      ) : (
+        <div />
+      )}
       {/*<div className="result-item-icon">*/}
       {/*  <div>*/}
       {/*    <img className="result-item-icon-back" src={thumbnail} />*/}

diff --git a/twake/frontend/src/app/components/search-popup/parts/recent-channels-and-contacts.tsx b/twake/frontend/src/app/components/search-popup/parts/recent-channels-and-contacts.tsx
@@ -30,7 +30,7 @@ export default (): JSX.Element => {
           Search.recent.channels.slice(0, 14).map(channel => (
             <ChannelItem
               channel={channel}
-              key={channel.id}
+              key={channel.id || '' + Math.random()}
               onClick={() => {
                 onClick(channel);
               }}
@@ -43,7 +43,7 @@ export default (): JSX.Element => {
 
 const ChannelItem = ({ channel, onClick }: { channel: ChannelType; onClick: any }): JSX.Element => {
   assert(channel.workspace_id, 'No workspace_id in channel object');
-  const avatar = ChannelAvatar({ channel, showLabel: true });
+  const avatar = ChannelAvatar({ channel, showLabel: true, collapseToOne: true });
   return (
     <div className="result-item" onClick={onClick}>
       <div className="result-item-icon">{avatar}</div>

diff --git a/twake/frontend/src/app/components/search-popup/search-popup.scss b/twake/frontend/src/app/components/search-popup/search-popup.scss
@@ -117,7 +117,7 @@ input:focus {
   //position: absolute;
 
   width: 100vw;
-  height: 90vh;
+  height: 100vh;
 
   max-width: 1000px;
 
@@ -456,7 +456,7 @@ input:focus {
       mask-image: linear-gradient(to right, black 92%, transparent 100%);
 
       .result-item {
-        margin-right: 5px;
+        margin-right: 4px;
         cursor: pointer;
       }
 

diff --git a/twake/frontend/src/app/components/search-popup/tabs/all/search.tsx b/twake/frontend/src/app/components/search-popup/tabs/all/search.tsx
@@ -25,7 +25,7 @@ export default (): JSX.Element => {
         <div>
           <div className="results-group-title ">Channels and contacts</div>
 
-          {Search.results.channels.length && (
+          {(Search.results.channels.length && (
             <div className="result-items">
               {Search.results.channels.map(channel => (
                 <ChannelsResult
@@ -36,9 +36,9 @@ export default (): JSX.Element => {
                 />
               ))}
             </div>
-          )}
+          )) || <div />}
 
-          {Search.results.users.length && (
+          {(Search.results.users.length && (
             <div className="result-items">
               {Search.results.users.map(user => (
                 <UsersResult
@@ -49,7 +49,7 @@ export default (): JSX.Element => {
                 />
               ))}
             </div>
-          )}
+          )) || <div />}
         </div>
       )) || <div />}
       {(Search.results.messages.length && (

diff --git a/twake/frontend/src/app/components/search-popup/tabs/files/index.tsx b/twake/frontend/src/app/components/search-popup/tabs/files/index.tsx
@@ -1,10 +1,10 @@
 import React, { useEffect, useState } from 'react';
 import Search from 'features/global/services/search-service';
-import FilesResult from 'components/search-popup/parts/recent/files-result';
-import PerfectScrollbar from 'react-perfect-scrollbar';
 import { FileType } from 'features/files/types/file';
 import DriveService from 'deprecated/Apps/Drive/Drive';
 import FileUploadService from 'features/files/services/file-upload-service';
+import PerfectScrollbar from 'react-perfect-scrollbar';
+import FilesResult from 'components/search-popup/parts/recent/files-result';
 
 export default (): JSX.Element => {
   const [pageReady, setPageReady] = useState(false);
@@ -85,6 +85,6 @@ export default (): JSX.Element => {
           </PerfectScrollbar>
         </div>
       </div>
-    )) || <div />
+    )) || <div></div>
   );
 };
diff --git a/twake/frontend/src/app/features/global/services/search-service.ts b/twake/frontend/src/app/features/global/services/search-service.ts
@@ -153,18 +153,43 @@ class SearchService extends Observable {
     this.notify();
 
     const promises = [
-      ChannelAPIClient.recent(Workspaces.currentGroupId, 12).then(a => {
+      ChannelAPIClient.recent(Workspaces.currentGroupId, 14).then(a => {
         this.recent.channels = a;
         this.notify();
       }),
-      FileAPIClient.recent(Workspaces.currentGroupId, 'file', 10).then(a => {
-        this.recent.files = a;
-        this.notify();
-      }),
-      FileAPIClient.recent(Workspaces.currentGroupId, 'media', 10).then(a => {
-        this.recent.media = a;
-        this.notify();
-      }),
+
+      MessageAPIClient.searchFile(null, {
+        limit: 10,
+        is_file: true,
+      })
+        .then(a => {
+          this.recent.files = a.resources;
+          this.notify();
+        })
+        .catch(e => {
+          this.logger.error(e);
+        }),
+
+      MessageAPIClient.searchFile(null, {
+        limit: 10,
+        is_media: true,
+      })
+        .then(a => {
+          this.recent.media = a.resources;
+          this.notify();
+        })
+        .catch(e => {
+          this.logger.error(e);
+        }),
+
+      // FileAPIClient.recent(Workspaces.currentGroupId, 'file', 10).then(a => {
+      //   this.recent.files = a;
+      //   this.notify();
+      // }),
+      // FileAPIClient.recent(Workspaces.currentGroupId, 'media', 10).then(a => {
+      //   this.recent.media = a;
+      //   this.notify();
+      // }),
     ];
 
     Promise.any(promises).then(() => {

diff --git a/twake/frontend/src/app/features/messages/api/message-api-client.ts b/twake/frontend/src/app/features/messages/api/message-api-client.ts
@@ -141,7 +141,7 @@ class MessageAPIClient {
 
   /**
    * Delete a link preview from a message
-   * 
+   *
    * @param {String} companyId - The company id
    * @param {String} threadId - The thread id
    * @param {String} messageId - The message id
@@ -156,7 +156,7 @@ class MessageAPIClient {
 
     return response.resource;
   }
-    
+
   async search(searchString: string, options?: BaseSearchOptions) {
     let companyId = options?.company_id ? options.company_id : Workspace.currentGroupId;
     let query = `/internal/services/messages/v1/companies/${companyId}/search?q=${searchString}`;
@@ -170,9 +170,12 @@ class MessageAPIClient {
     return res;
   }
 
-  async searchFile(searchString: string, options?: FileSearchOptions) {
+  async searchFile(searchString: string | null, options?: FileSearchOptions) {
     let companyId = options?.company_id ? options.company_id : Workspace.currentGroupId;
-    let query = `/internal/services/messages/v1/companies/${companyId}/files/search?q=${searchString}`;
+    let query = `/internal/services/messages/v1/companies/${companyId}/files/search`;
+    if (searchString) {
+      query += `q=${searchString}`;
+    }
     const res = await Api.getWithParams<{ resources: FileType[] }>(query, options);
     this.logger.debug(
       `FileSearch by name "${searchString}" with options`,