Web: Removed useless api @trash call on first load

packages/client/src/store/FilesStore.js

@@ -485,7 +485,19 @@ class FilesStore {
     if (!this.isEditor) {
       requests.push(
         getPortalCultures(),
-        this.treeFoldersStore.fetchTreeFolders()
+        this.treeFoldersStore.fetchTreeFolders().then((treeFolders) => {
+          if (!treeFolders || !treeFolders.length) return;
+
+          const trashFolder = treeFolders.find(
+            (f) => f.rootFolderType == FolderType.TRASH
+          );
+
+          if (!trashFolder) return;
+
+          const isEmpty = !trashFolder.foldersCount && !trashFolder.filesCount;
+
+          this.setTrashIsEmpty(isEmpty);
+        })
       );
 
       if (isDesktopClient) {
@@ -493,7 +505,6 @@ class FilesStore {
       }
     }
     requests.push(getFilesSettings());
-    requests.push(this.getIsEmptyTrash());
 
     return Promise.all(requests).then(() => this.setIsInit(true));
   };

packages/common/api/files/index.js

@@ -175,36 +175,27 @@ export function getFoldersTree() {
     const folders = sortInDisplayOrder(response);
 
     return folders.map((data, index) => {
-      const type = +data.current.rootFolderType;
+      const { new: newItems, pathParts, current, folders, files } = data;
+      const { foldersCount, filesCount } = current;
+      const { parentId, title, id, rootFolderType, security } = current;
+
+      const type = +rootFolderType;
+
       const name = getFolderClassNameByType(type);
-      const isRecycleBinFolder = type === FolderType.TRASH;
+
       return {
-        id: data.current.id,
+        id,
         key: `0-${index}`,
-        parentId: data.current.parentId,
-        title: data.current.title,
+        parentId,
+        title,
         rootFolderType: type,
         folderClassName: name,
-        // folders: !isRecycleBinFolder
-        //   ? data.folders.map((folder) => {
-        //       return {
-        //         id: folder.id,
-        //         title: folder.title,
-        //         access: folder.access,
-        //         foldersCount: folder.foldersCount,
-        //         rootFolderType: folder.rootFolderType,
-        //         providerKey: folder.providerKey,
-        //         newItems: folder.new,
-        //       };
-        //     })
-        //   : null,
         folders: null,
-        pathParts: data.pathParts,
-        foldersCount: !isRecycleBinFolder
-          ? data.current.foldersCount || data.folders.length
-          : null,
-        newItems: data.new,
-        security: data.current.security,
+        pathParts,
+        foldersCount,
+        filesCount,
+        newItems,
+        security,
       };
     });
   });