Merge branch '17585-Redesign-navigation-of-files-in-collections' into main
authorDaniel Kutyła <daniel.kutyla@contractors.roche.com>
Fri, 24 Sep 2021 09:53:16 +0000 (11:53 +0200)
committerDaniel Kutyła <daniel.kutyla@contractors.roche.com>
Fri, 24 Sep 2021 09:54:55 +0000 (11:54 +0200)
closes #17585

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>

.gitignore
cypress/integration/collection.spec.js
cypress/integration/delete-multiple-files.spec.js
src/common/service-provider.ts [new file with mode: 0644]
src/components/collection-panel-files/collection-panel-files.tsx
src/components/collection-panel-files/collection-panel-files2.test.tsx [moved from src/components/collection-panel-files/collection-panel-files.test.tsx with 98% similarity]
src/components/collection-panel-files/collection-panel-files2.tsx [new file with mode: 0644]
src/index.tsx
src/models/collection-file.ts
src/store/collection-panel/collection-panel-action.ts
src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts

index 8273cc9ff63fcd5a971535902e4923b5f795b44c..8ce5c38061530d0cae00cd9ad5567e2851933f18 100644 (file)
@@ -14,6 +14,7 @@
 /coverage
 /cypress/videos
 /cypress/screenshots
+/cypress/downloads
 
 # production
 /build
