projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20493-optional-array' refs #20493
[arvados-workbench2.git]
/
src
/
views-components
/
webdav-s3-dialog
/
webdav-s3-dialog.tsx
diff --git
a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
index 7255e756ce2919fbd8c17b5db96507234e25e0de..a32044a711ef36a70820596ceb509d5a976665e9 100644
(file)
--- a/
src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
+++ b/
src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
@@
-79,7
+79,7
@@
const mountainduckTemplate = ({
<key>Port</key>
<string>${(cyberDavStr.split(':')[2] || '443').split('/')[0]}</string>
<key>Username</key>
<key>Port</key>
<string>${(cyberDavStr.split(':')[2] || '443').split('/')[0]}</string>
<key>Username</key>
- <string>${username}</string>${isValidIpAddress(collectionsUrl.replace('https://', ``).split(':')[0])?
+ <string>${username}</string>${isValidIpAddress(collectionsUrl.replace('https://', ``).split(':')[0])
?
`
<key>Path</key>
<string>/c=${uuid}</string>` : ''}
`
<key>Path</key>
<string>/c=${uuid}</string>` : ''}
@@
-120,8
+120,8
@@
export const WebDavS3InfoDialog = compose(
} else {
winDav = new URL(props.data.downloadUrl);
cyberDav = new URL(props.data.downloadUrl);
} else {
winDav = new URL(props.data.downloadUrl);
cyberDav = new URL(props.data.downloadUrl);
- winDav.pathname = `/
by_id/
${props.data.uuid}`;
- cyberDav.pathname = `/
by_id/
${props.data.uuid}`;
+ winDav.pathname = `/
c=
${props.data.uuid}`;
+ cyberDav.pathname = `/
c=
${props.data.uuid}`;
}
cyberDav.username = props.data.username;
}
cyberDav.username = props.data.username;
@@
-148,6
+148,7
@@
export const WebDavS3InfoDialog = compose(
}
const wgetCommand = `wget --http-user=${props.data.username} --http-passwd=${props.data.token} --mirror --no-parent --no-host --cut-dirs=0 ${winDav.toString()}`;
}
const wgetCommand = `wget --http-user=${props.data.username} --http-passwd=${props.data.token} --mirror --no-parent --no-host --cut-dirs=0 ${winDav.toString()}`;
+ const curlCommand = `curl -O -u ${props.data.username}:${props.data.token} ${winDav.toString()}`;
return <Dialog
open={props.open}
return <Dialog
open={props.open}
@@
-227,7
+228,7
@@
export const WebDavS3InfoDialog = compose(
Download Cyber/Mountain Duck bookmark
</Button>
Download Cyber/Mountain Duck bookmark
</Button>
- <h3>G
nome
</h3>
+ <h3>G
NOME
</h3>
<ol>
<li>Open Files</li>
<li>Select +Other Locations</li>
<ol>
<li>Open Files</li>
<li>Select +Other Locations</li>
@@
-270,14
+271,17
@@
export const WebDavS3InfoDialog = compose(
</DetailsAttribute>
<DetailsAttribute
</DetailsAttribute>
<DetailsAttribute
- label='Username'
- value={props.data.username}
- copyValue={props.data.username} />
+ label='Curl command'
+ copyValue={curlCommand}
+ classValue={props.classes.detailsAttrValWithCode}>
+ <DefaultCodeSnippet
+ lines={[curlCommand]} />
+ </DetailsAttribute>
- <
DetailsAttribute
- label='Password'
- value={props.data.token}
-
copyValue={props.data.token} /
>
+ <
p>
+ Note: This curl command downloads single files.
+ Append the desired filename to the end of the URL.
+
</p
>
</TabPanel>
</TabPanel>
@@
-288,7
+292,7
@@
export const WebDavS3InfoDialog = compose(
color='primary'
onClick={props.closeDialog}>
Close
color='primary'
onClick={props.closeDialog}>
Close
- </Button>
+
</Button>
</DialogActions>
</Dialog >;
</DialogActions>
</Dialog >;