[ARVADOS-WORKBENCH2] created: 2.1.0-34-gfd447606
Git user
git at public.arvados.org
Fri Oct 23 15:18:00 UTC 2020
at fd44760652570645bb40ff9445bb5b9305a7fa1c (commit)
commit fd44760652570645bb40ff9445bb5b9305a7fa1c
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date: Fri Oct 23 12:17:31 2020 -0300
17018: Fixes the bug adding checks for readonly context menu type.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>
diff --git a/src/views-components/context-menu/actions/collection-copy-to-clipboard-action.tsx b/src/views-components/context-menu/actions/collection-copy-to-clipboard-action.tsx
index f6038b80..4fc11fb2 100644
--- a/src/views-components/context-menu/actions/collection-copy-to-clipboard-action.tsx
+++ b/src/views-components/context-menu/actions/collection-copy-to-clipboard-action.tsx
@@ -12,7 +12,9 @@ const mapStateToProps = (state: RootState) => {
const { resource } = state.contextMenu;
const currentCollectionUuid = state.collectionPanel.item ? state.collectionPanel.item.uuid : '';
const { keepWebServiceUrl } = state.auth.config;
- if (resource && resource.menuKind === ContextMenuKind.COLLECTION_FILES_ITEM) {
+ if (resource && (
+ resource.menuKind === ContextMenuKind.COLLECTION_FILES_ITEM ||
+ resource.menuKind === ContextMenuKind.READONLY_COLLECTION_FILES_ITEM)) {
const file = getNodeValue(resource.uuid)(state.collectionPanelFiles);
if (file) {
return {
@@ -21,10 +23,8 @@ const mapStateToProps = (state: RootState) => {
currentCollectionUuid
};
}
- } else {
- return ;
}
- return ;
+ return {};
};
export const CollectionCopyToClipboardAction = connect(mapStateToProps)(CopyToClipboardAction);
diff --git a/src/views-components/context-menu/actions/collection-file-viewer-action.tsx b/src/views-components/context-menu/actions/collection-file-viewer-action.tsx
index f75da238..dfc9d14a 100644
--- a/src/views-components/context-menu/actions/collection-file-viewer-action.tsx
+++ b/src/views-components/context-menu/actions/collection-file-viewer-action.tsx
@@ -11,7 +11,9 @@ import { ContextMenuKind } from '~/views-components/context-menu/context-menu';
const mapStateToProps = (state: RootState) => {
const { resource } = state.contextMenu;
const currentCollectionUuid = state.collectionPanel.item ? state.collectionPanel.item.uuid : '';
- if (resource && resource.menuKind === ContextMenuKind.COLLECTION_FILES_ITEM) {
+ if (resource && (
+ resource.menuKind === ContextMenuKind.COLLECTION_FILES_ITEM ||
+ resource.menuKind === ContextMenuKind.READONLY_COLLECTION_FILES_ITEM)) {
const file = getNodeValue(resource.uuid)(state.collectionPanelFiles);
if (file) {
return {
@@ -20,10 +22,8 @@ const mapStateToProps = (state: RootState) => {
currentCollectionUuid
};
}
- } else {
- return;
}
- return;
+ return {};
};
export const CollectionFileViewerAction = connect(mapStateToProps)(FileViewerAction);
diff --git a/src/views-components/context-menu/actions/download-collection-file-action.tsx b/src/views-components/context-menu/actions/download-collection-file-action.tsx
index 3e4e4a0b..e1986d3c 100644
--- a/src/views-components/context-menu/actions/download-collection-file-action.tsx
+++ b/src/views-components/context-menu/actions/download-collection-file-action.tsx
@@ -13,7 +13,9 @@ import { sanitizeToken } from "./helpers";
const mapStateToProps = (state: RootState) => {
const { resource } = state.contextMenu;
const currentCollectionUuid = state.collectionPanel.item ? state.collectionPanel.item.uuid : '';
- if (resource && resource.menuKind === ContextMenuKind.COLLECTION_FILES_ITEM) {
+ if (resource && (
+ resource.menuKind === ContextMenuKind.COLLECTION_FILES_ITEM ||
+ resource.menuKind === ContextMenuKind.READONLY_COLLECTION_FILES_ITEM)) {
const file = getNodeValue(resource.uuid)(state.collectionPanelFiles);
if (file) {
return {
commit fbaa1cdd31a8066e81a1114be2237ffdfdcbe910
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date: Fri Oct 23 11:01:27 2020 -0300
17018: Adds integration tests exposing the bug.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>
diff --git a/cypress/integration/collection-panel.spec.js b/cypress/integration/collection-panel.spec.js
index c14101d8..47281868 100644
--- a/cypress/integration/collection-panel.spec.js
+++ b/cypress/integration/collection-panel.spec.js
@@ -63,8 +63,8 @@ describe('Collection panel tests', function() {
.click()
cy.get('[data-cy=context-menu]')
.should('contain', 'Add to favorites')
- .and(`${isWritable ? '' : 'not.'}contain`, 'Edit collection')
- .type('{esc}'); // Collapse the options menu
+ .and(`${isWritable ? '' : 'not.'}contain`, 'Edit collection');
+ cy.get('body').click(); // Collapse the menu avoiding details panel expansion
cy.get('[data-cy=collection-properties-panel]')
.should('contain', 'someKey')
.and('contain', 'someValue')
@@ -94,6 +94,15 @@ describe('Collection panel tests', function() {
cy.get('[data-cy=upload-button]')
.should(`${isWritable ? '' : 'not.'}contain`, 'Upload data');
});
+ cy.get('[data-cy=collection-files-panel]')
+ .contains('bar').rightclick();
+ cy.get('[data-cy=context-menu]')
+ .should('contain', 'Download')
+ .and('contain', 'Open in new tab')
+ .and('contain', 'Copy to clipboard')
+ .and(`${isWritable ? '' : 'not.'}contain`, 'Rename')
+ .and(`${isWritable ? '' : 'not.'}contain`, 'Remove');
+ cy.get('body').click(); // Collapse the menu
// Hamburger 'more options' menu button
cy.get('[data-cy=collection-files-panel-options-btn]')
.click()
@@ -105,14 +114,14 @@ describe('Collection panel tests', function() {
cy.get('[data-cy=context-menu]')
// .should('contain', 'Download selected')
.should(`${isWritable ? '' : 'not.'}contain`, 'Remove selected')
- .type('{esc}'); // Collapse the options menu
+ cy.get('body').click(); // Collapse the menu
// File item 'more options' button
cy.get('[data-cy=file-item-options-btn')
.click()
cy.get('[data-cy=context-menu]')
.should('contain', 'Download')
- .and(`${isWritable ? '' : 'not.'}contain`, 'Remove')
- .type('{esc}'); // Collapse
+ .and(`${isWritable ? '' : 'not.'}contain`, 'Remove');
+ cy.get('body').click(); // Collapse the menu
})
})
})
diff --git a/src/views-components/context-menu/actions/copy-to-clipboard-action.tsx b/src/views-components/context-menu/actions/copy-to-clipboard-action.tsx
index 31ef4b97..fffcc19b 100644
--- a/src/views-components/context-menu/actions/copy-to-clipboard-action.tsx
+++ b/src/views-components/context-menu/actions/copy-to-clipboard-action.tsx
@@ -27,7 +27,7 @@ export const CopyToClipboardAction = (props: { href?: any, download?: any, onCli
</ListItemIcon>
<ListItemText>
Copy to clipboard
- </ListItemText>
+ </ListItemText>
</ListItem>
: null;
};
\ No newline at end of file
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list