index 2cb6281a300bb124d43d0119d2a3d52e246bd545..fb126af6a2a3577926cacb8ec659412f554aa8dd 100644 (file)
@@ -188,6 +188,7 @@ describe('Collection panel tests', function () {
                         }
                         // Check that the file listing show both read & write operations
                         cy.get('[data-cy=collection-files-panel]').within(() => {
+                            cy.wait(1000);
                             cy.root().should('contain', fileName);
                             if (isWritable) {
                                 cy.get('[data-cy=upload-button]')
@@ -289,7 +290,7 @@ describe('Collection panel tests', function () {
             });
     });
 
-    it('renames a file to a different directory', function () {
+    it.skip('renames a file to a different directory', function () {
         // Creates the collection using the admin token so we can set up
         // a bogus manifest text without block signatures.
         cy.createCollection(adminUser.token, {
@@ -346,6 +347,71 @@ describe('Collection panel tests', function () {
             });
     });
 
+    it('renames a file to a different directory', function () {
+        // Creates the collection using the admin token so we can set up
+        // a bogus manifest text without block signatures.
+        cy.createCollection(adminUser.token, {
+            name: `Test collection ${Math.floor(Math.random() * 999999)}`,
+            owner_uuid: activeUser.user.uuid,
+            manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
+        })
+            .as('testCollection').then(function () {
+                cy.loginAs(activeUser);
+                cy.goToPath(`/collections/${this.testCollection.uuid}`);
+
+                ['subdir', 'G%C3%BCnter\'s%20file', 'table%&?*2'].forEach((subdir) => {
+                    cy.get('[data-cy=collection-files-panel]')
+                        .contains('bar').rightclick({force: true});
+                    cy.get('[data-cy=context-menu]')
+                        .contains('Rename')
+                        .click();
+                    cy.get('[data-cy=form-dialog]')
+                        .should('contain', 'Rename')
+                        .within(() => {
+                            cy.get('input').type(`{selectall}{backspace}${subdir}/foo`);
+                        });
+                    cy.get('[data-cy=form-submit-btn]').click();
+                    cy.get('[data-cy=collection-files-panel]')
+                        .should('not.contain', 'bar')
+                        .and('contain', subdir);
+                    cy.wait(1000);
+                    cy.get('[data-cy=collection-files-panel]').contains(subdir).click();
+                    // Rename 'subdir/foo' to 'foo'
+                    cy.wait(1000);
+                    cy.get('[data-cy=collection-files-panel]')
+                        .contains('foo').rightclick();
+                    cy.get('[data-cy=context-menu]')
+                        .contains('Rename')
+                        .click();
+                    cy.get('[data-cy=form-dialog]')
+                        .should('contain', 'Rename')
+                        .within(() => {
+                            cy.get('input')
+                                .should('have.value', `${subdir}/foo`)
+                                .type(`{selectall}{backspace}bar`);
+                        });
+                    cy.get('[data-cy=form-submit-btn]').click();
+
+                    cy.wait(1000);
+                    cy.get('[data-cy=collection-files-panel]')
+                        .contains('Home')
+                        .click();
+
+                    cy.wait(2000);
+                    cy.get('[data-cy=collection-files-panel]')
+                        .should('contain', subdir) // empty dir kept
+                        .and('contain', 'bar');
+
+                    cy.get('[data-cy=collection-files-panel]')
+                        .contains(subdir).rightclick();
+                    cy.get('[data-cy=context-menu]')
+                        .contains('Remove')
+                        .click();
+                    cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
+                });
+            });
+    });
+
     it('tries to rename a file with illegal names', function () {
         // Creates the collection using the admin token so we can set up
         // a bogus manifest text without block signatures.
index deb56f66e72a0bc69a8e137fb7efc2b635d8eff2..b506fb3d6874b25e9fd16085d5da090e22b48be1 100644 (file)
@@ -41,13 +41,14 @@ describe('Multi-file deletion tests', function () {
                 cy.get('[data-cy=collection-files-panel-options-btn]').click();
                 cy.get('[data-cy=context-menu] div').contains('Remove selected').click();
                 cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
+                cy.wait(1000);
                 cy.get('[data-cy=collection-files-panel]')
                     .should('not.contain', 'baz')
                     .and('not.contain', 'bar');
             });
     });
 
-    it('deletes all files from non root dir', function () {
+    it.skip('deletes all files from non root dir', function () {
         cy.createCollection(adminUser.token, {
             name: `Test collection ${Math.floor(Math.random() * 999999)}`,
             owner_uuid: activeUser.user.uuid,
@@ -73,4 +74,32 @@ describe('Multi-file deletion tests', function () {
                     .and('contain', 'baz');
             });
     });
+
+    it('deletes all files from non root dir', function () {
+        cy.createCollection(adminUser.token, {
+            name: `Test collection ${Math.floor(Math.random() * 999999)}`,
+            owner_uuid: activeUser.user.uuid,
+            manifest_text: "./subdir 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo\n. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:baz\n"
+        })
+            .as('testCollection').then(function () {
+                cy.loginAs(activeUser);
+                cy.goToPath(`/collections/${this.testCollection.uuid}`);
+
+                cy.get('[data-cy=collection-files-panel]').contains('subdir').click();
+                cy.wait(1000);
+                cy.get('[data-cy=collection-files-panel]')
+                    .should('contain', 'foo');
+
+                cy.get('[data-cy=collection-files-panel]')
+                    .contains('foo').parent().find('[type="checkbox"]').click();
+
+                cy.get('[data-cy=collection-files-panel-options-btn]').click();
+                cy.get('[data-cy=context-menu] div').contains('Remove selected').click();
+                cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
+
+                cy.get('[data-cy=collection-files-panel]')
+                    .should('not.contain', 'foo')
+                    .and('contain', 'subdir');
+            });
+    });
 })
diff --git a/src/common/service-provider.ts b/src/common/service-provider.ts
new file mode 100644 (file)
index 0000000..080916c
--- /dev/null
@@ -0,0 +1,35 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+class ServicesProvider {
+
+    private static instance: ServicesProvider;
+
+    private services;
+
+    private constructor() {}
+
+    public static getInstance(): ServicesProvider {
+        if (!ServicesProvider.instance) {
+            ServicesProvider.instance = new ServicesProvider();
+        }
+
+        return ServicesProvider.instance;
+    }
+
+    public setServices(newServices): void {
+        if (!this.services) {
+            this.services = newServices;
+        }
+    }
+
+    public getServices() {
+        if (!this.services) {
+            throw "Please check if services have been set in the index.ts before the app is initiated"; // eslint-disable-line no-throw-literal
+        }
+        return this.services;
+    }
+}
+
+export default ServicesProvider.getInstance();
index 4118248283ae7deed8fb2b416a28ed09d764382c..97cbc8ce6bc924a2def5e0b88f1261a2e8e8e331 100644 (file)
@@ -3,16 +3,28 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import React from 'react';
-import { TreeItem, TreeItemStatus } from 'components/tree/tree';
-import { FileTreeData } from 'components/file-tree/file-tree-data';
-import { FileTree } from 'components/file-tree/file-tree';
-import { IconButton, Grid, Typography, StyleRulesCallback, withStyles, WithStyles, CardHeader, Card, Button, Tooltip, CircularProgress } from '@material-ui/core';
-import { CustomizeTableIcon } from 'components/icon/icon';
-import { DownloadIcon } from 'components/icon/icon';
-import { SearchInput } from '../search-input/search-input';
+import classNames from 'classnames';
+import { connect } from 'react-redux';
+import { FixedSizeList } from "react-window";
+import AutoSizer from "react-virtualized-auto-sizer";
+import servicesProvider from 'common/service-provider';
+import { CustomizeTableIcon, DownloadIcon } from 'components/icon/icon';
+import { SearchInput } from 'components/search-input/search-input';
+import { ListItemIcon, StyleRulesCallback, Theme, WithStyles, withStyles, Tooltip, IconButton, Checkbox, CircularProgress, Button } from '@material-ui/core';
+import { FileTreeData } from '../file-tree/file-tree-data';
+import { TreeItem, TreeItemStatus } from '../tree/tree';
+import { RootState } from 'store/store';
+import { WebDAV, WebDAVRequestConfig } from 'common/webdav';
+import { AuthState } from 'store/auth/auth-reducer';
+import { extractFilesData } from 'services/collection-service/collection-service-files-response';
+import { DefaultIcon, DirectoryIcon, FileIcon, BackIcon, SidePanelRightArrowIcon } from 'components/icon/icon';
+import { setCollectionFiles } from 'store/collection-panel/collection-panel-files/collection-panel-files-actions';
+import { sortBy } from 'lodash';
+import { formatFileSize } from 'common/formatters';
+import { getInlineFileUrl, sanitizeToken } from 'views-components/context-menu/actions/helpers';
 
 export interface CollectionPanelFilesProps {
-    items: Array<TreeItem<FileTreeData>>;
+    items: any;
     isWritable: boolean;
     isLoading: boolean;
     tooManyFiles: boolean;
@@ -24,115 +36,540 @@ export interface CollectionPanelFilesProps {
     onCollapseToggle: (id: string, status: TreeItemStatus) => void;
     onFileClick: (id: string) => void;
     loadFilesFunc: () => void;
-    currentItemUuid?: string;
+    currentItemUuid: any;
+    dispatch: Function;
+    collectionPanelFiles: any;
+    collectionPanel: any;
 }
 
-export type CssRules = 'root' | 'cardSubheader' | 'nameHeader' | 'fileSizeHeader' | 'uploadIcon' | 'button' | 'centeredLabel' | 'cardHeaderContent' | 'cardHeaderContentTitle';
+type CssRules = "backButton" | "backButtonHidden" | "pathPanelPathWrapper" | "uploadButton" | "uploadIcon" | "loader" | "wrapper" | "dataWrapper" | "row" | "rowEmpty" | "leftPanel" | "rightPanel" | "pathPanel" | "pathPanelItem" | "rowName" | "listItemIcon" | "rowActive" | "pathPanelMenu" | "rowSelection" | "leftPanelHidden" | "leftPanelVisible" | "searchWrapper" | "searchWrapperHidden";
 
-const styles: StyleRulesCallback<CssRules> = theme => ({
-    root: {
-        paddingBottom: theme.spacing.unit,
-        height: '100%'
+const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
+    wrapper: {
+        display: 'flex',
+        minHeight: '600px',
+        marginBottom: '1rem',
+        color: 'rgba(0, 0, 0, 0.87)',
+        fontSize: '0.875rem',
+        fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
+        fontWeight: 400,
+        lineHeight: '1.5',
+        letterSpacing: '0.01071em'
+    },
+    backButton: {
+        color: '#00bfa5',
+        cursor: 'pointer',
+        float: 'left',
     },
-    cardSubheader: {
-        paddingTop: 0,
-        paddingBottom: 0,
-        minHeight: 8 * theme.spacing.unit,
+    backButtonHidden: {
+        display: 'none',
     },
-    cardHeaderContent: {
+    dataWrapper: {
+        minHeight: '500px'
+    },
+    row: {
         display: 'flex',
-        paddingRight: 2 * theme.spacing.unit,
-        justifyContent: 'space-between',
+        marginTop: '0.5rem',
+        marginBottom: '0.5rem',
+        cursor: 'pointer',
+        "&:hover": {
+            backgroundColor: 'rgba(0, 0, 0, 0.08)',
+        }
     },
-    cardHeaderContentTitle: {
-        paddingLeft: theme.spacing.unit,
-        paddingTop: 2 * theme.spacing.unit,
-        paddingRight: 2 * theme.spacing.unit,
+    rowEmpty: {
+        top: '40%',
+        width: '100%',
+        textAlign: 'center',
+        position: 'absolute'
     },
-    nameHeader: {
-        marginLeft: '75px'
+    loader: {
+        top: '50%',
+        left: '50%',
+        marginTop: '-15px',
+        marginLeft: '-15px',
+        position: 'absolute'
     },
-    fileSizeHeader: {
-        marginRight: '65px'
+    rowName: {
+        display: 'inline-flex',
+        flexDirection: 'column',
+        justifyContent: 'center'
     },
-    uploadIcon: {
-        transform: 'rotate(180deg)'
+    searchWrapper: {
+        display: 'inline-block',
+        marginBottom: '1rem',
+        marginLeft: '1rem',
     },
-    button: {
-        marginRight: -theme.spacing.unit,
-        marginTop: '8px'
+    searchWrapperHidden: {
+        width: '0px'
     },
-    centeredLabel: {
-        fontSize: '0.875rem',
-        textAlign: 'center'
+    rowSelection: {
+        padding: '0px',
+    },
+    rowActive: {
+        color: `${theme.palette.primary.main} !important`,
+    },
+    listItemIcon: {
+        display: 'inline-flex',
+        flexDirection: 'column',
+        justifyContent: 'center'
+    },
+    pathPanelMenu: {
+        float: 'right',
+        marginTop: '-15px',
+    },
+    pathPanel: {
+        padding: '1rem',
+        marginBottom: '1rem',
+        backgroundColor: '#fff',
+        boxShadow: '0px 1px 3px 0px rgb(0 0 0 / 20%), 0px 1px 1px 0px rgb(0 0 0 / 14%), 0px 2px 1px -1px rgb(0 0 0 / 12%)',
     },
+    pathPanelPathWrapper: {
+        display: 'inline-block',
+    },
+    leftPanel: {
+        flex: 0,
+        padding: '1rem',
+        marginRight: '1rem',
+        whiteSpace: 'nowrap',
+        position: 'relative',
+        backgroundColor: '#fff',
+        boxShadow: '0px 3px 3px 0px rgb(0 0 0 / 20%), 0px 3px 1px 0px rgb(0 0 0 / 14%), 0px 3px 1px -1px rgb(0 0 0 / 12%)',
+    },
+    leftPanelVisible: {
+        opacity: 1,
+        flex: '50%',
+        animation: `animateVisible 1000ms ${theme.transitions.easing.easeOut}`
+    },
+    leftPanelHidden: {
+        opacity: 0,
+        flex: 'initial',
+        padding: '0',
+        marginRight: '0',
+    },
+    "@keyframes animateVisible": {
+        "0%": {
+            opacity: 0,
+            flex: 'initial',
+        },
+        "100%": {
+            opacity: 1,
+            flex: '50%',
+        }
+    },
+    rightPanel: {
+        flex: '50%',
+        padding: '1rem',
+        paddingTop: '2rem',
+        marginTop: '-1rem',
+        position: 'relative',
+        backgroundColor: '#fff',
+        boxShadow: '0px 3px 3px 0px rgb(0 0 0 / 20%), 0px 3px 1px 0px rgb(0 0 0 / 14%), 0px 3px 1px -1px rgb(0 0 0 / 12%)',
+    },
+    pathPanelItem: {
+        cursor: 'pointer',
+    },
+    uploadIcon: {
+        transform: 'rotate(180deg)'
+    },
+    uploadButton: {
+        float: 'right',
+    }
 });
 
-export const CollectionPanelFilesComponent = ({ onItemMenuOpen, onSearchChange, onOptionsMenuOpen, onUploadDataClick, classes,
-    isWritable, isLoading, tooManyFiles, loadFilesFunc, ...treeProps }: CollectionPanelFilesProps & WithStyles<CssRules>) => {
-    const { useState, useEffect } = React;
-    const [searchValue, setSearchValue] = useState('');
-
-    useEffect(() => {
-        onSearchChange(searchValue);
-    }, [onSearchChange, searchValue]);
-
-    return (<Card data-cy='collection-files-panel' className={classes.root}>
-        <CardHeader
-            title={
-                <div className={classes.cardHeaderContent}>
-                    <span className={classes.cardHeaderContentTitle}>Files</span>
-                    <SearchInput
-                        value={searchValue}
-                        label='Search files'
-                        onSearch={setSearchValue} />
-                </div>
+const pathPromise = {};
+
+export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState) => ({
+    auth: state.auth,
+    collectionPanel: state.collectionPanel,
+    collectionPanelFiles: state.collectionPanelFiles,
+}))((props: CollectionPanelFilesProps & WithStyles<CssRules> & { auth: AuthState }) => {
+    const { classes, onItemMenuOpen, onUploadDataClick, isWritable, dispatch, collectionPanelFiles, collectionPanel } = props;
+    const { apiToken, config } = props.auth;
+
+    const webdavClient = new WebDAV();
+    webdavClient.defaults.baseURL = config.keepWebServiceUrl;
+    webdavClient.defaults.headers = {
+        Authorization: `Bearer ${apiToken}`
+    };
+
+    const webDAVRequestConfig: WebDAVRequestConfig = {
+        headers: {
+            Depth: '1',
+        },
+    };
+
+    const parentRef = React.useRef(null);
+    const [path, setPath]: any = React.useState([]);
+    const [pathData, setPathData]: any = React.useState({});
+    const [isLoading, setIsLoading] = React.useState(false);
+    const [collectionAutofetchEnabled, setCollectionAutofetchEnabled] = React.useState(false);
+    const [leftSearch, setLeftSearch] = React.useState('');
+    const [rightSearch, setRightSearch] = React.useState('');
+
+    const leftKey = (path.length > 1 ? path.slice(0, path.length - 1) : path).join('/');
+    const rightKey = path.join('/');
+
+    const leftData = pathData[leftKey] || [];
+    const rightData = pathData[rightKey];
+
+    React.useEffect(() => {
+        if (props.currentItemUuid) {
+            setPathData({});
+            setPath([props.currentItemUuid]);
+        }
+    }, [props.currentItemUuid]);
+
+    const fetchData = (keys, ignoreCache = false) => {
+        const keyArray = Array.isArray(keys) ? keys : [keys];
+
+        Promise.all(keyArray
+            .map((key) => {
+                const dataExists = !!pathData[key];
+                const runningRequest = pathPromise[key];
+
+                if ((!dataExists || ignoreCache) && (!runningRequest || ignoreCache)) {
+                    if (!isLoading) {
+                        setIsLoading(true);
+                    }
+
+                    pathPromise[key] = true;
+
+                    return webdavClient.propfind(`c=${key}`, webDAVRequestConfig);
+                }
+
+                return Promise.resolve(null);
+            })
+            .filter((promise) => !!promise)
+        )
+            .then((requests) => {
+                const newState = requests.map((request, index) => {
+                    if (request && request.responseXML != null) {
+                        const key = keyArray[index];
+                        const result: any = extractFilesData(request.responseXML);
+                        const sortedResult = sortBy(result, (n) => n.name).sort((n1, n2) => {
+                            if (n1.type === 'directory' && n2.type !== 'directory') {
+                                return -1;
+                            }
+                            if (n1.type !== 'directory' && n2.type === 'directory') {
+                                return 1;
+                            }
+                            return 0;
+                        });
+
+                        return { [key]: sortedResult };
+                    }
+                    return {};
+                }).reduce((prev, next) => {
+                    return { ...next, ...prev };
+                }, {});
+
+                setPathData({ ...pathData, ...newState });
+            })
+            .finally(() => {
+                setIsLoading(false);
+                keyArray.forEach(key => delete pathPromise[key]);
+            });
+    };
+
+    React.useEffect(() => {
+        if (rightKey) {
+            fetchData(rightKey);
+            setLeftSearch('');
+            setRightSearch('');
+        }
+    }, [rightKey]); // eslint-disable-line react-hooks/exhaustive-deps
+
+    React.useEffect(() => {
+        const hash = (collectionPanel.item || {}).portableDataHash;
+
+        if (hash && collectionAutofetchEnabled) {
+            fetchData([leftKey, rightKey], true);
+        }
+    }, [(collectionPanel.item || {}).portableDataHash]); // eslint-disable-line react-hooks/exhaustive-deps
+
+    React.useEffect(() => {
+        if (rightData) {
+            const filtered = rightData.filter(({ name }) => name.indexOf(rightSearch) > -1);
+            setCollectionFiles(filtered, false)(dispatch);
+        }
+    }, [rightData, dispatch, rightSearch]);
+
+    const handleRightClick = React.useCallback(
+        (event) => {
+            event.preventDefault();
+            let elem = event.target;
+
+            while (elem && elem.dataset && !elem.dataset.item) {
+                elem = elem.parentNode;
             }
-            className={classes.cardSubheader}
-            classes={{ action: classes.button }}
-            action={<>
-                {isWritable &&
-                    <Button
-                        data-cy='upload-button'
-                        onClick={onUploadDataClick}
-                        variant='contained'
-                        color='primary'
-                        size='small'>
-                        <DownloadIcon className={classes.uploadIcon} />
-                    Upload data
-                </Button>}
-                {!tooManyFiles &&
-                    <Tooltip title="More options" disableFocusListener>
-                        <IconButton
-                            data-cy='collection-files-panel-options-btn'
-                            onClick={(ev) => onOptionsMenuOpen(ev, isWritable)}>
-                            <CustomizeTableIcon />
-                        </IconButton>
-                    </Tooltip>}
-            </>
-            } />
-        {tooManyFiles
-            ? <div className={classes.centeredLabel}>
-                File listing may take some time, please click to browse: <Button onClick={loadFilesFunc}><DownloadIcon />Show files</Button>
-            </div>
-            : <>
-                <Grid container justify="space-between">
-                    <Typography variant="caption" className={classes.nameHeader}>
-                        Name
-                    </Typography>
-                    <Typography variant="caption" className={classes.fileSizeHeader}>
-                        File size
-                    </Typography>
-                </Grid>
-                {isLoading
-                    ? <div className={classes.centeredLabel}><CircularProgress /></div>
-                    : <div style={{ height: 'calc(100% - 60px)' }}>
-                        <FileTree
-                            onMenuOpen={(ev, item) => onItemMenuOpen(ev, item, isWritable)}
-                            {...treeProps} /></div>}
-            </>
+
+            if (!elem || !elem.dataset) {
+                return;
+            }
+
+            const { id } = elem.dataset;
+
+            const item: any = {
+                id,
+                data: rightData.find((elem) => elem.id === id),
+            };
+
+            if (id) {
+                onItemMenuOpen(event, item, isWritable);
+
+                if (!collectionAutofetchEnabled) {
+                    setCollectionAutofetchEnabled(true);
+                }
+            }
+        },
+        [onItemMenuOpen, isWritable, rightData] // eslint-disable-line react-hooks/exhaustive-deps
+    );
+
+    React.useEffect(() => {
+        let node = null;
+
+        if (parentRef && parentRef.current) {
+            node = parentRef.current;
+            (node as any).addEventListener('contextmenu', handleRightClick);
         }
-    </Card>);
-};
 
-export const CollectionPanelFiles = withStyles(styles)(CollectionPanelFilesComponent);
+        return () => {
+            if (node) {
+                (node as any).removeEventListener('contextmenu', handleRightClick);
+            }
+        };
+    }, [parentRef, handleRightClick]);
+
+    const handleClick = React.useCallback(
+        (event: any) => {
+            let isCheckbox = false;
+            let elem = event.target;
+
+            if (elem.type === 'checkbox') {
+                isCheckbox = true;
+            }
+
+            while (elem && elem.dataset && !elem.dataset.item) {
+                elem = elem.parentNode;
+            }
+
+            if (elem && elem.dataset && !isCheckbox) {
+                const { parentPath, subfolderPath, breadcrumbPath, type } = elem.dataset;
+
+                if (breadcrumbPath) {
+                    const index = path.indexOf(breadcrumbPath);
+                    setPath([...path.slice(0, index + 1)]);
+                }
+
+                if (parentPath && type === 'directory') {
+                    if (path.length > 1) {
+                        path.pop()
+                    }
+
+                    setPath([...path, parentPath]);
+                }
+
+                if (subfolderPath && type === 'directory') {
+                    setPath([...path, subfolderPath]);
+                }
+
+                if (elem.dataset.id && type === 'file') {
+                    const item = rightData.find(({id}) => id === elem.dataset.id) || leftData.find(({ id }) => id === elem.dataset.id);
+                    const enhancedItem = servicesProvider.getServices().collectionService.extendFileURL(item);
+                    const fileUrl = sanitizeToken(getInlineFileUrl(enhancedItem.url, config.keepWebServiceUrl, config.keepWebInlineServiceUrl), true);
+                    window.open(fileUrl, '_blank');
+                }
+            }
+
+            if (isCheckbox) {
+                const { id } = elem.dataset;
+                const item = collectionPanelFiles[id];
+                props.onSelectionToggle(event, item);
+            }
+        },
+        [path, setPath, collectionPanelFiles] // eslint-disable-line react-hooks/exhaustive-deps
+    );
+
+    const getItemIcon = React.useCallback(
+        (type: string, activeClass: string | null) => {
+            let Icon = DefaultIcon;
+
+            switch (type) {
+                case 'directory':
+                    Icon = DirectoryIcon;
+                    break;
+                case 'file':
+                    Icon = FileIcon;
+                    break;
+            }
+
+            return (
+                <ListItemIcon className={classNames(classes.listItemIcon, activeClass)}>
+                    <Icon />
+                </ListItemIcon>
+            )
+        },
+        [classes]
+    );
+
+    const getActiveClass = React.useCallback(
+        (name) => {
+            return path[path.length - 1] === name ? classes.rowActive : null;
+        },
+        [path, classes]
+    );
+
+    const onOptionsMenuOpen = React.useCallback(
+        (ev, isWritable) => {
+            props.onOptionsMenuOpen(ev, isWritable);
+        },
+        [props.onOptionsMenuOpen] // eslint-disable-line react-hooks/exhaustive-deps
+    );
+
+    return (
+        <div data-cy="collection-files-panel" onClick={handleClick} ref={parentRef}>
+            <div className={classes.pathPanel}>
+                <div className={classes.pathPanelPathWrapper}>
+                    {
+                        path
+                            .map((p: string, index: number) => <span
+                                key={`${index}-${p}`}
+                                data-item="true"
+                                className={classes.pathPanelItem}
+                                data-breadcrumb-path={p}
+                            >
+                                <span className={classes.rowActive}>{index === 0 ? 'Home' : p}</span> <b>/</b>&nbsp;
+                            </span>)
+                    }
+                </div>
+                <Tooltip className={classes.pathPanelMenu} title="More options" disableFocusListener>
+                    <IconButton
+                        data-cy='collection-files-panel-options-btn'
+                        onClick={(ev) => {
+                            if (!collectionAutofetchEnabled) {
+                                setCollectionAutofetchEnabled(true);
+                            }
+                            onOptionsMenuOpen(ev, isWritable);
+                        }}>
+                        <CustomizeTableIcon />
+                    </IconButton>
+                </Tooltip>
+            </div>
+            <div className={classes.wrapper}>
+                <div className={classNames(classes.leftPanel, path.length > 1 ? classes.leftPanelVisible : classes.leftPanelHidden)}>
+                    <Tooltip title="Go back" className={path.length > 1 ? classes.backButton : classes.backButtonHidden}>
+                        <IconButton onClick={() => setPath([...path.slice(0, path.length -1)])}>
+                            <BackIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <div className={path.length > 1 ? classes.searchWrapper : classes.searchWrapperHidden}>
+                        <SearchInput label="Search" value={leftSearch} onSearch={setLeftSearch} />
+                    </div>
+                    <div className={classes.dataWrapper}>
+                        {
+                            leftData ?
+                                <AutoSizer defaultWidth={0}>
+                                    {({ height, width }) => {
+                                        const filtered = leftData.filter(({ name }) => name.indexOf(leftSearch) > -1);
+
+                                        return !!filtered.length ? <FixedSizeList
+                                            height={height}
+                                            itemCount={filtered.length}
+                                            itemSize={35}
+                                            width={width}
+                                        >
+                                            {
+                                                ({ index, style }) => {
+                                                    const { id, type, name } = filtered[index];
+
+                                                    return <div
+                                                        data-id={id}
+                                                        style={style}
+                                                        data-item="true"
+                                                        data-type={type}
+                                                        data-parent-path={name}
+                                                        className={classNames(classes.row, getActiveClass(name))}
+                                                        key={id}>
+                                                            {getItemIcon(type, getActiveClass(name))} 
+                                                            <div className={classes.rowName}>
+                                                                {name}
+                                                            </div>
+                                                            {
+                                                                getActiveClass(name) ? <SidePanelRightArrowIcon
+                                                                    style={{ display: 'inline', marginTop: '5px', marginLeft: '5px' }} /> : null
+                                                            }
+                                                    </div>;
+                                                }
+                                            }
+                                        </FixedSizeList> : <div className={classes.rowEmpty}>No directories available</div>
+                                    }}
+                                </AutoSizer> : <div className={classes.row}><CircularProgress className={classes.loader} size={30} /></div>
+                        }
+
+                    </div>
+                </div>
+                <div className={classes.rightPanel}>
+                    <div className={classes.searchWrapper}>
+                        <SearchInput label="Search" value={rightSearch} onSearch={setRightSearch} />
+                    </div>
+                    {
+                        isWritable &&
+                        <Button
+                            className={classes.uploadButton}
+                            data-cy='upload-button'
+                            onClick={onUploadDataClick}
+                            variant='contained'
+                            color='primary'
+                            size='small'>
+                            <DownloadIcon className={classes.uploadIcon} />
+                            Upload data
+                        </Button>
+                    }
+                    <div className={classes.dataWrapper}>
+                        {
+                            rightData && !isLoading ?
+                                <AutoSizer defaultHeight={500}>
+                                    {({ height, width }) => {
+                                        const filtered = rightData.filter(({ name }) => name.indexOf(rightSearch) > -1);
+
+                                        return !!filtered.length ? <FixedSizeList
+                                            height={height}
+                                            itemCount={filtered.length}
+                                            itemSize={35}
+                                            width={width}
+                                        >
+                                            {
+                                                ({ index, style }) => {
+                                                    const { id, type, name, size } = filtered[index];
+
+                                                    return <div
+                                                        style={style}
+                                                        data-id={id}
+                                                        data-item="true"
+                                                        data-type={type}
+                                                        data-subfolder-path={name}
+                                                        className={classes.row} key={id}>
+                                                        <Checkbox
+                                                            color="primary"
+                                                            className={classes.rowSelection}
+                                                            checked={collectionPanelFiles[id] ? collectionPanelFiles[id].value.selected : false}
+                                                        />&nbsp;
+                                                    {getItemIcon(type, null)} <div className={classes.rowName}>
+                                                            {name}
+                                                        </div>
+                                                        <span className={classes.rowName} style={{ marginLeft: 'auto', marginRight: '1rem' }}>
+                                                            {formatFileSize(size)}
+                                                        </span>
+                                                    </div>
+                                                }
+                                            }
+                                        </FixedSizeList> : <div className={classes.rowEmpty}>No data available</div>
+                                    }}
+                                </AutoSizer> : <div className={classes.row}><CircularProgress className={classes.loader} size={30} /></div>
+                        }
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+}));
similarity index 98%
rename from src/components/collection-panel-files/collection-panel-files.test.tsx
rename to src/components/collection-panel-files/collection-panel-files2.test.tsx
index 8c85a9cc18901f84a0137d75ef828abfe8987354..4d8b815022f20b81a53e5f7ea4858744efdd398c 100644 (file)
@@ -9,7 +9,7 @@ import Adapter from "enzyme-adapter-react-16";
 import { TreeItem, TreeItemStatus } from '../tree/tree';
 import { FileTreeData } from '../file-tree/file-tree-data';
 import { CollectionFileType } from "../../models/collection-file";
-import { CollectionPanelFilesComponent, CollectionPanelFilesProps, CssRules } from './collection-panel-files';
+import { CollectionPanelFilesComponent, CollectionPanelFilesProps, CssRules } from './collection-panel-files2';
 import { SearchInput } from '../search-input/search-input';
 
 configure({ adapter: new Adapter() });
diff --git a/src/components/collection-panel-files/collection-panel-files2.tsx b/src/components/collection-panel-files/collection-panel-files2.tsx
new file mode 100644 (file)
index 0000000..4118248
--- /dev/null
@@ -0,0 +1,138 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import React from 'react';
+import { TreeItem, TreeItemStatus } from 'components/tree/tree';
+import { FileTreeData } from 'components/file-tree/file-tree-data';
+import { FileTree } from 'components/file-tree/file-tree';
+import { IconButton, Grid, Typography, StyleRulesCallback, withStyles, WithStyles, CardHeader, Card, Button, Tooltip, CircularProgress } from '@material-ui/core';
+import { CustomizeTableIcon } from 'components/icon/icon';
+import { DownloadIcon } from 'components/icon/icon';
+import { SearchInput } from '../search-input/search-input';
+
+export interface CollectionPanelFilesProps {
+    items: Array<TreeItem<FileTreeData>>;
+    isWritable: boolean;
+    isLoading: boolean;
+    tooManyFiles: boolean;
+    onUploadDataClick: () => void;
+    onSearchChange: (searchValue: string) => void;
+    onItemMenuOpen: (event: React.MouseEvent<HTMLElement>, item: TreeItem<FileTreeData>, isWritable: boolean) => void;
+    onOptionsMenuOpen: (event: React.MouseEvent<HTMLElement>, isWritable: boolean) => void;
+    onSelectionToggle: (event: React.MouseEvent<HTMLElement>, item: TreeItem<FileTreeData>) => void;
+    onCollapseToggle: (id: string, status: TreeItemStatus) => void;
+    onFileClick: (id: string) => void;
+    loadFilesFunc: () => void;
+    currentItemUuid?: string;
+}
+
+export type CssRules = 'root' | 'cardSubheader' | 'nameHeader' | 'fileSizeHeader' | 'uploadIcon' | 'button' | 'centeredLabel' | 'cardHeaderContent' | 'cardHeaderContentTitle';
+
+const styles: StyleRulesCallback<CssRules> = theme => ({
+    root: {
+        paddingBottom: theme.spacing.unit,
+        height: '100%'
+    },
+    cardSubheader: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        minHeight: 8 * theme.spacing.unit,
+    },
+    cardHeaderContent: {
+        display: 'flex',
+        paddingRight: 2 * theme.spacing.unit,
+        justifyContent: 'space-between',
+    },
+    cardHeaderContentTitle: {
+        paddingLeft: theme.spacing.unit,
+        paddingTop: 2 * theme.spacing.unit,
+        paddingRight: 2 * theme.spacing.unit,
+    },
+    nameHeader: {
+        marginLeft: '75px'
+    },
+    fileSizeHeader: {
+        marginRight: '65px'
+    },
+    uploadIcon: {
+        transform: 'rotate(180deg)'
+    },
+    button: {
+        marginRight: -theme.spacing.unit,
+        marginTop: '8px'
+    },
+    centeredLabel: {
+        fontSize: '0.875rem',
+        textAlign: 'center'
+    },
+});
+
+export const CollectionPanelFilesComponent = ({ onItemMenuOpen, onSearchChange, onOptionsMenuOpen, onUploadDataClick, classes,
+    isWritable, isLoading, tooManyFiles, loadFilesFunc, ...treeProps }: CollectionPanelFilesProps & WithStyles<CssRules>) => {
+    const { useState, useEffect } = React;
+    const [searchValue, setSearchValue] = useState('');
+
+    useEffect(() => {
+        onSearchChange(searchValue);
+    }, [onSearchChange, searchValue]);
+
+    return (<Card data-cy='collection-files-panel' className={classes.root}>
+        <CardHeader
+            title={
+                <div className={classes.cardHeaderContent}>
+                    <span className={classes.cardHeaderContentTitle}>Files</span>
+                    <SearchInput
+                        value={searchValue}
+                        label='Search files'
+                        onSearch={setSearchValue} />
+                </div>
+            }
+            className={classes.cardSubheader}
+            classes={{ action: classes.button }}
+            action={<>
+                {isWritable &&
+                    <Button
+                        data-cy='upload-button'
+                        onClick={onUploadDataClick}
+                        variant='contained'
+                        color='primary'
+                        size='small'>
+                        <DownloadIcon className={classes.uploadIcon} />
+                    Upload data
+                </Button>}
+                {!tooManyFiles &&
+                    <Tooltip title="More options" disableFocusListener>
+                        <IconButton
+                            data-cy='collection-files-panel-options-btn'
+                            onClick={(ev) => onOptionsMenuOpen(ev, isWritable)}>
+                            <CustomizeTableIcon />
+                        </IconButton>
+                    </Tooltip>}
+            </>
+            } />
+        {tooManyFiles
+            ? <div className={classes.centeredLabel}>
+                File listing may take some time, please click to browse: <Button onClick={loadFilesFunc}><DownloadIcon />Show files</Button>
+            </div>
+            : <>
+                <Grid container justify="space-between">
+                    <Typography variant="caption" className={classes.nameHeader}>
+                        Name
+                    </Typography>
+                    <Typography variant="caption" className={classes.fileSizeHeader}>
+                        File size
+                    </Typography>
+                </Grid>
+                {isLoading
+                    ? <div className={classes.centeredLabel}><CircularProgress /></div>
+                    : <div style={{ height: 'calc(100% - 60px)' }}>
+                        <FileTree
+                            onMenuOpen={(ev, item) => onItemMenuOpen(ev, item, isWritable)}
+                            {...treeProps} /></div>}
+            </>
+        }
+    </Card>);
+};
+
+export const CollectionPanelFiles = withStyles(styles)(CollectionPanelFilesComponent);
index 2d62194bd3f7ab8e91466d066b66fcc100e02191..6ad22a551633a71d577ebe74e35f632d894f05ba 100644 (file)
@@ -19,6 +19,7 @@ import { createServices } from "services/services";
 import { MuiThemeProvider } from '@material-ui/core/styles';
 import { CustomTheme } from 'common/custom-theme';
 import { fetchConfig } from 'common/config';
+import servicesProvider from 'common/service-provider';
 import { addMenuActionSet, ContextMenuKind } from 'views-components/context-menu/context-menu';
 import { rootProjectActionSet } from "views-components/context-menu/action-sets/root-project-action-set";
 import { filterGroupActionSet, projectActionSet, readOnlyProjectActionSet } from "views-components/context-menu/action-sets/project-action-set";
@@ -136,6 +137,10 @@ fetchConfig()
                 }
             }
         });
+
+        // be sure this is initiated before the app starts
+        servicesProvider.setServices(services);
+
         const store = configureStore(history, services, config);
 
         store.subscribe(initListener(history, store, services, config));
index 3951d272ee8f3d046c96036be440fef8187f9e91..91008d1fdaf15d33f824ae40c2a694dbb38f5efd 100644 (file)
@@ -52,7 +52,7 @@ export const createCollectionFile = (data: Partial<CollectionFile>): CollectionF
     ...data
 });
 
-export const createCollectionFilesTree = (data: Array<CollectionDirectory | CollectionFile>) => {
+export const createCollectionFilesTree = (data: Array<CollectionDirectory | CollectionFile>, joinParents: Boolean = true) => {
     const directories = data.filter(item => item.type === CollectionFileType.DIRECTORY);
     directories.sort((a, b) => a.path.localeCompare(b.path));
     const files = data.filter(item => item.type === CollectionFileType.FILE);
@@ -60,7 +60,7 @@ export const createCollectionFilesTree = (data: Array<CollectionDirectory | Coll
         .reduce((tree, item) => setNode({
             children: [],
             id: item.id,
-            parent: getParentId(item),
+            parent: joinParents ? getParentId(item) : '',
             value: item,
             active: false,
             selected: false,
index 813fe4461367ad66071195d0b6c5a206b278b90f..ca9542c5b18d447854f7110af6fa40104548da00 100644 (file)
@@ -4,7 +4,6 @@
 
 import { Dispatch } from "redux";
 import {
-    loadCollectionFiles,
     COLLECTION_PANEL_LOAD_FILES_THRESHOLD
 } from "./collection-panel-files/collection-panel-files-actions";
 import { CollectionResource } from 'models/collection';
@@ -40,7 +39,7 @@ export const loadCollectionPanel = (uuid: string, forceReload = false) =>
         dispatch(resourcesActions.SET_RESOURCES([collection]));
         if (collection.fileCount <= COLLECTION_PANEL_LOAD_FILES_THRESHOLD &&
             !getState().collectionPanel.loadBigCollections) {
-            dispatch<any>(loadCollectionFiles(collection.uuid));
+            // dispatch<any>(loadCollectionFiles(collection.uuid));
         }
         return collection;
     };
index 3217d01439e084bd96aca8230cd96e74fc11bcac..71e1f6e8eed4b02343552843a746c29d10494a1b 100644 (file)
@@ -4,6 +4,7 @@
 
 import { unionize, ofType, UnionOf } from "common/unionize";
 import { Dispatch } from "redux";
+import servicesProvider from 'common/service-provider';
 import { CollectionFilesTree, CollectionFileType, createCollectionFilesTree } from "models/collection-file";
 import { ServiceRepository } from "services/services";
 import { RootState } from "../../store";
@@ -31,6 +32,13 @@ export type CollectionPanelFilesAction = UnionOf<typeof collectionPanelFilesActi
 export const COLLECTION_PANEL_LOAD_FILES = 'collectionPanelLoadFiles';
 export const COLLECTION_PANEL_LOAD_FILES_THRESHOLD = 40000;
 
+export const setCollectionFiles = (files, joinParents = true) => (dispatch: any) => {
+    const tree = createCollectionFilesTree(files, joinParents);
+    const sorted = sortFilesTree(tree);
+    const mapped = mapTreeValues(servicesProvider.getServices().collectionService.extendFileURL)(sorted);
+    dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES(mapped));
+};
+
 export const loadCollectionFiles = (uuid: string) =>
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(progressIndicatorActions.START_WORKING(COLLECTION_PANEL_LOAD_FILES));