1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00

Revert "add repo in right tool panel (#7410)" (#7413)

This reverts commit b07f33e07c.
This commit is contained in:
Daniel Pan
2025-01-23 09:50:56 +08:00
committed by GitHub
parent 9cf1e9564a
commit 2467734990
7 changed files with 16 additions and 75 deletions

View File

@@ -1,61 +0,0 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Dropdown, DropdownMenu, DropdownToggle, DropdownItem } from 'reactstrap';
import { gettext } from '../utils/constants';
const propTypes = {
className: PropTypes.string,
onAddRepo: PropTypes.func.isRequired,
};
class AddRepos extends React.Component {
constructor(props) {
super(props);
this.state = {
isDropdownMenuOpen: false
};
}
toggleDropdownMenu = () => {
this.setState({
isDropdownMenuOpen: !this.state.isDropdownMenuOpen
});
};
render() {
const { isDropdownMenuOpen } = this.state;
const { className = '' } = this.props;
return (
<Dropdown
isOpen={isDropdownMenuOpen}
toggle={this.toggleDropdownMenu}
className={className}
>
<DropdownToggle
tag="div"
data-toggle="dropdown"
title={gettext('New Library')}
aria-label={gettext('New Library')}
aria-expanded={isDropdownMenuOpen}
>
<span className='cur-view-path-btn px-1'>
<span className='sf3-font sf3-font-new'></span>
<span className='sf3-font sf3-font-down'></span>
</span>
</DropdownToggle>
<DropdownMenu right={true} className="mt-1">
<DropdownItem onClick={this.props.onAddRepo}>
<span className='sf3-font sf3-font-new mr-2'></span>
<span>{gettext('New Library')}</span>
</DropdownItem>
</DropdownMenu>
</Dropdown>
);
}
}
AddRepos.propTypes = propTypes;
export default AddRepos;

View File

@@ -8,7 +8,6 @@ import { GRID_MODE, LIST_MODE } from './dir-view-mode/constants';
import '../css/view-modes.css';
const propTypes = {
className: PropTypes.string,
currentViewMode: PropTypes.string.isRequired,
switchViewMode: PropTypes.func.isRequired
};
@@ -48,7 +47,7 @@ class ViewModes extends React.Component {
render() {
const { isDropdownMenuOpen } = this.state;
const { currentViewMode, className = '' } = this.props;
const { currentViewMode } = this.props;
const shortcutMain = Utils.isMac() ? '⇧ ⌘' : 'Ctrl + Shift +';
const options = [
{ 'icon': 'list-view', 'text': gettext('List view'), 'value': LIST_MODE, 'shortcut': `${shortcutMain} 1` },
@@ -59,7 +58,6 @@ class ViewModes extends React.Component {
isOpen={isDropdownMenuOpen}
toggle={this.toggleDropdownMenu}
id="cur-view-change-mode-dropdown"
className={className}
>
<DropdownToggle
tag="div"

View File

@@ -23,7 +23,6 @@ import SharedRepoListView from '../../components/shared-repo-list-view/shared-re
import SortOptionsDialog from '../../components/dialog/sort-options';
import SingleDropdownToolbar from '../../components/toolbar/single-dropdown-toolbar';
import ViewModes from '../../components/view-modes';
import AddRepos from '../../components/add-repos';
import ReposSortMenu from '../../components/sort-menu';
import { LIST_MODE } from '../../components/dir-view-mode/constants';
@@ -461,8 +460,9 @@ class GroupView extends React.Component {
)}
{Utils.isDesktop() && (
<div className="d-flex align-items-center">
<AddRepos className="mr-2" onAddRepo={this.onCreateRepoToggle} />
<ViewModes currentViewMode={currentViewMode} switchViewMode={this.switchViewMode} className="mr-2" />
<div className="mr-2">
<ViewModes currentViewMode={currentViewMode} switchViewMode={this.switchViewMode} />
</div>
<ReposSortMenu sortBy={sortBy} sortOrder={sortOrder} onSelectSortOption={this.onSelectSortOption}/>
</div>
)}

View File

@@ -9,7 +9,6 @@ import toaster from '../../components/toast';
import Loading from '../../components/loading';
import ViewModes from '../../components/view-modes';
import ReposSortMenu from '../../components/sort-menu';
import AddRepos from '../../components/add-repos';
import SingleDropdownToolbar from '../../components/toolbar/single-dropdown-toolbar';
import SortOptionsDialog from '../../components/dialog/sort-options';
import GuideForNewDialog from '../../components/dialog/guide-for-new-dialog';
@@ -408,8 +407,9 @@ class Libraries extends Component {
<h3 className="sf-heading m-0">{gettext('Files')}</h3>
{isDesktop &&
<div className="d-flex align-items-center">
<AddRepos className="mr-2" onAddRepo={this.toggleCreateRepoDialog} />
<ViewModes currentViewMode={currentViewMode} switchViewMode={this.switchViewMode} className="mr-2" />
<div className="mr-2">
<ViewModes currentViewMode={currentViewMode} switchViewMode={this.switchViewMode} />
</div>
<ReposSortMenu sortBy={sortBy} sortOrder={sortOrder} onSelectSortOption={this.onSelectSortOption} />
</div>
}

View File

@@ -10,7 +10,6 @@ import Loading from '../../components/loading';
import EmptyTip from '../../components/empty-tip';
import ModalPortal from '../../components/modal-portal';
import ViewModes from '../../components/view-modes';
import AddRepos from '../../components/add-repos';
import ReposSortMenu from '../../components/sort-menu';
import SingleDropdownToolbar from '../../components/toolbar/single-dropdown-toolbar';
import SortOptionsDialog from '../../components/dialog/sort-options';
@@ -176,8 +175,9 @@ class MyLibraries extends Component {
</h3>
{isDesktop ? (
<div className="d-flex align-items-center">
<AddRepos className="mr-2" onAddRepo={this.toggleCreateRepoDialog} />
<ViewModes currentViewMode={currentViewMode} switchViewMode={this.switchViewMode} className="mr-2" />
<div className="mr-2">
<ViewModes currentViewMode={currentViewMode} switchViewMode={this.switchViewMode} />
</div>
<ReposSortMenu sortBy={sortBy} sortOrder={sortOrder} onSelectSortOption={this.onSelectSortOption} />
</div>
) : (

View File

@@ -142,7 +142,9 @@ class SharedLibraries extends Component {
<h3 className="sf-heading m-0">{gettext('Shared with me')}</h3>
{Utils.isDesktop() && (
<div className="d-flex align-items-center">
<ViewModes currentViewMode={currentViewMode} switchViewMode={this.switchViewMode} className="mr-2" />
<div className="mr-2">
<ViewModes currentViewMode={currentViewMode} switchViewMode={this.switchViewMode} />
</div>
<ReposSortMenu sortBy={sortBy} sortOrder={sortOrder} onSelectSortOption={this.onSelectSortOption}/>
</div>
)}

View File

@@ -264,7 +264,9 @@ class SharedWithAll extends React.Component {
</h3>
{Utils.isDesktop() && (
<div className="d-flex align-items-center">
<ViewModes currentViewMode={currentViewMode} switchViewMode={this.switchViewMode} className="mr-2" />
<div className="mr-2">
<ViewModes currentViewMode={currentViewMode} switchViewMode={this.switchViewMode} />
</div>
<ReposSortMenu sortBy={sortBy} sortOrder={sortOrder} onSelectSortOption={this.onSelectSortOption}/>
</div>
)}