diff --git a/src/pages/fdp/FdpPod.tsx b/src/pages/fdp/FdpPod.tsx index 29ebf67d..b47797eb 100644 --- a/src/pages/fdp/FdpPod.tsx +++ b/src/pages/fdp/FdpPod.tsx @@ -1,8 +1,8 @@ import { FdpStorage } from '@fairdatasociety/fdp-storage' -import { Strings } from 'cafe-utility' import { useState } from 'react' import { CafeReactFs } from '../../react-fs/CafeReactFs' import { FsItem, FsItemType } from '../../react-fs/CafeReactType' +import { joinUrl } from '../../react-fs/Utility' interface Props { fdp: FdpStorage @@ -44,7 +44,7 @@ export function FdpPod({ fdp, name }: Props) { } for (const file of Array.from(input.files)) { const data = await file.arrayBuffer() - await fdp.file.uploadData(name, Strings.joinUrl(path, file.name), new Uint8Array(data)) + await fdp.file.uploadData(name, joinUrl(path, file.name), new Uint8Array(data)) } reload() resolve() @@ -58,7 +58,7 @@ export function FdpPod({ fdp, name }: Props) { if (!newDirectoryName) { return } - await fdp.directory.create(name, Strings.joinUrl(path, newDirectoryName)) + await fdp.directory.create(name, joinUrl(path, newDirectoryName)) reload() }} // eslint-disable-next-line require-await diff --git a/src/pages/fdp/index.tsx b/src/pages/fdp/index.tsx index 8a6e7537..c388ddc2 100644 --- a/src/pages/fdp/index.tsx +++ b/src/pages/fdp/index.tsx @@ -2,12 +2,12 @@ import { Bee } from '@ethersphere/bee-js' import { FdpStorage } from '@fairdatasociety/fdp-storage' import { Pod } from '@fairdatasociety/fdp-storage/dist/pod/types' import { CircularProgress, Typography } from '@material-ui/core' -import { Strings } from 'cafe-utility' import { useSnackbar } from 'notistack' import { ReactElement, useEffect, useState } from 'react' import ImportIcon from 'remixicon-react/AddBoxLineIcon' import PlusCircle from 'remixicon-react/AddCircleLineIcon' import { SwarmButton } from '../../components/SwarmButton' +import { joinUrl } from '../../react-fs/Utility' import { ManifestJs } from '../../utils/manifest' import { FdpLogin } from './FdpLogin' import { FdpPods } from './FdpPods' @@ -124,7 +124,7 @@ export default function FDP(): ReactElement { const entries = await manifestJs.getHashes(importHash) await fdp.personalStorage.create(name) for (const [path, hash] of Object.entries(entries)) { - await fdp.file.uploadData(name, Strings.joinUrl('/', path), await bee.downloadData(hash)) + await fdp.file.uploadData(name, joinUrl('/', path), await bee.downloadData(hash)) } const pods = await fdp.personalStorage.list() setPods(pods.pods) diff --git a/src/react-fs/CafeReactFsFile.tsx b/src/react-fs/CafeReactFsFile.tsx index c3b0bc6e..212033a8 100644 --- a/src/react-fs/CafeReactFsFile.tsx +++ b/src/react-fs/CafeReactFsFile.tsx @@ -1,9 +1,9 @@ -import { Strings } from 'cafe-utility' import { useState } from 'react' import { CafeReactFsDelete } from './CafeReactFsDelete' import { CafeReactFsLoading } from './CafeReactFsLoading' import { CafeReactFsName } from './CafeReactFsName' import { VirtualFile } from './CafeReactType' +import { joinUrl } from './Utility' interface Props { path: string @@ -24,12 +24,12 @@ export function CafeReactFsFile({ path, file, download, deleteFile, backgroundCo function proxyDelete() { setLoading(true) - return deleteFile(Strings.joinUrl(path, file.name)).finally(() => setLoading(false)) + return deleteFile(joinUrl(path, file.name)).finally(() => setLoading(false)) } return (