diff --git a/client/package.json b/client/package.json index 0245f3f3f..057b0d963 100644 --- a/client/package.json +++ b/client/package.json @@ -72,7 +72,6 @@ "@testing-library/jest-dom": "^5.0.2", "@testing-library/react": "^16.0.1", "@types/js-cookie": "^3.0.6", - "@types/node": "^22.9.0", "@types/react": "^18.3.10", "@types/react-dom": "^18.3.0", "@types/react-redux": "^7.1.18", diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesCompressModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesCompressModal.jsx index 2c794b0d1..32b59e031 100644 --- a/client/src/components/DataFiles/DataFilesModals/DataFilesCompressModal.jsx +++ b/client/src/components/DataFiles/DataFilesModals/DataFilesCompressModal.jsx @@ -108,7 +108,7 @@ const DataFilesCompressModal = () => { />

A job to compress these files will be submitted. The - compressed file archive will appear in the Root directory. + compressed file archive will appear in this directory.

diff --git a/client/src/hooks/datafiles/mutations/useCompress.ts b/client/src/hooks/datafiles/mutations/useCompress.ts index 33b09f31f..12469c825 100644 --- a/client/src/hooks/datafiles/mutations/useCompress.ts +++ b/client/src/hooks/datafiles/mutations/useCompress.ts @@ -19,8 +19,6 @@ async function submitJobUtil(body: TJobBody) { return res.data.response; } - - function useCompress() { const dispatch = useDispatch(); const status = useSelector( @@ -78,6 +76,10 @@ function useCompress() { let defaultPrivateSystem: TPortalSystem | undefined; + if (files[0].scheme === 'private' && files[0].api === 'tapis') { + defaultPrivateSystem === null + }; + if (scheme !== 'private' && scheme !== 'projects') { defaultPrivateSystem = systems.find((s: any) => s.default); diff --git a/client/src/utils/getCompressParams.ts b/client/src/utils/getCompressParams.ts index b814bb5dc..82db3db3d 100644 --- a/client/src/utils/getCompressParams.ts +++ b/client/src/utils/getCompressParams.ts @@ -14,13 +14,16 @@ export const getCompressParams = ( let archivePath, archiveSystem; - if (defaultPrivateSystem) { - archivePath = defaultPrivateSystem.homeDir; - archiveSystem = defaultPrivateSystem.system; - } else { - archivePath = `${files[0].path.slice(0, -files[0].name.length)}`; - archiveSystem = files[0].system; - } + // if (defaultPrivateSystem) { + // archivePath = defaultPrivateSystem.homeDir; + // archiveSystem = defaultPrivateSystem.system; + // } else { + // archivePath = `${files[0].path.slice(0, -files[0].name.length)}`; + // archiveSystem = files[0].system; + // } + + archivePath = `${files[0].path.slice(0, -files[0].name.length)}`; + archiveSystem = files[0].system; return { fileInputs: fileInputs, diff --git a/client/src/utils/types.ts b/client/src/utils/types.ts index 686519bbe..3feb55c30 100644 --- a/client/src/utils/types.ts +++ b/client/src/utils/types.ts @@ -307,4 +307,6 @@ export type TTapisFile = { length: number; permissions: string; doi?: string; + scheme?: string; + api?: string; };