[ARVADOS-WORKBENCH2] updated: 2.2.1-42-ge07a6c34
Git user
git at public.arvados.org
Thu Jul 29 14:55:51 UTC 2021
Summary of changes:
.../webdav-s3-dialog/webdav-s3-dialog.tsx | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
via e07a6c34953c6546de1c3d13a0bacf031981c356 (commit)
via 64c1e51d2d973cb0ef0f982afbb80efdb2700ea0 (commit)
from 463581836f4fa5f1a6a54358998de32aa1dbd8e3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit e07a6c34953c6546de1c3d13a0bacf031981c356
Author: Stephen Smith <stephen at curii.com>
Date: Thu Jul 29 10:50:49 2021 -0400
17526: Use codesnippet component on webdav dialog wget command for monospace
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
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 73c89621..7255e756 100644
--- a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
+++ b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
@@ -10,8 +10,9 @@ import { WithDialogProps } from 'store/dialog/with-dialog';
import { compose } from 'redux';
import { DetailsAttribute } from "components/details-attribute/details-attribute";
import { DownloadIcon } from "components/icon/icon";
+import { DefaultCodeSnippet } from "components/default-code-snippet/default-code-snippet";
-export type CssRules = 'details' | 'downloadButton';
+export type CssRules = 'details' | 'downloadButton' | 'detailsAttrValWithCode';
const styles: StyleRulesCallback<CssRules> = theme => ({
details: {
@@ -20,6 +21,10 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
},
downloadButton: {
marginTop: theme.spacing.unit * 2,
+ },
+ detailsAttrValWithCode: {
+ display: "flex",
+ alignItems: "center",
}
});
@@ -258,8 +263,11 @@ export const WebDavS3InfoDialog = compose(
<DetailsAttribute
label='Wget command'
- value={wgetCommand}
- copyValue={wgetCommand} />
+ copyValue={wgetCommand}
+ classValue={props.classes.detailsAttrValWithCode}>
+ <DefaultCodeSnippet
+ lines={[wgetCommand]} />
+ </DetailsAttribute>
<DetailsAttribute
label='Username'
commit 64c1e51d2d973cb0ef0f982afbb80efdb2700ea0
Author: Stephen Smith <stephen at curii.com>
Date: Wed Jul 28 16:55:01 2021 -0400
17526: Fix webdav dialog > wget tab command copy button only copying url
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
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 50d50944..73c89621 100644
--- a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
+++ b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
@@ -142,6 +142,8 @@ export const WebDavS3InfoDialog = compose(
activeTab = 2;
}
+ const wgetCommand = `wget --http-user=${props.data.username} --http-passwd=${props.data.token} --mirror --no-parent --no-host --cut-dirs=0 ${winDav.toString()}`;
+
return <Dialog
open={props.open}
maxWidth="md"
@@ -256,8 +258,8 @@ export const WebDavS3InfoDialog = compose(
<DetailsAttribute
label='Wget command'
- value={`wget --http-user=${props.data.username} --http-passwd=${props.data.token} --mirror --no-parent --no-host --cut-dirs=0 ${winDav.toString()}`}
- copyValue={winDav.toString()} />
+ value={wgetCommand}
+ copyValue={wgetCommand} />
<DetailsAttribute
label='Username'
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list