fix broken things

packages/common-contexts/package.json

@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@chainsafe/browser-storage-hooks": "^1.0.1",
-    "@chainsafe/files-api-client": "1.9.0",
+    "@chainsafe/files-api-client": "1.11.1",
     "axios": "^0.21.1",
     "uuid": "^8.3.1"
   },

packages/files-ui/src/Components/Modules/FileBrowsers/BinFileBrowser.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react"
-import { BucketType, FileSystemItem, useDrive } from "../../../Contexts/DriveContext"
+import { FileSystemItem, useDrive } from "../../../Contexts/DriveContext"
 import { IBulkOperations, IFilesBrowserModuleProps } from "./types"
 import FilesTableView from "./views/FilesTable.view"
 import DragAndDrop from "../../../Contexts/DnDContext"
@@ -13,14 +13,15 @@ import { ROUTE_LINKS } from "../../FilesRoutes"
 import { FileBrowserContext } from "../../../Contexts/FileBrowserContext"
 
 const BinFileBrowser: React.FC<IFilesBrowserModuleProps> = ({ controls = false }: IFilesBrowserModuleProps) => {
-  const { removeCSFObjects, moveCSFObject, list } = useDrive()
+  const { removeCSFObjects, moveCSFObject, list, buckets } = useDrive()
   const { addToastMessage } = useToaster()
   const [loadingCurrentPath, setLoadingCurrentPath] = useState(false)
   const [pathContents, setPathContents] = useState<FileSystemItem[]>([])
-  const bucketType: BucketType = "trash"
   const { pathname } = useLocation()
   const [currentPath, setCurrentPath] = useState(extractDrivePath(pathname.split("/").slice(1).join("/")))
 
+  const bucket = useMemo(() => buckets.find(b => b.type === "trash"), [buckets])
+
   const refreshContents = useCallback(
     (
       showLoading?: boolean
@@ -30,7 +31,7 @@ const BinFileBrowser: React.FC<IFilesBrowserModuleProps> = ({ controls = false }
         list({
           path: currentPath,
           source: {
-            type: bucketType
+            type: bucket?.type
           }
         }).then((newContents) => {
           showLoading && setLoadingCurrentPath(false)
@@ -54,7 +55,7 @@ const BinFileBrowser: React.FC<IFilesBrowserModuleProps> = ({ controls = false }
         showLoading && setLoadingCurrentPath(false)
       }
     },
-    [bucketType, list, currentPath]
+    [bucket, list, currentPath]
   )
 
   useEffect(() => {
@@ -77,7 +78,7 @@ const BinFileBrowser: React.FC<IFilesBrowserModuleProps> = ({ controls = false }
   const deleteFile = useCallback(async (cid: string) => {
     const itemToDelete = pathContents.find((i) => i.cid === cid)
 
-    if (!itemToDelete) {
+    if (!itemToDelete || !bucket) {
       console.error("No item found to delete")
       return
     }
@@ -86,7 +87,7 @@ const BinFileBrowser: React.FC<IFilesBrowserModuleProps> = ({ controls = false }
       await removeCSFObjects({
         paths: [`${currentPath}${itemToDelete.name}`],
         source: {
-          type: bucketType
+          type: bucket.type
         }
       })
       refreshContents()
@@ -108,7 +109,7 @@ const BinFileBrowser: React.FC<IFilesBrowserModuleProps> = ({ controls = false }
       })
       return Promise.reject()
     }
-  }, [addToastMessage, bucketType, currentPath, pathContents, refreshContents, removeCSFObjects])
+  }, [addToastMessage, bucket, currentPath, pathContents, refreshContents, removeCSFObjects])
 
   const deleteFiles = useCallback(async (cids: string[]) => {
     await Promise.all(
@@ -126,9 +127,6 @@ const BinFileBrowser: React.FC<IFilesBrowserModuleProps> = ({ controls = false }
       await moveCSFObject({
         path: getPathWithFile("/", itemToRestore.name),
         new_path: getPathWithFile("/", itemToRestore.name),
-        source: {
-          type: "trash"
-        },
         destination: {
           type: "csf"
         }
@@ -175,6 +173,7 @@ const BinFileBrowser: React.FC<IFilesBrowserModuleProps> = ({ controls = false }
 
   return (
     <FileBrowserContext.Provider value={{
+      bucket: bucket,
       crumbs: undefined,
       recoverFile,
       deleteFiles,
@@ -187,7 +186,6 @@ const BinFileBrowser: React.FC<IFilesBrowserModuleProps> = ({ controls = false }
       sourceFiles: pathContents,
       heading: t`Bin`,
       controls,
-      bucketType,
       itemOperations,
       bulkOperations
     }}>

packages/files-ui/src/Components/Modules/FileBrowsers/CSFFileBrowser.tsx

@@ -23,16 +23,19 @@ const CSFFileBrowser: React.FC<IFilesBrowserModuleProps> = () => {
     uploadFiles,
     moveCSFObject,
     uploadsInProgress,
-    list
+    list,
+    buckets
   } = useDrive()
   const { addToastMessage } = useToaster()
   const [loadingCurrentPath, setLoadingCurrentPath] = useState(false)
   const [pathContents, setPathContents] = useState<FileSystemItem[]>([])
-  const bucketType: BucketType = "csf"
   const { redirect } = useHistory()
 
   const { pathname } = useLocation()
   const [currentPath, setCurrentPath] = useState(extractDrivePath(pathname.split("/").slice(1).join("/")))
+  const bucket = useMemo(() => {
+    return buckets.find(b => b.type === "csf")
+  }, [buckets])
   const refreshContents = useCallback(
     (
       path: string,
@@ -43,7 +46,7 @@ const CSFFileBrowser: React.FC<IFilesBrowserModuleProps> = () => {
         list({
           path,
           source: {
-            type: bucketType
+            type: bucket?.type
           }
         }).then((newContents) => {
           showLoading && setLoadingCurrentPath(false)
@@ -68,7 +71,7 @@ const CSFFileBrowser: React.FC<IFilesBrowserModuleProps> = () => {
         showLoading && setLoadingCurrentPath(false)
       }
     },
-    [bucketType, list]
+    [bucket, list]
   )
   const { localStorageGet, localStorageSet } = useLocalStorage()
   const { profile } = useUser()
@@ -168,10 +171,10 @@ const CSFFileBrowser: React.FC<IFilesBrowserModuleProps> = () => {
 
   const handleDownload = useCallback(async (cid: string) => {
     const target = pathContents.find(item => item.cid === cid)
-    if (!target) return
+    if (!target || !bucket) return
 
-    await downloadFile(target, currentPath, bucketType)
-  }, [pathContents, downloadFile, currentPath, bucketType])
+    await downloadFile(target, currentPath, bucket.type)
+  }, [pathContents, downloadFile, currentPath, bucket])
 
 
   // Breadcrumbs/paths
@@ -230,6 +233,7 @@ const CSFFileBrowser: React.FC<IFilesBrowserModuleProps> = () => {
 
   return (
     <FileBrowserContext.Provider value={{
+      bucket: bucket,
       bulkOperations,
       crumbs,
       moduleRootPath: ROUTE_LINKS.Drive(""),
@@ -246,7 +250,6 @@ const CSFFileBrowser: React.FC<IFilesBrowserModuleProps> = () => {
       showUploadsInTable: true,
       sourceFiles: pathContents,
       heading: t`My Files`,
-      bucketType,
       controls: true,
       allowDropUpload: true,
       itemOperations,

packages/files-ui/src/Components/Modules/FileBrowsers/SearchFileBrowser.tsx

@@ -129,7 +129,6 @@ const SearchFileBrowser: React.FC<IFilesBrowserModuleProps> = ({ controls = fals
       controls,
       itemOperations,
       isSearch: true,
-      bucketType,
       getPath
     }}>
       <DragAndDrop>

packages/files-ui/src/Components/Modules/FileBrowsers/views/FilesTable.view.tsx

@@ -299,9 +299,9 @@ const FilesTableView = () => {
     itemOperations,
     getPath,
     moduleRootPath,
-    bucketType,
     isSearch,
-    withSurvey
+    withSurvey,
+    bucket
   } = useFileBrowser()
   const classes = useStyles({ themeKey })
   const [editing, setEditing] = useState<string | undefined>()
@@ -936,11 +936,11 @@ const FilesTableView = () => {
             ))}
           </section>
         )}
-      {files && previewFileIndex !== undefined && (
+      {files && previewFileIndex !== undefined && bucket && (
         <FilePreviewModal
           file={files[previewFileIndex]}
           closePreview={clearPreview}
-          bucketType={bucketType}
+          bucketType={bucket.type}
           nextFile={
             previewFileIndex < files.length - 1 ? setNextPreview : undefined
           }

packages/files-ui/src/Contexts/DriveContext.tsx

@@ -1,5 +1,5 @@
 import {
-  CSFFilesFullinfoResponse,
+  CSFFilesFullInfoResponse,
   FileContentResponse,
   FilesMvRequest,
   FilesPathRequest,
@@ -56,6 +56,7 @@ interface GetFileContentParams {
 
 
 type DriveContext = {
+  buckets: Bucket[]
   uploadFiles: (files: File[], path: string) => Promise<void>
   createFolder: (body: FilesPathRequest) => Promise<FileContentResponse>
   renameFile: (body: FilesMvRequest) => Promise<void>
@@ -72,7 +73,7 @@ type DriveContext = {
   downloadsInProgress: DownloadProgress[]
   spaceUsed: number
   getFolderTree: () => Promise<DirectoryContentResponse>
-  getFileInfo: (path: string)  => Promise<CSFFilesFullinfoResponse>
+  getFileInfo: (path: string)  => Promise<CSFFilesFullInfoResponse>
   secureAccountWithMasterPassword: (candidatePassword: string) => Promise<void>
 }
 
@@ -103,6 +104,16 @@ const DriveProvider = ({ children }: DriveContextProps) => {
   const [spaceUsed, setSpaceUsed] = useState(0)
   const [encryptionKey, setEncryptionKey] = useState<string | undefined>()
 
+  const [buckets, setBuckets] = useState<Bucket[]>([])
+
+  useEffect(() => {
+    const fetchBuckets = async () => {
+      const result = await imployApiClient.listBuckets()
+      setBuckets(result)
+    }
+    fetchBuckets()
+  }, [imployApiClient])
+
   // Space used counter
   useEffect(() => {
     const getSpaceUsage = async () => {
@@ -527,7 +538,8 @@ const DriveProvider = ({ children }: DriveContextProps) => {
         listBuckets,
         searchFiles,
         getFileInfo,
-        secureAccountWithMasterPassword
+        secureAccountWithMasterPassword,
+        buckets
       }}
     >
       {children}
@@ -547,7 +559,7 @@ export { DriveProvider, useDrive }
 export type {
   FileSystemItem,
   DirectoryContentResponse,
-  CSFFilesFullinfoResponse as FileFullInfo,
+  CSFFilesFullInfoResponse as FileFullInfo,
   BucketType,
   SearchEntry
 }

packages/files-ui/src/Contexts/FileBrowserContext.tsx

@@ -2,8 +2,9 @@ import { Crumb } from "@chainsafe/common-components"
 import React, { useContext } from "react"
 import { FileOperation, IBulkOperations, IFilesBrowserModuleProps } from "../Components/Modules/FileBrowsers/types"
 import { BucketType, FileSystemItem, UploadProgress } from "./DriveContext"
-
+import { Bucket } from "@chainsafe/files-api-client"
 interface FileBrowserContext extends IFilesBrowserModuleProps {
+  bucket?: Bucket
   itemOperations: {[contentType: string]: FileOperation[]}
 
   bulkOperations?: IBulkOperations
@@ -24,7 +25,6 @@ interface FileBrowserContext extends IFilesBrowserModuleProps {
 
   refreshContents?: () => void
   currentPath: string
-  bucketType: BucketType
   loadingCurrentPath: boolean
   uploadsInProgress?: UploadProgress[]
   showUploadsInTable: boolean

yarn.lock

@@ -1664,10 +1664,10 @@
   resolved "https://registry.yarnpkg.com/@chainsafe/browser-storage-hooks/-/browser-storage-hooks-1.0.1.tgz#26d32cde1999914db755a631e2643823c54959f7"
   integrity sha512-Q4b5gQAZnsRXKeADspd5isqfwwhhXjDk70y++YadufA6EZ3tf340oW0OVszp74KaGEw+CAYFGQR4X7bzpZ3x9Q==
 
-"@chainsafe/files-api-client@1.9.0":
-  version "1.9.0"
-  resolved "https://npm.pkg.github.com/download/@chainsafe/files-api-client/1.9.0/4670ba7db48668a6ac1f5ef204bdae517594fcfb5855e4324fe228dfc9da4f29#08dd2c11392619d5cd9f3828876347d07177cd72"
-  integrity sha512-m5zJkB4zVKZE+8RFThsky1kJmh09niMyAB6xLykyCkUJeF2b4t1Wd5OItoSPTeo09tzUNjQmh+HbOP/jUDA9+Q==
+"@chainsafe/files-api-client@1.11.1":
+  version "1.11.1"
+  resolved "https://npm.pkg.github.com/download/@chainsafe/files-api-client/1.11.1/e3f6bacbb76a09d44b755dc7a1d9b7e29aa8136a6aa648e784e89c31174abdb2#4879404c2f4d80c18448c11ab15cfff77bd0e7e5"
+  integrity sha512-6mvyFnqqlOUfMDdf1sSJHQzOA0/wBa4Rnt2TOfD+rV5z82tJYGADxEwCbmbQ3b8G4H01aNhIQxkoaDwFcnMp9w==
 
 "@chainsafe/web3-context@1.1.4":
   version "1.1.4"