[ARVADOS-WORKBENCH2] updated: 2.2.1-40-g46358183
Git user
git at public.arvados.org
Wed Jul 28 20:46:07 UTC 2021
Summary of changes:
cypress/integration/collection.spec.js | 2 +-
src/store/collections/collection-info-actions.ts | 2 +-
.../context-menu/action-sets/collection-action-set.ts | 2 +-
.../context-menu/action-sets/project-action-set.ts | 2 +-
src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx | 12 ++++++------
5 files changed, 10 insertions(+), 10 deletions(-)
via 463581836f4fa5f1a6a54358998de32aa1dbd8e3 (commit)
via c025baa77d3d077bc79283cce71e91c3aef06e4b (commit)
from 9df0dc3888f9d63ae0844e7425cd02b21af9da68 (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 463581836f4fa5f1a6a54358998de32aa1dbd8e3
Author: Stephen Smith <stephen at curii.com>
Date: Wed Jul 28 16:45:17 2021 -0400
17526: Rename supportsWebdav to isCollection
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 16fe2526..50d50944 100644
--- a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
+++ b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
@@ -135,10 +135,10 @@ export const WebDavS3InfoDialog = compose(
tokenSecret = tokenUuid;
}
- const supportsWebdav = (props.data.uuid.indexOf("-4zz18-") === 5);
+ const isCollection = (props.data.uuid.indexOf("-4zz18-") === 5);
let activeTab = props.data.activeTab;
- if (!supportsWebdav) {
+ if (!isCollection) {
activeTab = 2;
}
@@ -151,10 +151,10 @@ export const WebDavS3InfoDialog = compose(
title={`Open with 3rd party client`} />
<div className={props.classes.details} >
<Tabs value={activeTab} onChange={props.data.setActiveTab}>
- {supportsWebdav && <Tab value={0} key="cyberduck" label="WebDAV" />}
- {supportsWebdav && <Tab value={1} key="windows" label="Windows or MacOS" />}
+ {isCollection && <Tab value={0} key="cyberduck" label="WebDAV" />}
+ {isCollection && <Tab value={1} key="windows" label="Windows or MacOS" />}
<Tab value={2} key="s3" label="S3 bucket" />
- {supportsWebdav && <Tab value={3} key="cli" label="wget / curl" />}
+ {isCollection && <Tab value={3} key="cli" label="wget / curl" />}
</Tabs>
<TabPanel index={1} value={activeTab}>
commit c025baa77d3d077bc79283cce71e91c3aef06e4b
Author: Stephen Smith <stephen at curii.com>
Date: Wed Jul 28 16:43:05 2021 -0400
17526: Change webdav dialog title to "Open" to preserve ordering
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js
index 73370817..92511d4e 100644
--- a/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@ -43,7 +43,7 @@ describe('Collection panel tests', function () {
cy.goToPath(`/collections/${testCollection.uuid}`);
cy.get('[data-cy=collection-panel-options-btn]').click();
- cy.get('[data-cy=context-menu]').contains('Access with 3rd party client').click();
+ cy.get('[data-cy=context-menu]').contains('Open with 3rd party client').click();
cy.get('[data-cy=download-button').click();
const filename = path.join(downloadsFolder, `${testCollection.name}.duck`);
diff --git a/src/store/collections/collection-info-actions.ts b/src/store/collections/collection-info-actions.ts
index 4838481e..6107c409 100644
--- a/src/store/collections/collection-info-actions.ts
+++ b/src/store/collections/collection-info-actions.ts
@@ -29,7 +29,7 @@ export const openWebDavS3InfoDialog = (uuid: string, activeTab?: number) =>
dispatch(dialogActions.OPEN_DIALOG({
id: COLLECTION_WEBDAV_S3_DIALOG_NAME,
data: {
- title: 'Access with 3rd party client',
+ title: 'Open with 3rd party client',
token: getState().auth.extraApiToken || getState().auth.apiToken,
downloadUrl: getState().auth.config.keepWebServiceUrl,
collectionsUrl: getState().auth.config.keepWebInlineServiceUrl,
diff --git a/src/views-components/context-menu/action-sets/collection-action-set.ts b/src/views-components/context-menu/action-sets/collection-action-set.ts
index c4c8788f..9b0efac0 100644
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@ -90,7 +90,7 @@ export const readOnlyCollectionActionSet: ContextMenuActionSet = [[
toggleFavoriteAction,
{
icon: FolderSharedIcon,
- name: "Access with 3rd party client",
+ name: "Open with 3rd party client",
execute: (dispatch, resource) => {
dispatch<any>(openWebDavS3InfoDialog(resource.uuid));
}
diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index 02a6731e..a079bf4f 100644
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -59,7 +59,7 @@ export const readOnlyProjectActionSet: ContextMenuActionSet = [[
},
{
icon: FolderSharedIcon,
- name: "Access with 3rd party client",
+ name: "Open with 3rd party client",
execute: (dispatch, resource) => {
dispatch<any>(openWebDavS3InfoDialog(resource.uuid));
}
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 d6055852..16fe2526 100644
--- a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
+++ b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
@@ -148,7 +148,7 @@ export const WebDavS3InfoDialog = compose(
onClose={props.closeDialog}
style={{ alignSelf: 'stretch' }}>
<CardHeader
- title={`Access with 3rd party client`} />
+ title={`Open with 3rd party client`} />
<div className={props.classes.details} >
<Tabs value={activeTab} onChange={props.data.setActiveTab}>
{supportsWebdav && <Tab value={0} key="cyberduck" label="WebDAV" />}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list