X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/27d2ca4c2691cad55993f25a4427d48e86ec6166..a353970c1fcfc61ebac8b3587f4b16b6c25b62e1:/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 2c92e28de4..018a0ef096 100644
--- a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
+++ b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
@@ -10,7 +10,7 @@ import { WithDialogProps } from '~/store/dialog/with-dialog';
 import { compose } from 'redux';
 import { DetailsAttribute } from "~/components/details-attribute/details-attribute";
 
-type CssRules = 'details';
+export type CssRules = 'details';
 
 const styles: StyleRulesCallback<CssRules> = theme => ({
     details: {
@@ -47,21 +47,29 @@ export const WebDavS3InfoDialog = compose(
     (props: WithDialogProps<WebDavS3InfoDialogData> & WithStyles<CssRules>) => {
         if (!props.data.downloadUrl) { return null; }
 
-        const keepwebUrl = props.data.downloadUrl.replace(/\/\*(--[^.]+)?\./, "/");
+        let winDav;
+        let cyberDav;
 
-        const winDav = new URL(props.data.downloadUrl.replace("*", props.data.uuid));
+        if (props.data.collectionsUrl.indexOf("*") > -1) {
+            const withuuid = props.data.collectionsUrl.replace("*", props.data.uuid);
+            winDav = new URL(withuuid);
+            cyberDav = new URL(withuuid);
+        } 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}`;
+        }
 
-        const gnomeDav = new URL(keepwebUrl);
-        gnomeDav.username = props.data.username;
-        gnomeDav.pathname = `/c=${props.data.uuid}/`;
-        gnomeDav.protocol = "davs:";
+        cyberDav.username = props.data.username;
+        const cyberDavStr = "dav" + cyberDav.toString().slice(4);
 
-        const s3endpoint = new URL(keepwebUrl);
+        const s3endpoint = new URL(props.data.collectionsUrl.replace(/\/\*(--[^.]+)?\./, "/"));
 
         const sp = props.data.token.split("/");
         let tokenUuid;
         let tokenSecret;
-        if (sp.length === 3 && sp[0] === "v2" && props.data.homeCluster === props.data.localCluster) {
+        if (sp.length === 3 && sp[0] === "v2" && sp[1].slice(0, 5) === props.data.localCluster) {
             tokenUuid = sp[1];
             tokenSecret = sp[2];
         } else {
@@ -69,30 +77,33 @@ export const WebDavS3InfoDialog = compose(
             tokenSecret = tokenUuid;
         }
 
+        const supportsWebdav = (props.data.uuid.indexOf("-4zz18-") === 5);
+
+        let activeTab = props.data.activeTab;
+        if (!supportsWebdav) {
+            activeTab = 2;
+        }
+
         return <Dialog
             open={props.open}
             maxWidth="md"
             onClose={props.closeDialog}
             style={{ alignSelf: 'stretch' }}>
             <CardHeader
-                title={`WebDAV and S3`} />
+                title={`Open as Network Folder or S3 Bucket`} />
             <div className={props.classes.details} >
-                <Tabs value={props.data.activeTab} onChange={props.data.setActiveTab}>
-                    <Tab key="windows" label="Add a Network Location in Windows" />
-                    <Tab key="gnome" label="Connect to Server in GNOME" />
-                    <Tab key="s3" label="Using an S3 client" />
+                <Tabs value={activeTab} onChange={props.data.setActiveTab}>
+                    {supportsWebdav && <Tab value={0} key="cyberduck" label="Cyberduck/Mountain Duck or Gnome Files" />}
+                    {supportsWebdav && <Tab value={1} key="windows" label="Windows or MacOS" />}
+                    <Tab value={2} key="s3" label="S3 bucket" />
                 </Tabs>
 
-                <TabPanel index={0} value={props.data.activeTab}>
-                    <ol>
-                        <li>Open File Explorer</li>
-                        <li>Click on "This PC", then go to Computer &rarr; Add a Network Location</li>
-                        <li>Click Next, then choose "Add a custom network location", then click Next</li>
-                    </ol>
+                <TabPanel index={1} value={activeTab}>
+                    <h2>Settings</h2>
 
                     <DetailsAttribute
                         label='Internet address'
-                        value={winDav.toString()}
+                        value={<a href={winDav.toString()} target="_blank">{winDav.toString()}</a>}
                         copyValue={winDav.toString()} />
 
                     <DetailsAttribute
@@ -104,27 +115,47 @@ export const WebDavS3InfoDialog = compose(
                         label='Password'
                         value={props.data.token}
                         copyValue={props.data.token} />
-                </TabPanel>
 
-                <TabPanel index={1} value={props.data.activeTab}>
+                    <h3>Windows</h3>
                     <ol>
-                        <li>Open Files</li>
-                        <li>Select +Other Locations</li>
-                        <li>Connect to Server &rarr; Enter server address</li>
+                        <li>Open File Explorer</li>
+                        <li>Click on "This PC", then go to Computer &rarr; Add a Network Location</li>
+                        <li>Click Next, then choose "Add a custom network location", then click Next</li>
                     </ol>
 
+                    <h3>MacOS</h3>
+                    <ol>
+                        <li>Open Finder</li>
+                        <li>Click Go &rarr; Connect to server</li>
+                    </ol>
+                </TabPanel>
+
+                <TabPanel index={0} value={activeTab}>
                     <DetailsAttribute
-                        label='Server address'
-                        value={gnomeDav.toString()}
-                        copyValue={gnomeDav.toString()} />
+                        label='Server'
+                        value={<a href={cyberDavStr} target="_blank">{cyberDavStr}</a>}
+                        copyValue={cyberDavStr} />
+
+                    <DetailsAttribute
+                        label='Username'
+                        value={props.data.username}
+                        copyValue={props.data.username} />
 
                     <DetailsAttribute
                         label='Password'
                         value={props.data.token}
                         copyValue={props.data.token} />
+
+                    <h3>Gnome</h3>
+                    <ol>
+                        <li>Open Files</li>
+                        <li>Select +Other Locations</li>
+                        <li>Connect to Server &rarr; Enter server address</li>
+                    </ol>
+
                 </TabPanel>
 
-                <TabPanel index={2} value={props.data.activeTab}>
+                <TabPanel index={2} value={activeTab}>
                     <DetailsAttribute
                         label='Endpoint'
                         value={s3endpoint.host}