From aea14dd74abbb85fa9ce9b64473aa0e30b396442 Mon Sep 17 00:00:00 2001 From: Michael An <2331806369@qq.com> Date: Thu, 11 Apr 2019 11:13:36 +0800 Subject: [PATCH] delete details choice in menu (#3239) --- .../src/components/dir-view-mode/dir-list-view.js | 2 -- .../components/dirent-list-view/dirent-list-item.js | 8 -------- .../components/dirent-list-view/dirent-list-view.js | 6 ------ .../src/components/dirent-list-view/dirent-menu.js | 11 +++-------- .../components/dirent-list-view/dirent-right-menu.js | 11 +++-------- .../src/components/dirent-list-view/dirents-menu.js | 5 +---- frontend/src/pages/my-libs/my-libs.js | 1 - frontend/src/pages/my-libs/mylib-repo-list-item.js | 8 -------- frontend/src/pages/my-libs/mylib-repo-list-view.js | 2 -- frontend/src/pages/my-libs/mylib-repo-menu.js | 4 ---- 10 files changed, 7 insertions(+), 51 deletions(-) diff --git a/frontend/src/components/dir-view-mode/dir-list-view.js b/frontend/src/components/dir-view-mode/dir-list-view.js index ced53459b4..92c65f10c9 100644 --- a/frontend/src/components/dir-view-mode/dir-list-view.js +++ b/frontend/src/components/dir-view-mode/dir-list-view.js @@ -31,7 +31,6 @@ const propTypes = { onItemMove: PropTypes.func.isRequired, onItemCopy: PropTypes.func.isRequired, onDirentClick: PropTypes.func.isRequired, - onItemDetails: PropTypes.func.isRequired, updateDirent: PropTypes.func.isRequired, isAllItemSelected: PropTypes.bool.isRequired, onAllItemSelected: PropTypes.func.isRequired, @@ -156,7 +155,6 @@ class DirListView extends React.Component { onItemMove={this.props.onItemMove} onItemCopy={this.props.onItemCopy} onDirentClick={this.props.onDirentClick} - onItemDetails={this.props.onItemDetails} isDirentListLoading={this.props.isDirentListLoading} updateDirent={this.props.updateDirent} isAllItemSelected={this.props.isAllItemSelected} diff --git a/frontend/src/components/dirent-list-view/dirent-list-item.js b/frontend/src/components/dirent-list-view/dirent-list-item.js index 32265ae802..4e70a3bda8 100644 --- a/frontend/src/components/dirent-list-view/dirent-list-item.js +++ b/frontend/src/components/dirent-list-view/dirent-list-item.js @@ -31,7 +31,6 @@ const propTypes = { onItemRename: PropTypes.func.isRequired, onItemMove: PropTypes.func.isRequired, onItemCopy: PropTypes.func.isRequired, - onItemDetails: PropTypes.func.isRequired, onDirentClick: PropTypes.func.isRequired, updateDirent: PropTypes.func.isRequired, showImagePopup: PropTypes.func.isRequired, @@ -242,9 +241,6 @@ class DirentListItem extends React.Component { case 'Permission': this.onPermissionItem(); break; - case 'Details': - this.onDetailsItem(); - break; case 'Unlock': this.onUnlockItem(); break; @@ -298,10 +294,6 @@ class DirentListItem extends React.Component { } - onDetailsItem = () => { - this.props.onItemDetails(this.props.dirent); - } - onLockItem = () => { let repoID = this.props.repoID; let filePath = this.getDirentPath(this.props.dirent); diff --git a/frontend/src/components/dirent-list-view/dirent-list-view.js b/frontend/src/components/dirent-list-view/dirent-list-view.js index 8950611dc9..7a6d647a76 100644 --- a/frontend/src/components/dirent-list-view/dirent-list-view.js +++ b/frontend/src/components/dirent-list-view/dirent-list-view.js @@ -30,7 +30,6 @@ const propTypes = { onItemMove: PropTypes.func.isRequired, onItemCopy: PropTypes.func.isRequired, onDirentClick: PropTypes.func.isRequired, - onItemDetails: PropTypes.func.isRequired, updateDirent: PropTypes.func.isRequired, switchAnotherMenuToShow: PropTypes.func, appMenuType: PropTypes.oneOf(['list_view_contextmenu', 'item_contextmenu', 'tree_contextmenu', 'item_op_menu']), @@ -98,10 +97,6 @@ class DirentListView extends React.Component { this.onFreezedItem(); } - onItemDetails = (dirent) => { - this.props.onItemDetails(dirent); - } - onCreateFileToggle = () => { this.setState({ isCreateFileDialogShow: !this.state.isCreateFileDialogShow, @@ -296,7 +291,6 @@ class DirentListView extends React.Component { onFreezedItem={this.onFreezedItem} onUnfreezedItem={this.onUnfreezedItem} onDirentClick={this.props.onDirentClick} - onItemDetails={this.onItemDetails} showImagePopup={this.showImagePopup} switchAnotherMenuToShow={this.props.switchAnotherMenuToShow} appMenuType={this.props.appMenuType} diff --git a/frontend/src/components/dirent-list-view/dirent-menu.js b/frontend/src/components/dirent-list-view/dirent-menu.js index 8296cdfcb4..c5f737e778 100644 --- a/frontend/src/components/dirent-list-view/dirent-menu.js +++ b/frontend/src/components/dirent-list-view/dirent-menu.js @@ -42,15 +42,15 @@ class DirentMenu extends React.Component { if (type === 'dir' && permission === 'rw') { let menuList = []; if (can_set_folder_perm) { - menuList = ['Rename', 'Move', 'Copy', 'Divider', 'Permission', 'Details', 'Divider', 'Open via Client']; + menuList = ['Rename', 'Move', 'Copy', 'Divider', 'Permission', 'Divider', 'Open via Client']; } else { - menuList = ['Rename', 'Move', 'Copy', 'Divider', 'Details', 'Divider', 'Open via Client']; + menuList = ['Rename', 'Move', 'Copy', 'Divider', 'Open via Client']; } return menuList; } if (type === 'dir' && permission === 'r') { - let menuList = currentRepoInfo.encrypted ? ['Copy', 'Details'] : ['Details']; + let menuList = currentRepoInfo.encrypted ? ['Copy'] : []; return menuList; } @@ -78,7 +78,6 @@ class DirentMenu extends React.Component { if (fileAuditEnabled) { menuList.push('Access Log'); } - menuList.push('Details'); menuList.push('Divider'); menuList.push('Open via Client'); return menuList; @@ -93,7 +92,6 @@ class DirentMenu extends React.Component { menuList.push('Comment'); } menuList.push('History'); - menuList.push('Details'); return menuList; } } @@ -113,9 +111,6 @@ class DirentMenu extends React.Component { case 'Permission': translateResult = gettext('Permission'); break; - case 'Details': - translateResult = gettext('Details'); - break; case 'Unlock': translateResult = gettext('Unlock'); break; diff --git a/frontend/src/components/dirent-list-view/dirent-right-menu.js b/frontend/src/components/dirent-list-view/dirent-right-menu.js index 8b5216db0c..d323a03c95 100644 --- a/frontend/src/components/dirent-list-view/dirent-right-menu.js +++ b/frontend/src/components/dirent-list-view/dirent-right-menu.js @@ -59,15 +59,15 @@ class DirentRightMenu extends React.Component { let subscriptList = showShare ? ['Share', 'Download', 'Delete', 'Divider'] : ['Download', 'Delete', 'Divider']; let menuList = []; if (can_set_folder_perm) { - menuList = [...subscriptList, 'Rename', 'Move', 'Copy', 'Divider', 'Permission', 'Details', 'Divider', 'Open via Client']; + menuList = [...subscriptList, 'Rename', 'Move', 'Copy', 'Divider', 'Permission', 'Divider', 'Open via Client']; } else { - menuList = [...subscriptList, 'Rename', 'Move', 'Copy', 'Divider', 'Details', 'Divider', 'Open via Client']; + menuList = [...subscriptList, 'Rename', 'Move', 'Copy', 'Divider', 'Open via Client']; } return menuList; } if (type === 'dir' && permission === 'r') { - let menuList = showShare ? ['Share', 'Download','Delete', 'Divider', 'Copy', 'Details'] : ['Download', 'Delete', 'Divider', 'Details']; + let menuList = showShare ? ['Share', 'Download','Delete', 'Divider', 'Copy'] : ['Download', 'Delete']; return menuList; } @@ -96,7 +96,6 @@ class DirentRightMenu extends React.Component { if (fileAuditEnabled) { menuList.push('Access Log'); } - menuList.push('Details'); menuList.push('Divider'); menuList.push('Open via Client'); return menuList; @@ -111,7 +110,6 @@ class DirentRightMenu extends React.Component { menuList.push('Comment'); } menuList.push('History'); - menuList.push('Details'); return menuList; } } @@ -165,9 +163,6 @@ class DirentRightMenu extends React.Component { case 'Delete': translateResult = gettext('Delete'); break; - case 'Details': - translateResult = gettext('Details'); - break; case 'Unlock': translateResult = gettext('Unlock'); break; diff --git a/frontend/src/components/dirent-list-view/dirents-menu.js b/frontend/src/components/dirent-list-view/dirents-menu.js index cf76e228ba..2b7bf7c519 100644 --- a/frontend/src/components/dirent-list-view/dirents-menu.js +++ b/frontend/src/components/dirent-list-view/dirents-menu.js @@ -31,7 +31,7 @@ class DirentMenu extends React.Component { if (dirent.type === 'dir') { menuList = ['Share']; } else if (dirent.type === 'file') { - menuList = ['Share', 'Tags', 'Related Files', 'Divider', 'History', 'Details', 'Divider', 'Open via Client']; + menuList = ['Share', 'Tags', 'Related Files', 'Divider', 'History', 'Divider', 'Open via Client']; if (!Utils.isMarkdownFile(dirent.name)) { menuList.splice(2, 1); } @@ -62,9 +62,6 @@ class DirentMenu extends React.Component { case 'Tags': translateResult = gettext('Tags'); break; - case 'Details': - translateResult = gettext('Details'); - break; case 'Lock': translateResult = gettext('Lock'); break; diff --git a/frontend/src/pages/my-libs/my-libs.js b/frontend/src/pages/my-libs/my-libs.js index 5fa02e3f3a..86ce85d5f6 100644 --- a/frontend/src/pages/my-libs/my-libs.js +++ b/frontend/src/pages/my-libs/my-libs.js @@ -155,7 +155,6 @@ class MyLibraries extends Component { onRenameRepo={this.onRenameRepo} onDeleteRepo={this.onDeleteRepo} onTransferRepo={this.onTransferRepo} - onRepoDetails={this.onRepoDetails} onRepoClick={this.onRepoClick} sortRepoList={this.sortRepoList} /> diff --git a/frontend/src/pages/my-libs/mylib-repo-list-item.js b/frontend/src/pages/my-libs/mylib-repo-list-item.js index 39da47cae8..8338939f48 100644 --- a/frontend/src/pages/my-libs/mylib-repo-list-item.js +++ b/frontend/src/pages/my-libs/mylib-repo-list-item.js @@ -25,7 +25,6 @@ const propTypes = { onRenameRepo: PropTypes.func.isRequired, onDeleteRepo: PropTypes.func.isRequired, onTransferRepo: PropTypes.func.isRequired, - onRepoDetails: PropTypes.func.isRequired, onRepoClick: PropTypes.func.isRequired, }; @@ -90,9 +89,6 @@ class MylibRepoListItem extends React.Component { case 'Folder Permission': // todo break; - case 'Details': - this.onRepoDetails(); - break; case 'Label current state': this.onLabel(); break; @@ -146,10 +142,6 @@ class MylibRepoListItem extends React.Component { this.setState({isResetPasswordDialogShow: !this.state.isResetPasswordDialogShow}); } - onRepoDetails = () => { - this.props.onRepoDetails(this.props.repo); - } - onLabel = () => { // todo } diff --git a/frontend/src/pages/my-libs/mylib-repo-list-view.js b/frontend/src/pages/my-libs/mylib-repo-list-view.js index 93b0420aab..0ead4bf0f2 100644 --- a/frontend/src/pages/my-libs/mylib-repo-list-view.js +++ b/frontend/src/pages/my-libs/mylib-repo-list-view.js @@ -12,7 +12,6 @@ const propTypes = { onRenameRepo: PropTypes.func.isRequired, onDeleteRepo: PropTypes.func.isRequired, onTransferRepo: PropTypes.func.isRequired, - onRepoDetails: PropTypes.func.isRequired, onRepoClick: PropTypes.func.isRequired, }; @@ -61,7 +60,6 @@ class MylibRepoListView extends React.Component { onRenameRepo={this.props.onRenameRepo} onDeleteRepo={this.props.onDeleteRepo} onTransferRepo={this.props.onTransferRepo} - onRepoDetails={this.props.onRepoDetails} onRepoClick={this.props.onRepoClick} /> ); diff --git a/frontend/src/pages/my-libs/mylib-repo-menu.js b/frontend/src/pages/my-libs/mylib-repo-menu.js index 5fa4a15104..820530fd52 100644 --- a/frontend/src/pages/my-libs/mylib-repo-menu.js +++ b/frontend/src/pages/my-libs/mylib-repo-menu.js @@ -61,7 +61,6 @@ class MylibRepoMenu extends React.Component { if (folderPermEnabled) { operations.push('Folder Permission'); } - operations.push('Details'); if (this.props.isPC && enableRepoSnapshotLabel) { operations.push('Label current state'); } @@ -95,9 +94,6 @@ class MylibRepoMenu extends React.Component { case 'Folder Permission': translateResult = gettext('Folder Permission'); break; - case 'Details': - translateResult = gettext('Details'); - break; case 'Label current state': translateResult = gettext('Label current state'); break;